Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe

Browse Source
This commit is contained in:
Samuele Locatelli
2020-07-08 16:34:35 +02:00
parent 64a6306bfc 82f16e9b6b
commit 028d67d9ca
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.ts
+2 -2
View File
@@ -34,7 +34,7 @@ export default class GanttComponent extends Vue {
case 5: value = this.ganttOptions.block_body_Cooling_minDuration;
case 6: value = this.ganttOptions.block_body_Extraction_minDuration;
}
return Math.max(value, this.value.estimatedDuration / 1000);
return Math.max(value, this.value.estimatedDuration);
}
get showStatus() {
@@ -42,7 +42,7 @@ export default class GanttComponent extends Vue {
}
get delayDuration() {
return this.value.showDelay ? Math.max(this.value.estimatedDelay / 1000, this.ganttOptions.block_delay_minDuration) : 0;
return this.value.showDelay ? Math.max(this.value.estimatedDelay, this.ganttOptions.block_delay_minDuration) : 0;
}
get actualDelay() {
Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue
+2 -2
View File
@@ -18,7 +18,7 @@
</div>
</foreignObject>
<foreignObject :width="delayDuration * ganttOptions.secondSize" height="26" x="0" y="44">
<div class="delay-footer">{{(value.estimatedDelay / 1000) | round(1)}}s</div>
<div class="delay-footer">{{(value.estimatedDelay ) | round(1)}}s</div>
</foreignObject>
<line
class="vertical-line"
@@ -34,7 +34,7 @@
<div class="body-header">{{value.label | localize(value.label)}}</div>
</foreignObject>
<foreignObject :width="duration * ganttOptions.secondSize" height="26" x="0" y="44">
<div class="body-footer">{{(value.estimatedDuration / 1000) | round(1)}}s</div>
<div class="body-footer">{{(value.estimatedDuration ) | round(1)}}s</div>
</foreignObject>
<line
v-if="showStatus"
Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-row.ts
+2 -2
View File
@@ -81,7 +81,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 / 1000, includeDelay ? options.block_delay_minDuration : 0);
duration += Math.max(block.estimatedDelay, includeDelay ? options.block_delay_minDuration : 0);
// check della durata del blocco in base al tipo
var minduration = 0;
@@ -94,7 +94,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 / 1000);
duration += Math.max(minduration, block.estimatedDuration);
if (block.idParam > 0 && includeDelay)