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

Improvements to tasks

Browse Source
This commit is contained in:
Hillel Coren 2017-03-05 17:07:27 +02:00
parent 2ca410d92e
commit 3302b04efe
1 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
resources/views/tasks/edit.blade.php
View File

@ -115,13 +115,13 @@
<td style="padding: 0px 12px 12px 0 !important"> <td style="padding: 0px 12px 12px 0 !important">
<div data-bind="css: { 'has-error': !isStartValid() }"> <div data-bind="css: { 'has-error': !isStartValid() }">
<input type="text" data-bind="dateTimePicker: startTime.pretty, event:{ change: $root.refresh }" <input type="text" data-bind="dateTimePicker: startTime.pretty, event:{ change: $root.refresh }"
class="form-control time-input" placeholder="{{ trans('texts.start_time') }}"/> class="form-control time-input time-input-start" placeholder="{{ trans('texts.start_time') }}"/>
</div> </div>
</td> </td>
<td style="padding: 0px 12px 12px 0 !important"> <td style="padding: 0px 12px 12px 0 !important">
<div data-bind="css: { 'has-error': !isEndValid() }"> <div data-bind="css: { 'has-error': !isEndValid() }">
<input type="text" data-bind="dateTimePicker: endTime.pretty, event:{ change: $root.refresh }" <input type="text" data-bind="dateTimePicker: endTime.pretty, event:{ change: $root.refresh }"
class="form-control time-input" placeholder="{{ trans('texts.end_time') }}"/> class="form-control time-input time-input-end" placeholder="{{ trans('texts.end_time') }}"/>
</div> </div>
</td> </td>
<td style="width:100px"> <td style="width:100px">
@ -208,6 +208,13 @@
$(element).datetimepicker({ $(element).datetimepicker({
value: current_time value: current_time
}); });
// set end to an hour after the start time
if ($(element).hasClass('time-input-start')) {
var timeModel = ko.dataFor(element);
if (!timeModel.endTime()) {
timeModel.endTime((current_time.getTime() / 1000) + (60*60));
}
}
}, },
dayOfWeekStart: {{ Session::get('start_of_week') }} dayOfWeekStart: {{ Session::get('start_of_week') }}
}); });
@ -219,7 +226,9 @@
}, },
update: function (element, valueAccessor) { update: function (element, valueAccessor) {
var value = ko.utils.unwrapObservable(valueAccessor()); var value = ko.utils.unwrapObservable(valueAccessor());
if (value) $(element).val(value); if (value) {
$(element).val(value);
}
} }
} }
@ -442,28 +451,35 @@
window.model = new ViewModel({!! $task !!}); window.model = new ViewModel({!! $task !!});
ko.applyBindings(model); ko.applyBindings(model);
function onTaskTypeChange() {
var val = $('input[name=task_type]:checked').val();
if (val == 'timer') {
$('#datetime-details').hide();
} else {
$('#datetime-details').fadeIn();
}
setButtonsVisible();
if (isStorageSupported()) {
localStorage.setItem('last:task_type', val);
}
}
function setButtonsVisible() {
var val = $('input[name=task_type]:checked').val();
if (val == 'timer') {
$('#start-button').show();
$('#save-button').hide();
} else {
$('#start-button').hide();
$('#save-button').show();
}
}
$(function() { $(function() {
$('input[type=radio]').change(function(event) { $('input[type=radio]').change(function() {
var val = $(event.target).val(); onTaskTypeChange();
if (val == 'timer') {
$('#datetime-details').hide();
} else {
$('#datetime-details').fadeIn();
}
setButtonsVisible();
}) })
function setButtonsVisible() {
//model.removeItems();
var val = $('input[name=task_type]:checked').val();
if (val == 'timer') {
$('#start-button').show();
$('#save-button').hide();
} else {
$('#start-button').hide();
$('#save-button').show();
}
}
setButtonsVisible(); setButtonsVisible();
$('#start-button').click(function() { $('#start-button').click(function() {
@ -590,6 +606,12 @@
$clientSelect.trigger('change'); $clientSelect.trigger('change');
} }
var taskType = localStorage.getItem('last:task_type');
if (taskType) {
$('input[name=task_type][value='+taskType+']').prop('checked', true);
onTaskTypeChange();
}
@if (!$task && !$clientPublicId) @if (!$task && !$clientPublicId)
$('.client-select input.form-control').focus(); $('.client-select input.form-control').focus();
@else @else