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

Working on time tracker

Browse Source
This commit is contained in:
Hillel Coren 2017-09-18 00:21:39 +03:00
parent 4a2ee7d228
commit 62628edbd4
1 changed files with 71 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,8 +99,9 @@
</span> </span>
<h4 class="list-group-item-heading" data-bind="text: description"></h4> <h4 class="list-group-item-heading" data-bind="text: description"></h4>
<p class="list-group-item-text"> <p class="list-group-item-text">
<span class="link" data-bind="text: client.displayName, click: $parent.viewClient, clickBubble: false"></span>
<span data-bind="visible: client.displayName &amp;&amp; project.name"> | </span>
<span class="link" data-bind="text: project.name, click: $parent.viewProject, clickBubble: false"></span> <span class="link" data-bind="text: project.name, click: $parent.viewProject, clickBubble: false"></span>
<span class="link" data-bind="text: client.name, click: $parent.viewClient, clickBubble: false"></span>
</p> </p>
</a> </a>
</div> </div>
@ -136,8 +137,12 @@
return true; return true;
} }
self.viewClient = function(task) {
self.filter(task.client.displayName());
return false;
}
self.viewProject = function(task) { self.viewProject = function(task) {
console.log('view project');
self.filter(task.project.name()); self.filter(task.project.name());
return false; return false;
} }
@ -237,9 +242,14 @@
self.time_log = ko.observableArray(); self.time_log = ko.observableArray();
self.mapping = { self.mapping = {
'project': { 'client': {
create: function(data) { create: function(data) {
console.log(data.data); console.log(data.data);
return new ClientModel(data.data);
}
},
'project': {
create: function(data) {
return new ProjectModel(data.data); return new ProjectModel(data.data);
} }
}, },
@ -266,6 +276,9 @@
if (self.project && self.project.name().toLowerCase().indexOf(filter) >= 0) { if (self.project && self.project.name().toLowerCase().indexOf(filter) >= 0) {
return true; return true;
} }
if (self.client && self.client.displayName().toLowerCase().indexOf(filter) >= 0) {
return true;
}
return false; return false;
} }
@ -309,6 +322,61 @@
} }
} }
function ClientModel(data) {
var self = this;
self.public_id = ko.observable(0);
self.name = ko.observable('');
self.contacts = ko.observableArray();
self.mapping = {
'contacts': {
create: function(options) {
return new ContactModel(options.data);
}
}
}
self.displayName = ko.computed(function() {
if (self.name()) {
return self.name();
}
if (self.contacts().length == 0) return;
var contact = self.contacts()[0];
if (contact.first_name() || contact.last_name()) {
return contact.first_name() + ' ' + contact.last_name();
} else {
return contact.email();
}
});
if (data) {
ko.mapping.fromJS(data, self.mapping, this);
} else {
self.addContact();
}
}
function ContactModel(data) {
var self = this;
self.first_name = ko.observable('');
self.last_name = ko.observable('');
self.email = ko.observable('');
if (data) {
ko.mapping.fromJS(data, {}, this);
}
self.displayName = ko.computed(function() {
if (self.first_name() || self.last_name()) {
return (self.first_name() || '') + ' ' + (self.last_name() || '') + ' ';
} else if (self.email()) {
return self.email();
} else {
return '';
}
});
}
function TimeModel(data) { function TimeModel(data) {
var self = this; var self = this;
self.startTime = ko.observable(0); self.startTime = ko.observable(0);