From ac44c1ebffe21a3908b7802a83a64c3be3bc6c87 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 28 Sep 2017 13:00:08 +0300 Subject: [PATCH] Working on time tracker --- .../views/tasks/time_tracker_knockout.blade.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/resources/views/tasks/time_tracker_knockout.blade.php b/resources/views/tasks/time_tracker_knockout.blade.php index 24612776fd22..d3521ebf93a0 100644 --- a/resources/views/tasks/time_tracker_knockout.blade.php +++ b/resources/views/tasks/time_tracker_knockout.blade.php @@ -32,10 +32,7 @@ if (! model.selectedTask() || ! model.formChanged()) { return; } - var task = model.selectedTask(); - var data = $('#taskForm').serialize(); - data += '&time_log=' + JSON.stringify(task.times()); - task.save(data, true); + model.selectedTask().save(true); } self.onSortChange = function() { @@ -490,12 +487,19 @@ } } - self.save = function(data, isSelected) { + self.save = function(isSelected) { if (self.isValid() !== true) { toastr.error("{{ trans('texts.error_refresh_page') }}"); throw self.isValid(); return; } + + var data = 'client_id=' + self.client_id() + + '&project_id=' + self.project_id() + + '&project_name=' + encodeURIComponent(self.project() ? self.project().name() : '') + + '&description=' + encodeURIComponent(self.description()) + + '&time_log=' + JSON.stringify(self.times()); + var url = '{{ url('/tasks') }}'; var method = 'post'; if (self.public_id()) { @@ -702,7 +706,7 @@ model.onSaveClick(); } else { model.isStartEnabled(false); - self.save('time_log=' + JSON.stringify(self.times())); + self.save(); } } }