mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Working on time tracker
This commit is contained in:
parent
d3ab0a522e
commit
9b7d2cb832
@ -202,7 +202,12 @@
|
||||
self.clock = ko.observable(0);
|
||||
|
||||
self.onSaveClick = function() {
|
||||
if (! model.selectedTask()) {
|
||||
return;
|
||||
}
|
||||
var data = $('#taskForm').serialize();
|
||||
var times = model.selectedTask().times();
|
||||
data += '&time_log=' + JSON.stringify(times);
|
||||
var url = '{{ url('/tasks') }}';
|
||||
$.ajax({
|
||||
dataType: 'json',
|
||||
@ -379,14 +384,17 @@
|
||||
return data.data ? new ProjectModel(data.data) : null;
|
||||
}
|
||||
},
|
||||
'ignore': [
|
||||
'time_log'
|
||||
]
|
||||
}
|
||||
|
||||
self.update = function(data) {
|
||||
var times = JSON.parse(data.time_log);
|
||||
data.time_log = false;
|
||||
ko.mapping.fromJS(data, self.mapping, this);
|
||||
self.time_log = ko.observableArray();
|
||||
for (var i=0; i<times.length; i++) {
|
||||
self.time_log.removeAll();
|
||||
for (var i=0; i<times.length; i++) {
|
||||
self.time_log.push(new TimeModel(times[i]));
|
||||
}
|
||||
}
|
||||
@ -407,6 +415,17 @@
|
||||
self.time_log.push(time);
|
||||
}
|
||||
|
||||
self.times = function() {
|
||||
var times = [];
|
||||
for (var i=0; i<self.time_log().length; i++) {
|
||||
var timeLog = self.time_log()[i];
|
||||
if (! timeLog.isEmpty()) {
|
||||
times.push([timeLog.startTime(),timeLog.endTime()]);
|
||||
}
|
||||
}
|
||||
return times;
|
||||
}
|
||||
|
||||
self.matchesFilter = function(filter) {
|
||||
filter = filter.toLowerCase();
|
||||
var parts = filter.split(' ');
|
||||
|
Loading…
x
Reference in New Issue
Block a user