diff --git a/Thermo.Active/wwwroot/assets/styles/base/gantt-component.less b/Thermo.Active/wwwroot/assets/styles/base/gantt-component.less deleted file mode 100644 index 21dfbf7a..00000000 --- a/Thermo.Active/wwwroot/assets/styles/base/gantt-component.less +++ /dev/null @@ -1,2 +0,0 @@ -// out: false, sourceMap: false, main: ../style.less - diff --git a/Thermo.Active/wwwroot/assets/styles/base/layout.less b/Thermo.Active/wwwroot/assets/styles/base/layout.less index 4a817938..2e20b907 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/layout.less +++ b/Thermo.Active/wwwroot/assets/styles/base/layout.less @@ -53,6 +53,7 @@ @import "users.less"; @import "tooltip.less"; + @background-color: rgb(216, 216, 216); @handle-width: 48px; @handle-height: 32px; diff --git a/Thermo.Active/wwwroot/config.development.json b/Thermo.Active/wwwroot/config.development.json index 34bce964..3f9529d8 100644 --- a/Thermo.Active/wwwroot/config.development.json +++ b/Thermo.Active/wwwroot/config.development.json @@ -2,6 +2,6 @@ "env": "development", "api": { "enabled": true, - "apiServerUrl": "http://localhost:9000/" + "apiServerUrl": "http://seriate.steamware.net:9000/" } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/index.html b/Thermo.Active/wwwroot/index.html index c3b2dafc..dbc47d4e 100644 --- a/Thermo.Active/wwwroot/index.html +++ b/Thermo.Active/wwwroot/index.html @@ -13,7 +13,7 @@ - + @@ -28,4 +28,4 @@ - + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/base-components/gantt-component.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/base-components/gantt-component.ts deleted file mode 100644 index 29dc6517..00000000 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/base-components/gantt-component.ts +++ /dev/null @@ -1,22 +0,0 @@ -import Vue from 'vue'; -import Component from 'vue-class-component'; -import { Prop } from 'vue-property-decorator'; - -@Component({}) -export default class GanttComponent extends Vue{ - - @Prop({default:0}) - estimated_delay:number; - @Prop({default:0}) - estimated_duration:number; - @Prop({default:"null"}) - tag:string; - @Prop({default:"#57636b"}) - color:string; - @Prop({default:"#c0c7cc"}) - overlapping_color:string; - - visible:boolean=true; - - -} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/base-components/gantt-component.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/base-components/gantt-component.vue deleted file mode 100644 index 1bfeb2fb..00000000 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/base-components/gantt-component.vue +++ /dev/null @@ -1,74 +0,0 @@ - - - \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.ts new file mode 100644 index 00000000..615a2de0 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.ts @@ -0,0 +1,51 @@ +import Vue from 'vue'; +import Component from 'vue-class-component'; +import { Prop, InjectReactive } from 'vue-property-decorator'; +import { IGanttOptions } from './gantt'; + +@Component({}) +export default class GanttComponent extends Vue { + + @Prop() + value: server.Modblock; + + @InjectReactive() + ganttOptions: IGanttOptions; + + get blockType() { + switch (this.value.type) { + case 1: return 'heating'; + case 2: return 'drawing'; + case 3: return 'movement'; + case 4: return 'vacuum'; + case 5: return 'cooling'; + case 6: return 'extraction'; + } + return 'nd'; + } + + get duration() { + let value = 0 + switch (this.value.type) { + case 1: value = this.ganttOptions.block_body_Heating_minDuration; + case 2: value = this.ganttOptions.block_body_Drawing_minDuration; + case 3: value = this.ganttOptions.block_body_Movement_minDuration; + case 4: value = this.ganttOptions.block_body_Vacuum_minDuration; + 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); + } + + get showStatus() { + return this.value.idParam > 0 + } + + get delayDuration() { + return this.value.showDelay ? Math.max(this.value.estimatedDelay / 1000, this.ganttOptions.block_delay_minDuration) : 0; + } + + mounted() { + this.value.showDelay = true; + } +} \ No newline at end of file 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 new file mode 100644 index 00000000..cf581649 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue @@ -0,0 +1,39 @@ + + + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-header.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-header.ts index 8203135a..8df40f24 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-header.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-header.ts @@ -15,5 +15,8 @@ export default class ganttHeader extends Vue { } + get stepSize() { + return this.ganttOptions.stepDuration * this.ganttOptions.secondSize; + } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-header.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-header.vue index 40269e25..33cb5ece 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-header.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-header.vue @@ -2,18 +2,18 @@ {{getDuration((idx-1) *ganttOptions.labelInterval * ganttOptions.stepDuration) | date("m'ss''")}} 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 59ed4dcf..edd43cc9 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 @@ -1,12 +1,59 @@ import Component from "vue-class-component"; import Vue from "vue"; -import { Prop } from "vue-property-decorator"; +import { Prop, InjectReactive } from "vue-property-decorator"; +import { IGanttOptions } from "./gantt"; +import block from "./gantt-component.vue"; -@Component({}) +@Component({ components: { block } }) export default class GanttRow extends Vue { - @Prop() - rowHeight: number; + @InjectReactive() + ganttOptions: IGanttOptions; + + @Prop({ default: "" }) + header: string; @Prop() - header: string; + section: number; + + @Prop() + blocks: server.Modblock[]; + + get blocksInSection() { + return Array.from(this.blocks.values()).filter(i => i.section == this.section).sort((a, b) => a.priority - b.priority); + } + + startPosition(block: server.Modblock) { + return blockStartPosition(block, this.blocks) * this.ganttOptions.secondSize; + } + + verticalPosition(block: server.Modblock) { + let idx = this.blocksInSection.indexOf(block); + let myStartPosition = this.startPosition(block); + + let result = this.blocksInSection.slice(0, idx).filter(p => { + let sp = this.startPosition(p); + let ep = sp + p.estimatedDuration / 1000; + + return sp <= myStartPosition && ep >= myStartPosition; + }).length * (this.ganttOptions.elementHeight + this.ganttOptions.elementPadding * 2); + + + return result; + } + + get rowHeight() { + return Math.max(...this.blocksInSection.map(b => this.verticalPosition(b) + this.ganttOptions.elementHeight + this.ganttOptions.elementPadding * 2)) + } +} + +function blockEndPosition(block: server.Modblock, blocks: server.Modblock[]) { + let ids = block.precedingId.filter(i => i > 0); + let duration = Math.max(0, ...blocks.filter(i => ids.indexOf(i.id) >= 0).map(i => blockEndPosition(i, blocks))); + return duration + (block.estimatedDuration / 1000); +} + +function blockStartPosition(block: server.Modblock, blocks: server.Modblock[]) { + let ids = block.precedingId.filter(i => i > 0); + let duration = Math.max(0, ...blocks.filter(i => ids.indexOf(i.id) >= 0).map(i => blockEndPosition(i, blocks))); + return duration; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-row.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-row.vue index b4318b6e..fcb1b1eb 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-row.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-row.vue @@ -1,11 +1,42 @@ - \ No newline at end of file + + \ No newline at end of file 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 new file mode 100644 index 00000000..807e230e --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.css @@ -0,0 +1,69 @@ +.gantt-block { + fill: none; + stroke: none; +} +.gantt-block .vertical-line { + stroke: rgba(0, 0, 0, 0.5); + stroke-width: 1; +} +.gantt-block .delay-header, +.gantt-block .delay-footer { + height: 100%; + width: 100%; + display: flex; +} +.gantt-block .delay-header { + height: calc(100% - 10px); + padding: 5px; + align-items: flex-end; + justify-content: flex-start; + color: #545454; +} +.gantt-block .delay-footer { + align-items: center; + justify-content: flex-start; + color: #fff; + padding: 0 5px; +} +.gantt-block .body { + color: #fff; +} +.gantt-block .header { + color: #545454; +} +.gantt-block.heating .body { + fill: #913030; +} +.gantt-block.heating .header { + fill: #ff8d8d; +} +.gantt-block.drawing .body { + fill: #465d18; +} +.gantt-block.drawing .header { + fill: #b0db57; +} +.gantt-block.movement .body { + fill: #57636b; +} +.gantt-block.movement .header { + fill: #c0c7cc; +} +.gantt-block.vacuum .body { + fill: #916330; +} +.gantt-block.vacuum .header { + fill: #ffc78d; +} +.gantt-block.cooling .body { + fill: #306c91; +} +.gantt-block.cooling .header { + fill: #8dd3ff; +} +.gantt-block.extraction .body { + fill: #30916b; +} +.gantt-block.extraction .header { + fill: #75f0bf; +} 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 new file mode 100644 index 00000000..3998ec25 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.less @@ -0,0 +1,101 @@ +.gantt-block { + fill: none; + stroke: none; + + .vertical-line { + stroke: rgba(0, 0, 0, .5); + stroke-width: 1; + } + + .delay-header, + .delay-footer { + height: 100%; + width: 100%; + display: flex; + + } + + .delay-header { + height: calc(~'100% - 10px'); + padding: 5px; + align-items: flex-end; + justify-content: flex-start; + color: #545454; + } + + .delay-footer { + align-items: center; + justify-content: flex-start; + color: #fff; + padding: 0 5px; + } + + .body { + color: #fff; + } + + .header { + color: #545454; + } + + &.heating { + .body { + fill: #913030; + + } + + .header { + fill: #ff8d8d; + } + } + + &.drawing { + .body { + fill: #465d18; + } + + .header { + fill: #b0db57; + } + } + + &.movement { + .body { + fill: #57636b; + } + + .header { + fill: #c0c7cc; + } + } + + &.vacuum { + .body { + fill: #916330; + } + + .header { + fill: #ffc78d; + } + } + + &.cooling { + .body { + fill: #306c91; + } + + .header { + fill: #8dd3ff; + } + } + + &.extraction { + .body { + fill: #30916b; + } + + .header { + fill: #75f0bf; + } + } +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.ts index 54cd9ab0..9852bbdb 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.ts @@ -2,31 +2,51 @@ import Vue from "vue"; import { Component, Prop, Provide, Watch, ProvideReactive } from "vue-property-decorator"; import moment from "moment"; import ganttHeader from "./gantt-header.vue"; +import ganttRow from "./gantt-row.vue" @Component({ components: { - ganttHeader + ganttHeader, ganttRow } }) export default class Gantt extends Vue { + @Prop() + blocks: server.Modblock[]; @ProvideReactive() ganttOptions: IGanttOptions = { width: 2000, - stepSize: 40, + elementHeight: 70, + elementPadding: 5, + secondSize: 20, stepDuration: 2, labelInterval: 10, - maxGanttDuration: 500 + maxGanttDuration: 500, + block_status_minDuration: 1.5, + block_delay_minDuration: 1.5, + block_body_Heating_minDuration: 5, + block_body_Drawing_minDuration: 5, + block_body_Movement_minDuration: 5, + block_body_Vacuum_minDuration: 5, + block_body_Cooling_minDuration: 5, + block_body_Extraction_minDuration: 5, }; - - currentDate: Date = null; + + getRowHeight(element) { + return element?.rowHeight || 0; + } + + mounted() { + + } } + export interface IGanttElement { from: Date, to?: Date, @@ -35,8 +55,19 @@ export interface IGanttElement { export interface IGanttOptions { width: number; - stepSize: number; // dimensione del singolo step + elementHeight: number; + elementPadding: number; + secondSize: number; // dimensione del singolo step stepDuration: number; // durata in secondi del singolo step labelInterval: number; maxGanttDuration: number; + + block_status_minDuration: number; + block_delay_minDuration: number; + block_body_Heating_minDuration: number; + block_body_Drawing_minDuration: number; + block_body_Movement_minDuration: number; + block_body_Vacuum_minDuration: number; + block_body_Cooling_minDuration: number; + block_body_Extraction_minDuration: number; } 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 40ac044c..21ea7c10 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 @@ -1,7 +1,24 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts index 152d2fb1..6fa945f0 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts @@ -4,6 +4,7 @@ import { Prop } from 'vue-property-decorator'; import { messageService } from "@/_base/messageService"; import { Modal, ModalHelper } from "@/components/modals"; import gantt from "./gantt/gantt.vue"; +import { moduleService } from '@/services/moduleService'; @Component({ components: { @@ -17,13 +18,21 @@ export default class Processo extends Vue { @Prop({ default: 145 }) tot: number; - blocks: { [id: number]: server.Modblock } = null; + blocks: server.Modblock[] = []; public sendMessage(name: string) { messageService.publishToChannel(name); } + async mounted() { + let result = await moduleService.GetCurrent(); + for (const key in result) { + if (result.hasOwnProperty(key)) { + this.blocks.push(result[key]); + } + } + } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue index c992c2b7..230467e1 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue @@ -31,7 +31,7 @@ - + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts index ac09ab61..68b8ea50 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts @@ -53,7 +53,7 @@ export default class ShowCicloInfo extends Vue { cycle_loader_manualunloading_enabled: this.recipe.cycle_loader_manualunloading_enabled, } ); - //await recipeService.Confirm(); + await recipeService.Confirm('Cycle'); ModalHelper.HideModal(); this.deferred.resolve(1); }; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.ts index e00f0b84..7d96c679 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.ts @@ -16,7 +16,7 @@ import ShowVuotoInfo from "@/app_modules_thermo/setup/vuoto/show-vuoto-info.vue" import ShowImbutituraInfo from "@/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue"; import ShowOpzioniInfo from "@/app_modules_thermo/setup/opzioni/show-opzioni-info.vue"; import AvvioProduzione from "@/app_modules_thermo/setup/avvio-produzione/avvio-produzione.vue"; -import ShowArretramentoRiscaldiInfo from "@/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.vue"; +import { store } from '@/store'; @Component({ @@ -37,6 +37,10 @@ export default class Setup extends Vue { } } + get overview() { + return store.state.recipe.overview; + } + showModalStep(step: number): Promise { switch (step) { case 0: return ModalHelper.ShowModalAsync(ShowFormatoInfo); diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue index a10dcd4e..65e20d35 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue @@ -5,78 +5,78 @@
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setupButton.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setupButton.ts index a2abb0fe..9ad4a60a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setupButton.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setupButton.ts @@ -14,4 +14,7 @@ export default class setupButton extends Vue { @Prop() statusImage: string; + + @Prop() + status: string; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setupButton.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setupButton.vue index 7bdf33ea..2da69607 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setupButton.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setupButton.vue @@ -4,7 +4,9 @@
{{phase}} - + + +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.ts index f3708063..f37d86ec 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.ts @@ -70,7 +70,7 @@ export default class ShowControstampoInfo extends Vue { upperplate_extraction_manual: this.recipe.upperplate_extraction_manual, } ); - //await recipeService.Confirm(); + await recipeService.Confirm('UpperPlate'); ModalHelper.HideModal(); this.deferred.resolve(1); }; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts index 13bdcaec..aa4ff213 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts @@ -50,7 +50,7 @@ export default class ShowEstrazioneInfo extends Vue { extraction_aux_manual: this.recipe.extraction_aux_manual, } ); - //await recipeService.Confirm(); + await recipeService.Confirm('Extraction'); ModalHelper.HideModal(); this.deferred.resolve(1); }; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts index 09585a5b..07dd026b 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts @@ -78,7 +78,7 @@ export default class ShowFormatoInfo extends Vue { general_area_working_dxsx: this.recipe.general_area_working_dxsx, } ); - await recipeService.Confirm(); + await recipeService.Confirm('General'); ModalHelper.HideModal(); this.deferred.resolve(1); }; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts index 5303bbcd..b6d85d92 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts @@ -27,11 +27,11 @@ export default class ShowImbutituraInfo extends Vue { get bars() { return [ - { - backgroundColor: "#b3dbff", - borderColor: "#848484", + { + backgroundColor: "#b3dbff", + borderColor: "#848484", height: this.recipe.drawing_1_chart_setpointx.setpointHMI, - width: this.recipe.drawing_1_chart_setpointy.setpointHMI + width: this.recipe.drawing_1_chart_setpointy.setpointHMI } ] as svg.BarChartInfo[] } @@ -59,7 +59,7 @@ export default class ShowImbutituraInfo extends Vue { drawing_mould_up_delay: this.recipe.drawing_mould_up_delay, } ); - //await recipeService.Confirm(); + await recipeService.Confirm('Drawing'); ModalHelper.HideModal(); this.deferred.resolve(1); }; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts index c9b183b7..43d798a5 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts @@ -140,7 +140,7 @@ export default class ShowOpzioniInfo extends Vue { options_thermoregulator_10_setpoint: this.recipe.options_thermoregulator_10_setpoint, } ); - await recipeService.Confirm(); + await recipeService.Confirm('Options'); ModalHelper.HideModal(); this.deferred.resolve(1); }; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts index 387f1a53..b7089eb6 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts @@ -51,7 +51,7 @@ export default class ShowPirometroInfo extends Vue { pyrometer_lowerthermoregulator_working_temperature: this.recipe.pyrometer_lowerthermoregulator_working_temperature, } ); - //await recipeService.Confirm(); + await recipeService.Confirm('Pyrometer'); ModalHelper.HideModal(); this.deferred.resolve(1); }; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue index 58d90299..00297f24 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue @@ -8,28 +8,28 @@ {{recipe.positions_mould_intermediate_position.unitMeasure}} -
+
00 mm
-
+
00 mm
-
+
00 mm
-
+
00 diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue index 5baf24f8..bddef026 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue @@ -7,71 +7,92 @@
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts index c57afbe8..7c5ff59e 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts @@ -64,7 +64,7 @@ export default class ShowQuoteVelocitaInfo extends Vue { positions_upperplate_lowerdeceleration_speed: this.recipe.positions_upperplate_lowerdeceleration_speed, } ); - //await recipeService.Confirm(); + await recipeService.Confirm('Positions'); ModalHelper.HideModal(); this.deferred.resolve(1); }; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts index 6dee5d9f..2a305249 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts @@ -73,7 +73,7 @@ export default class Raffreddamento extends Vue { cooling_shutter_16_opening_perc: this.recipe.cooling_shutter_16_opening_perc, } ); - //await recipeService.Confirm(); + await recipeService.Confirm('Cooling'); ModalHelper.HideModal(); this.deferred.resolve(1); }; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.ts index 59bcf534..63a9682c 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.ts @@ -47,7 +47,7 @@ export default class ShowRiscaldamentoSuperioreInfo extends Vue { heats_decomsustain_smoke_function_enabled: this.recipe.heats_decomsustain_smoke_function_enabled, } ); - //await recipeService.Confirm(); + await recipeService.Confirm('Heats'); ModalHelper.HideModal(); this.deferred.resolve(1); }; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts index 9f1506b7..314c2212 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts @@ -75,7 +75,7 @@ export default class ShowVuotoInfo extends Vue { vacuum_pre_3_chart_setpointy: this.recipe.vacuum_pre_3_chart_setpointy, } ); - //await recipeService.Confirm(); + await recipeService.Confirm('Vacuum'); ModalHelper.HideModal(); this.deferred.resolve(1); }; diff --git a/Thermo.Active/wwwroot/src/filters/dateFilter.ts b/Thermo.Active/wwwroot/src/filters/dateFilter.ts index d2bf7e42..2dd7b0f3 100644 --- a/Thermo.Active/wwwroot/src/filters/dateFilter.ts +++ b/Thermo.Active/wwwroot/src/filters/dateFilter.ts @@ -2,7 +2,7 @@ import Vue from "vue"; import moment from "moment"; Vue.filter("date", function (value: Date, format: string): string { - debugger + if (value) return moment(value).format(format); return null; diff --git a/Thermo.Active/wwwroot/src/services/prodService.ts b/Thermo.Active/wwwroot/src/services/prodService.ts index 01033a18..87861038 100644 --- a/Thermo.Active/wwwroot/src/services/prodService.ts +++ b/Thermo.Active/wwwroot/src/services/prodService.ts @@ -8,7 +8,7 @@ export class ProdService extends baseRestService { BASE_URL = async () => (await CONFIGURATION).api.apiServerUrl + "/api/prod/"; async GetProd() { - let result = await this.Put((await this.BASE_URL()) + "prod/get", true); + let result = await this.Put((await this.BASE_URL()) + "get", true); prodActions.setProd(store, result); return result; } diff --git a/Thermo.Active/wwwroot/src/services/recipeService.ts b/Thermo.Active/wwwroot/src/services/recipeService.ts index f2feddf4..e912067c 100644 --- a/Thermo.Active/wwwroot/src/services/recipeService.ts +++ b/Thermo.Active/wwwroot/src/services/recipeService.ts @@ -33,8 +33,8 @@ export class RecipeService extends baseRestService { return result; } - async Confirm() { - let result = await this.Put((await this.BASE_URL()) + "confirm", true); + async Confirm(section: string) { + let result = await this.Put((await this.BASE_URL()) + "confirm?section=" + section, true); return result; } diff --git a/Thermo.Active/wwwroot/src/store/recipe.store.ts b/Thermo.Active/wwwroot/src/store/recipe.store.ts index 37070810..aaa4ba46 100644 --- a/Thermo.Active/wwwroot/src/store/recipe.store.ts +++ b/Thermo.Active/wwwroot/src/store/recipe.store.ts @@ -20,7 +20,19 @@ export const recipeStore = { state: { current: {}, - overview: {}, + overview: { + general: "", + heats: "", + cooling: "", + cycle: "", + drawing: "", + extraction: "", + options: "", + positions: "", + pyrometer: "", + upperPlate: "", + vacuum: "" + }, } as RecipeStoreModel, getters: {