PartJobShop: find job informations in initial schedule

dream/platform/static/src/dream.js

@@ -385,11 +385,15 @@
           // find the corresponding input
           var data = that.getData(),
               input_job;
-          $.each(data.wip_spreadsheet, function(i, line){
-            if (line[1] == obj['id']) {
-              input_job = line;
-            }
-          });
+          if (configuration['Dream-Configuration'].gui.wip_spreadsheet) {
+            $.each(data.wip_spreadsheet, function(i, line){
+              if (line[1] == obj['id']) {
+                input_job = line;
+              }
+            });
+          } else if (configuration['Dream-Configuration'].gui.wip_part_spreadsheet) {
+            input_job = data.wip_part_spreadsheet[obj["id"]];
+          }
 
           var duration = 0;
           gantt_data.data.push({

dream/simulation/Examples/JobShopWithParts.json

 {
   "edges": {
     "con_10": [
-      "QStart",
-      "CAD2",
-      {}
-    ],
-    "con_15": [
       "CAD1",
       "Decomposition",
       {}
     ],
-    "con_20": [
+    "con_15": [
       "Decomposition",
       "QCAM",
       {}
     ],
-    "con_25": [
+    "con_20": [
       "QCAM",
       "CAM1",
       {}
     ],
-    "con_30": [
+    "con_25": [
       "QCAM",
       "CAM2",
       {}
     ],
-    "con_35": [
+    "con_30": [
       "CAD2",
       "Decomposition",
       {}
     ],
-    "con_5": [
+    "con_35": [
       "QStart",
       "CAD1",
       {}
+    ],
+    "con_5": [
+      "QStart",
+      "CAD2",
+      {}
     ]
   },
   "general": {
@@ -293,4 +293,4 @@
       null
     ]
   ]
-}
+}
\ No newline at end of file

dream/simulation/GUI/PartJobShop.py

@@ -132,7 +132,7 @@ class Simulation(ACO.Simulation):
         processing_time_list = processing_time_list.split('-')
 
         order_dict["_class"] = "Dream.Order"
-        order_dict["id"] = order_id
+        order_dict["id"] = "%i" % i # XXX hack, we use it in UI to retrieve spreadsheet line
         order_dict["manager"] = project_manager
         order_dict["name"] = order_id
         # XXX can we do better than this ?
@@ -174,7 +174,7 @@ class Simulation(ACO.Simulation):
             component_dict = {}
             component_dict["_class"] = "Dream.OrderComponent"
             component_dict["componentType"] = part_type
-            component_dict["id"] = "%i" % i
+            component_dict["id"] = "%i" % i # XXX hack, we use it in UI to retrieve spreadsheet line
             component_dict["name"] = part
             component_list.append(component_dict)
             route_list = []