From d4c1c04923eb8378ba0fa9067dfd6bc31f7096e4 Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <torsten@ŧ3r.de>
Date: Fri, 6 Feb 2015 11:23:51 +0100
Subject: [PATCH] Phi: tweaking the Date&Time topic

---
 webgui/topics/Environment/DateTime.html |  7 +++---
 webgui/topics/Environment/DateTime.js   | 31 ++++++++++++++-----------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/webgui/topics/Environment/DateTime.html b/webgui/topics/Environment/DateTime.html
index d896f15a9..0405e3423 100644
--- a/webgui/topics/Environment/DateTime.html
+++ b/webgui/topics/Environment/DateTime.html
@@ -11,12 +11,11 @@
 </fieldset>
 <fieldset>
     <legend>Date and Time</legend>
-    <div>Current System time is: <span data-bind="text: simTimeUTC"></span></div>
-        <div>Current System date is: <span data-bind="text: date"></span></div>
+    <div>Current System Time is: <span data-bind="text: simTimeUTC().toUTCString()"></span></div>
     
-    <div data-bind="datepicker: { value: date }"></div>
+    <div data-bind="datepicker: { value: simTimeUTC }"></div>
     <div>
-        <input class="phi-datetime-2digits" data-bind="spinner: { value: hour, spin: wrapHour }" /> 
+        <input class="phi-datetime-2digits" data-bind="spinner: { value: hour, spin: wrapHour, page: 6 }" /> 
         <input class="phi-datetime-2digits" data-bind="spinner: { value: minute, spin: wrapMinute }" />
         
     </div>
diff --git a/webgui/topics/Environment/DateTime.js b/webgui/topics/Environment/DateTime.js
index fc07c836c..fdaa5802e 100644
--- a/webgui/topics/Environment/DateTime.js
+++ b/webgui/topics/Environment/DateTime.js
@@ -28,48 +28,53 @@ define([
         }
 
         self.wrapHour = function(evt, ui) {
-           return self._wrap(evt,ui,0,23);
+           return self._wrap(evt,ui,0,24);
         }
 
         self.wrapMinute = function(evt, ui) {
-            return self._wrap(evt,ui,0,59);
+            return self._wrap(evt,ui,0,60);
         }
         
         self._wrap = function(evt,ui,min,max) {
-            if (ui.value > max) {
-                $(evt.target).spinner("value", min);
+            if (ui.value >= max) {
+                $(evt.target).spinner("value", ui.value - max);
                 return false;
             } else if (ui.value < min) {
-                $(evt.target).spinner("value", max);
+                $(evt.target).spinner("value", ui.value + max);
                 return false;
             }
+            $(evt.target).spinner("value",ui.value);
+            return true;
         }
 
         self.gmtProp = ko.observable().extend({ fgprop: 'gmt' });
        
-        self.simTimeUTC = ko.pureComputed( function() {
-            return new Date(self.gmtProp() + "Z");
+        self.simTimeUTC = ko.pureComputed({
+            read: function() {
+                return new Date(self.gmtProp() + "Z");
+            },
+            write: function(newValue) {
+                console.log("new time: ", newValue );
+            }
         });
         
        
         self.hour = ko.pureComputed({
             read: function() {
-                return self.simTimeUTC().getHours();
+                return self.simTimeUTC().getUTCHours();
             },
             write: function(newValue) {
-                
+                console.log("new hour", newValue );
             }
         });
         self.minute = ko.pureComputed({
             read: function() {
-                return self.simTimeUTC().getMinutes();
+                return self.simTimeUTC().getUTCMinutes();
             },
             write: function(newValue) {
-                
+                console.log("new minute", newValue );
             }
         });
-        self.date = ko.observable(0);
-
     }
 
     ViewModel.prototype.dispose = function() {