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 14:13:26 +03:00
parent 026d440831
commit dea460e0a9
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -650,31 +650,28 @@
var times = data.time_log instanceof Array ? data.time_log : JSON.parse(data.time_log); var times = data.time_log instanceof Array ? data.time_log : JSON.parse(data.time_log);
ko.mapping.fromJS(data, self.mapping, this); ko.mapping.fromJS(data, self.mapping, this);
self.time_log.removeAll(); self.time_log.removeAll();
console.log('removing all...');
for (var i=0; i<times.length; i++) { for (var i=0; i<times.length; i++) {
self.time_log.push(new TimeModel(times[i])); self.time_log.push(new TimeModel(times[i]));
} }
//self.addTime(); if (! self.isRunning()) {
self.checkForEmpty(); self.addTime();
}
} }
self.checkForEmpty = function() { self.checkForEmpty = function() {
setTimeout(function() { setTimeout(function() {
console.log('checking..');
var hasEmpty = false; var hasEmpty = false;
var times = self.time_log(); var times = self.time_log();
for (var i=0; i<times.length; i++) { for (var i=0; i<times.length; i++) {
var timeLog = times[i]; var timeLog = times[i];
console.log('end time: ' + timeLog.endTime());
if (! timeLog.endTime()) { if (! timeLog.endTime()) {
hasEmpty = true; hasEmpty = true;
} }
} }
if (! hasEmpty) { if (! hasEmpty) {
console.log('addng blank');
self.addTime(); self.addTime();
} }
}, 1); }, 0);
} }
self.sortValue = function(field) { self.sortValue = function(field) {
@ -734,7 +731,7 @@
for (var i=0; i<self.time_log().length; i++) { for (var i=0; i<self.time_log().length; i++) {
var timeLog = self.time_log()[i]; var timeLog = self.time_log()[i];
if (! timeLog.isEmpty()) { if (! timeLog.isEmpty()) {
times.push([timeLog.startTime(),timeLog.endTime()]); times.push([timeLog.startTime(), timeLog.endTime()]);
} }
} }
return times; return times;
@ -788,10 +785,17 @@
var time = self.lastTime(); var time = self.lastTime();
time.endTime(moment().unix()); time.endTime(moment().unix());
} else { } 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(); var time = new TimeModel();
time.startTime(moment().unix());
self.addTime(time); self.addTime(time);
} }
time.startTime(moment().unix());
}
if (self.public_id()) { if (self.public_id()) {
var selectedTask = model.selectedTask(); var selectedTask = model.selectedTask();