Merge remote-tracking branch 'origin/develop' into develop

2020-06-12 10:41:51 +02:00
parent 11fb2c2355 00dcc638fc
commit f58068b4f7
23 changed files with 87 additions and 37 deletions
@@ -30,6 +30,12 @@ export default class ShowCicloInfo extends Vue {
    this.deferred.resolve(1);
  };

+  goTo(step) {
+    recipeActions.setCurrent(store, this.recipe);
+    ModalHelper.HideModal();
+    this.deferred.resolve(step);
+  }
+
  async beforeMount() {
    // this.contactInfo = await awaiter(new machineService().getContactConfiguration());
    messageService.subscribeToChannel("esc_pressed", args => {
@@ -17,7 +17,7 @@
 				<button class="btn btn-success" @click="conferma()">Conferma</button>
 			</footer>
 		</modal>
-		<stepfooter :current="2"></stepfooter>
+		<stepfooter :current="2" @click="goTo"></stepfooter>
 	</div>
 </template>

@@ -11,6 +11,6 @@ export default class StepFooter extends Vue {
  current: number;

  public showModalAtStep(step: number) {
-    messageService.publishToChannel('show-setup-modal', step);
+    this.$emit('click', step - this.current)
  }
 }
@@ -19,17 +19,23 @@ export default class ShowControstampoInfo extends Vue {
  @Prop()
  deferred: Deferred<boolean>;

-  annulla(name: string) {
+  annulla() {
    ModalHelper.HideModal();
    this.deferred.resolve(-1);
  };

-  conferma(name: string) {
+  conferma() {
    recipeActions.setCurrent(store, this.recipe);
    ModalHelper.HideModal();
    this.deferred.resolve(1);
  };

+  goTo(step) {
+    recipeActions.setCurrent(store, this.recipe);
+    ModalHelper.HideModal();
+    this.deferred.resolve(step);
+  }
+
  async beforeMount() {
    // this.contactInfo = await awaiter(new machineService().getContactConfiguration());
    messageService.subscribeToChannel("esc_pressed", args => {
@@ -19,7 +19,7 @@
 				<button class="btn btn-success" @click="conferma()">Conferma</button>
 			</footer>
 		</modal>
-		<stepfooter :current="6"></stepfooter>
+		<stepfooter :current="6" @click="goTo"></stepfooter>
 	</div>
 </template>

@@ -35,6 +35,12 @@ export default class ShowEstrazioneInfo extends Vue {
    this.deferred.resolve(1);
  };

+  goTo(step) {
+    recipeActions.setCurrent(store, this.recipe);
+    ModalHelper.HideModal();
+    this.deferred.resolve(step);
+  }
+
  async beforeMount() {
    // this.contactInfo = await awaiter(new machineService().getContactConfiguration());
    messageService.subscribeToChannel("esc_pressed", args => {
@@ -22,7 +22,7 @@
 				<button class="btn btn-success" @click="conferma()">Conferma</button>
 			</footer>
 		</modal>
-		<stepfooter :current="9"></stepfooter>
+		<stepfooter :current="9" @click="goTo"></stepfooter>
 	</div>
 </template>

@@ -55,14 +55,16 @@ export default class ShowFormatoInfo extends Vue {

  conferma() {
    recipeActions.setCurrent(store, this.recipe);
-
-
-
-
    ModalHelper.HideModal();
    this.deferred.resolve(1);
  };

+  goTo(step) {
+    recipeActions.setCurrent(store, this.recipe);
+    ModalHelper.HideModal();
+    this.deferred.resolve(step);
+  }
+
  async beforeMount() {
    // this.contactInfo = await awaiter(new machineService().getContactConfiguration());
    messageService.subscribeToChannel("esc_pressed", args => {
@@ -62,7 +62,7 @@
 				<button class="btn btn-success" @click="conferma()">Conferma</button>
 			</footer>
 		</modal>
-		<stepfooter :current="0"></stepfooter>
+		<stepfooter :current="0" @click="goTo"></stepfooter>
 	</div>
 </template>

@@ -36,6 +36,12 @@ export default class ShowImbutituraInfo extends Vue {
    this.deferred.resolve(1);
  };

+  goTo(step) {
+    recipeActions.setCurrent(store, this.recipe);
+    ModalHelper.HideModal();
+    this.deferred.resolve(step);
+  }
+
  async beforeMount() {
    // this.contactInfo = await awaiter(new machineService().getContactConfiguration());
    messageService.subscribeToChannel("esc_pressed", args => {
@@ -13,48 +13,36 @@
 						<label>{{'drawing_delay'|localize('Ritardo')}}</label>
 						<numeric v-model="recipe.drawing_delay" />
 					</div>
-					<slider
-						v-model="recipe.drawing_delay"
-					></slider>
+					<slider v-model="recipe.drawing_delay"></slider>
 					<hr />
 					<div class="input-area">
 						<label>{{'drawing_type'|localize('Tipo')}}</label>
-						<select v-model="recipe.drawing_type">
-						</select>
+						<select v-model="recipe.drawing_type"></select>
 					</div>
 					<div class="input-area">
 						<label>{{'drawing_photocell'|localize('Scelta fotocellula')}}</label>
-						<select v-model="recipe.drawing_photocell">
-						</select>
+						<select v-model="recipe.drawing_photocell"></select>
 					</div>
 					<div class="input-area">
 						<label>{{'drawing_height'|localize('Altezza bolla')}}</label>
 						<numeric v-model="recipe.drawing_height" />
 					</div>
-					<slider
-						v-model="recipe.drawing_height"
-					></slider>
+					<slider v-model="recipe.drawing_height"></slider>
 					<div class="input-area">
 						<label>{{'drawing_mantaining_flow'|localize('Portata mantenimento')}}</label>
 						<numeric v-model="recipe.drawing_mantaining_flow" />
 					</div>
-					<slider
-						v-model="recipe.drawing_mantaining_flow"
-					></slider>
+					<slider v-model="recipe.drawing_mantaining_flow"></slider>
 					<div class="input-area">
 						<label>{{'drawing_manual'|localize('Portata manuale')}}</label>
 						<numeric v-model="recipe.drawing_manual" />
 					</div>
-					<slider
-						v-model="recipe.drawing_manual"
-					></slider>
+					<slider v-model="recipe.drawing_manual"></slider>
 					<div class="input-area">
 						<label>{{'drawing_mould_up_delay'|localize('Ritardo salita stampo')}}</label>
 						<numeric v-model="recipe.drawing_mould_up_delay" />
 					</div>
-					<slider
-						v-model="recipe.drawing_mould_up_delay"
-					></slider>
+					<slider v-model="recipe.drawing_mould_up_delay"></slider>
 				</aside>
 				<hr />
 				<div class="specific">
@@ -70,7 +58,7 @@
 				</button>
 			</footer>
 		</modal>
-		<stepfooter :current="5"></stepfooter>
+		<stepfooter :current="5" @click="goTo"></stepfooter>
 	</div>
 </template>

@@ -37,6 +37,12 @@ export default class ShowOpzioniInfo extends Vue {
    this.deferred.resolve(1);
  };

+  goTo(step) {
+    recipeActions.setCurrent(store, this.recipe);
+    ModalHelper.HideModal();
+    this.deferred.resolve(step);
+  }
+
  async beforeMount() {
    // this.contactInfo = await awaiter(new machineService().getContactConfiguration());
    messageService.subscribeToChannel("esc_pressed", args => {
@@ -24,7 +24,7 @@
 				<button class="btn btn-success" @click="conferma()">Conferma</button>
 			</footer>
 		</modal>
-		<stepfooter :current="10"></stepfooter>
+		<stepfooter :current="10" @click="goTo"></stepfooter>
 	</div>
 </template>

@@ -30,6 +30,12 @@ export default class ShowPirometroInfo extends Vue {
    this.deferred.resolve(1);
  };

+  goTo(step) {
+    recipeActions.setCurrent(store, this.recipe);
+    ModalHelper.HideModal();
+    this.deferred.resolve(step);
+  }
+
  async beforeMount() {
    // this.contactInfo = await awaiter(new machineService().getContactConfiguration());
    messageService.subscribeToChannel("esc_pressed", args => {
@@ -24,7 +24,7 @@
 				<button class="btn btn-success" @click="conferma()">Conferma</button>
 			</footer>
 		</modal>
-		<stepfooter :current="4"></stepfooter>
+		<stepfooter :current="4" @click="goTo"></stepfooter>
 	</div>
 </template>

@@ -39,6 +39,12 @@ export default class ShowQuoteVelocitaInfo extends Vue {
    this.deferred.resolve(1);
  };

+  goTo(step) {
+    recipeActions.setCurrent(store, this.recipe);
+    ModalHelper.HideModal();
+    this.deferred.resolve(step);
+  }
+
  async beforeMount() {
    // this.contactInfo = await awaiter(new machineService().getContactConfiguration());
    messageService.subscribeToChannel("esc_pressed", args => {
@@ -19,7 +19,7 @@
 				<button class="btn btn-success" @click="conferma()">Conferma</button>
 			</footer>
 		</modal>
-		<stepfooter :current="1"></stepfooter>
+		<stepfooter :current="1" @click="goTo"></stepfooter>
 	</div>
 </template>

@@ -35,6 +35,12 @@ export default class Raffreddamento extends Vue {
    this.deferred.resolve(1);
  };

+  goTo(step) {
+    recipeActions.setCurrent(store, this.recipe);
+    ModalHelper.HideModal();
+    this.deferred.resolve(step);
+  }
+
  async beforeMount() {
    // this.contactInfo = await awaiter(new machineService().getContactConfiguration());
    messageService.subscribeToChannel("esc_pressed", args => {
@@ -17,7 +17,7 @@
 				<button class="btn btn-success" @click="conferma()">Conferma</button>
 			</footer>
 		</modal>
-		<stepfooter :current="7"></stepfooter>
+		<stepfooter :current="7" @click="goTo"></stepfooter>
 	</div>
 </template>

@@ -31,6 +31,12 @@ export default class ShowRiscaldamentoSuperioreInfo extends Vue {
    this.deferred.resolve(1);
  };

+  goTo(step) {
+    recipeActions.setCurrent(store, this.recipe);
+    ModalHelper.HideModal();
+    this.deferred.resolve(step);
+  }
+
  async beforeMount() {
    // this.contactInfo = await awaiter(new machineService().getContactConfiguration());
    messageService.subscribeToChannel("esc_pressed", args => {
@@ -26,7 +26,7 @@
 				<button class="btn btn-success" @click="conferma()">Conferma</button>
 			</footer>
 		</modal>
-		<stepfooter :current="3"></stepfooter>
+		<stepfooter :current="3" @click="goTo"></stepfooter>
 	</div>
 </template>

@@ -29,6 +29,12 @@ export default class ShowVuotoInfo extends Vue {
    this.deferred.resolve(1);
  };

+  goTo(step) {
+    recipeActions.setCurrent(store, this.recipe);
+    ModalHelper.HideModal();
+    this.deferred.resolve(step);
+  }
+
  async beforeMount() {
    // this.contactInfo = await awaiter(new machineService().getContactConfiguration());
    messageService.subscribeToChannel("esc_pressed", args => {
@@ -18,7 +18,7 @@
 				<button class="btn btn-success" @click="conferma()">Conferma</button>
 			</footer>
 		</modal>
-		<stepfooter :current="8"></stepfooter>
+		<stepfooter :current="8" @click="goTo"></stepfooter>
 	</div>
 </template>