Commit baf78621 authored by Sebastien Robin's avatar Sebastien Robin

PartJobShop: several GUI cosmetic improvements

- display colors on nodes on the tool box
- display dates nicely in results with momentjs
- do not display Order Date and Material in the spreadsheet of results
parent 7d466347
...@@ -275,13 +275,13 @@ path, ._jsPlumb_endpoint { ...@@ -275,13 +275,13 @@ path, ._jsPlumb_endpoint {
background-image: linear-gradient(to bottom, #ffe 0%, #dde 100%); background-image: linear-gradient(to bottom, #ffe 0%, #dde 100%);
} }
.Dream-Machine, .Dream-MachineJobShop, .Dream-BatchScrapMachine { .Dream-Machine, .Dream-MachineJobShop, .Dream-BatchScrapMachine, .Dream-MachineManagedJob {
border: 1px solid #cbc; border: 1px solid #cbc;
background-color: #fef; background-color: #fef;
background-image: linear-gradient(to bottom, #fef 0%, #ede 100%); background-image: linear-gradient(to bottom, #fef 0%, #ede 100%);
} }
.Dream-Queue, .Dream-QueueJobShop, .Dream-LineClearance { .Dream-Queue, .Dream-QueueJobShop, .Dream-LineClearance, .Dream-QueueManagedJob, .Dream-ConditionalBuffer, .Dream-OrderDecomposition {
border: 1px solid #bcc; border: 1px solid #bcc;
background-color:#eff; background-color:#eff;
background-image: linear-gradient(to bottom, #eff 0%, #dee 100%); background-image: linear-gradient(to bottom, #eff 0%, #dee 100%);
......
...@@ -108,6 +108,9 @@ ...@@ -108,6 +108,9 @@
<!-- gantt chart --> <!-- gantt chart -->
<script type="text/javascript" src="lib/dhtmlxgantt/dhtmlxgantt.js"></script> <script type="text/javascript" src="lib/dhtmlxgantt/dhtmlxgantt.js"></script>
<!-- nice display of dates -->
<script type="text/javascript" src="lib/moment-with-langs.min.js"></script>
<div id="dialog-form" title="Configure"> <div id="dialog-form" title="Configure">
<form> <form>
<fieldset id="dialog-fieldset"> <fieldset id="dialog-fieldset">
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -299,10 +299,8 @@ ...@@ -299,10 +299,8 @@
[ [
"Jobs", "Jobs",
"ID", "ID",
"Order Date",
"Due Date", "Due Date",
"Priority", "Priority",
"Material",
"Entrance Time", "Entrance Time",
"Processing Time", "Processing Time",
"Station ID", "Station ID",
...@@ -414,14 +412,14 @@ ...@@ -414,14 +412,14 @@
$.each(obj['results']['schedule'], function (i, schedule) { $.each(obj['results']['schedule'], function (i, schedule) {
// Filter intermediate steps in part job shop // Filter intermediate steps in part job shop
if (isVisibleStation(schedule['stationId'])) { if (isVisibleStation(schedule['stationId'])) {
var entrance_date = new Date(start_date.getTime());
entrance_date.setTime(entrance_date.getTime() + schedule['entranceTime']*1000*3600);
spreadsheet_data.push([ spreadsheet_data.push([
input_order[0] + "-" + input_job[4], input_order[0] + "-" + input_job[4],
obj['id'], obj['id'],
null, // orderDate
input_order[1], // dueDate input_order[1], // dueDate
input_order[2], // priority input_order[2], // priority
null, // material moment(entrance_date).format("MMM/DD HH:mm"),
schedule['entranceTime'],
input_job[7].split('-')[schedule['stepNumber']] || 0, // processing time input_job[7].split('-')[schedule['stepNumber']] || 0, // processing time
schedule['stationId'], schedule['stationId'],
schedule['stepNumber'] schedule['stepNumber']
......
...@@ -56,7 +56,7 @@ class Simulation(ACO.Simulation): ...@@ -56,7 +56,7 @@ class Simulation(ACO.Simulation):
conf["Dream-Configuration"]["gui"]["job_schedule_spreadsheet"] = 1 conf["Dream-Configuration"]["gui"]["job_schedule_spreadsheet"] = 1
conf["Dream-Configuration"]["gui"]["job_gantt"] = 1 conf["Dream-Configuration"]["gui"]["job_gantt"] = 1
conf["Dream-Configuration"]["gui"]["debug_json"] = 1 #conf["Dream-Configuration"]["gui"]["debug_json"] = 1
# remove tools that does not make sense here # remove tools that does not make sense here
conf.pop('Dream-Machine') conf.pop('Dream-Machine')
......
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