Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on the time tracker

Browse Source
This commit is contained in:
Hillel Coren 2017-10-01 20:26:53 +03:00
parent fc624d1aab
commit d37e2b90a0
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
resources/views/tasks/time_tracker.blade.php
View File

@ -127,7 +127,11 @@
xpadding-bottom: 10px !important; xpadding-bottom: 10px !important;
} }
.ui-timepicker-wrapper { .ui-timepicker-wrapper.start-time {
width: 140px !important;
}
.ui-timepicker-wrapper.end-time {
width: 230px !important; width: 230px !important;
} }
@ -230,7 +234,7 @@
<div data-bind="css: { 'has-error': !isStartValid() }"> <div data-bind="css: { 'has-error': !isStartValid() }">
{!! Former::text('start_time') {!! Former::text('start_time')
->placeholder('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() !!} ->raw() !!}
</div> </div>
</td> </td>
@ -238,17 +242,18 @@
<div data-bind="css: { 'has-error': !isEndValid() }"> <div data-bind="css: { 'has-error': !isEndValid() }">
{!! Former::text('end_time') {!! Former::text('end_time')
->placeholder('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() !!} ->raw() !!}
</div> </div>
</td> </td>
<td style="padding: 0 0 10px 6px"> <td style="padding: 0 0 10px 6px">
{!! Former::text('duration') {!! Former::text('duration')
->placeholder('duration') ->placeholder('duration')
->addClass('hide-phone')
->data_bind("typeahead: duration") ->data_bind("typeahead: duration")
->raw() !!} ->raw() !!}
</td> </td>
<td style="width:38px; padding-top: 0px; padding-right: 8px"> <td style="width:38px; padding-top: 0px; padding-right: 8px" class="hide-phone">
<i style="cursor:pointer;float:right" data-bind="click: $root.selectedTask().removeTime, visible: actionButtonVisible" class="fa fa-minus-circle redlink" title="{{ trans('texts.remove') }}"/> <i style="cursor:pointer;float:right" data-bind="click: $root.selectedTask().removeTime, visible: actionButtonVisible" class="fa fa-minus-circle redlink" title="{{ trans('texts.remove') }}"/>
</td> </td>

4
resources/views/tasks/time_tracker_knockout.blade.php
View File

@ -76,8 +76,8 @@
}; };
var defaultTimes = []; var defaultTimes = [];
for (var i=15; i<(15*4*24); i+=15) { for (var i=15; i<(15*4*6); i+=15) {
var time = moment.utc(i * 1000 * 60).format("HH:mm:ss"); var time = moment.utc(i * 1000 * 60).format("H:mm:ss");
defaultTimes.push(time); defaultTimes.push(time);
} }