From 0bc77c0124271812e87910d1799fbd94f3abecc2 Mon Sep 17 00:00:00 2001 From: karthik Date: Wed, 30 Jul 2025 12:24:28 +0530 Subject: [PATCH] fix : removed 1 and added F directly to MJP,JKP --- .../touch-pad-menu.component.ts | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.ts b/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.ts index dc81ec3..71326d0 100755 --- a/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.ts +++ b/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.ts @@ -476,8 +476,7 @@ export class TouchPadMenuComponent implements OnInit { this.selectionService.updatePartial({ label: this.selectedLabel, numbers: [...this.selectedNumbers], - isBoxed: false, - value: 1 + isBoxed: false }); } else { this.secondGroup = ['F']; @@ -485,8 +484,7 @@ export class TouchPadMenuComponent implements OnInit { this.selectionService.updatePartial({ label: this.selectedLabel, numbers: [...this.selectedNumbers], - isBoxed: false, - value: 1 + isBoxed: false }); } } else if (this.selectedLabel === 'TAN') { @@ -495,8 +493,7 @@ export class TouchPadMenuComponent implements OnInit { this.selectionService.updatePartial({ label: this.selectedLabel, numbers: ['F'], - isBoxed: true, - value: 1 + isBoxed: true }); } else { this.tanGroups[this.tanGroupStage] = ['F']; @@ -507,14 +504,20 @@ export class TouchPadMenuComponent implements OnInit { this.selectionService.updatePartial({ label: this.selectedLabel, numbers: [...this.selectedNumbers], - isBoxed: false, - value: 1 + isBoxed: false }); } + } 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 = ''; } closeCalculator() { this.calculatorOpen = false; } press(val: string) { if (this.calcDisplay === 'Error') this.calcDisplay = ''; this.calcDisplay += val; } @@ -552,7 +555,7 @@ export class TouchPadMenuComponent implements OnInit { } openFieldModal() { - if (['FOR', 'QUI', 'TAN'].includes(this.selectedLabel || '')) { + if (['FOR', 'QUI', 'TAN'].includes(this.selectedLabel || '') || this.multiLegLabels.includes(this.selectedLabel || '')) { this.handleFieldForSpecialLabels(); } else { this.fieldModalOpen = true; @@ -595,8 +598,7 @@ export class TouchPadMenuComponent implements OnInit { this.selectionService.updatePartial({ label: this.selectedLabel, numbers: [...this.selectedNumbers], - isBoxed: false, - value: 1 + isBoxed: false }); } else if (this.selectedLabel === 'TAN') { if (this.isBoxed) { @@ -604,8 +606,7 @@ export class TouchPadMenuComponent implements OnInit { this.selectionService.updatePartial({ label: this.selectedLabel, numbers: ['F'], - isBoxed: true, - value: 1 + isBoxed: true }); } else { this.tanGroups[this.tanGroupStage] = ['F']; @@ -616,8 +617,7 @@ export class TouchPadMenuComponent implements OnInit { this.selectionService.updatePartial({ label: this.selectedLabel, numbers: [...this.selectedNumbers], - isBoxed: false, - value: 1 + isBoxed: false }); } } else if (this.multiLegLabels.includes(this.selectedLabel)) { @@ -626,16 +626,14 @@ export class TouchPadMenuComponent implements OnInit { this.selectionService.updatePartial({ label: this.selectedLabel, numbers: [...this.selectedNumbers], - isBoxed: false, - value: 1 + isBoxed: false }); } else { this.selectedNumbers = ['F']; this.selectionService.updatePartial({ label: this.selectedLabel, numbers: ['F'], - isBoxed: false, - value: 1 + isBoxed: false }); } this.closeFieldModal();