From 279dfb6bb0210401b468d3ce597a6424a1a7c91a Mon Sep 17 00:00:00 2001 From: Alessio Date: Fri, 19 Jun 2020 14:34:35 +0200 Subject: [PATCH 1/5] fix opzioni --- .../wwwroot/assets/styles/base/opzioni.css | 26 -- .../wwwroot/assets/styles/base/opzioni.less | 2 + .../base-components/setupSottosquadra.vue | 8 +- .../components/sottosquadra-controstampo.ts | 2 +- .../components/sottosquadra-controstampo.vue | 221 ++--------------- .../opzioni/components/sottosquadra-stampo.ts | 2 +- .../components/sottosquadra-stampo.vue | 222 ++---------------- 7 files changed, 56 insertions(+), 427 deletions(-) delete mode 100644 Thermo.Active/wwwroot/assets/styles/base/opzioni.css diff --git a/Thermo.Active/wwwroot/assets/styles/base/opzioni.css b/Thermo.Active/wwwroot/assets/styles/base/opzioni.css deleted file mode 100644 index ad0ee4f4..00000000 --- a/Thermo.Active/wwwroot/assets/styles/base/opzioni.css +++ /dev/null @@ -1,26 +0,0 @@ -.opzionilavorazione { - display: grid; - grid-template-columns: 1fr 1fr; - align-items: flex-start; - width: 100%; - height: 100%; -} -.opzionilavorazione .list { - border-right: 2px solid #979797; - height: 100%; -} -.opzionilavorazione .option-row { - display: grid; - grid-template-columns: 1fr 1fr 1fr; - align-items: center; - justify-content: space-around; - height: 64px; - cursor: pointer; -} -.opzionilavorazione .option-row:nth-child(odd) { - background-color: #ddd; -} -.opzionilavorazione .option-row.active { - background-color: rgba(23, 145, 255, 0.75); - color: #fff; -} diff --git a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less index 1aa3fe71..e97d0537 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less +++ b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less @@ -1,3 +1,5 @@ +// out: false, sourceMap: false, main: ../style.less + .opzionilavorazione { display: grid; grid-template-columns: 1fr 1fr; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupSottosquadra.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupSottosquadra.vue index 54333c5c..8a93aa8b 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupSottosquadra.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupSottosquadra.vue @@ -1,7 +1,6 @@ + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-controstampo.ts index dcd7fa41..a495e73a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-controstampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-controstampo.ts @@ -13,6 +13,6 @@ export default class SottosqaudraControstampo extends Vue{ @Prop() recipe:Recipe.IRecipe; + selectedItem: number = 1; - showSottosquadra: string = "sottosquadra-1"; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-controstampo.vue index 15414803..cfe44822 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-controstampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-controstampo.vue @@ -1,203 +1,28 @@ \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.ts index 1c361b57..9f8e3f49 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.ts @@ -13,6 +13,6 @@ export default class SottosqaudraStampo extends Vue{ @Prop() recipe:Recipe.IRecipe; + selectedItem: number = 1; - showSottosquadra: string = "sottosquadra-1"; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue index e97e0fb1..19630db6 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue @@ -1,203 +1,27 @@ - \ No newline at end of file From 65ee4154f16759ec12fd643fef5b1e63f8d4b760 Mon Sep 17 00:00:00 2001 From: Alessio Date: Fri, 19 Jun 2020 14:53:19 +0200 Subject: [PATCH 2/5] fix style buttons opzioni --- .../wwwroot/assets/styles/base/opzioni.less | 21 +++++++++++++++++++ Thermo.Active/wwwroot/assets/styles/style.css | 13 ++++++++++++ 2 files changed, 34 insertions(+) diff --git a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less index e97d0537..c09b64b8 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less +++ b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less @@ -1,5 +1,26 @@ // out: false, sourceMap: false, main: ../style.less +.modal.opzioni-info{ + section{ + aside{ + button{ + box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5); + width: 547px; + height: 72px; + background-color: #bbbcbc; + border:none; + text-align: left; + color: @color-darkish-blue; + font-size: 20px; + + &.active{ + background-color: white; + } + } + } + } +} + .opzionilavorazione { display: grid; grid-template-columns: 1fr 1fr; diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 09b372fc..9a377386 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -5539,6 +5539,19 @@ select:focus { padding: 0 20px; font-size: 1rem; } +.modal.opzioni-info section aside button { + box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5); + width: 547px; + height: 72px; + background-color: #bbbcbc; + border: none; + text-align: left; + color: #002680; + font-size: 20px; +} +.modal.opzioni-info section aside button.active { + background-color: white; +} .opzionilavorazione { display: grid; grid-template-columns: 1fr 1fr; From 32510556d6a2ea476aa4e5ecc7e8b89559d84548 Mon Sep 17 00:00:00 2001 From: Alessio Date: Fri, 19 Jun 2020 15:20:46 +0200 Subject: [PATCH 3/5] add usage of prodService --- .../src/app_modules_thermo/dashboard/base-components/piece.ts | 3 +++ Thermo.Active/wwwroot/src/main.ts | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/piece.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/piece.ts index c8450480..b7772e09 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/piece.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/piece.ts @@ -2,10 +2,13 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import { Prop } from 'vue-property-decorator'; import PieceSubMenu from "./piece-sub-menu.vue"; +import { ProdActions } from '@/store/prod.store'; @Component({components:{submenu:PieceSubMenu}}) export default class Piece extends Vue{ + prod: Prod.IProd = this.$store.getters.getProd(); + @Prop({default:0}) number:number; @Prop({default:0}) diff --git a/Thermo.Active/wwwroot/src/main.ts b/Thermo.Active/wwwroot/src/main.ts index 72cb94af..b71e7660 100644 --- a/Thermo.Active/wwwroot/src/main.ts +++ b/Thermo.Active/wwwroot/src/main.ts @@ -30,6 +30,9 @@ import { warmersService } from "./services/warmersService"; warmersService.GetChannels(); warmersService.GetResistances(); +import { prodService } from "./services/prodService"; +prodService.GetProd(); + // import VueDragDrop from 'vue-drag-drop'; // Vue.use(VueDragDrop); From 25444bf1a3c5dce39f586669d290715f076d1d2f Mon Sep 17 00:00:00 2001 From: Alessio Date: Fri, 19 Jun 2020 15:43:10 +0200 Subject: [PATCH 4/5] fix dashboard --- .../wwwroot/assets/styles/base/dashboard.less | 40 +++++++++++++++++++ Thermo.Active/wwwroot/assets/styles/style.css | 30 ++++++++++++++ .../app_modules_thermo/dashboard/dashboard.ts | 4 ++ .../dashboard/dashboard.vue | 12 ++++++ 4 files changed, 86 insertions(+) diff --git a/Thermo.Active/wwwroot/assets/styles/base/dashboard.less b/Thermo.Active/wwwroot/assets/styles/base/dashboard.less index 18ee1dde..f771f748 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/dashboard.less +++ b/Thermo.Active/wwwroot/assets/styles/base/dashboard.less @@ -256,6 +256,46 @@ display : flex; flex-flow : column; + .piece_time{ + display: grid; + grid-template-rows : repeat(2,auto); + grid-template-columns: repeat(2,auto); + + .piece_hours{ + grid-row: 1; + grid-column: 1; + } + + .time_cycle{ + grid-row: 1; + grid-column: 2; + } + + div{ + display: flex; + flex-flow: column; + + span{ + font-family: "Work Sans"; + font-weight: 500; + text-align: center; + color:#4b4b4b; + + &:first-of-type{ + font-size: 26px; + text-transform: uppercase; + } + + &:last-of-type{ + font-size: 120px; + } + + } + + } + + } + .pieces { height: 400px; diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 9a377386..b0a86862 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -4412,6 +4412,36 @@ article .box .body { display: flex; flex-flow: column; } +.dashboard .third_col .piece_time { + display: grid; + grid-template-rows: repeat(2, auto); + grid-template-columns: repeat(2, auto); +} +.dashboard .third_col .piece_time .piece_hours { + grid-row: 1; + grid-column: 1; +} +.dashboard .third_col .piece_time .time_cycle { + grid-row: 1; + grid-column: 2; +} +.dashboard .third_col .piece_time div { + display: flex; + flex-flow: column; +} +.dashboard .third_col .piece_time div span { + font-family: "Work Sans"; + font-weight: 500; + text-align: center; + color: #4b4b4b; +} +.dashboard .third_col .piece_time div span:first-of-type { + font-size: 26px; + text-transform: uppercase; +} +.dashboard .third_col .piece_time div span:last-of-type { + font-size: 120px; +} .dashboard .third_col .pieces { height: 400px; } 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 1d188e81..43b707f0 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts @@ -22,6 +22,10 @@ import Piece from "./base-components/piece.vue"; }) export default class Dashboard extends Vue { + @Prop({ default: "18,2" }) + piece_hours: string; + @Prop({ default: "3'12''" }) + time_cycle: string; @Prop({ default: 10 }) pieces:number; @Prop({ default: 280 }) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue index 63811fb9..e400d7da 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue @@ -124,6 +124,18 @@
+ +
+
+ {{'dashboard-piece-hours' | localize('pezzi/ora')}} + {{piece_hours}} +
+
+ {{'dashboard-time-cycle' | localize('tempo/ciclo')}} + {{time_cycle}} +
+
+