Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-08-07 10:01:47 -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 07:39:21 +03:00
parent 3ca9071154
commit 6395d393a3
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,10 @@
<a href="#" data-bind="click: $parent.selectTask, hasFocus: $data == $parent.selectedTask(), event: { mouseover: showActionButton, mouseout: hideActionButton }" <a href="#" data-bind="click: $parent.selectTask, hasFocus: $data == $parent.selectedTask(), event: { mouseover: showActionButton, mouseout: hideActionButton }"
class="list-group-item list-group-item-type1"> class="list-group-item list-group-item-type1">
<span class="pull-right"> <span class="pull-right">
<span data-bind="text: duration"></span> <span>
<span data-bind="text: duration"></span><br/>
<span data-bind="text: age"></span>
</span>
<span data-bind="visible: actionButtonVisible()" data-bindx="style : { visibility : actionButtonVisible() ? '' : 'hidden' }"> <span data-bind="visible: actionButtonVisible()" data-bindx="style : { visibility : actionButtonVisible() ? '' : 'hidden' }">
&nbsp;&nbsp; &nbsp;&nbsp;
<button type='button' class="btn btn-sm btn-success" style="padding-left:0px"> <button type='button' class="btn btn-sm btn-success" style="padding-left:0px">
@ -307,12 +310,21 @@
return time.isRunning(); return time.isRunning();
}); });
self.age = ko.computed(function() {
if (! self.time_log().length) {
return '';
}
var time = self.time_log()[0];
return time.age();
});
self.duration = ko.computed(function() { self.duration = ko.computed(function() {
model.clock(); // bind to the clock model.clock(); // bind to the clock
if (! self.time_log().length) { if (! self.time_log().length) {
return '0:00:00'; return '0:00:00';
} }
var time = self.time_log()[0]; var times = self.time_log();
var time = times[times.length - 1];
var now = new Date().getTime(); var now = new Date().getTime();
var duration = 0; var duration = 0;
if (time.isRunning()) { if (time.isRunning()) {
@ -415,6 +427,17 @@
return self.startTime() && !self.endTime(); return self.startTime() && !self.endTime();
}); });
self.age = ko.computed(function() {
console.log(moment.unix(self.startTime()).toString());
return moment.unix(self.startTime()).fromNow();
});
self.duration = ko.computed(function() {
return self.endTime() - self.startTime();
});
/*
self.startTime.pretty = ko.computed({ self.startTime.pretty = ko.computed({
read: function() { read: function() {
return self.startTime() ? moment.unix(self.startTime()).tz(timezone).format(dateTimeFormat) : ''; return self.startTime() ? moment.unix(self.startTime()).tz(timezone).format(dateTimeFormat) : '';
@ -438,10 +461,6 @@
self.endTime(moment.tz(timezone).unix()); self.endTime(moment.tz(timezone).unix());
} }
self.duration = ko.computed(function() {
return self.endTime() - self.startTime();
});
self.duration.pretty = ko.computed({ self.duration.pretty = ko.computed({
read: function() { read: function() {
var duration = false; var duration = false;
@ -459,6 +478,7 @@
self.endTime(self.startTime() + convertToSeconds(data)); self.endTime(self.startTime() + convertToSeconds(data));
} }
}); });
*/
} }
$(function() { $(function() {