Better employee selection for schedule
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
p Select employee
|
p= modal_options.header
|
||||||
ul.select-employees
|
ul.select-employees
|
||||||
each employee in employees
|
each employee in employees
|
||||||
li.select-employee
|
li.select-employee
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ App.ScheduleView = Ember.View.extend
|
|||||||
selectable: true
|
selectable: true
|
||||||
selectHelper: true
|
selectHelper: true
|
||||||
select: (start, end)=>
|
select: (start, end)=>
|
||||||
|
format = 'dddd h:mm'
|
||||||
controller.modal 'select_employee',
|
controller.modal 'select_employee',
|
||||||
ok: ->
|
ok: ->
|
||||||
# this context is SelectEmployeeController
|
# this context is SelectEmployeeController
|
||||||
@@ -20,6 +21,7 @@ App.ScheduleView = Ember.View.extend
|
|||||||
shift.set 'employee', employee
|
shift.set 'employee', employee
|
||||||
shift.save().then ->
|
shift.save().then ->
|
||||||
placeholder.fullCalendar('renderEvent', shift.get('calendar_event'), true)
|
placeholder.fullCalendar('renderEvent', shift.get('calendar_event'), true)
|
||||||
|
header: t('employee_shift.time_window', start: start.format(format), end: end.format(format))
|
||||||
editable: true
|
editable: true
|
||||||
defaultView: 'agendaWeek'
|
defaultView: 'agendaWeek'
|
||||||
events: events
|
events: events
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ $.extend($translations.en, <%= I18n.t('supplier', locale: :en).to_json %>);
|
|||||||
$.extend($translations.nl, <%= I18n.t('supplier', locale: :nl).to_json %>);
|
$.extend($translations.nl, <%= I18n.t('supplier', locale: :nl).to_json %>);
|
||||||
|
|
||||||
String.prototype.capitalize = function() { return this.charAt(0).toUpperCase() + this.slice(1); }
|
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.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 %>;
|
window.countries = <%= IsoCountryCodes.all.map{|cc| {name: cc.name}}.to_json.html_safe %>;
|
||||||
|
|
||||||
|
|||||||
@@ -21,6 +21,7 @@
|
|||||||
@ttry = (path, vars={})->
|
@ttry = (path, vars={})->
|
||||||
@t(path, $.extend(vars, emptyWhenNotFound: true))
|
@t(path, $.extend(vars, emptyWhenNotFound: true))
|
||||||
|
|
||||||
|
|
||||||
# return translation in the form
|
# return translation in the form
|
||||||
# <span data-t="models.table">Tafel</span>
|
# <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>"
|
@tspan = (path, vars={}) -> "<span data-t='#{path}' class='translation' data-t-attributes='#{JSON.stringify(vars)}'>#{t(path, vars)}</span>"
|
||||||
|
|||||||
@@ -210,6 +210,7 @@ en:
|
|||||||
title: Select ${models.employee}
|
title: Select ${models.employee}
|
||||||
close_button: Close
|
close_button: Close
|
||||||
employee_shift:
|
employee_shift:
|
||||||
|
time_window: From %{start} to %{end}
|
||||||
modal:
|
modal:
|
||||||
title: Edit ${models.employee_shift}
|
title: Edit ${models.employee_shift}
|
||||||
body_header: ''
|
body_header: ''
|
||||||
|
|||||||
@@ -213,6 +213,7 @@ nl:
|
|||||||
title: Select ${models.employee}
|
title: Select ${models.employee}
|
||||||
close_button: Close
|
close_button: Close
|
||||||
employee_shift:
|
employee_shift:
|
||||||
|
time_window: Van %{start} tot %{end}
|
||||||
modal:
|
modal:
|
||||||
title: ${models.employee_shift} bewerken
|
title: ${models.employee_shift} bewerken
|
||||||
body_header: ''
|
body_header: ''
|
||||||
|
|||||||
Reference in New Issue
Block a user