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

Browse Source
This commit is contained in:
Hillel Coren 2017-09-19 21:38:48 +03:00
parent 0e4d309d2f
commit 75bc40bcce
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,10 +16,6 @@
vertical-align: text-top; vertical-align: text-top;
} }
.panel-body label:not(:first-child) {
margin-top: 20px !important;
}
a:focus { a:focus {
outline: none; outline: none;
} }
@ -106,18 +102,18 @@
<div class="panel-body"> <div class="panel-body">
<form id="taskForm"> <form id="taskForm">
<span data-bind="event: { keypress: onFormKeyPress }"> <span data-bind="event: { keypress: onFormKeyPress }">
<span class="client-select"> <div style="padding-bottom: 20px" class="client-select">
{!! 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") !!}
</span> </div>
<span class="project-select"> <div style="padding-bottom: 20px" class="project-select">
{!! Former::select('project_id') {!! Former::select('project_id')
->addOption('', '') ->addOption('', '')
->data_bind("dropdown: selectedTask().project_id") ->data_bind("dropdown: selectedTask().project_id")
->label(trans('texts.project')) !!} ->label(trans('texts.project')) !!}
</span> </div>
{!! Former::textarea('description') {!! Former::textarea('description')
->data_bind("value: selectedTask().description, valueUpdate: 'afterkeydown'") ->data_bind("value: selectedTask().description, valueUpdate: 'afterkeydown'")
->rows(4) !!} ->rows(4) !!}
@ -769,7 +765,6 @@
$clientSelect.combobox(); $clientSelect.combobox();
$clientSelect.on('change', function(e) { $clientSelect.on('change', function(e) {
console.log('onClientChange...');
var clientId = $('input[name=client_id]').val(); var clientId = $('input[name=client_id]').val();
var projectId = $('input[name=project_id]').val(); var projectId = $('input[name=project_id]').val();
var client = clientMap[clientId]; var client = clientMap[clientId];
@ -777,11 +772,6 @@
if (!clientId && (window.model && !model.selectedTask().client())) { if (!clientId && (window.model && !model.selectedTask().client())) {
e.preventDefault();return; e.preventDefault();return;
} }
/*
if (project && ((project.client && project.client.public_id == clientId) || !project.client)) {
e.preventDefault();return;
}
*/
if (window.model && model.selectedTask()) { if (window.model && model.selectedTask()) {
model.selectedTask().client(new ClientModel(client)); model.selectedTask().client(new ClientModel(client));
model.selectedTask().client_id(clientId); model.selectedTask().client_id(clientId);