Merge pull request #195 from HaughtCodeworks/261-schedule-flow-ui-audit

Schedule flow UI audit (rubycentral#261)

app/assets/javascripts/staff/program/time-slot.js

@@ -16,9 +16,25 @@
   }
 
   function initTimePickers() {
-    $('#time_slot_start_time, #time_slot_end_time').timepicker({
-      timeFormat: 'HH:mm',
-      stepMinute: 5
+    $('#time_slot_start_time').timepicker({
+      controlType: 'select',
+      timeFormat: 'h:mm tt',
+      stepMinute: 5,
+      maxTime: $('#time_slot_end_time').val(),
+      onSelect: function(time) {
+        $('#time_slot_end_time').timepicker('destroy');
+        initTimePickers();
+      }
+    });
+    $('#time_slot_end_time').timepicker({
+      controlType: 'select',
+      timeFormat: 'h:mm tt',
+      stepMinute: 5,
+      minTime: $('#time_slot_start_time').val(),
+      onSelect: function(time) {
+        $('#time_slot_start_time').timepicker('destroy');
+        initTimePickers();
+      }
     });
   }
 

app/decorators/staff/time_slot_decorator.rb

@@ -3,11 +3,11 @@ class Staff::TimeSlotDecorator < Draper::Decorator
   delegate_all
 
   def start_time
-    object.start_time.try(:to_s, :time)
+    object.start_time.try(:to_s, :time_p)
   end
 
   def end_time
-    object.end_time.try(:to_s, :time)
+    object.end_time.try(:to_s, :time_p)
   end
 
   def session_duration

app/models/event.rb

@@ -1,4 +1,5 @@
 class Event < ApplicationRecord
+
   has_many :teammates, dependent: :destroy
   has_many :staff, through: :teammates, source: :user
   has_many :proposals, dependent: :destroy

app/models/time_slot.rb

@@ -22,6 +22,10 @@ class TimeSlot < ApplicationRecord
   scope :scheduled, -> { where.not(title: [nil, ""]).or(where.not(program_session_id: nil)) }
   scope :empty, -> { where(program_session: nil, title: [nil, ""]) }
 
+  validate :end_time_later_than_start_time
+
+  validates :room_id, :conference_day, presence: true
+
   def self.import(file)
     raw_json = file.read # maybe open as well
     parsed_slots = JSON.parse(raw_json)
@@ -95,6 +99,12 @@ def session_confirmation_notes
   def session_duration
     (end_time - start_time).to_i/60
   end
+
+  def end_time_later_than_start_time
+    if session_duration <= 0
+      errors.add(:end_time, 'must be later than start time')
+    end
+  end
 end
 
 # == Schema Information

app/views/staff/rooms/destroy.js.erb

@@ -1,5 +1,4 @@
 $('table#organizer-rooms #room_<%= room.id %>').remove();
-window.Schedule.TimeSlots.reloadTable(<%=raw time_slots.rows.to_json %>);
 
 <% if has_missing_requirements?(room.event) %>
   $('#time-slot-prereqs').removeClass('hidden');

config/initializers/time_formats.rb

@@ -4,4 +4,4 @@
 Time::DATE_FORMATS[:month_day] = "%b %d"
 Time::DATE_FORMATS[:db_just_date] = "%Y-%m-%d"
 Time::DATE_FORMATS[:event_day] = "%A, %b %d"
-Time::DATE_FORMATS[:time_p] = "%H:%M%p"
+Time::DATE_FORMATS[:time_p] = "%l:%M %P"

spec/factories/time_slots.rb

@@ -4,24 +4,25 @@
   factory :time_slot do
     conference_day 1
     start_time "2014-01-31 10:41:58"
-    end_time "2014-01-31 10:41:58"
+    end_time "2014-01-31 11:41:58"
     title "MyText"
     description "MyText"
     presenter "MyText"
     event
+    room
 
     factory :time_slot_with_program_session do
       conference_day 1
       start_time "2014-01-31 10:41:58"
-      end_time "2014-01-31 10:41:58"
+      end_time "2014-01-31 11:41:58"
       event
       program_session { FactoryGirl.create(:program_session_with_proposal)}
     end
 
     factory :time_slot_with_empty_program_session do
       conference_day 1
       start_time "2014-01-31 10:41:58"
-      end_time "2014-01-31 10:41:58"
+      end_time "2014-01-31 11:41:58"
       event
       program_session
     end

spec/features/admin/users_spec.rb

@@ -20,20 +20,20 @@
       visit admin_users_path
 
       within("tr#user-#{admin_user.id}") do
-        expect(page).to have_content admin_teammate.name
-        expect(page).to have_content admin_teammate.email
+        expect(page).to have_content admin_user.name
+        expect(page).to have_content admin_user.email
         expect(page).to have_content admin_teammate.role
       end
 
       within("tr#user-#{organizer_user.id}") do
-        expect(page).to have_content organizer_teammate.name
-        expect(page).to have_content organizer_teammate.email
+        expect(page).to have_content organizer_user.name
+        expect(page).to have_content organizer_user.email
         expect(page).to have_content organizer_teammate.role
       end
 
       within("tr#user-#{reviewer_user.id}") do
-        expect(page).to have_content reviewer_teammate.name
-        expect(page).to have_content reviewer_teammate.email
+        expect(page).to have_content reviewer_user.name
+        expect(page).to have_content reviewer_user.email
         expect(page).to have_content reviewer_teammate.role
       end