Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on time tracker

Browse Source
This commit is contained in:
Hillel Coren 2017-09-20 11:42:42 +03:00
parent 0b794f2c96
commit f5e94cbee7
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
resources/views/time_tracker.blade.php
View File

@ -25,7 +25,6 @@
color: black !important; color: black !important;
border-left-color: #f8f8f8 !important; border-left-color: #f8f8f8 !important;
border-right-color: #f8f8f8 !important; border-right-color: #f8f8f8 !important;
box-shadow: 0 0 0 2px rgba(0,0,0,.1), 0 2px 2px rgba(0,0,0,.2); box-shadow: 0 0 0 2px rgba(0,0,0,.1), 0 2px 2px rgba(0,0,0,.2);
border-color: #fff !important; border-color: #fff !important;
} }
@ -235,13 +234,12 @@
console.log(response); console.log(response);
var task = self.selectedTask(); var task = self.selectedTask();
if (task.isNew()) { if (task.isNew()) {
self.addTask(task); //self.addTask(task);
} else { } else {
self.removeTask(task.original); //self.removeTask(task.original);
self.addTask(task); //self.addTask(task);
} }
task.update(response); task.update(response);
//self.formChanged(false);
self.selectTask(task); self.selectTask(task);
}, },
}); });
@ -302,6 +300,11 @@
self.onStartClick = function() { self.onStartClick = function() {
if (self.selectedTask()) { if (self.selectedTask()) {
self.selectedTask().onStartClick(); self.selectedTask().onStartClick();
/*
if (self.selectedTask().original) {
self.selectedTask().original.onStartClick();
}
*/
} else { } else {
var time = new TimeModel(); var time = new TimeModel();
time.startTime(moment().unix()); time.startTime(moment().unix());
@ -309,6 +312,7 @@
task.description(self.filter()); task.description(self.filter());
task.addTime(time); task.addTime(time);
self.selectedTask(task); self.selectedTask(task);
self.addTask(task);
self.filter(''); self.filter('');
$('.client-select input.form-control').focus(); $('.client-select input.form-control').focus();
} }
@ -383,9 +387,12 @@
// sort the data // sort the data
tasks.sort(function (left, right) { tasks.sort(function (left, right) {
return right.createdAt() - left.createdAt();
/*
right = right.firstTime() ? right.firstTime().order() : right.createdAt(); right = right.firstTime() ? right.firstTime().order() : right.createdAt();
left = left.firstTime() ? left.firstTime().order() : left.createdAt(); left = left.firstTime() ? left.firstTime().order() : left.createdAt();
return right - left; return right - left;
*/
}); });
return tasks; return tasks;
@ -406,11 +413,11 @@
// client change event to re-filter the list // client change event to re-filter the list
refreshProjectList(true); refreshProjectList(true);
var clone = new TaskModel(task.data); //var clone = new TaskModel(task.data);
clone.original = task; //clone.original = task;
self.selectedTask(clone); //self.selectedTask(clone);
//self.selectedTask(task); self.selectedTask(task);
//self.filter(''); //self.filter('');
if (! task.project()) { if (! task.project()) {
@ -431,7 +438,8 @@
self.client = ko.observable(); self.client = ko.observable();
self.project = ko.observable(); self.project = ko.observable();
self.actionButtonVisible = ko.observable(false); self.actionButtonVisible = ko.observable(false);
self.created_at = ko.observable(moment().unix()); self.created_at = ko.observable(moment().format('YYYY-MM-DD HH:mm:ss'));
console.log('self.created_at: ' + self.created_at());
self.mapping = { self.mapping = {
'client': { 'client': {
@ -472,6 +480,7 @@
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]));
} }
console.log('self.created_at [updated]: ' + self.created_at());
} }
if (data) { if (data) {
@ -550,6 +559,9 @@
self.listItemState = ko.computed(function() { self.listItemState = ko.computed(function() {
var str = ''; var str = '';
if (! model.selectedTask()) {
return str;
}
if (self == model.selectedTask()) { if (self == model.selectedTask()) {
str = 'active'; str = 'active';
} }