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-19 23:27:54 +03:00
parent ebff337a02
commit 8375348b24
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,14 @@
outline: none; outline: none;
} }
.list-group-item.active {
background-color: #f8f8f8 !important;
color: black !important;
border-color: #ccc !important;
border-left-color: #f8f8f8 !important;
border-right-color: #f8f8f8 !important;
}
span.link { span.link {
cursor:pointer; cursor:pointer;
color:#0000EE; color:#0000EE;
@ -153,7 +161,7 @@
<!-- Task List --> <!-- Task List -->
<div class="list-group col-sm-5 col-sm-pull-7" data-bind="foreach: filteredTasks"> <div class="list-group col-sm-5 col-sm-pull-7" data-bind="foreach: filteredTasks">
<a href="#" data-bind="click: $parent.selectTask, event: { mouseover: showActionButton, mouseout: hideActionButton }, css: projectColor" <a href="#" data-bind="click: $parent.selectTask, event: { mouseover: showActionButton, mouseout: hideActionButton }, css: listItemState"
class="list-group-item" stylex="white-space: nowrap; text-overflow: ellipsis; overflow: hidden;"> class="list-group-item" stylex="white-space: nowrap; text-overflow: ellipsis; overflow: hidden;">
<div class="pull-right" style="text-align:right;"> <div class="pull-right" style="text-align:right;">
<div data-bind="visible: actionButtonVisible()" <div data-bind="visible: actionButtonVisible()"
@ -224,10 +232,14 @@
console.log(response); console.log(response);
//var task = new TaskModel(response); //var task = new TaskModel(response);
var task = self.selectedTask(); var task = self.selectedTask();
task.update(response); //self.selectTask(task);
if (task.isNew()) { if (task.isNew()) {
self.addTask(task); self.addTask(task);
} else {
//self.removeTask(task.original);
//self.addTask(task);
} }
task.update(response);
}, },
}); });
} }
@ -368,8 +380,11 @@
//var clone = new TaskModel(task.data); //var clone = new TaskModel(task.data);
//clone.original = task; //clone.original = task;
//self.selectedTask(clone);
self.selectedTask(task); self.selectedTask(task);
self.filter('');
if (! task.project()) { if (! task.project()) {
$('select#client_id').trigger('change'); $('select#client_id').trigger('change');
} }
@ -409,7 +424,7 @@
} }
self.update = function(data) { self.update = function(data) {
self.data = data; self.data = data;
var times = JSON.parse(data.time_log); var times = JSON.parse(data.time_log);
data.time_log = false; data.time_log = false;
ko.mapping.fromJS(data, self.mapping, this); ko.mapping.fromJS(data, self.mapping, this);
@ -487,13 +502,18 @@
} }
} }
self.projectColor = ko.computed(function() { self.listItemState = ko.computed(function() {
var str = '';
if (self == model.selectedTask()) {
str = 'active';
}
if (! self.project()) { if (! self.project()) {
return ''; return str;
} }
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 str + ' list-group-item-type' + (colorNum+1);
}); });
self.isRunning = ko.computed(function() { self.isRunning = ko.computed(function() {
@ -522,7 +542,7 @@
}); });
self.description.truncated = ko.computed(function() { self.description.truncated = ko.computed(function() {
return truncate(self.description(), self.actionButtonVisible() ? 60 : 80); return truncate(self.description(), self.actionButtonVisible() ? 35 : 60);
}); });
self.createdAt = function() { self.createdAt = function() {