merge cherry-pick

dlech · Oct 2, 2015 · dfedb5a · dfedb5a
1 parent b106a31
commit dfedb5a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 38 deletions.
diff --git a/OpenRobertaServer/staticResources/index.html b/OpenRobertaServer/staticResources/index.html
@@ -39,8 +39,7 @@
 <script type="text/javascript" src="/roberta/program.js"></script>
 <script type="text/javascript" src="/roberta/configuration.js"></script>
 <script type="text/javascript" src="/roberta/util.js"></script>
-<script type="text/javascript" src="/roberta/roberta.js"></script>
-<script type="text/javascript" src="/roberta/moment.js"></script> -->
+<script type="text/javascript" src="/roberta/roberta.js"></script> -->
 <script type="text/javascript" src="/roberta/roberta.min.js"></script>
 
 <!-- <script type="text/javascript" src="/simulation/simulationLogic/robot.js"></script>

diff --git a/OpenRobertaServer/staticResources/roberta/roberta.js b/OpenRobertaServer/staticResources/roberta/roberta.js
@@ -348,16 +348,16 @@ function saveAsProgramToServer() {
     var xml = Blockly.Xml.workspaceToDom(Blockly.mainWorkspace);
     var xmlText = Blockly.Xml.domToText(xml);
     LOG.info('saveAs program ' + userState.program + ' login: ' + userState.id);
-    var timestamp = UTIL.parseDate(userState.programTimestamp);
-    PROGRAM.saveAsProgramToServer(progName, timestamp, xmlText, function(result) {
+//    var timestamp = UTIL.parseDate(userState.programTimestamp);
+    PROGRAM.saveAsProgramToServer(progName, userState.programTimestamp, xmlText, function(result) {
         response(result);
         if (result.rc === 'ok') {
             setProgram(progName);
             $('#menuSaveProg').parent().removeClass('disabled');
             Blockly.getMainWorkspace().saveButton.enable();
             userState.programSaved = true;
             userState.programModified = false;
-            userState.programTimestamp = UTIL.formatDateComplete(result.lastChanged);
+            userState.programTimestamp = result.lastChanged;
             displayInformation(result, "MESSAGE_EDIT_SAVE_PROGRAM_AS", result.message, userState.program);
         }
     });
@@ -373,11 +373,11 @@ function saveToServer() {
         userState.programSaved = true;
         LOG.info('save program ' + userState.program + ' login: ' + userState.id);
         $('.modal').modal('hide'); // close all opened popups
-        var timestamp = UTIL.parseDate(userState.programTimestamp);
-        PROGRAM.saveProgramToServer(userState.program, userState.programShared, timestamp, xmlText, function(result) {
+//        var timestamp = UTIL.parseDate(userState.programTimestamp);
+        PROGRAM.saveProgramToServer(userState.program, userState.programShared, userState.programTimestamp, xmlText, function(result) {
             if (result.rc === 'ok') {
                 userState.programModified = false;
-                userState.programTimestamp = UTIL.formatDateComplete(result.lastChanged);
+                userState.programTimestamp = result.lastChanged;
             }
             displayInformation(result, "MESSAGE_EDIT_SAVE_PROGRAM", result.message, userState.program);
         });
@@ -999,10 +999,10 @@ function initProgramNameTable() {
             }
         }, {
             "aTargets" : [ 5 ], // indexes of columns to be formatted
-            "sType" : "date-de",
-            "mRender" : function(data) {
-                return UTIL.formatDateComplete(data);
-            }
+//            "sType" : "date-de",
+//            "mRender" : function(data) {
+//                return UTIL.formatDateComplete(data);
+//            }
         }, {
             "aTargets" : [ 2 ], // indexes of columns to be formatted
             "mRender" : function(data, type, row) {
@@ -1221,8 +1221,9 @@ function initRobot() {
  * Switch robot
  */
 function switchRobot(robot) {
-    if (robot === userState.robot)
+    if (robot === userState.robot) {
         return;
+    }
     ROBOT.setRobot(robot, function(result) {
         if (result.rc === "ok") {
             userState.robot = robot;

diff --git a/OpenRobertaServer/staticResources/roberta/roberta.min.js b/OpenRobertaServer/staticResources/roberta/roberta.min.js
diff --git a/OpenRobertaServer/staticResources/roberta/util.js b/OpenRobertaServer/staticResources/roberta/util.js
@@ -37,16 +37,13 @@ var UTIL = {};
      * @param {date}
      *            date from server to be formatted
      */
-    UTIL.formatDate = function(date) {
-        if (date) {
-            var YYYY = date.substring(0, 4);
-            var MM = date.substring(5, 7);
-            var DD = date.substring(8, 10);
-            var hh = date.substring(11, 13);
-            var mm = date.substring(14, 16);
-            var ss = date.substring(17, 19);
-            var str = DD + '.' + MM + '.' + YYYY + ', ' + hh + ':' + mm + ':' + ss;
-            return str;
+    UTIL.formatDate = function(dateLong) {
+        if (dateLong) {
+            var date = new Date(dateLong);
+            var datestring = ("0" + date.getDate()).slice(-2) + "." + ("0" + (date.getMonth() + 1)).slice(-2) + "." + date.getFullYear() + ", "
+                    + ("0" + date.getHours()).slice(-2) + ":" + ("0" + date.getMinutes()).slice(-2);
+            return datestring;
+//            return moment(date).format('DD.MM.YYYY, HH:mm:ss');
         }
         return "";
     };
@@ -61,18 +58,7 @@ var UTIL = {};
      */
     UTIL.formatDateComplete = function(date) {
         if (date) {
-            var YYYY = date.substring(0, 4);
-            var MM = date.substring(5, 7);
-            var DD = date.substring(8, 10);
-            var hh = date.substring(11, 13);
-            var mm = date.substring(14, 16);
-            var ss = date.substring(17, 19);
-            var ms = date.substring(20, 23);
-            while (ms.length < 3) {
-                ms += '0';
-            }
-            var str = DD + '.' + MM + '.' + YYYY + ', ' + hh + ':' + mm + ':' + ss + '.' + ms;
-            return str;
+            return moment(date).format('DD.MM.YYYY, HH:mm:ss.SSS');
         }
         return "";
     };