diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts index d1ccdbeb..3f806d21 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts @@ -36,7 +36,8 @@ export default class Dashboard extends Vue { @Watch("lastItem", { deep: true }) async lastitemChanged(n: Prod.IProd, o) { - this.items.splice(0, 0, ...await prodService.History(n.numDone - 1, 1)); + if (this.items.length && n.numDone - 1 != this.items[0].numDone) + this.items.splice(0, 0, ...await prodService.History(n.numDone - 1, 1)); } items: Prod.IProd[] = []; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue index a8edbe76..11f8d735 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue @@ -145,10 +145,10 @@
{{value.actualDelay | round(1)}}
@@ -163,10 +163,10 @@ class="progress-line" />
{{value.actualDuration | round(1)}}
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-row.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-row.ts index dc637e74..f20c3d1d 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-row.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-row.ts @@ -82,7 +82,7 @@ function blockEndPosition(block: server.Modblock, blocks: server.Modblock[], opt function blockDuration(block: server.Modblock, options: IGanttOptions, includeDelay: boolean) { let duration = 0; if (block.showDelay) - duration += Math.max(block.estimatedDelay, includeDelay ? options.block_delay_minDuration : 0); + duration += Math.max(block.actualDelay, block.estimatedDelay, includeDelay ? options.block_delay_minDuration : 0); // check della durata del blocco in base al tipo var minduration = 0; @@ -95,7 +95,7 @@ function blockDuration(block: server.Modblock, options: IGanttOptions, includeDe case 5: minduration = options.block_body_Cooling_minDuration; case 6: minduration = options.block_body_Extraction_minDuration; } - duration += Math.max(minduration, block.estimatedDuration); + duration += Math.max(minduration, block.estimatedDuration, block.actualDuration); if (block.idParam > 0 && includeDelay) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.css b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.css index bce07c97..aef3dd67 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.css +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.css @@ -17,7 +17,7 @@ justify-content: center; border-radius: 10px; height: 10px; - width: 20px; + width: 30px; font-size: 8px; background-color: rgba(0, 0, 0, 0.5); color: #fff; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.less b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.less index 48b606eb..339649c2 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.less +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.less @@ -19,7 +19,7 @@ justify-content: center; border-radius: 10px; height: 10px; - width: 20px; + width: 30px; font-size: 8px; background-color: rgba(0, 0, 0, .5); color: #fff; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.vue index f3aac95c..d1221d7f 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.vue @@ -48,9 +48,9 @@
- - - + + + + +