fix : enter and shash enter has better working things (qui, tan,for)

This commit is contained in:
karthik 2025-07-26 23:09:23 +05:30
parent 3f1081b014
commit f7552a8479
2 changed files with 19 additions and 12 deletions

View File

@ -16,14 +16,15 @@
<!-- Right Group: ENTER, COPY, CLEAR, PR --> <!-- Right Group: ENTER, COPY, CLEAR, PR -->
<div class="d-flex flex-wrap justify-content-center gap-2 second"> <div class="d-flex flex-wrap justify-content-center gap-2 second">
<button <button
*ngIf="showShashEnter" *ngIf="showShashEnter"
class="btn btn-dark" class="btn btn-dark"
[disabled]="twoGroupLabels.includes(selectedLabel || '') && isFirstGroupComplete" [disabled]="isShashEnterDisabled"
(click)="padEnter()" (click)="onShashEnter()"
> >
shash ENTER shash ENTER
</button> </button>
<button class="btn btn-dark">COPY</button> <button class="btn btn-dark">COPY</button>
<button class="btn btn-danger btn-bkp" *ngIf="showBackspace" (click)="removeLastNumber()">BKP</button> <button class="btn btn-danger btn-bkp" *ngIf="showBackspace" (click)="removeLastNumber()">BKP</button>
@ -96,7 +97,7 @@
</ng-container> </ng-container>
<div class="col-6"> <div class="col-6">
<button class="btn btn-secondary w-100 number-button" [disabled]="!numericPadEnabled" (click)="padEnter()">Enter</button> <button class="btn btn-secondary w-100 number-button" [disabled]="!numericPadEnabled" (click)="onPadEnter()">Enter</button>
</div> </div>
<div class="col-6"> <div class="col-6">
<button class="btn btn-secondary w-100 number-button" [disabled]="!canPrint" (click)="print()">Print</button> <button class="btn btn-secondary w-100 number-button" [disabled]="!canPrint" (click)="print()">Print</button>

View File

@ -1,3 +1,4 @@
// ... same imports
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SelectionService } from '../selection.service/selection.service'; import { SelectionService } from '../selection.service/selection.service';
@ -162,7 +163,14 @@ export class TouchPadMenuComponent implements OnInit {
return this.selectedNumbers.includes(number); return this.selectedNumbers.includes(number);
} }
padEnter() { // 👉 Changed from padEnter to split into two handlers
onPadEnter() {
if (this.canPrint) {
this.print();
}
}
onShashEnter() {
if (this.selectedLabel === 'TAN') { if (this.selectedLabel === 'TAN') {
if (this.tanGroupStage < 2) { if (this.tanGroupStage < 2) {
this.tanGroupStage++; this.tanGroupStage++;
@ -183,8 +191,6 @@ export class TouchPadMenuComponent implements OnInit {
this.selectionService.updatePartial({ numbers: [...this.selectedNumbers] }); this.selectionService.updatePartial({ numbers: [...this.selectedNumbers] });
return; return;
} }
} else if (this.canPrint) {
this.print();
} }
} }