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

Working on time tracker

Browse Source
This commit is contained in:
Hillel Coren 2017-09-20 09:23:41 +03:00
parent adcf25ee87
commit 331a8ad0a2
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/TaskController.php
View File

@ -243,7 +243,7 @@ class TaskController extends BaseController
} }
if (request()->wantsJson()) { if (request()->wantsJson()) {
return $task->toJson(); return $task->load(['client.contacts', 'project'])->toJson();
} else { } else {
return Redirect::to("tasks/{$task->public_id}/edit"); return Redirect::to("tasks/{$task->public_id}/edit");
} }

2
resources/lang/en/texts.php
View File

@ -655,7 +655,7 @@ $LANG = array(
'created_by_invoice' => 'Created by :invoice', 'created_by_invoice' => 'Created by :invoice',
'primary_user' => 'Primary User', 'primary_user' => 'Primary User',
'help' => 'Help', 'help' => 'Help',
'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p> 'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
<p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p> <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
<p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>', <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
'invoice_due_date' => 'Due Date', 'invoice_due_date' => 'Due Date',

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

@ -233,16 +233,13 @@
}, },
success: function(response) { success: function(response) {
console.log(response); console.log(response);
//var task = new TaskModel(response);
var task = self.selectedTask(); var task = self.selectedTask();
//self.selectTask(task);
if (task.isNew()) { if (task.isNew()) {
self.addTask(task); self.addTask(task);
} else {
//self.removeTask(task.original);
//self.addTask(task);
} }
task.update(response); task.update(response);
self.formChanged(false);
//self.selectTask(task);
}, },
}); });
} }
@ -254,10 +251,7 @@
self.selectedTask(false); self.selectedTask(false);
$('.search').focus(); $('.search').focus();
} else { } else {
//console.log(task.data.client)
//console.log('before: ' + task.client_id());
task.update(task.data); task.update(task.data);
//console.log('after: ' + task.client_id());
} }
self.formChanged(false); self.formChanged(false);
}); });
@ -399,8 +393,6 @@
} }
self.removeTask = function(task) { self.removeTask = function(task) {
console.log('remove:');
console.log(task);
self.tasks.remove(task); self.tasks.remove(task);
} }
@ -442,20 +434,24 @@
'client': { 'client': {
update: function(data) { update: function(data) {
if (! data.data) { if (! data.data) {
self.client_id(0);
return false; return false;
}; } else {
self.client_id(data.data.public_id); self.client_id(data.data.public_id);
return new ClientModel(data.data); return new ClientModel(data.data);
}
} }
}, },
'project': { 'project': {
update: function(data) { update: function(data) {
if (! data.data) { if (! data.data) {
self.project_id(0);
return false; return false;
}; } else {
self.project_id(data.data.public_id); self.project_id(data.data.public_id);
return data.data ? new ProjectModel(data.data) : null; return new ProjectModel(data.data);
} }
},
}, },
'ignore': [ 'ignore': [
'time_log', 'time_log',