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

Browse Source
This commit is contained in:
Hillel Coren 2017-10-02 21:35:14 +03:00
parent 530deb2b95
commit 790148236b
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,13 +14,11 @@
<style type="text/css"> <style type="text/css">
/*
@media (max-width: 768px) { @media (max-width: 768px) {
#formDiv { #taskList {
position: relative; position: relative !important;
} }
} }
*/
@media (max-width: 768px) { @media (max-width: 768px) {
#clock, #clock,
@ -204,13 +202,13 @@
<form id="taskForm"> <form id="taskForm">
<span data-bind="event: { keypress: onFormKeyPress }"> <span data-bind="event: { keypress: onFormKeyPress }">
<div class="row"> <div class="row">
<div style="padding-bottom: 20px" class="client-select col-md-6"> <div style="padding-bottom: 20px; padding-right:6px;" class="client-select col-md-6">
{!! Former::select('client_id') {!! Former::select('client_id')
->addOption('', '') ->addOption('', '')
->label('client') ->label('client')
->data_bind("dropdown: selectedTask().client_id") !!} ->data_bind("dropdown: selectedTask().client_id") !!}
</div> </div>
<div style="padding-bottom: 20px" class="project-select col-md-6"> <div style="padding-bottom: 20px; padding-left:6px;" class="project-select col-md-6">
{!! Former::select('project_id') {!! Former::select('project_id')
->addOption('', '') ->addOption('', '')
->data_bind("dropdown: selectedTask().project_id") ->data_bind("dropdown: selectedTask().project_id")
@ -229,14 +227,14 @@
<table class="table times-table" data-bind="event: { change: selectedTask().onChange }" style="margin-bottom: 0px !important;"> <table class="table times-table" data-bind="event: { change: selectedTask().onChange }" style="margin-bottom: 0px !important;">
<tbody data-bind="foreach: selectedTask().sortedTimes"> <tbody data-bind="foreach: selectedTask().sortedTimes">
<tr data-bind="event: { mouseover: onMouseOver, mouseout: onMouseOut }"> <tr data-bind="event: { mouseover: onMouseOver, mouseout: onMouseOut }">
<td style="padding: 0 6px 10px 0"> <td style="width: 25%; padding: 0 6px 10px 0">
{!! Former::text('date') {!! Former::text('date')
->placeholder($account->formatDate($account->getDateTime())) ->placeholder($account->formatDate($account->getDateTime()))
->data_bind("datepicker: startDate, valueUpdate: 'afterkeydown'") ->data_bind("datepicker: startDate, valueUpdate: 'afterkeydown'")
->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT)) ->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT))
->raw() !!} ->raw() !!}
</td> </td>
<td style="padding: 0 6px 10px 6px"> <td style="width: 25%; padding: 0 6px 10px 6px">
<div data-bind="css: { 'has-error': !isStartValid() }"> <div data-bind="css: { 'has-error': !isStartValid() }">
{!! Former::text('start_time') {!! Former::text('start_time')
->placeholder('start_time') ->placeholder('start_time')
@ -244,7 +242,7 @@
->raw() !!} ->raw() !!}
</div> </div>
</td> </td>
<td style="padding: 0 6px 10px 6px"> <td style="width: 25%; padding: 0 6px 10px 6px">
<div data-bind="css: { 'has-error': !isEndValid() }"> <div data-bind="css: { 'has-error': !isEndValid() }">
{!! Former::text('end_time') {!! Former::text('end_time')
->placeholder('end_time') ->placeholder('end_time')
@ -259,7 +257,7 @@
->data_bind("typeahead: duration") ->data_bind("typeahead: duration")
->raw() !!} ->raw() !!}
</td> </td>
<td style="width:38px; padding-top: 0px; padding-right: 8px" class="hide-phone"> <td style="width: 38px; padding-top: 0px; padding-right: 8px" class="hide-phone">
<i style="cursor:pointer;float:right" data-bind="click: $root.selectedTask().removeTime, visible: actionButtonVisible" class="fa fa-minus-circle redlink" title="{{ trans('texts.remove') }}"/> <i style="cursor:pointer;float:right" data-bind="click: $root.selectedTask().removeTime, visible: actionButtonVisible" class="fa fa-minus-circle redlink" title="{{ trans('texts.remove') }}"/>
</td> </td>

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

@ -956,7 +956,6 @@
} }
time.startTime(moment().unix()); time.startTime(moment().unix());
} }
if (self.public_id()) { if (self.public_id()) {
var selectedTask = model.selectedTask(); var selectedTask = model.selectedTask();
if (model.isChanged() && selectedTask && selectedTask.public_id() == self.public_id()) { if (model.isChanged() && selectedTask && selectedTask.public_id() == self.public_id()) {