Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIx load recipe

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-10-15 15:47:22 +02:00
parent dee9084d62
commit bd4cb3504a
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue
+2 -2
View File
@@ -24,8 +24,8 @@
<div>{{actual}}/</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
+3 -1
View File
@@ -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
+1 -2
View File
@@ -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>