From d37e2b90a028164e4e084156ffa9b4afaa8fbc5a Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 1 Oct 2017 20:26:53 +0300 Subject: [PATCH] Working on the time tracker --- resources/views/tasks/time_tracker.blade.php | 13 +++++++++---- .../views/tasks/time_tracker_knockout.blade.php | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/resources/views/tasks/time_tracker.blade.php b/resources/views/tasks/time_tracker.blade.php index 7f6b03587086..581ec104c65a 100644 --- a/resources/views/tasks/time_tracker.blade.php +++ b/resources/views/tasks/time_tracker.blade.php @@ -127,7 +127,11 @@ xpadding-bottom: 10px !important; } - .ui-timepicker-wrapper { + .ui-timepicker-wrapper.start-time { + width: 140px !important; + } + + .ui-timepicker-wrapper.end-time { width: 230px !important; } @@ -230,7 +234,7 @@
{!! Former::text('start_time') ->placeholder('start_time') - ->data_bind("timepicker: startTimeOfDay, timepickerOptions: {scrollDefault: 'now', timeFormat: '" . ($account->military_time ? 'H:i:s' : 'g:i:s A') . "'}") + ->data_bind("timepicker: startTimeOfDay, timepickerOptions: {className: 'start-time', scrollDefault: 'now', timeFormat: '" . ($account->military_time ? 'H:i:s' : 'g:i:s A') . "'}") ->raw() !!}
@@ -238,17 +242,18 @@
{!! Former::text('end_time') ->placeholder('end_time') - ->data_bind("timepicker: endTimeOfDay, timepickerOptions: {scrollDefault: 'now', timeFormat: '" . ($account->military_time ? 'H:i:s' : 'g:i:s A') . "'}") + ->data_bind("timepicker: endTimeOfDay, timepickerOptions: {className: 'end-time', scrollDefault: 'now', timeFormat: '" . ($account->military_time ? 'H:i:s' : 'g:i:s A') . "'}") ->raw() !!}
{!! Former::text('duration') ->placeholder('duration') + ->addClass('hide-phone') ->data_bind("typeahead: duration") ->raw() !!} - + diff --git a/resources/views/tasks/time_tracker_knockout.blade.php b/resources/views/tasks/time_tracker_knockout.blade.php index c8a7b335c79e..220750d9830c 100644 --- a/resources/views/tasks/time_tracker_knockout.blade.php +++ b/resources/views/tasks/time_tracker_knockout.blade.php @@ -76,8 +76,8 @@ }; var defaultTimes = []; - for (var i=15; i<(15*4*24); i+=15) { - var time = moment.utc(i * 1000 * 60).format("HH:mm:ss"); + for (var i=15; i<(15*4*6); i+=15) { + var time = moment.utc(i * 1000 * 60).format("H:mm:ss"); defaultTimes.push(time); }