fix : removed 1 and added F directly to MJP,JKP
This commit is contained in:
parent
4d01e19093
commit
0bc77c0124
@ -476,8 +476,7 @@ export class TouchPadMenuComponent implements OnInit {
|
|||||||
this.selectionService.updatePartial({
|
this.selectionService.updatePartial({
|
||||||
label: this.selectedLabel,
|
label: this.selectedLabel,
|
||||||
numbers: [...this.selectedNumbers],
|
numbers: [...this.selectedNumbers],
|
||||||
isBoxed: false,
|
isBoxed: false
|
||||||
value: 1
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
this.secondGroup = ['F'];
|
this.secondGroup = ['F'];
|
||||||
@ -485,8 +484,7 @@ export class TouchPadMenuComponent implements OnInit {
|
|||||||
this.selectionService.updatePartial({
|
this.selectionService.updatePartial({
|
||||||
label: this.selectedLabel,
|
label: this.selectedLabel,
|
||||||
numbers: [...this.selectedNumbers],
|
numbers: [...this.selectedNumbers],
|
||||||
isBoxed: false,
|
isBoxed: false
|
||||||
value: 1
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else if (this.selectedLabel === 'TAN') {
|
} else if (this.selectedLabel === 'TAN') {
|
||||||
@ -495,8 +493,7 @@ export class TouchPadMenuComponent implements OnInit {
|
|||||||
this.selectionService.updatePartial({
|
this.selectionService.updatePartial({
|
||||||
label: this.selectedLabel,
|
label: this.selectedLabel,
|
||||||
numbers: ['F'],
|
numbers: ['F'],
|
||||||
isBoxed: true,
|
isBoxed: true
|
||||||
value: 1
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
this.tanGroups[this.tanGroupStage] = ['F'];
|
this.tanGroups[this.tanGroupStage] = ['F'];
|
||||||
@ -507,14 +504,20 @@ export class TouchPadMenuComponent implements OnInit {
|
|||||||
this.selectionService.updatePartial({
|
this.selectionService.updatePartial({
|
||||||
label: this.selectedLabel,
|
label: this.selectedLabel,
|
||||||
numbers: [...this.selectedNumbers],
|
numbers: [...this.selectedNumbers],
|
||||||
isBoxed: false,
|
isBoxed: false
|
||||||
value: 1
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
} else if (this.multiLegLabels.includes(this.selectedLabel)) {
|
||||||
|
this.multiLegGroups[this.multiLegStage] = ['F'];
|
||||||
|
this.updateMultiLegSelection();
|
||||||
|
this.selectionService.updatePartial({
|
||||||
|
label: this.selectedLabel,
|
||||||
|
numbers: [...this.selectedNumbers],
|
||||||
|
isBoxed: false
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Calculator and Field Modal methods
|
|
||||||
openCalculator() { this.calculatorOpen = true; this.calcDisplay = ''; }
|
openCalculator() { this.calculatorOpen = true; this.calcDisplay = ''; }
|
||||||
closeCalculator() { this.calculatorOpen = false; }
|
closeCalculator() { this.calculatorOpen = false; }
|
||||||
press(val: string) { if (this.calcDisplay === 'Error') this.calcDisplay = ''; this.calcDisplay += val; }
|
press(val: string) { if (this.calcDisplay === 'Error') this.calcDisplay = ''; this.calcDisplay += val; }
|
||||||
@ -552,7 +555,7 @@ export class TouchPadMenuComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
openFieldModal() {
|
openFieldModal() {
|
||||||
if (['FOR', 'QUI', 'TAN'].includes(this.selectedLabel || '')) {
|
if (['FOR', 'QUI', 'TAN'].includes(this.selectedLabel || '') || this.multiLegLabels.includes(this.selectedLabel || '')) {
|
||||||
this.handleFieldForSpecialLabels();
|
this.handleFieldForSpecialLabels();
|
||||||
} else {
|
} else {
|
||||||
this.fieldModalOpen = true;
|
this.fieldModalOpen = true;
|
||||||
@ -595,8 +598,7 @@ export class TouchPadMenuComponent implements OnInit {
|
|||||||
this.selectionService.updatePartial({
|
this.selectionService.updatePartial({
|
||||||
label: this.selectedLabel,
|
label: this.selectedLabel,
|
||||||
numbers: [...this.selectedNumbers],
|
numbers: [...this.selectedNumbers],
|
||||||
isBoxed: false,
|
isBoxed: false
|
||||||
value: 1
|
|
||||||
});
|
});
|
||||||
} else if (this.selectedLabel === 'TAN') {
|
} else if (this.selectedLabel === 'TAN') {
|
||||||
if (this.isBoxed) {
|
if (this.isBoxed) {
|
||||||
@ -604,8 +606,7 @@ export class TouchPadMenuComponent implements OnInit {
|
|||||||
this.selectionService.updatePartial({
|
this.selectionService.updatePartial({
|
||||||
label: this.selectedLabel,
|
label: this.selectedLabel,
|
||||||
numbers: ['F'],
|
numbers: ['F'],
|
||||||
isBoxed: true,
|
isBoxed: true
|
||||||
value: 1
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
this.tanGroups[this.tanGroupStage] = ['F'];
|
this.tanGroups[this.tanGroupStage] = ['F'];
|
||||||
@ -616,8 +617,7 @@ export class TouchPadMenuComponent implements OnInit {
|
|||||||
this.selectionService.updatePartial({
|
this.selectionService.updatePartial({
|
||||||
label: this.selectedLabel,
|
label: this.selectedLabel,
|
||||||
numbers: [...this.selectedNumbers],
|
numbers: [...this.selectedNumbers],
|
||||||
isBoxed: false,
|
isBoxed: false
|
||||||
value: 1
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else if (this.multiLegLabels.includes(this.selectedLabel)) {
|
} else if (this.multiLegLabels.includes(this.selectedLabel)) {
|
||||||
@ -626,16 +626,14 @@ export class TouchPadMenuComponent implements OnInit {
|
|||||||
this.selectionService.updatePartial({
|
this.selectionService.updatePartial({
|
||||||
label: this.selectedLabel,
|
label: this.selectedLabel,
|
||||||
numbers: [...this.selectedNumbers],
|
numbers: [...this.selectedNumbers],
|
||||||
isBoxed: false,
|
isBoxed: false
|
||||||
value: 1
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
this.selectedNumbers = ['F'];
|
this.selectedNumbers = ['F'];
|
||||||
this.selectionService.updatePartial({
|
this.selectionService.updatePartial({
|
||||||
label: this.selectedLabel,
|
label: this.selectedLabel,
|
||||||
numbers: ['F'],
|
numbers: ['F'],
|
||||||
isBoxed: false,
|
isBoxed: false
|
||||||
value: 1
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
this.closeFieldModal();
|
this.closeFieldModal();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user