Revert default currency branch

app/assets/javascripts/osem-schedule.js

@@ -80,6 +80,35 @@ $(document).ready( function() {
   $('.unscheduled-events .schedule-event-delete-button').hide();
   $('.non_schedulable .schedule-event-delete-button').hide();
 
+  $('#current-event-btn').on('click', function() {
+    var now = new Date();
+    var closestEventId = null;
+    var smallestDiff = Infinity;
+    var i = 0;
+
+    $('.event-item').each(function() {
+
+      var eventTimeStr = $(this).data('time');
+
+        if (eventTimeStr) {
+            var eventTime = new Date(eventTimeStr);
+            var diff = Math.abs(eventTime - now);
+
+            if (diff < smallestDiff) {
+                smallestDiff = diff;
+                closestEventId = $(this).attr('class').split(' ')[1];
+            }
+        }
+    });
+
+    if (closestEventId) {
+      //Instead of relying on hash it's probably better to scroll using javascript
+      //Since the users and click button->scroll->click again, which won't re-scroll
+      $('.highlighted').removeClass('highlighted');
+      $('.' + closestEventId).addClass('highlighted').get(0).scrollIntoView({ behavior: 'smooth', block: 'start' });
+    }
+  });
+
   // set events as draggable
   $('.schedule-event').not('.non_schedulable').draggable({
     snap: '.schedule-room-slot',

app/assets/stylesheets/osem-schedule.scss

@@ -185,3 +185,10 @@
 h3.event-panel-title small {
   line-height: 1.4;
 }
+
+#current-event-btn {
+  position: fixed;
+  bottom: 40px;
+  right: 40px;
+  z-index: 1000;
+}

app/controllers/admin/commercials_controller.rb

@@ -55,30 +55,44 @@ def render_commercial
     # Received a file from user
     # Reads file and creates commercial for event
     # File content example:
-    # EventID:MyURL
+    # EventID, Title, URL
     def mass_upload
       errors = Commercial.read_file(params[:file]) if params[:file]
 
       if !params[:file]
         flash[:error] = 'Empty file detected while adding materials to Event'
-      elsif errors.all? { |_k, v| v.blank? }
-        flash[:notice] = 'Successfully added materials.'
-      else
-        errors_text = ''
-        errors_text += 'Unable to find event with ID: ' + errors[:no_event].join(', ') + '. ' if errors[:no_event].any?
-        if errors[:validation_errors].any?
-          errors_text += 'There were some errors: ' + errors[:validation_errors].join('. ')
-        end
+      elsif errors.present?
+        errors_text = aggregate_errors(errors)
+        flash[:notice] = if errors_text.length > 4096
+                           'Errors are too long to be displayed. Please check the logs.'
+                         else
+                           errors_text
+                         end
 
-        flash[:error] = errors_text
+      else
+        flash[:notice] = 'Successfully added materials.'
       end
       redirect_back(fallback_location: root_path)
     end
 
     private
 
+    # Aggregate errors and ensure that they do not exceed 4 KB in total size
+    def aggregate_errors(errors)
+      errors_text = ''
+      if errors[:no_event].any?
+        errors_text += 'Unable to find events with IDs: ' + errors[:no_event].join(', ') + '. '
+      end
+      if errors[:validation_errors].any?
+        errors_text += 'Validation errors: ' + errors[:validation_errors].join('. ')
+      end
+      errors_text
+    end
+
     def commercial_params
-      params.require(:commercial).permit(:title, :url)
+      params.require(:commercial).permit(:title, :url).tap do |params|
+        params[:url] = Commercial.generate_snap_embed(params[:url]) if params[:url]
+      end
     end
   end
 end

app/controllers/admin/event_types_controller.rb

@@ -50,7 +50,7 @@ def destroy
 
     def event_type_params
       params.require(:event_type).permit(:title, :length, :minimum_abstract_length, :maximum_abstract_length,
-                                         :submission_template, :color, :conference_id, :description)
+                                         :submission_template, :color, :conference_id, :description, :enable_public_submission)
     end
   end
 end

app/controllers/admin/events_controller.rb

@@ -182,6 +182,17 @@ def toggle_attendance
       end
     end
 
+    def destroy
+      @event = Event.find(params[:id])
+      if @event.destroy
+        flash[:notice] = 'Event successfully deleted.'
+        redirect_to admin_conference_program_events_path(@conference.short_title)
+      else
+        flash[:alert] = 'Event could not be deleted.'
+        redirect_to admin_conference_program_event_path(@conference.short_title, @event)
+      end
+    end
+
     private
 
     def event_params

app/controllers/admin/schedules_controller.rb

@@ -4,6 +4,7 @@ module Admin
   class SchedulesController < Admin::BaseController
     # By authorizing 'conference' resource, we can ensure there will be no unauthorized access to
     # the schedule of a conference, which should not be accessed in the first place
+    before_action :set_conference
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource :program, through: :conference, singleton: true
     load_and_authorize_resource :schedule, through: :program, except: %i[new create]
@@ -68,8 +69,63 @@ def destroy
       end
     end
 
+    def upload_csv
+      authorize! :update, @conference
+      return flash[:alert] = 'No file was attached!' unless file_present?
+
+      if process_csv
+        flash[:notice] = 'Schedule uploaded successfully!'
+      else
+        flash[:alert] = 'Failed to process CSV file.'
+      end
+
+      redirect_to admin_conference_schedules_path(@conference)
+    end
+
     private
 
+    def set_conference
+      @conference = Conference.find_by!(short_title: params[:conference_id])
+    end
+
+    def file_present?
+      params[:schedule] && params[:schedule][:file].present?
+    end
+
+    def process_csv
+      file = params[:schedule][:file]
+      CSV.foreach(file.path, headers: true) do |row|
+        process_row(row)
+      end
+      true
+    rescue StandardError => e
+      Rails.logger.error "CSV Processing Error: #{e.message}"
+      false
+    end
+
+    def process_row(row)
+      event_date = parse_date(row['Date'])
+      event_time = parse_time(row['Start_Time'])
+      event_start_time = combine_datetime(event_date, event_time)
+
+      room = Room.find_or_create_by(name: row['Room'])
+      event = Event.find_by(id: row['Event_ID'])
+
+      event&.update(start_time: event_start_time, room: room)
+    end
+
+    def parse_date(date_str)
+      Date.strptime(date_str, '%m/%d/%y')
+    end
+
+    def parse_time(time_str)
+      Time.parse(time_str)
+    end
+
+    def combine_datetime(date, time)
+      DateTime.new(date.year, date.month, date.day, time.hour, time.min, time.sec, time.zone)
+    end
+
     def schedule_params
       params.require(:schedule).permit(:track_id) if params[:schedule]
     end

app/controllers/admin/splashpages_controller.rb

@@ -51,7 +51,8 @@ def splashpage_params
                                          :include_venue, :include_registrations,
                                          :include_tickets, :include_lodgings,
                                          :include_sponsors, :include_social_media,
-                                         :include_booths, :include_happening_now)
+                                         :include_booths, :include_happening_now,
+                                         :include_committee)
     end
   end
 end

