Commit 5885027c authored by Jérome Perrin's avatar Jérome Perrin

Simplify GUI now that ManPy outputs "family"

parent 9ff82f06
...@@ -55,7 +55,8 @@ ...@@ -55,7 +55,8 @@
for (i = 0; i < elementList.length; i += 1) { for (i = 0; i < elementList.length; i += 1) {
element = elementList[i]; element = elementList[i];
if (element._class === 'Dream.Exit') {
if (element.family === 'Exit') {
result += '<table>'; result += '<table>';
result += header_template({name: element.name || element.id}); result += header_template({name: element.name || element.id});
......
...@@ -54,12 +54,8 @@ ...@@ -54,12 +54,8 @@
function isVisibleStation(station) { function isVisibleStation(station) {
// we should be able to define in the backend which // we should be able to define in the backend which
// station is visible // station is visible
return (input_data.nodes[station]._class !== "Dream.QueueManagedJob") && return (input_data.nodes[station].family !== 'Buffer' &&
(input_data.nodes[station]._class !== "Dream.OperatorManagedJob") && input_data.nodes[station].family !== 'Exit');
(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");
} }
$.each( $.each(
...@@ -78,8 +74,7 @@ ...@@ -78,8 +74,7 @@
duration, duration,
seen_parts = {}; seen_parts = {};
if (obj._class === 'Dream.Job' || if (obj.family === 'Job') {
obj._class === 'Dream.CapacityProject') {
// find the corresponding input // find the corresponding input
// find the input order and order component for this job // find the input order and order component for this job
for (node_key in input_data.nodes) { for (node_key in input_data.nodes) {
......
...@@ -50,8 +50,7 @@ ...@@ -50,8 +50,7 @@
for (i = 0; i < output_data.elementList.length; i += 1) { for (i = 0; i < output_data.elementList.length; i += 1) {
obj = output_data.elementList[i]; obj = output_data.elementList[i];
if (obj._class === 'Dream.Job' || if (obj.family === 'Job') {
obj._class === 'Dream.CapacityProject') {
input_job = null; input_job = null;
input_order = null; input_order = null;
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
*/ */
var series = []; var series = [];
$.each(output_data.elementList, function (idx, el) { $.each(output_data.elementList, function (idx, el) {
if (el._class === 'Dream.Queue') { if (el.family === 'Buffer') {
series.push({label: el.name || el.id, series.push({label: el.name || el.id,
data: el.wip_stat_list}); data: el.results.wip_stat_list});
} }
}); });
return series; return series;
......
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