Fix "Edit" button behaviour in Tooling-Equipment

This commit is contained in:
Nicola Carminati
2019-01-17 15:01:39 +01:00
parent 5c680f55dc
commit 7e7f0ee6c4
4 changed files with 47 additions and 15 deletions
@@ -273,11 +273,19 @@
}
.tooling-families-container .box-right .box-right-body, .tooling-shanks-container .box-right .box-right-body, .tooling-equipment-container .box-right .box-right-body{
height: calc(~'100% - 136px');
button{
margin-top: -30px !important;
.lock-icon{
height: 48px !important;
width: 30px !important;
.fa{
text-align: center !important;
margin: 0 !important;
}
color: #002680;
font-size: 48px;
}
.tooling-equipment-footer, .tooling-families-footer, .tooling-shanks-footer{
height:80px;
height:60px;
float: right;
display: flex;
align-items: center;
+17 -6
View File
@@ -7727,6 +7727,7 @@ footer .container button.big:before {
}
.depot-container .depot-position.drop:hover .empty {
border: dashed 4px #878787;
font-weight: bold;
}
.depot-container .depot-position.disabled::after {
content: '\f05e';
@@ -7744,7 +7745,7 @@ footer .container button.big:before {
font-size: 5em;
color: #000;
justify-content: center;
z-index: 100;
z-index: 1;
}
.depot-container .depot-box {
width: 1808px;
@@ -7971,6 +7972,7 @@ footer .container button.big:before {
position: absolute;
font-size: 36px;
top: -29px;
left: 0;
color: #1791ff;
}
.depot-container .depot-box .depot-boxbody .box-right .single-depot .square-container .selected-empty {
@@ -11639,10 +11641,19 @@ footer .container button.big:before {
.tooling-equipment-container .box-right .box-right-body {
height: calc(100% - 136px);
}
.tooling-families-container .box-right .box-right-body button,
.tooling-shanks-container .box-right .box-right-body button,
.tooling-equipment-container .box-right .box-right-body button {
margin-top: -30px !important;
.tooling-families-container .box-right .box-right-body .lock-icon,
.tooling-shanks-container .box-right .box-right-body .lock-icon,
.tooling-equipment-container .box-right .box-right-body .lock-icon {
height: 48px !important;
width: 30px !important;
color: #002680;
font-size: 48px;
}
.tooling-families-container .box-right .box-right-body .lock-icon .fa,
.tooling-shanks-container .box-right .box-right-body .lock-icon .fa,
.tooling-equipment-container .box-right .box-right-body .lock-icon .fa {
text-align: center !important;
margin: 0 !important;
}
.tooling-families-container .box-right .box-right-body .tooling-equipment-footer,
.tooling-shanks-container .box-right .box-right-body .tooling-equipment-footer,
@@ -11653,7 +11664,7 @@ footer .container button.big:before {
.tooling-families-container .box-right .box-right-body .tooling-shanks-footer,
.tooling-shanks-container .box-right .box-right-body .tooling-shanks-footer,
.tooling-equipment-container .box-right .box-right-body .tooling-shanks-footer {
height: 80px;
height: 60px;
float: right;
display: flex;
align-items: center;
@@ -36,7 +36,7 @@ export default class toolingEquipment extends Vue {
}
public get tools(): server.Tool[] { return (this.$store.state as AppModel).tooling.tools; }
public get ncTools(): server.ToolNc[] { console.log((this.$store.state as AppModel).tooling.ncTools); return (this.$store.state as AppModel).tooling.ncTools; }
public get ncTools(): server.ToolNc[] { return (this.$store.state as AppModel).tooling.ncTools; }
public get ncShanks(): server.ShankNc[] { return (this.$store.state as AppModel).tooling.ncShanks; }
public get maxTools(): number {
@@ -162,8 +162,6 @@ export default class toolingEquipment extends Vue {
}
async mounted() {
if(this.isSiemens){
awaiter (Promise.all([
await new ToolingService().GetTools(),
@@ -471,6 +469,19 @@ export default class toolingEquipment extends Vue {
}
private canEdit = function () {
if(this.isSiemens){
if(this.selectedTool)
return (this.selectedTool.magazineId == 0)
return false
}
else{
console.log("TODO canEdit() in tooling-equipment.ts")
return true
}
}
public getToolIcon = function (id) {
if (id == 9999)
return "../assets/iicons/Tools/Undefined.png"
@@ -67,7 +67,8 @@
<div class="box-right-body" v-if="enableParameters">
<button class="btn deleteElement" @click="deleteTool(selectedTool)"><i class="fa fa-trash"></i></button>
<div class="box-right-label-header" v-if="selectedTool.id" >{{'tooling_equipment_editlabel' | localize("Modifica utensile %d",selectedTool.id)}}</div>
<div class="box-right-label-header" v-if="selectedTool.id && isSiemens" >{{'tooling_equipment_editlabel' | localize("Modifica utensile %d",selectedTool.id,selectedTool.familyName)}}</div>
<div class="box-right-label-header" v-if="selectedTool.id && !isSiemens" >{{'tooling_equipment_editlabel' | localize("Modifica utensile %d",selectedTool.id)}}</div>
<div class="box-right-label-header" v-if="!selectedTool.id" >{{'tooling_equipment_newlabel' | localize("Creazione Nuovo Utensile")}}</div>
<div class="list-skill-equipment scrollable">
<form>
@@ -99,7 +100,8 @@
</form>
</div>
<div class="tooling-equipment-footer">
<button class="btn" v-if="!enableModify" @click="modify()">{{'tooling_equipment_button_modify' | localize("Modifica")}}</button>
<div v-if="!enableModify && !canEdit()" class="lock-icon"><i class="fa fa-lock"></i></div>
<button class="btn" v-if="!enableModify" :disabled="!canEdit()" @click="modify()">{{'tooling_equipment_button_modify' | localize("Modifica")}}</button>
<button class="btn" v-if="enableModify" @click="cancel()">{{'tooling_equipment_button_cancel' | localize("Annulla")}}</button>
<button class="btn blue-reverse" :disabled="!isValid" v-if="enableModify && selectedTool.id" @click="buttonSave(selectedTool, selectedEquipment)">{{'tooling_equipment_button_save' | localize("Salva")}}</button>
<button class="btn blue-reverse" :disabled="!isValid" v-if="enableModify && !selectedTool.id" @click="buttonSave(selectedTool, selectedEquipment)">{{'tooling_equipment_button_add' | localize("Aggiungi")}}</button>
@@ -141,7 +143,7 @@
</div>
<div class="tooling-equipment-footer">
<button class="btn" v-if="!enableModify" @click="modify()">{{'tooling_equipment_button_modify' | localize("Modifica")}}</button>
<button class="btn" v-if="!enableModify" @click="modify()">{{'tooling_equipment_button_modify' | localize("Modifica")}}</button>
<button class="btn" v-if="enableModify" @click="cancel()">{{'tooling_equipment_button_cancel' | localize("Annulla")}}</button>
<button class="btn blue-reverse" v-if="enableModify && selectedEquipment.id>0" @click="buttonSave(selectedTool, selectedEquipment)">{{'tooling_equipment_button_save' | localize("Salva")}}</button>
<button class="btn blue-reverse" v-if="enableModify && (!selectedEquipment.id || selectedEquipment.id<=0)" @click="buttonSave(selectedTool, selectedEquipment)">{{'tooling_equipment_button_add' | localize("Aggiungi")}}</button>