From adcf25ee878225b661a337a351d531920231bdef Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 20 Sep 2017 08:37:26 +0300 Subject: [PATCH] Working on time tracker --- resources/views/time_tracker.blade.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/resources/views/time_tracker.blade.php b/resources/views/time_tracker.blade.php index 43ada62d730f..b89b7c972644 100644 --- a/resources/views/time_tracker.blade.php +++ b/resources/views/time_tracker.blade.php @@ -254,7 +254,10 @@ self.selectedTask(false); $('.search').focus(); } else { + //console.log(task.data.client) + //console.log('before: ' + task.client_id()); task.update(task.data); + //console.log('after: ' + task.client_id()); } self.formChanged(false); }); @@ -413,11 +416,13 @@ //self.selectedTask(clone); self.selectedTask(task); - self.filter(''); + //self.filter(''); if (! task.project()) { $('select#client_id').trigger('change'); } + + self.formChanged(false); } } @@ -434,14 +439,20 @@ self.created_at = ko.observable(moment().unix()); self.mapping = { - 'client': { - create: function(data) { + 'client': { + update: function(data) { + if (! data.data) { + return false; + }; self.client_id(data.data.public_id); return new ClientModel(data.data); } }, 'project': { - create: function(data) { + update: function(data) { + if (! data.data) { + return false; + }; self.project_id(data.data.public_id); return data.data ? new ProjectModel(data.data) : null; }