Commit 6b1a795b authored by Sebastien Robin's avatar Sebastien Robin

PartJobShop: several GUI cosmetics improvements

- sort data on the gant diagram
- make the gantt diagram much bigger
- stop calculating the height of the gantt diagram, it
  was buggy since the tree was not fully expanded by default
- better setup of gantt diagram, use one scale for days,
  a sub scale for hours (grouped by 4)
parent 9a40db8b
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</div> </div>
<div id="exit_stat"></div> <div id="exit_stat"></div>
<div id="job_schedule_spreadsheet"></div> <div id="job_schedule_spreadsheet"></div>
<div id="job_gantt"></div> <div id="job_gantt" style='width:1320px; height:800px;'></div>
<div id="debug_json" style="display: none"> <div id="debug_json" style="display: none">
<div class="six columns alpha"> <div class="six columns alpha">
......
...@@ -582,14 +582,27 @@ ...@@ -582,14 +582,27 @@
} catch (e) {} } catch (e) {}
var gantt_output_height = 35 * (gantt_data.data.length + 1) + 1; var gantt_output_height = 35 * (gantt_data.data.length + 1) + 1;
// TODO: gantt data have to be sorted in a clever way: gantt_data.data.sort(function (a, b) {
// jobs by alphabetic order // sort gantt data in a chronological order
// for each job, stations in chronological order. var result;
// console.log("sorting gantt, a, b", a.start_date, b.start_date);
// gantt_data.data = gantt_data.data.sort(function(a,b) if (a.start_date === undefined && b.start_date !== undefined) {
// {return a.name > b.name ? -1 : 1}); result = 1;
} else if (a.start_date !== undefined && b.start_date === undefined) {
result = - 1;
} else if (a.start_date === undefined && b.start_date === undefined) {
result = 0;
} else if (a.start_date > b.start_date) {
result = 1;
} else if (a.start_date < b.start_date) {
result = -1;
} else {
result = 0;
}
return result;
});
if (configuration['Dream-Configuration'].gui.job_gantt){ if (configuration['Dream-Configuration'].gui.job_gantt){
$('#job_gantt').height(gantt_output_height).show().dhx_gantt({ $('#job_gantt').show().dhx_gantt({
data: gantt_data, data: gantt_data,
readonly: true, readonly: true,
/* for days has simulation time unit /* for days has simulation time unit
...@@ -597,12 +610,14 @@ ...@@ -597,12 +610,14 @@
step: 7 step: 7
*/ */
// for hours has simulation time unit // for hours has simulation time unit
scale_unit: 'hour', scale_unit: 'day',
duration_unit: 60*60*1000, duration_unit: 60*60*1000,
date_grid: "%H:%i", //date_grid: "%H:%i",
date_scale: "%d-%H:%i", date_scale: "%M/%d",
step: 1 step: 1,
subscales: [{unit:"hour", step:4, date:"%H:%i" }]
}); });
//$('#gantt_grid').width(1000);
} }
} }
}; };
......
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