fix for cherry-pick

dlech · Oct 3, 2015 · dc03719 · dc03719
1 parent f125ffb
commit dc03719
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 239 deletions.
diff --git a/OpenRobertaRobot/src/main/java/de/fhg/iais/roberta/persistence/ConfigurationProcessor.java b/OpenRobertaRobot/src/main/java/de/fhg/iais/roberta/persistence/ConfigurationProcessor.java
@@ -89,8 +89,8 @@ public JSONArray getConfigurationInfo(int ownerId) {
             configurationInfos.put(configurationInfo);
             configurationInfo.put(program.getName());
             configurationInfo.put(program.getOwner().getAccount());
-            configurationInfo.put(program.getCreated().toString());
-            configurationInfo.put(program.getLastChanged().toString());
+            configurationInfo.put(program.getCreated().getTime());
+            configurationInfo.put(program.getLastChanged().getTime());
         }
         setSuccess(Key.CONFIGURATION_GET_ALL_SUCCESS, "" + configurationInfos.length());
         return configurationInfos;

diff --git a/OpenRobertaRobot/src/main/java/de/fhg/iais/roberta/persistence/ProgramProcessor.java b/OpenRobertaRobot/src/main/java/de/fhg/iais/roberta/persistence/ProgramProcessor.java
@@ -91,9 +91,9 @@ public JSONArray getProgramInfo(int ownerId, int robotId) {
             }
 
             programInfo.put(sharedWithUser);
-            programInfo.put(program.getCreated().toString());
-            programInfo.put(program.getLastChanged().toString());
-            programInfo.put(program.getLastChanged().toString());
+            programInfo.put(program.getCreated().getTime());
+            programInfo.put(program.getLastChanged().getTime());
+            programInfo.put(program.getLastChanged().getTime());
             programInfos.put(programInfo);
         }
         // Now we find all the programs which are not owned by the user but have been shared to him
@@ -104,9 +104,9 @@ public JSONArray getProgramInfo(int ownerId, int robotId) {
             programInfo2.put(accessRight.getProgram().getOwner().getAccount());
             //            programInfo2.put(userProgram.getProgram().getNumberOfBlocks());
             programInfo2.put(accessRight.getRelation().toString());
-            programInfo2.put(accessRight.getProgram().getCreated().toString());
-            programInfo2.put(accessRight.getProgram().getLastChanged().toString());
-            programInfo2.put(accessRight.getProgram().getLastChanged().toString());
+            programInfo2.put(accessRight.getProgram().getCreated().getTime());
+            programInfo2.put(accessRight.getProgram().getLastChanged().getTime());
+            programInfo2.put(accessRight.getProgram().getLastChanged().getTime());
             programInfos.put(programInfo2);
         }
 

diff --git a/OpenRobertaServer/staticResources/index.html b/OpenRobertaServer/staticResources/index.html
@@ -34,13 +34,14 @@
 <script type="text/javascript" src="/common/ui/jquery-ui-1.10.4.custom.min.js" charset="utf-8"></script>
 <script type="text/javascript" src="/common/jquery/jquery.dataTables.min.js" charset="utf-8"></script>
 <script type="text/javascript" src="/common/bootstrap/bootstrap-3.3.1-dist/dist/js/bootstrap.min.js"></script>
-<!-- <script type="text/javascript" src="/roberta/user.js"></script>
+<script type="text/javascript" src="/roberta/user.js"></script>
 <script type="text/javascript" src="/roberta/robot.js"></script>
 <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/roberta.min.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.min.js"></script> -->
 
 <!-- <script type="text/javascript" src="/simulation/simulationLogic/robot.js"></script>
 <script type="text/javascript" src="/simulation/simulationLogic/scene.js"></script>

diff --git a/OpenRobertaServer/staticResources/roberta/util.js b/OpenRobertaServer/staticResources/roberta/util.js