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 time tracker

Browse Source
This commit is contained in:
Hillel Coren 2017-09-18 13:36:30 +03:00
parent 81c8934a94
commit 5c0aa6b813
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,9 +12,9 @@
<style type="text/css"> <style type="text/css">
.panel-body .form-control { .panel-body label:not(:first-child) {
margin-bottom: 20px !important; margin-top: 20px !important;
} }
a:focus { a:focus {
outline: none; outline: none;
@ -182,12 +182,12 @@
} }
self.viewClient = function(task) { self.viewClient = function(task) {
self.filter(task.client.displayName()); self.filter(task.client().displayName());
return false; return false;
} }
self.viewProject = function(task) { self.viewProject = function(task) {
self.filter(task.project.name()); self.filter(task.project().name());
return false; return false;
} }
@ -276,8 +276,8 @@
self.time_log = ko.observableArray(); self.time_log = ko.observableArray();
self.client_id = ko.observable(); self.client_id = ko.observable();
self.project_id = ko.observable(); self.project_id = ko.observable();
self.client = false; self.client = ko.observable();
self.project = false; self.project = ko.observable();
self.actionButtonVisible = ko.observable(false); self.actionButtonVisible = ko.observable(false);
self.mapping = { self.mapping = {
@ -325,10 +325,10 @@
if (self.description().toLowerCase().indexOf(part) >= 0) { if (self.description().toLowerCase().indexOf(part) >= 0) {
isMatch = true; isMatch = true;
} }
if (self.project && self.project.name().toLowerCase().indexOf(part) >= 0) { if (self.project() && self.project().name().toLowerCase().indexOf(part) >= 0) {
isMatch = true; isMatch = true;
} }
if (self.client && self.client.displayName().toLowerCase().indexOf(part) >= 0) { if (self.client() && self.client().displayName().toLowerCase().indexOf(part) >= 0) {
isMatch = true; isMatch = true;
} }
if (! isMatch) { if (! isMatch) {
@ -351,10 +351,10 @@
} }
self.projectColor = ko.computed(function() { self.projectColor = ko.computed(function() {
if (! self.project) { if (! self.project()) {
return ''; return '';
} }
var projectId = self.project.public_id(); var projectId = self.project().public_id();
var colorNum = (projectId-1) % 8; var colorNum = (projectId-1) % 8;
return 'list-group-item-type' + (colorNum+1); return 'list-group-item-type' + (colorNum+1);
}); });
@ -369,11 +369,11 @@
}); });
self.clientName = ko.computed(function() { self.clientName = ko.computed(function() {
return self.client_id() && self.client ? self.client.displayName() : ''; return self.client() ? self.client().displayName() : '';
}); });
self.projectName = ko.computed(function() { self.projectName = ko.computed(function() {
return self.project_id() && self.project ? self.project.name() : ''; return self.project() ? self.project().name() : '';
}); });
self.startClass = ko.computed(function() { self.startClass = ko.computed(function() {
@ -604,10 +604,10 @@
e.preventDefault();return; e.preventDefault();return;
} }
if (window.model && model.selectedTask()) { if (window.model && model.selectedTask()) {
model.selectedTask().client = new ClientModel(client); model.selectedTask().client(new ClientModel(client));
model.selectedTask().client_id(clientId); model.selectedTask().client_id(clientId);
model.selectedTask().project = false;
model.selectedTask().project_id(0); model.selectedTask().project_id(0);
model.selectedTask().project(false);
} }
$projectCombobox = $('select#project_id'); $projectCombobox = $('select#project_id');
$projectCombobox.find('option').remove().end().combobox('refresh'); $projectCombobox.find('option').remove().end().combobox('refresh');
@ -630,16 +630,19 @@
var projectId = $('input[name=project_id]').val(); var projectId = $('input[name=project_id]').val();
if (projectId == '-1') { if (projectId == '-1') {
$('input[name=project_name]').val(projectName); $('input[name=project_name]').val(projectName);
//var project = new ProjectModel();
//model.selectedTask().project = project;
//model.selectedTask().project_id(projectId);
} else if (projectId) { } else if (projectId) {
var project = projectMap[projectId]; var project = projectMap[projectId];
model.selectedTask().project = new ProjectModel(project); model.selectedTask().project(new ProjectModel(project));
model.selectedTask().project_id(projectId); model.selectedTask().project_id(projectId);
// when selecting a project make sure the client is loaded // when selecting a project make sure the client is loaded
if (project && project.client) { if (project && project.client) {
var client = clientMap[project.client.public_id]; var client = clientMap[project.client.public_id];
if (client) { if (client) {
project.client = client; project.client = client;
model.selectedTask().client = new ClientModel(client); model.selectedTask().client(new ClientModel(client));
model.selectedTask().client_id(client.public_id); model.selectedTask().client_id(client.public_id);
} }
} }