From 6a94c45b43979171db85dda736e1d01244057869 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 25 Sep 2017 09:59:43 +0300 Subject: [PATCH] Working on time tracker --- .../tasks/time_tracker_knockout.blade.php | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/resources/views/tasks/time_tracker_knockout.blade.php b/resources/views/tasks/time_tracker_knockout.blade.php index ea1eca4cd0a4..9c5223fed741 100644 --- a/resources/views/tasks/time_tracker_knockout.blade.php +++ b/resources/views/tasks/time_tracker_knockout.blade.php @@ -123,17 +123,29 @@ } self.viewClient = function(task) { - self.filter(task.client().displayName()); - self.selectedProject(false); - self.selectedClient(task.client()); + var client = task.client(); + if (self.selectedClient() && self.selectedClient().public_id() == client.public_id()) { + self.filter(''); + self.selectedClient(false); + } else { + self.filter(client.displayName()); + self.selectedProject(false); + self.selectedClient(client); + } $('#search').focus(); return false; } self.viewProject = function(task) { - self.filter(task.project().name()); - self.selectedClient(false); - self.selectedProject(task.project()); + var project = task.project(); + if (self.selectedProject() && self.selectedProject().public_id() == project.public_id()) { + self.filter(''); + self.selectedProject(false); + } else { + self.filter(project.name()); + self.selectedClient(false); + self.selectedProject(project); + } $('#search').focus(); return false; }