From 6fd6cf0ec5975a69867d25247a307af638fd5468 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 2 Oct 2017 11:54:22 +0300
Subject: [PATCH] Working on the time tracker

---
 resources/views/tasks/time_tracker.blade.php    |  6 +++---
 .../views/tasks/time_tracker_knockout.blade.php | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/resources/views/tasks/time_tracker.blade.php b/resources/views/tasks/time_tracker.blade.php
index cd3edd9e6d8a..4f2a831e22ad 100644
--- a/resources/views/tasks/time_tracker.blade.php
+++ b/resources/views/tasks/time_tracker.blade.php
@@ -112,8 +112,8 @@
             bottom: 0;
             width: 6px;
             content: "";
-			background-color: #d9534f; /* red */
-			xbackground-color: #36c157; /* green */
+			background-color: #36c157; /* green */
+			xbackground-color: #d9534f; /* red */
 			xbackground-color: orange; /* orange */
         }
 
@@ -221,7 +221,7 @@
 
 
 								<table class="table times-table" data-bind="event: { change: selectedTask().onChange }" style="margin-bottom: 0px !important;">
-									<tbody data-bind="foreach: selectedTask().time_log">
+									<tbody data-bind="foreach: selectedTask().sortedTimes">
 										<tr data-bind="event: { mouseover: onMouseOver, mouseout: onMouseOut }">
 											<td style="padding: 0 6px 10px 0">
 												{!! Former::text('date')
diff --git a/resources/views/tasks/time_tracker_knockout.blade.php b/resources/views/tasks/time_tracker_knockout.blade.php
index 1ed2298a4afb..f64dd6b4d41e 100644
--- a/resources/views/tasks/time_tracker_knockout.blade.php
+++ b/resources/views/tasks/time_tracker_knockout.blade.php
@@ -385,6 +385,10 @@
                     task.setProject(self.selectedProject());
                 } else if (self.selectedClient()) {
                     task.setClient(self.selectedClient());
+                    setTimeout(function() {
+                        $('select#client_id').trigger('change');
+                    }, 1);
+
                 } else {
                     task.description(self.filter());
                 }
@@ -800,6 +804,19 @@
             return self.public_id();
         });
 
+        self.sortedTimes = ko.computed(function() {
+            var times = self.time_log();
+            times.sort(function (left, right) {
+                if (! left.startTime()) {
+                    return 1;
+                } else if (! right.startTime()) {
+                    return -1;
+                }
+                return left.startTime() - right.startTime();
+            });
+            return times;
+        });
+
         self.isRunning = ko.computed(function() {
             var timeLog = self.time_log();
             if (! timeLog.length) {