Commit 3e1b8dcd authored by Jérome Perrin's avatar Jérome Perrin

update gantt widget to support capacity project

parent 9cae3eb4
...@@ -453,10 +453,13 @@ ...@@ -453,10 +453,13 @@
// we should be able to define in the backend which station is visible // we should be able to define in the backend which station is visible
return input_data.nodes[station]._class != "Dream.QueueManagedJob" && return input_data.nodes[station]._class != "Dream.QueueManagedJob" &&
input_data.nodes[station]._class != "Dream.OperatorManagedJob" && input_data.nodes[station]._class != "Dream.OperatorManagedJob" &&
input_data.nodes[station]._class != "Dream.ExitJobShop" input_data.nodes[station]._class != "Dream.ExitJobShop" &&
input_data.nodes[station]._class != "Dream.CapacityStationBuffer" &&
input_data.nodes[station]._class != "Dream.CapacityStationExit" &&
input_data.nodes[station]._class != "Dream.Queue"
}; };
if (obj._class === 'Dream.Job') { if (obj._class === 'Dream.Job' || obj._class === 'Dream.CapacityProject') {
// find the corresponding input // find the corresponding input
var input_job = null, input_order = null; var input_job = null, input_order = null;
// find the input order and order component for this job // find the input order and order component for this job
...@@ -468,7 +471,7 @@ ...@@ -468,7 +471,7 @@
if (order.id == obj.id) { if (order.id == obj.id) {
input_job = input_order = order; input_job = input_order = order;
} }
if (input_job === null) { if (input_job === null && order.componentsList) {
for (var j=0; j<order.componentsList.length; j++){ for (var j=0; j<order.componentsList.length; j++){
var component = order.componentsList[j]; var component = order.componentsList[j];
if (component.id == obj.id){ if (component.id == obj.id){
...@@ -498,10 +501,14 @@ ...@@ -498,10 +501,14 @@
if (isVisibleStation(schedule['stationId'])) { if (isVisibleStation(schedule['stationId'])) {
var entrance_date = new Date(start_date.getTime()); var entrance_date = new Date(start_date.getTime());
entrance_date.setTime(entrance_date.getTime() + schedule['entranceTime']*1000*3600); entrance_date.setTime(entrance_date.getTime() + schedule['entranceTime']*1000*3600);
if (obj['results']['schedule'][i + 1]) { if (schedule['exitTime']) {
duration = obj['results']['schedule'][i + 1]['entranceTime'] - schedule['entranceTime']; duration = (schedule['exitTime'] - schedule['entranceTime']);
} else { } else {
duration = obj['results'].completionTime - schedule['entranceTime']; if (obj['results']['schedule'][i + 1]) {
duration = obj['results']['schedule'][i + 1]['entranceTime'] - schedule['entranceTime'];
} else {
duration = obj['results'].completionTime - schedule['entranceTime'];
}
} }
if (duration > 0.0) { if (duration > 0.0) {
var task_start_date = new Date(start_date.getTime()); var task_start_date = new Date(start_date.getTime());
......
...@@ -27,7 +27,7 @@ class Simulation(DefaultSimulation): ...@@ -27,7 +27,7 @@ class Simulation(DefaultSimulation):
conf["Dream-Configuration"]["gui"]["station_utilisation_graph"] = 0 conf["Dream-Configuration"]["gui"]["station_utilisation_graph"] = 0
conf["Dream-Configuration"]["gui"]["capacity_utilisation_graph"] = 1 conf["Dream-Configuration"]["gui"]["capacity_utilisation_graph"] = 1
conf["Dream-Configuration"]["gui"]["job_schedule_spreadsheet"] = 1 conf["Dream-Configuration"]["gui"]["job_schedule_spreadsheet"] = 1
conf["Dream-Configuration"]["gui"]["job_gantt"] = 0 # XXX does not work conf["Dream-Configuration"]["gui"]["job_gantt"] = 1 # XXX does not work
conf["Dream-Configuration"]["gui"]["queue_stat"] = 0 conf["Dream-Configuration"]["gui"]["queue_stat"] = 0
conf["Dream-Configuration"]["gui"]["debug_json"] = 1 conf["Dream-Configuration"]["gui"]["debug_json"] = 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment