From b70c4b6b2053f943d2df3d5a042c69ef1ceaba8b Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 1 Oct 2017 13:04:49 +0300 Subject: [PATCH] Working on the time tracker --- resources/views/tasks/time_tracker.blade.php | 6 +- .../tasks/time_tracker_knockout.blade.php | 83 ++++++++++++++++--- 2 files changed, 73 insertions(+), 16 deletions(-) diff --git a/resources/views/tasks/time_tracker.blade.php b/resources/views/tasks/time_tracker.blade.php index 26e17fb15960..d913d1f6a867 100644 --- a/resources/views/tasks/time_tracker.blade.php +++ b/resources/views/tasks/time_tracker.blade.php @@ -220,7 +220,7 @@ {!! Former::text('date') - ->placeholder('date') + ->placeholder($account->formatDate($account->getDateTime())) ->data_bind("datepicker: startDate, valueUpdate: 'afterkeydown'") ->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT)) ->raw() !!} @@ -228,13 +228,13 @@ {!! Former::text('start_time') ->placeholder('start_time') - ->data_bind("timepicker: startTime, timepickerOptions: {scrollDefault: 'now', timeFormat: '" . ($account->military_time ? 'H:i:s' : 'g:i:s A') . "'}") + ->data_bind("timepicker: startTimeOfDay, timepickerOptions: {scrollDefault: 'now', timeFormat: '" . ($account->military_time ? 'H:i:s' : 'g:i:s A') . "'}") ->raw() !!} {!! Former::text('end_time') ->placeholder('end_time') - ->data_bind("timepicker: endTime, timepickerOptions: {scrollDefault: 'now', timeFormat: '" . ($account->military_time ? 'H:i:s' : 'g:i:s A') . "'}") + ->data_bind("timepicker: endTimeOfDay, timepickerOptions: {scrollDefault: 'now', timeFormat: '" . ($account->military_time ? 'H:i:s' : 'g:i:s A') . "'}") ->raw() !!} diff --git a/resources/views/tasks/time_tracker_knockout.blade.php b/resources/views/tasks/time_tracker_knockout.blade.php index 8be1f0ec3bc3..4feac239f7cf 100644 --- a/resources/views/tasks/time_tracker_knockout.blade.php +++ b/resources/views/tasks/time_tracker_knockout.blade.php @@ -48,6 +48,9 @@ ko.utils.registerEventHandler(element, 'change', function () { var value = valueAccessor(); + var seconds = $(element).timepicker('getSecondsFromMidnight'); + value(seconds); + /* var field = $(element).attr('name'); var time = 0; if (field == 'duration') { @@ -59,16 +62,17 @@ } } value(time); + */ }); }, update: function (element, valueAccessor) { var value = ko.utils.unwrapObservable(valueAccessor()); var field = $(element).attr('name'); - if (field == 'duration') { - $(element).timepicker('setTime', intToTime(value)); - } else { - if (value) { + if (value) { + if (field == 'duration') { + $(element).timepicker('setTime', intToTime(value)); + } else { $(element).timepicker('setTime', new Date(value * 1000)); } } @@ -662,8 +666,18 @@ } } - if (data) { - self.update(data); + self.checkForEmpty = function() { + var hasEmpty = false; + var lastTime = 0; + for (var i=0; i