app/controllers/conference_registrations_controller.rb

@@ -29,11 +29,16 @@ def new
   end
 
   def show
-    @total_price = Ticket.total_price_user(@conference, current_user, paid: true)
-    @tickets = current_user.ticket_purchases.by_conference(@conference).paid
-    @total_price_per_ticket = @tickets.group(:ticket_id).sum('amount_paid * quantity')
-    @ticket_payments = @tickets.group_by(&:ticket_id)
-    @total_quantity = @tickets.group(:ticket_id).sum(:quantity)
+    @purchases = current_user.ticket_purchases.by_conference(@conference).paid
+    summed_per_ticket_per_currency = @purchases.group(:ticket_id, :currency).sum('amount_paid_cents * quantity')
+    @total_price_per_ticket_per_currency = summed_per_ticket_per_currency.each_with_object({}) do |((ticket_id, currency), amount), hash|
+      hash[[ticket_id, currency]] = Money.new(amount, currency)
+    end
+    @total_quantity = @purchases.group(:ticket_id, :currency).sum(:quantity)
+    sum_total_currency = @purchases.group(:currency).sum('amount_paid_cents * quantity')
+    @total_price_per_currency = sum_total_currency.each_with_object({}) do |(currency, amount), hash|
+      hash[currency] = Money.new(amount, currency)
+    end
   end
 
   def edit; end

