From 2193ca56a109cd32969a5fa52d094003e46141ae Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Tue, 24 Mar 2015 17:49:27 +0100
Subject: [PATCH] Better employee selection for schedule

---
 .../supplier/app/templates/modals/select_employee.emblem        | 2 +-
 app/assets/javascripts/supplier/app/views/schedule.js.coffee    | 2 ++
 app/assets/javascripts/supplier/foundation1/application.js.erb  | 1 +
 app/assets/javascripts/translations.js.coffee.erb               | 1 +
 config/locales/supplier.en.yml                                  | 1 +
 config/locales/supplier.nl.yml                                  | 1 +
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/supplier/app/templates/modals/select_employee.emblem b/app/assets/javascripts/supplier/app/templates/modals/select_employee.emblem
index 1b12cd54..495f9565 100644
--- a/app/assets/javascripts/supplier/app/templates/modals/select_employee.emblem
+++ b/app/assets/javascripts/supplier/app/templates/modals/select_employee.emblem
@@ -1,4 +1,4 @@
-p Select employee
+p= modal_options.header
 ul.select-employees
   each employee in employees
     li.select-employee
diff --git a/app/assets/javascripts/supplier/app/views/schedule.js.coffee b/app/assets/javascripts/supplier/app/views/schedule.js.coffee
index 45397788..c4d63d3f 100644
--- a/app/assets/javascripts/supplier/app/views/schedule.js.coffee
+++ b/app/assets/javascripts/supplier/app/views/schedule.js.coffee
@@ -12,6 +12,7 @@ App.ScheduleView = Ember.View.extend
       selectable: true
       selectHelper: true
       select: (start, end)=>
+        format = 'dddd h:mm'
         controller.modal 'select_employee',
           ok: ->
             # this context is SelectEmployeeController
@@ -20,6 +21,7 @@ App.ScheduleView = Ember.View.extend
               shift.set 'employee', employee
               shift.save().then ->
                 placeholder.fullCalendar('renderEvent', shift.get('calendar_event'), true)
+          header: t('employee_shift.time_window', start: start.format(format), end: end.format(format))
       editable: true
       defaultView: 'agendaWeek'
       events: events
diff --git a/app/assets/javascripts/supplier/foundation1/application.js.erb b/app/assets/javascripts/supplier/foundation1/application.js.erb
index ce0ba41a..714541c0 100644
--- a/app/assets/javascripts/supplier/foundation1/application.js.erb
+++ b/app/assets/javascripts/supplier/foundation1/application.js.erb
@@ -23,6 +23,7 @@ $.extend($translations.en, <%= I18n.t('supplier', locale: :en).to_json %>);
 $.extend($translations.nl, <%= I18n.t('supplier', locale: :nl).to_json %>);
 
 String.prototype.capitalize = function() { return this.charAt(0).toUpperCase() + this.slice(1); }
+
 window.time_zones = <%= ActiveSupport::TimeZone.all.map{|tz| {name: tz.name, formatted: "GMT#{tz.formatted_offset} #{tz.name}"}}.to_json.html_safe %>;
 window.countries = <%= IsoCountryCodes.all.map{|cc| {name: cc.name}}.to_json.html_safe %>;
 
diff --git a/app/assets/javascripts/translations.js.coffee.erb b/app/assets/javascripts/translations.js.coffee.erb
index 2e668c6f..3627698c 100644
--- a/app/assets/javascripts/translations.js.coffee.erb
+++ b/app/assets/javascripts/translations.js.coffee.erb
@@ -21,6 +21,7 @@
 @ttry = (path, vars={})->
   @t(path, $.extend(vars, emptyWhenNotFound: true))
 
+
 # return translation in the form
 #   <span data-t="models.table">Tafel</span>
 @tspan = (path, vars={}) -> "<span data-t='#{path}' class='translation' data-t-attributes='#{JSON.stringify(vars)}'>#{t(path, vars)}</span>"
diff --git a/config/locales/supplier.en.yml b/config/locales/supplier.en.yml
index ff2c72a7..90b6169f 100644
--- a/config/locales/supplier.en.yml
+++ b/config/locales/supplier.en.yml
@@ -210,6 +210,7 @@ en:
         title: Select ${models.employee}
         close_button: Close
     employee_shift:
+      time_window: From %{start} to %{end}
       modal:
         title: Edit ${models.employee_shift}
         body_header: ''
diff --git a/config/locales/supplier.nl.yml b/config/locales/supplier.nl.yml
index 76211d60..9fcf07ee 100644
--- a/config/locales/supplier.nl.yml
+++ b/config/locales/supplier.nl.yml
@@ -213,6 +213,7 @@ nl:
         title: Select ${models.employee}
         close_button: Close
     employee_shift:
+      time_window: Van %{start} tot %{end}
       modal:
         title: ${models.employee_shift} bewerken
         body_header: ''