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

Working on time tracker

Browse Source
This commit is contained in:
Hillel Coren 2017-09-25 20:09:23 +03:00
parent f7c8518cd0
commit e1581cfc94
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/views/tasks/time_tracker.blade.php
View File

@ -205,7 +205,7 @@
<!-- Task List --> <!-- Task List -->
<div id="taskList" class="list-group col-sm-5 col-sm-pull-7" data-bind="foreach: filteredTasks" style="display:none"> <div id="taskList" class="list-group col-sm-5 col-sm-pull-7" data-bind="foreach: filteredTasks" style="display:none">
<a href="#" data-bind="click: $parent.selectTask, event: { mouseover: showActionButton, mouseout: hideActionButton }, css: listItemState" <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">
<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()"
data-bindx="style : { visibility : actionButtonVisible() ? '' : 'hidden' }"> data-bindx="style : { visibility : actionButtonVisible() ? '' : 'hidden' }">
@ -216,12 +216,13 @@
</button> </button>
</div> </div>
</div> </div>
<div class="pull-right" style="text-align:right"> <div class="pull-right" style="text-align:right; padding-left: 16px;">
<div data-bind="text: totalDuration, style: { fontWeight: isRunning() ? 'bold' : '' }"></div> <div data-bind="text: totalDuration, style: { fontWeight: isRunning() ? 'bold' : '' }"></div>
<div data-bind="text: age, style: { fontWeight: isRunning() ? 'bold' : '' }" style="padding-top: 2px"></div> <div data-bind="text: age, style: { fontWeight: isRunning() ? 'bold' : '' }" style="padding-top: 2px"></div>
</div> </div>
<div style="white-space: nowrap; text-overflow: ellipsis; overflow: hidden;">
<h4 class="list-group-item-heading"> <h4 class="list-group-item-heading">
<span data-bind="text: description.truncated, style: { fontWeight: isRunning() ? 'bold' : '' }"></span>&nbsp; <span data-bind="text: description, style: { fontWeight: isRunning() ? 'bold' : '' }"></span>&nbsp;
</h4> </h4>
<p class="list-group-item-text"> <p class="list-group-item-text">
<span class="link" data-bind="text: clientName, click: $parent.viewClient, clickBubble: false"></span> <span class="link" data-bind="text: clientName, click: $parent.viewClient, clickBubble: false"></span>
@ -229,6 +230,7 @@
<span class="link" data-bind="text: projectName, click: $parent.viewProject, clickBubble: false"></span> <span class="link" data-bind="text: projectName, click: $parent.viewProject, clickBubble: false"></span>
&nbsp; &nbsp;
</p> </p>
</div>
</a> </a>
</div> </div>

9
resources/views/tasks/time_tracker_knockout.blade.php
View File

@ -252,7 +252,7 @@
self.placeholder = ko.computed(function() { self.placeholder = ko.computed(function() {
if (self.selectedTask()) { if (self.selectedTask()) {
if (self.selectedTask().description()) { if (self.selectedTask().description()) {
return self.selectedTask().description.truncated(); return self.selectedTask().description();
} else { } else {
return "{{ trans('texts.no_description') }}" return "{{ trans('texts.no_description') }}"
} }
@ -632,13 +632,6 @@
return self.isRunning() ? 'glyphicon glyphicon-stop' : 'glyphicon glyphicon-play'; return self.isRunning() ? 'glyphicon glyphicon-stop' : 'glyphicon glyphicon-play';
}); });
self.description.truncated = ko.computed(function() {
if (! self.description()) {
return '';
}
return truncate(self.description(), self.actionButtonVisible() ? 35 : 60);
});
self.setClient = function(client) { self.setClient = function(client) {
self.client(client); self.client(client);
self.client_id(client.public_id()); self.client_id(client.public_id());