app/controllers/conferences_controller.rb

@@ -14,6 +14,7 @@ def index
   end
 
   # rubocop:disable Metrics/CyclomaticComplexity
+  # rubocop:disable Metrics/PerceivedComplexity
   def show
     # load conference with header content
     @conference = Conference.unscoped.eager_load(
@@ -65,8 +66,12 @@ def show
       ).order('sponsorship_levels.position ASC', 'sponsors.name')
       @sponsors = @conference.sponsors
     end
+    if @splashpage.include_committee?
+      @organizers = User.with_role(:organizer, @conference)
+    end
   end
   # rubocop:enable Metrics/CyclomaticComplexity
+  # rubocop:enable Metrics/PerceivedComplexity
 
   def calendar
     respond_to do |format|

app/controllers/payments_controller.rb

@@ -23,10 +23,6 @@ def new
     @has_registration_ticket = params[:has_registration_ticket]
     @unpaid_ticket_purchases = current_user.ticket_purchases.unpaid.by_conference(@conference)
 
-    @converted_prices = {}
-    @unpaid_ticket_purchases.each do |ticket_purchase|
-      @converted_prices[ticket_purchase.id] = ticket_purchase.amount_paid
-    end
     @currency = selected_currency
   end
 

app/controllers/proposals_controller.rb

@@ -216,6 +216,6 @@ def event_params
   end
 
   def user_params
-    params.require(:user).permit(:email, :password, :password_confirmation, :username)
+    params.require(:user).permit(:email, :password, :password_confirmation, :username, :is_admin)
   end
 end

app/controllers/users_controller.rb

@@ -2,6 +2,7 @@
 
 class UsersController < ApplicationController
   before_action :authenticate_user!, only: :search
+  before_action :set_currency_options, only: [:edit, :new, :create, :update]
   load_and_authorize_resource
 
   # GET /users/1
@@ -40,7 +41,7 @@ def search
 
   def user_params
     params[:user][:timezone] = params[:user][:timezone].presence || nil
-    params.require(:user).permit(:name, :biography, :nickname, :affiliation,
+    params.require(:user).permit(:name, :biography, :nickname, :affiliation, :default_currency,
                                  :picture, :picture_cache, :timezone)
   end
 
@@ -49,5 +50,9 @@ def user_params
   def load_user
     @user ||= (params[:id] && params[:id] != 'current' && User.find(params[:id])) || current_user
   end
+
   # rubocop:enable Naming/MemoizedInstanceVariableName
+  def set_currency_options
+    @currency_options = CurrencyConversion::VALID_CURRENCIES.map { |currency| [currency, currency] }
+  end
 end

app/helpers/application_helper.rb

@@ -122,8 +122,12 @@ def volunteer_links(event)
     end, ', ')
   end
 
-  def event_types_sentence(conference)
-    conference.event_types.map { |et| et.title.pluralize }.to_sentence
+  def event_types_sentence(conference, is_admin)
+    if is_admin
+      conference.event_types.map { |et| et.title.pluralize }.to_sentence
+    else
+      conference.event_types.available_for_public.map { |et| et.title.pluralize }.to_sentence
+    end
   end
 
   def sign_in_path

app/helpers/event_types_helper.rb

@@ -13,9 +13,9 @@ def event_type_select_options(event_types = {})
         "#{type.title} - #{show_time(type.length)}",
         type.id,
         { data: {
-          min_words:    type.minimum_abstract_length,
-          max_words:    type.maximum_abstract_length,
-          instructions: type.submission_template
+          min_words: type.minimum_abstract_length,
+          max_words: type.maximum_abstract_length,
+          template:  type.submission_template
         } }
       ]
     end