Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Set time to now if + or - is used and no time is available.

Browse source
This commit is contained in:
Martin Edenhofer 2015-09-23 11:08:19 +02:00
parent 60e259021a
commit 11400f4dd8
2 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/assets/javascripts/app/controllers/_ui_element/date.js.coffee
View file

@ -33,22 +33,22 @@ class App.UiElement.date
) )
item.find('.js-plus-day').bind('click', (e) => item.find('.js-plus-day').bind('click', (e) =>
e.preventDefault() e.preventDefault()
@setNewTime(item, attribute, 60 * 24) @setNewTime(item, attribute, 60 * 24, false, true)
@validation(item, attribute) @validation(item, attribute)
) )
item.find('.js-minus-day').bind('click', (e) => item.find('.js-minus-day').bind('click', (e) =>
e.preventDefault() e.preventDefault()
@setNewTime(item, attribute, -60 * 24) @setNewTime(item, attribute, -60 * 24, false, true)
@validation(item, attribute) @validation(item, attribute)
) )
item.find('.js-plus-week').bind('click', (e) => item.find('.js-plus-week').bind('click', (e) =>
e.preventDefault() e.preventDefault()
@setNewTime(item, attribute, 60 * 24 * 7) @setNewTime(item, attribute, 60 * 24 * 7, false, true)
@validation(item, attribute) @validation(item, attribute)
) )
item.find('.js-minus-week').bind('click', (e) => item.find('.js-minus-week').bind('click', (e) =>
e.preventDefault() e.preventDefault()
@setNewTime(item, attribute, -60 * 24 * 7) @setNewTime(item, attribute, -60 * 24 * 7, false, true)
@validation(item, attribute) @validation(item, attribute)
) )
item.find('input').bind('keyup blur focus change', (e) => item.find('input').bind('keyup blur focus change', (e) =>
@ -68,20 +68,21 @@ class App.UiElement.date
number = "0#{number}" number = "0#{number}"
number number
@setNewTime: (item, attribute, diff, reset = false) -> @setNewTime: (item, attribute, diff, reset = false, tolerant = false) ->
# remove old validation resetTimeToToday = =>
#item.find('.has-error').removeClass('has-error')
#item.closest('.form-group').find('.help-inline').html('')
if reset
time = new Date() time = new Date()
time.setMinutes( time.getMinutes() + diff ) time.setMinutes( time.getMinutes() + diff )
@setParams(item, attribute, time) @setParams(item, attribute, time)
return
return resetTimeToToday() if reset
params = @getParams(item) params = @getParams(item)
return if params.year is '' && params.month is '' && params.day is '' && params.hour is '' && params.day is '' if params.year is '' && params.month is '' && params.day is ''
return if !tolerant
resetTimeToToday()
params = @getParams(item)
time = new Date( Date.parse( "#{params.year}-#{@format(params.month)}-#{@format(params.day)}T00:00:00Z" ) ) time = new Date( Date.parse( "#{params.year}-#{@format(params.month)}-#{@format(params.day)}T00:00:00Z" ) )
time.setMinutes( time.getMinutes() + diff ) time.setMinutes( time.getMinutes() + diff )
return if !time return if !time

29
app/assets/javascripts/app/controllers/_ui_element/datetime.js.coffee
View file

@ -37,32 +37,32 @@ class App.UiElement.datetime
) )
item.find('.js-plus-hour').bind('click', (e) => item.find('.js-plus-hour').bind('click', (e) =>
e.preventDefault() e.preventDefault()
@setNewTime(item, attribute, 60) @setNewTime(item, attribute, 60, false, true)
@validation(item, attribute) @validation(item, attribute)
) )
item.find('.js-minus-hour').bind('click', (e) => item.find('.js-minus-hour').bind('click', (e) =>
e.preventDefault() e.preventDefault()
@setNewTime(item, attribute, -60) @setNewTime(item, attribute, -60, false, true)
@validation(item, attribute) @validation(item, attribute)
) )
item.find('.js-plus-day').bind('click', (e) => item.find('.js-plus-day').bind('click', (e) =>
e.preventDefault() e.preventDefault()
@setNewTime(item, attribute, 60 * 24) @setNewTime(item, attribute, 60 * 24, false, true)
@validation(item, attribute) @validation(item, attribute)
) )
item.find('.js-minus-day').bind('click', (e) => item.find('.js-minus-day').bind('click', (e) =>
e.preventDefault() e.preventDefault()
@setNewTime(item, attribute, -60 * 24) @setNewTime(item, attribute, -60 * 24, false, true)
@validation(item, attribute) @validation(item, attribute)
) )
item.find('.js-plus-week').bind('click', (e) => item.find('.js-plus-week').bind('click', (e) =>
e.preventDefault() e.preventDefault()
@setNewTime(item, attribute, 60 * 24 * 7) @setNewTime(item, attribute, 60 * 24 * 7, false, true)
@validation(item, attribute) @validation(item, attribute)
) )
item.find('.js-minus-week').bind('click', (e) => item.find('.js-minus-week').bind('click', (e) =>
e.preventDefault() e.preventDefault()
@setNewTime(item, attribute, -60 * 24 * 7) @setNewTime(item, attribute, -60 * 24 * 7, false, true)
@validation(item, attribute) @validation(item, attribute)
) )
item.find('input').bind('keyup blur focus change', (e) => item.find('input').bind('keyup blur focus change', (e) =>
@ -82,20 +82,21 @@ class App.UiElement.datetime
number = "0#{number}" number = "0#{number}"
number number
@setNewTime: (item, attribute, diff, reset = false) -> @setNewTime: (item, attribute, diff, reset = false, tolerant = false) ->
# remove old validation resetTimeToToday = =>
#item.find('.has-error').removeClass('has-error')
#item.closest('.form-group').find('.help-inline').html('')
if reset
time = new Date() time = new Date()
time.setMinutes( time.getMinutes() + diff ) time.setMinutes( time.getMinutes() + diff )
@setParams(item, attribute, time) @setParams(item, attribute, time)
return
return resetTimeToToday() if reset
params = @getParams(item) params = @getParams(item)
return if params.year is '' && params.month is '' && params.day is '' && params.hour is '' && params.day is '' if params.year is '' && params.month is '' && params.day is '' && params.hour is '' && params.minute is ''
return if !tolerant
resetTimeToToday()
params = @getParams(item)
time = new Date( Date.parse( "#{params.year}-#{@format(params.month)}-#{@format(params.day)}T#{@format(params.hour)}:#{@format(params.minute)}:00Z" ) ) time = new Date( Date.parse( "#{params.year}-#{@format(params.month)}-#{@format(params.day)}T#{@format(params.hour)}:#{@format(params.minute)}:00Z" ) )
time.setMinutes( time.getMinutes() + diff + time.getTimezoneOffset() ) time.setMinutes( time.getMinutes() + diff + time.getTimezoneOffset() )
return if !time return if !time