From 3cca07422ce218ff13948ce9c91d3b7e72692cd9 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 15 Sep 2020 09:22:32 +0200 Subject: [PATCH 1/4] =?UTF-8?q?Unit=C3=A0=20di=20misura:=20messa=20in=20DT?= =?UTF-8?q?O=20da=20NCAdapter=20(era=20commentata)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Thermo.Active.NC/NcAdapter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Thermo.Active.NC/NcAdapter.cs b/Thermo.Active.NC/NcAdapter.cs index 9d1f5678..a8844330 100644 --- a/Thermo.Active.NC/NcAdapter.cs +++ b/Thermo.Active.NC/NcAdapter.cs @@ -1836,7 +1836,7 @@ namespace Thermo.Active.NC Id = item.Id, Range = currRange, Status = currStatus, - UnitMeasure = "", + UnitMeasure = $"{paramPLC.UnitMeasure}", ValueAct = paramPLC.ValueAct / item.ScaleFactor, SetpointHMI = paramPLC.SetpointHMI / item.ScaleFactor, SetpointPLC = paramPLC.SetpointPLC / item.ScaleFactor, From 2dfc9e293f66c50010a732a1ac14c780cd007ca9 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 15 Sep 2020 09:22:50 +0200 Subject: [PATCH 2/4] new rel --- Thermo.Active/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Thermo.Active/Properties/AssemblyInfo.cs b/Thermo.Active/Properties/AssemblyInfo.cs index 90ebf45a..9db78c0a 100644 --- a/Thermo.Active/Properties/AssemblyInfo.cs +++ b/Thermo.Active/Properties/AssemblyInfo.cs @@ -30,4 +30,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.14.80")] \ No newline at end of file +[assembly: AssemblyVersion("0.14.81")] \ No newline at end of file From 4737d22a2f149acc1be0e0809f79b69955192f37 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 15 Sep 2020 11:16:01 +0200 Subject: [PATCH 3/4] fix gantt to setup --- .../components/gantt/gantt-component.ts | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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 index d7dd3936..14954675 100644 --- 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 @@ -114,17 +114,17 @@ export default class GanttComponent extends Vue { showModalStep(step: number, subcategory: string): Promise { switch (step) { - case 0: return ModalHelper.ShowModalAsync(ShowFormatoInfo, { subcategory }); - case 1: return ModalHelper.ShowModalAsync(ShowQuoteVelocitaInfo, { subcategory }); - case 2: return ModalHelper.ShowModalAsync(ShowCicloInfo, { subcategory }); - case 3: return ModalHelper.ShowModalAsync(ShowRiscaldamentoInfo, { subcategory }); - case 4: return ModalHelper.ShowModalAsync(ShowPirometroInfo, { subcategory }); - case 5: return ModalHelper.ShowModalAsync(ShowImbutituraInfo, { subcategory }); - case 6: return ModalHelper.ShowModalAsync(ShowControstampoInfo, { subcategory }); - case 7: return ModalHelper.ShowModalAsync(ShowRaffreddamentoInfo, { subcategory }); - case 8: return ModalHelper.ShowModalAsync(ShowVuotoInfo, { subcategory }); - case 9: return ModalHelper.ShowModalAsync(ShowEstrazioneInfo, { subcategory }); - case 10: return ModalHelper.ShowModalAsync(ShowOpzioniInfo, { subcategory }); + case 0: return ModalHelper.ShowModalAsync(ShowFormatoInfo, subcategory?.toLowerCase()); + case 1: return ModalHelper.ShowModalAsync(ShowQuoteVelocitaInfo, subcategory?.toLowerCase()); + case 2: return ModalHelper.ShowModalAsync(ShowCicloInfo, subcategory?.toLowerCase()); + case 3: return ModalHelper.ShowModalAsync(ShowRiscaldamentoInfo, subcategory?.toLowerCase()); + case 4: return ModalHelper.ShowModalAsync(ShowPirometroInfo, subcategory?.toLowerCase()); + case 5: return ModalHelper.ShowModalAsync(ShowImbutituraInfo, subcategory?.toLowerCase()); + case 6: return ModalHelper.ShowModalAsync(ShowControstampoInfo, subcategory?.toLowerCase()); + case 7: return ModalHelper.ShowModalAsync(ShowRaffreddamentoInfo, subcategory?.toLowerCase()); + case 8: return ModalHelper.ShowModalAsync(ShowVuotoInfo, subcategory?.toLowerCase()); + case 9: return ModalHelper.ShowModalAsync(ShowEstrazioneInfo, subcategory?.toLowerCase()); + case 10: return ModalHelper.ShowModalAsync(ShowOpzioniInfo, subcategory?.toLowerCase()); // case 11: return ModalHelper.ShowModalAsync(AvvioProduzione); } From a7548a6e78962a97bbe67a4f0c564a6434fb23e9 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 15 Sep 2020 11:34:45 +0200 Subject: [PATCH 4/4] cursore ciclo --- .../wwwroot/assets/styles/base/dashboard.less | 1 + Thermo.Active/wwwroot/assets/styles/style.css | 1 + .../processo/components/gantt/gantt.ts | 21 +++++++++++++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Thermo.Active/wwwroot/assets/styles/base/dashboard.less b/Thermo.Active/wwwroot/assets/styles/base/dashboard.less index 4618b544..378686c0 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/dashboard.less +++ b/Thermo.Active/wwwroot/assets/styles/base/dashboard.less @@ -176,6 +176,7 @@ font-size: 120px; font-weight: 300; z-index: 1; + max-height: 140px; } } diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 08ae7b4d..45e54031 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -4301,6 +4301,7 @@ article .box .body { font-size: 120px; font-weight: 300; z-index: 1; + max-height: 140px; } .dashboard .first_col .timing-area .start::before { background-image: url(/assets/svg/dashboard-top-left.svg); 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 fa412607..16f0a1b5 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 @@ -107,10 +107,22 @@ export default class Gantt extends Vue { } get PadY() { + if (this.follow) { + try { + let result = Math.min(...this.blocks.filter(b => !b.terminated).map(i => i.section)); + switch (result) { + case 1: return 0; break; + case 2: return (this.$refs.section1 as any).rowHeight; break; + case 3: return (this.$refs.section1 as any).rowHeight + (this.$refs.section2 as any).rowHeight; break; + } + } catch { } + + } return this.padY; } set PadY(value: number) { - this.padY = value; + if (!this.follow) + this.padY = value; } follow: boolean = false; @@ -169,14 +181,15 @@ export default class Gantt extends Vue { doPan(event: MouseEvent | TouchEvent) { if (this.lastPosition) if (event.type == "touchmove" || (event.type == "mousemove" && (event as MouseEvent).buttons)) { + this.follow = false; + let p = this.getSvgCoords(event) this.PadX = Math.min(this.PadX + p.x - this.lastPosition.x, 0); this.PadY = Math.max(Math.min(this.PadY + p.y - this.lastPosition.y, 0), -this.maxPaddingY); - - - this.lastPosition = p; + + } }