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

Client/Program.cs

@@ -172,6 +172,7 @@ namespace Active_Client
             e.CommandLine.AppendSwitch("--enable-usermedia-screen-capture");
             e.CommandLine.AppendSwitch("--no-proxy-server");
             e.CommandLine.AppendSwitch("--ignore-certificate-errors-spki-list");
+            e.CommandLine.AppendSwitch("--ignore-certificate-errors");
             e.CommandLine.AppendSwitch("--ignore-ssl-errors");
         }
 

Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.ts

@@ -33,6 +33,7 @@ export default class Combo extends Vue {
 
   opened: boolean = false;
   showList() {
+    if(!this.value.status.enabled) return;
     this.opened = !this.opened;
     this.$nextTick(() => lottie.searchAnimations());
 

Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.vue

@@ -3,7 +3,7 @@
 		<div
 			class="form"
 			@click="showList"
-			:class="{'error': value && value.status && value.status.hasError}"
+			:class="{'error': value && value.status && value.status.hasError, 'disabled': value && value.status && !value.status.enabled}"
 		>
 			{{currentValue}}
 			<i v-if="opened" class="fa fa-chevron-up" />
@@ -30,6 +30,11 @@
 <style scoped>
 .combo {
 	position: relative;
+
+}
+
+.disabled{
+	background-color: rgba(0, 0, 0, 0.15);
 }
 
 .combo select:disabled {

Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts

@@ -30,6 +30,9 @@ export default class Processo extends Vue {
   get tot(): number {
     return store.state.prod.panel.numTarget;
   };
+  get preHot(): number {
+    return store.state.prod.panel.numPreHot;
+  };
 
   get blocks(): server.Modblock[] {
     return store.state.modules.blocks;

Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue

@@ -21,11 +21,12 @@
 					></soft-key>
 				</template>
 				<label v-if="actual != null" >
-					<div>{{actual}}/</div>
+					<div v-if="preHot == 0">{{actual}}/</div>
+					<div v-else>-{{preHot}}/</div>
 					<button @click="editProd" class="btn" v-if="inAuto && tot != 0">{{tot}}</button>
 					<button @click="editProd" class="btn" v-if="inAuto && tot == 0">--</button>
-					<div @click="editProd" class="totp" v-if="!inAuto && tot != 0">{{tot}}</div>
-					<div @click="editProd" class="totp" v-if="!inAuto && tot == 0">--</div>
+					<div class="totp" v-if="!inAuto && tot != 0">{{tot}}</div>
+					<div class="totp" v-if="!inAuto && tot == 0">--</div>
 				</label>
 			</div>
 			<gantt

Thermo.Active/wwwroot/src/modules/base-components/modal-load-program.ts

@@ -85,9 +85,11 @@ export default class ModalLoadProgram extends Vue {
   }
 
   get canLoadProgram() {
-    return this.$store.state.process.canLoadProgram;
+    if(this.$store.state.machineStatus.cycleProd) return false
+    return this.$store.state.machineStatus.cycleProd.mode!=2;
   }
 
+
   async duplicate() {
     let result = await ModalHelper.ShowModalAsync(duplicateModal, { name: this.selectedFile.Name, folder: this.currentPath });
     this.relaodFiles();

Thermo.Active/wwwroot/src/modules/base-components/modal-load-program.vue

@@ -251,8 +251,7 @@
 		<div class="modal-load-program-footer">
 			<button
 				class="btn btn-success"
-				:disabled="!selectedFile || fileIsChanged || loadClicked"
-				v-if="this.isLocalNavigation"
+				:disabled="!selectedFile || fileIsChanged || loadClicked || !canLoadProgram"
 				@click="load(selectedFile)"
 			>{{'modal_load_program_btn_upload_recipe' | localize('Carica e attiva ricetta')}}</button>
 		</div>