fix : box logic for FOR is working
This commit is contained in:
parent
c8bc66d214
commit
aa1471e89c
@ -1,4 +1,4 @@
|
|||||||
// ✅ Final SelectionService.ts with strict FOR logic, split from QUI
|
// ✅ Final SelectionService.ts with strict QUI logic
|
||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { BehaviorSubject } from 'rxjs';
|
import { BehaviorSubject } from 'rxjs';
|
||||||
|
|
||||||
@ -82,7 +82,7 @@ export class SelectionService {
|
|||||||
} else {
|
} else {
|
||||||
for (const a of group1) {
|
for (const a of group1) {
|
||||||
for (const b of group2) {
|
for (const b of group2) {
|
||||||
combinations++;
|
if (a !== b) combinations++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
updated.numbers = [...group1, '-', ...group2];
|
updated.numbers = [...group1, '-', ...group2];
|
||||||
|
|||||||
@ -78,8 +78,13 @@ export class TouchPadMenuComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
get showShashEnter(): boolean {
|
get showShashEnter(): boolean {
|
||||||
|
const label = this.selectedLabel || '';
|
||||||
|
const isBoxed = this.isBoxed;
|
||||||
|
if (['FOR', 'QUI', 'TAN'].includes(label) && isBoxed) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
const specialLabels = ['FOR', 'QUI', 'TAN', 'EXA', 'WSP', 'TRE', 'MJP', 'JKP', '.'];
|
const specialLabels = ['FOR', 'QUI', 'TAN', 'EXA', 'WSP', 'TRE', 'MJP', 'JKP', '.'];
|
||||||
return specialLabels.includes(this.selectedLabel || '');
|
return specialLabels.includes(label);
|
||||||
}
|
}
|
||||||
|
|
||||||
get isShashEnterDisabled(): boolean {
|
get isShashEnterDisabled(): boolean {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user