From 09ad1668a0b97dd7031404dc219e4ba1c2b13047 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 1 Oct 2017 16:31:19 +0300
Subject: [PATCH] Working on the time tracker

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

diff --git a/resources/views/tasks/time_tracker.blade.php b/resources/views/tasks/time_tracker.blade.php
index 80b7e6f538..d5ece07c2d 100644
--- a/resources/views/tasks/time_tracker.blade.php
+++ b/resources/views/tasks/time_tracker.blade.php
@@ -112,8 +112,9 @@
             bottom: 0;
             width: 6px;
             content: "";
+			background-color: #d9534f; /* red */
 			xbackground-color: #36c157; /* green */
-			background-color: orange; /* orange */
+			xbackground-color: orange; /* orange */
         }
 
 		body {
diff --git a/resources/views/tasks/time_tracker_knockout.blade.php b/resources/views/tasks/time_tracker_knockout.blade.php
index e63d69b4be..162ba03f85 100644
--- a/resources/views/tasks/time_tracker_knockout.blade.php
+++ b/resources/views/tasks/time_tracker_knockout.blade.php
@@ -49,6 +49,7 @@
            ko.utils.registerEventHandler(element, 'change', function () {
              var value = valueAccessor();
              var seconds = $(element).timepicker('getSecondsFromMidnight');
+             console.log('seconds:' + seconds);
              value(seconds);
            });
         },
@@ -303,10 +304,6 @@
             if (self.selectedTask()) {
                 self.selectedTask().onStartClick();
             } else {
-                if (! task.checkForOverlaps()) {
-                    swal("{{ trans('texts.task_errors') }}");
-                    return;
-                }
                 var time = new TimeModel();
                 time.startTime(moment().unix());
                 var task = new TaskModel();
@@ -675,7 +672,10 @@
                 var startValid = true;
                 var endValid = true;
                 if (!timeLog.isEmpty()) {
-                    if (timeLog.startTime() < lastTime || (timeLog.endTime() && timeLog.startTime() > timeLog.endTime())) {
+                    console.log('1: ' + (lastTime && timeLog.startTime() < lastTime));
+                    console.log('2: ' + (timeLog.endTime() && timeLog.startTime() > timeLog.endTime()));
+                    console.log('end: ' + timeLog.endTime());
+                    if ((lastTime && timeLog.startTime() < lastTime) || (timeLog.endTime() && timeLog.startTime() > timeLog.endTime())) {
                         startValid = false;
                     }
                     if (timeLog.endTime() && timeLog.endTime() < Math.min(timeLog.startTime(), lastTime)) {
@@ -1059,12 +1059,16 @@
                 return self.startTime();
             },
             write: function(value) {
-                if (self.startTime()) {
-                    var orig = self.startDateMidnight().unix();
+                if (value === null) {
+                    self.startTime('');
                 } else {
-                    var orig = moment().set('hours', 0).set('minutes', 0).set('seconds', 0).unix();
+                    if (self.startTime()) {
+                        var orig = self.startDateMidnight().unix();
+                    } else {
+                        var orig = moment().set('hours', 0).set('minutes', 0).set('seconds', 0).unix();
+                    }
+                    self.startTime(orig + value);
                 }
-                self.startTime(orig + value);
             }
         });
 
@@ -1073,7 +1077,11 @@
                 return self.endTime();
             },
             write: function(value) {
-                self.endTime(self.startDateMidnight().unix() + value);
+                if (value === null) {
+                    self.endTime('');
+                } else {
+                    self.endTime(self.startDateMidnight().unix() + value);
+                }
             }
         });