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 16:16:27 +03:00
parent dea460e0a9
commit 6f76cb1686
2 changed files with 52 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,16 +226,20 @@
->raw() !!}
</td>
<td style="padding: 0 6px 10px 6px">
{!! 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') . "'}")
->raw() !!}
<div data-bind="css: { 'has-error': !isStartValid() }">
{!! 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') . "'}")
->raw() !!}
</div>
</td>
<td style="padding: 0 6px 10px 6px">
{!! 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') . "'}")
->raw() !!}
<div data-bind="css: { 'has-error': !isEndValid() }">
{!! 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') . "'}")
->raw() !!}
</div>
</td>
<td style="padding: 0 0 10px 6px">
{!! Former::text('duration')

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

@ -303,6 +303,10 @@
if (self.selectedTask()) {
self.selectedTask().onStartClick();
} else {
if (! task.checkForOverlaps()) {
swal("{{ trans('texts.task_errors') }}");
return;
}
var time = new TimeModel();
time.startTime(moment().unix());
var task = new TaskModel();
@ -560,6 +564,10 @@
}
self.save = function(isSelected) {
if (! self.checkForOverlaps()) {
swal("{{ trans('texts.task_errors') }}");
return;
}
if (self.isValid() !== true) {
toastr.error("{{ trans('texts.error_refresh_page') }}");
throw self.isValid();
@ -658,6 +666,33 @@
}
}
self.checkForOverlaps = function() {
var lastTime = 0;
var isValid = true;
for (var i=0; i<self.time_log().length; i++) {
var timeLog = self.time_log()[i];
var startValid = true;
var endValid = true;
if (!timeLog.isEmpty()) {
if (timeLog.startTime() < lastTime || (timeLog.endTime() && timeLog.startTime() > timeLog.endTime())) {
startValid = false;
}
if (timeLog.endTime() && timeLog.endTime() < Math.min(timeLog.startTime(), lastTime)) {
endValid = false;
}
lastTime = Math.max(lastTime, timeLog.endTime());
}
timeLog.isStartValid(startValid);
timeLog.isEndValid(endValid);
if (! startValid || ! endValid) {
isValid = false;
}
}
return isValid;
}
self.checkForEmpty = function() {
setTimeout(function() {
var hasEmpty = false;
@ -708,6 +743,7 @@
});
self.onChange = function() {
self.checkForOverlaps();
self.checkForEmpty();
}
@ -780,17 +816,18 @@
if (! model.isStartEnabled()) {
return false;
}
if (! self.checkForOverlaps()) {
swal("{{ trans('texts.task_errors') }}");
return;
}
if (self.isRunning()) {
var time = self.lastTime();
time.endTime(moment().unix());
} else {
var lastTime = self.lastTime();
if (lastTime && ! lastTime.startTime()) {
console.log('using time');
var time = lastTime;
} else {
console.log('adding time');
var time = new TimeModel();
self.addTime(time);
}