Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a2a7bc6100 | ||
|
|
0c1a9f86d6 | ||
|
|
ab32f01e07 | ||
|
|
07f6919617 | ||
|
|
1d84985a76 | ||
|
|
33d635839f |
@@ -9,19 +9,20 @@
|
||||
"build": "ng build",
|
||||
"watch": "ng build --watch --configuration development",
|
||||
"test": "ng test",
|
||||
"lint": "ng lint"
|
||||
"lint": "ng lint",
|
||||
"tauri": "tauri"
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@angular/animations": "^20.0.0",
|
||||
"@angular/animations": "^20.3.28",
|
||||
"@angular/cdk": "^20.2.14",
|
||||
"@angular/common": "^20.0.0",
|
||||
"@angular/compiler": "^20.0.0",
|
||||
"@angular/core": "^20.0.0",
|
||||
"@angular/forms": "^20.0.0",
|
||||
"@angular/platform-browser": "^20.0.0",
|
||||
"@angular/platform-browser-dynamic": "^20.0.0",
|
||||
"@angular/router": "^20.0.0",
|
||||
"@angular/common": "^20.3.28",
|
||||
"@angular/compiler": "^20.3.28",
|
||||
"@angular/core": "^20.3.28",
|
||||
"@angular/forms": "^20.3.28",
|
||||
"@angular/platform-browser": "^20.3.28",
|
||||
"@angular/platform-browser-dynamic": "^20.3.28",
|
||||
"@angular/router": "^20.3.28",
|
||||
"@capacitor/app": "8.1.0",
|
||||
"@capacitor/core": "8.3.4",
|
||||
"@capacitor/haptics": "8.0.2",
|
||||
@@ -35,15 +36,15 @@
|
||||
"zone.js": "~0.15.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-devkit/build-angular": "^20.0.0",
|
||||
"@angular-eslint/builder": "^20.0.0",
|
||||
"@angular-eslint/eslint-plugin": "^20.0.0",
|
||||
"@angular-eslint/eslint-plugin-template": "^20.0.0",
|
||||
"@angular-eslint/schematics": "^20.0.0",
|
||||
"@angular-eslint/template-parser": "^20.0.0",
|
||||
"@angular/cli": "^20.0.0",
|
||||
"@angular/compiler-cli": "^20.0.0",
|
||||
"@angular/language-service": "^20.0.0",
|
||||
"@angular-devkit/build-angular": "^20.3.34",
|
||||
"@angular-eslint/builder": "^20.3.0",
|
||||
"@angular-eslint/eslint-plugin": "^20.3.0",
|
||||
"@angular-eslint/eslint-plugin-template": "^20.3.0",
|
||||
"@angular-eslint/schematics": "^20.3.0",
|
||||
"@angular-eslint/template-parser": "^20.3.0",
|
||||
"@angular/cli": "^20.3.34",
|
||||
"@angular/compiler-cli": "^20.3.28",
|
||||
"@angular/language-service": "^20.3.28",
|
||||
"@capacitor/cli": "8.3.4",
|
||||
"@ionic/angular-toolkit": "^12.0.0",
|
||||
"@tauri-apps/cli": "^2.11.2",
|
||||
|
||||
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 838 B |
|
After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 790 B |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 1.4 KiB |
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||
<background android:drawable="@color/ic_launcher_background"/>
|
||||
</adaptive-icon>
|
||||
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 6.0 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 3.6 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 3.1 KiB |
|
After Width: | Height: | Size: 9.4 KiB |
|
After Width: | Height: | Size: 3.6 KiB |
|
After Width: | Height: | Size: 5.1 KiB |
|
After Width: | Height: | Size: 19 KiB |
|
After Width: | Height: | Size: 5.8 KiB |
|
After Width: | Height: | Size: 7.4 KiB |
|
After Width: | Height: | Size: 31 KiB |
|
After Width: | Height: | Size: 8.4 KiB |
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="ic_launcher_background">#fff</color>
|
||||
</resources>
|
||||
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 44 KiB |
|
After Width: | Height: | Size: 513 B |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 751 B |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 2.6 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 2.4 KiB |
|
After Width: | Height: | Size: 2.4 KiB |
|
After Width: | Height: | Size: 3.7 KiB |
|
After Width: | Height: | Size: 164 KiB |
|
After Width: | Height: | Size: 3.7 KiB |
|
After Width: | Height: | Size: 6.2 KiB |
|
After Width: | Height: | Size: 2.3 KiB |
|
After Width: | Height: | Size: 5.0 KiB |
|
After Width: | Height: | Size: 5.6 KiB |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
||||
"productName": "court-pilot",
|
||||
"version": "0.1.0",
|
||||
"version": "1.0.0",
|
||||
"identifier": "com.tauri.dev",
|
||||
"build": {
|
||||
"frontendDist": "../wwww",
|
||||
@@ -15,8 +15,8 @@
|
||||
"minHeight": 600,
|
||||
"minWidth": 800,
|
||||
"title": "Court Pilot",
|
||||
"width": 800,
|
||||
"height": 600,
|
||||
"width": 1366,
|
||||
"height": 768,
|
||||
"resizable": true,
|
||||
"fullscreen": false
|
||||
}
|
||||
|
||||
@@ -1,16 +1,24 @@
|
||||
import { Pipe, PipeTransform } from '@angular/core';
|
||||
import { inject, Pipe, PipeTransform } from '@angular/core';
|
||||
import { Umpire } from 'db';
|
||||
import { TranslationService } from './i18n/translation.service';
|
||||
|
||||
@Pipe({
|
||||
name: 'fullname',
|
||||
standalone: true
|
||||
standalone: true,
|
||||
pure: false
|
||||
})
|
||||
export class FullnamePipe implements PipeTransform {
|
||||
readonly translationService = inject(TranslationService);
|
||||
|
||||
transform(value: Umpire | undefined, ...args: unknown[]): string {
|
||||
if (typeof value === 'undefined') {
|
||||
return '';
|
||||
}
|
||||
// TODO: in case of multilang, change here
|
||||
|
||||
if (this.translationService.language() === 'en') {
|
||||
return value.firstName + ' ' + value.lastName;
|
||||
}
|
||||
|
||||
return value.lastName + ' ' + value.firstName;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
import { Pipe, PipeTransform, inject } from '@angular/core';
|
||||
import { TranslationKey, TranslationParams } from './translations';
|
||||
import { TranslationService } from './translation.service';
|
||||
|
||||
@Pipe({
|
||||
name: 'translate',
|
||||
standalone: true,
|
||||
pure: false
|
||||
})
|
||||
export class TranslatePipe implements PipeTransform {
|
||||
private readonly translationService = inject(TranslationService);
|
||||
|
||||
transform(key: TranslationKey, params: TranslationParams = {}): string {
|
||||
return this.translationService.translate(key, params);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
import { Injectable, signal } from '@angular/core';
|
||||
import {
|
||||
translations,
|
||||
Language,
|
||||
TranslationKey,
|
||||
TranslationParams
|
||||
} from './translations';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class TranslationService {
|
||||
private readonly storageKey = 'language';
|
||||
|
||||
readonly language = signal<Language>(this.getInitialLanguage());
|
||||
|
||||
setLanguage(language: Language): void {
|
||||
this.language.set(language);
|
||||
localStorage.setItem(this.storageKey, language);
|
||||
}
|
||||
|
||||
translate(key: TranslationKey, params: TranslationParams = {}): string {
|
||||
let text: string = translations[this.language()][key];
|
||||
|
||||
for (const [param, value] of Object.entries(params)) {
|
||||
text = text.replaceAll(`{${param}}`, String(value));
|
||||
}
|
||||
|
||||
return text;
|
||||
}
|
||||
|
||||
private getInitialLanguage(): Language {
|
||||
const stored = localStorage.getItem(this.storageKey);
|
||||
|
||||
if (stored && stored in translations) {
|
||||
return stored as Language;
|
||||
}
|
||||
|
||||
const browserLanguage = navigator.language.split('-')[0] as Language;
|
||||
|
||||
if (browserLanguage in translations) {
|
||||
return browserLanguage;
|
||||
}
|
||||
|
||||
return 'en';
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,88 @@
|
||||
import { language, male, settings } from 'ionicons/icons';
|
||||
import { noop } from 'rxjs';
|
||||
|
||||
export const translations = {
|
||||
en: {
|
||||
courts: 'Courts',
|
||||
numberOfCourts: 'Number of Courts',
|
||||
showAlerts: 'Show alerts on quick buttons',
|
||||
serviceJudge: 'Service Judge',
|
||||
language: 'Language',
|
||||
settings: 'Settings',
|
||||
courtOfficials: 'Court Officials',
|
||||
add: 'Add',
|
||||
noCourtOfficials: 'No court officials',
|
||||
newCourtOfficial: 'New Court Official',
|
||||
cancel: 'Cancel',
|
||||
save: 'Save',
|
||||
firstName: 'First Name',
|
||||
lastName: 'Last Name',
|
||||
country: 'Country',
|
||||
gender: 'Gender',
|
||||
male: 'Male',
|
||||
female: 'Female',
|
||||
confirmation: 'Confirmation',
|
||||
confirmDeleteUmpire: 'Do you really want to delete this court official?',
|
||||
no: 'No',
|
||||
yes: 'Yes',
|
||||
umpires: 'Umpires',
|
||||
serviceJudges: 'Service Judges',
|
||||
notOnDuty: 'Not on Duty',
|
||||
shortCourtName: 'C',
|
||||
court: 'Court',
|
||||
umpire: 'Umpire',
|
||||
removeUmpireFromCourt:
|
||||
'Are you sure you want to remove them from the court?',
|
||||
removeUmpiresFromCourt:
|
||||
'Are you sure you want to remove them from the court?',
|
||||
courtConfirm: 'Court {courtNo}',
|
||||
sendUmpireToCourt: 'Are you sure you want to send them to the court?',
|
||||
sendUmpiresToCourt: 'Are you sure you want to send them to the court?',
|
||||
sendUmpireMessage: '{umpire}',
|
||||
sendUmpiresMessage: '{umpire} - {serviceJudge}',
|
||||
version: 'Version',
|
||||
},
|
||||
|
||||
hu: {
|
||||
courts: 'Pályák',
|
||||
numberOfCourts: 'Pályák száma',
|
||||
showAlerts: 'Figyelmeztetések megjelenítése a gyors gomboknál',
|
||||
serviceJudge: 'Adogatásbíró',
|
||||
language: 'Nyelv',
|
||||
settings: 'Beállítások',
|
||||
courtOfficials: 'Tisztségviselők',
|
||||
add: 'Hozzáadás',
|
||||
noCourtOfficials: 'Nincsenek tisztségviselők',
|
||||
newCourtOfficial: 'Új Tisztségviselő',
|
||||
cancel: 'Mégse',
|
||||
save: 'Mentés',
|
||||
firstName: 'Keresztnév',
|
||||
lastName: 'Vezetéknév',
|
||||
country: 'Ország',
|
||||
gender: 'Nem',
|
||||
male: 'Férfi',
|
||||
female: 'Nő',
|
||||
confirmation: 'Megerősítés',
|
||||
confirmDeleteUmpire: 'Biztosan törölni szeretnéd ezt a tisztségviselőt?',
|
||||
no: 'Nem',
|
||||
yes: 'Igen',
|
||||
umpires: 'Játékeveztők',
|
||||
serviceJudges: 'Adogatásbírók',
|
||||
notOnDuty: 'Pihenő',
|
||||
shortCourtName: 'P',
|
||||
court: 'Pálya',
|
||||
umpire: 'Játékeveztő',
|
||||
removeUmpireFromCourt: 'Biztos leveszed őt a pályáról?',
|
||||
removeUmpiresFromCourt: 'Biztos leveszed őket a pályáról?',
|
||||
courtConfirm: 'Pálya {courtNo}',
|
||||
sendUmpireToCourt: 'Biztos pályára küldöd őt?',
|
||||
sendUmpiresToCourt: 'Biztos pályára küldöd őket?',
|
||||
sendUmpireMessage: '{umpire}',
|
||||
sendUmpiresMessage: '{umpire} - {serviceJudge}',
|
||||
version: 'Verzió',
|
||||
}
|
||||
} as const;
|
||||
|
||||
export type Language = keyof typeof translations;
|
||||
export type TranslationKey = keyof typeof translations.en;
|
||||
export type TranslationParams = Record<string, string | number>;
|
||||
@@ -1,34 +1,36 @@
|
||||
<ion-header [translucent]="true">
|
||||
<ion-toolbar>
|
||||
<ion-title> Pályák </ion-title>
|
||||
<ion-title> {{ 'courts' | translate }} </ion-title>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
|
||||
<ion-content [fullscreen]="true" cdkDropListGroup>
|
||||
<ion-header collapse="condense">
|
||||
<ion-toolbar>
|
||||
<ion-title size="large">Pályák</ion-title>
|
||||
<ion-title size="large">{{ 'courts' | translate }}</ion-title>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
|
||||
<ion-grid [fixed]="'fixed'" class="bottom-lists">
|
||||
<ion-row>
|
||||
<ion-col [size]="1" class="ion-display-none ion-display-xl-block">
|
||||
<ion-item [lines]="'none'">Pálya</ion-item>
|
||||
<ion-item [lines]="'none'">{{ 'court' | translate }}</ion-item>
|
||||
</ion-col>
|
||||
<ion-col [size]="1" class="ion-display-xl-none">
|
||||
<ion-item [lines]="'none'">P</ion-item>
|
||||
<ion-item [lines]="'none'">{{ 'shortCourtName' | translate }}</ion-item>
|
||||
</ion-col>
|
||||
<ion-col>
|
||||
<ion-item [lines]="'none'">
|
||||
<ion-label class="ion-text-center"> Játékvezető </ion-label>
|
||||
<ion-label class="ion-text-center"> {{ 'umpire' | translate }} </ion-label>
|
||||
</ion-item>
|
||||
</ion-col>
|
||||
@if (serviceJudgeEnabled()) {
|
||||
<ion-col>
|
||||
<ion-item [lines]="'none'">
|
||||
<ion-label class="ion-text-center"> Adogatásbíró </ion-label>
|
||||
<ion-label class="ion-text-center"> {{ 'serviceJudge' | translate }} </ion-label>
|
||||
</ion-item>
|
||||
</ion-col>
|
||||
}
|
||||
<ion-col size="2" sizeLg="1"></ion-col>
|
||||
</ion-row>
|
||||
@for (item of [].constructor(settings()?.numberOfCourts); track $index) {
|
||||
@@ -58,6 +60,7 @@
|
||||
}
|
||||
</ion-list>
|
||||
</ion-col>
|
||||
@if (serviceJudgeEnabled()) {
|
||||
<ion-col>
|
||||
<ion-list
|
||||
[lines]="'none'"
|
||||
@@ -77,11 +80,13 @@
|
||||
}
|
||||
</ion-list>
|
||||
</ion-col>
|
||||
}
|
||||
<ion-col size="2" sizeLg="1">
|
||||
<ion-list>
|
||||
<ion-item lines="none">
|
||||
@if (umpireByCourt().get($index + 1) &&
|
||||
serviceJudgeByCourt().get($index + 1)) {
|
||||
@if ( (umpireByCourt().get($index + 1) &&
|
||||
serviceJudgeByCourt().get($index + 1)) ||
|
||||
(umpireByCourt().get($index + 1) && !serviceJudgeEnabled()) ) {
|
||||
<ion-button
|
||||
[color]="'danger'"
|
||||
(click)="showRemoveConfirmation($index + 1)">
|
||||
@@ -90,9 +95,10 @@
|
||||
size="large"
|
||||
name="exit-outline"></ion-icon>
|
||||
</ion-button>
|
||||
} @else if (!umpireByCourt().get($index + 1) &&
|
||||
} @else if ((!umpireByCourt().get($index + 1) &&
|
||||
!serviceJudgeByCourt().get($index + 1) && waitingUmpires().length &&
|
||||
waitingServiceJudges().length) {
|
||||
waitingServiceJudges().length) || (!umpireByCourt().get($index + 1)
|
||||
&& waitingUmpires().length && !serviceJudgeEnabled())) {
|
||||
<ion-button
|
||||
[color]="'success'"
|
||||
[disabled]=""
|
||||
@@ -111,19 +117,21 @@
|
||||
</ion-grid>
|
||||
<ion-grid [fixed]="'fixed'" class="ion-margin-top bottom-lists">
|
||||
<ion-row>
|
||||
<ion-col [size]="4">
|
||||
<ion-col [size]="!serviceJudgeEnabled() ? 6 : 4">
|
||||
<ion-item color="primary">
|
||||
<ion-label class="ion-text-center"> Játékvezetők </ion-label>
|
||||
<ion-label class="ion-text-center"> {{ 'umpires' | translate }} </ion-label>
|
||||
</ion-item>
|
||||
</ion-col>
|
||||
@if (serviceJudgeEnabled()) {
|
||||
<ion-col [size]="4">
|
||||
<ion-item color="primary">
|
||||
<ion-label class="ion-text-center"> Adogatásbírók </ion-label>
|
||||
<ion-label class="ion-text-center"> {{ 'serviceJudges' | translate }} </ion-label>
|
||||
</ion-item>
|
||||
</ion-col>
|
||||
<ion-col [size]="4">
|
||||
}
|
||||
<ion-col [size]="!serviceJudgeEnabled() ? 6 : 4">
|
||||
<ion-item color="medium">
|
||||
<ion-label class="ion-text-center"> Pihenők </ion-label>
|
||||
<ion-label class="ion-text-center"> {{ 'notOnDuty' | translate }} </ion-label>
|
||||
</ion-item>
|
||||
</ion-col>
|
||||
</ion-row>
|
||||
@@ -145,6 +153,7 @@
|
||||
}
|
||||
</ion-list>
|
||||
</ion-col>
|
||||
@if (serviceJudgeEnabled()) {
|
||||
<ion-col>
|
||||
<ion-list
|
||||
[lines]="'none'"
|
||||
@@ -162,6 +171,7 @@
|
||||
}
|
||||
</ion-list>
|
||||
</ion-col>
|
||||
}
|
||||
<ion-col>
|
||||
<ion-list
|
||||
[lines]="'none'"
|
||||
|
||||
@@ -32,6 +32,8 @@ import { CourtUmpireService } from '../services/court.umpire.service';
|
||||
import { CourtServiceJudgeService } from '../services/court.service.judge.service';
|
||||
import { addIcons } from 'ionicons';
|
||||
import { enterOutline, exitOutline } from 'ionicons/icons';
|
||||
import { TranslatePipe } from '../i18n/translation.pipe';
|
||||
import { TranslationService } from '../i18n/translation.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-tab1',
|
||||
@@ -56,7 +58,8 @@ import { enterOutline, exitOutline } from 'ionicons/icons';
|
||||
CdkDrag,
|
||||
CommonModule,
|
||||
CdkDragPlaceholder,
|
||||
CdkDropListGroup
|
||||
CdkDropListGroup,
|
||||
TranslatePipe
|
||||
]
|
||||
})
|
||||
export class Tab1Page {
|
||||
@@ -70,6 +73,7 @@ export class Tab1Page {
|
||||
readonly waitingServiceJudgeService = inject(WaitingServiceJudgesService);
|
||||
readonly courtUmpireService = inject(CourtUmpireService);
|
||||
readonly courtServiceJudgeService = inject(CourtServiceJudgeService);
|
||||
readonly translationService = inject(TranslationService);
|
||||
|
||||
private alertController = inject(AlertController);
|
||||
private fullnamePipe = inject(FullnamePipe);
|
||||
@@ -270,6 +274,13 @@ export class Tab1Page {
|
||||
return Array.from({ length: count }, (_, i) => i + 1);
|
||||
});
|
||||
|
||||
/**
|
||||
* Is service judge functionality enabled in settings.
|
||||
*/
|
||||
readonly serviceJudgeEnabled = computed(() => {
|
||||
return this.settings()?.withServiceJudge ?? false;
|
||||
});
|
||||
|
||||
dropToRest(event: CdkDragDrop<Umpire[]>) {
|
||||
if (event.previousContainer === event.container) {
|
||||
return;
|
||||
@@ -378,25 +389,48 @@ export class Tab1Page {
|
||||
const umpire = this.umpireByCourt().get(courtNo);
|
||||
const serviceJudge = this.serviceJudgeByCourt().get(courtNo);
|
||||
|
||||
if (typeof umpire === 'undefined' || typeof serviceJudge === 'undefined') {
|
||||
if (
|
||||
typeof umpire === 'undefined' ||
|
||||
(typeof serviceJudge === 'undefined' && this.serviceJudgeEnabled())
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!this.settings()?.showAlert) {
|
||||
this.removeUmpiresFromCourt(courtNo);
|
||||
return;
|
||||
}
|
||||
|
||||
const alert = await this.alertController.create({
|
||||
header: `Pálya ${courtNo}`,
|
||||
subHeader: 'Biztos leveszed őket pályáról?',
|
||||
header: this.translationService.translate('courtConfirm', {
|
||||
courtNo
|
||||
}),
|
||||
|
||||
subHeader: this.translationService.translate(
|
||||
serviceJudge ? 'removeUmpiresFromCourt' : 'removeUmpireFromCourt'
|
||||
),
|
||||
|
||||
cssClass: 'wide',
|
||||
message: `${this.fullnamePipe.transform(umpire)} - ${this.fullnamePipe.transform(serviceJudge)}`,
|
||||
|
||||
message: `${this.fullnamePipe.transform(umpire)}${
|
||||
serviceJudge ? ' - ' : ''
|
||||
}${this.fullnamePipe.transform(serviceJudge)}`,
|
||||
|
||||
buttons: [
|
||||
{
|
||||
text: 'Nem',
|
||||
text: this.translationService.translate('no'),
|
||||
role: 'cancel'
|
||||
},
|
||||
{
|
||||
text: 'Igen',
|
||||
text: this.translationService.translate('yes'),
|
||||
role: 'confirm',
|
||||
handler: () => {
|
||||
if (this.serviceJudgeEnabled()) {
|
||||
this.removeUmpiresFromCourt(courtNo);
|
||||
return;
|
||||
}
|
||||
|
||||
this.removeUmpireFromCourt(courtNo);
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -405,6 +439,9 @@ export class Tab1Page {
|
||||
await alert.present();
|
||||
}
|
||||
|
||||
/**
|
||||
* This is for removing both umpire and service judge from the court (when service judge is enabled).
|
||||
*/
|
||||
private async removeUmpiresFromCourt(courtNo: number) {
|
||||
const umpire = this.umpireByCourt().get(courtNo);
|
||||
const serviceJudge = this.serviceJudgeByCourt().get(courtNo);
|
||||
@@ -419,30 +456,74 @@ export class Tab1Page {
|
||||
await this.waitingServiceJudgeService.add(umpire.id);
|
||||
}
|
||||
|
||||
/**
|
||||
* This is for removing 1 umpire only (when service judge is not enabled).
|
||||
*/
|
||||
private async removeUmpireFromCourt(courtNo: number) {
|
||||
const umpire = this.umpireByCourt().get(courtNo);
|
||||
|
||||
if (typeof umpire === 'undefined') {
|
||||
return;
|
||||
}
|
||||
|
||||
await this.courtUmpireService.removeByUmpireId(umpire.id);
|
||||
await this.waitingUmpireService.add(umpire.id);
|
||||
}
|
||||
|
||||
public async showAddConfirmation(courtNo: number) {
|
||||
const umpire = await this.waitingUmpireService.getCurrentUmpire();
|
||||
const serviceJudge =
|
||||
await this.waitingServiceJudgeService.getCurrentUmpire();
|
||||
|
||||
if (typeof umpire === 'undefined' || typeof serviceJudge === 'undefined') {
|
||||
if (
|
||||
typeof umpire === 'undefined' ||
|
||||
(typeof serviceJudge === 'undefined' && this.serviceJudgeEnabled())
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!this.settings()?.showAlert) {
|
||||
if (this.serviceJudgeEnabled() && serviceJudge) {
|
||||
this.addUmpiresToCourt(courtNo, umpire, serviceJudge);
|
||||
return;
|
||||
}
|
||||
this.addUmpireToCourt(courtNo, umpire);
|
||||
return;
|
||||
}
|
||||
|
||||
const alert = await this.alertController.create({
|
||||
header: `Pálya ${courtNo}`,
|
||||
header: this.translationService.translate('court', {
|
||||
courtNo
|
||||
}),
|
||||
|
||||
cssClass: 'wide',
|
||||
subHeader: 'Biztos pályára küldöd őket?',
|
||||
message: `${this.fullnamePipe.transform(umpire)} - ${this.fullnamePipe.transform(serviceJudge)}`,
|
||||
|
||||
subHeader: this.translationService.translate(
|
||||
serviceJudge ? 'sendUmpiresToCourt' : 'sendUmpireToCourt'
|
||||
),
|
||||
|
||||
message: this.translationService.translate(
|
||||
serviceJudge ? 'sendUmpiresMessage' : 'sendUmpireMessage',
|
||||
{
|
||||
umpire: this.fullnamePipe.transform(umpire),
|
||||
serviceJudge: this.fullnamePipe.transform(serviceJudge)
|
||||
}
|
||||
),
|
||||
|
||||
buttons: [
|
||||
{
|
||||
text: 'Nem',
|
||||
text: this.translationService.translate('no'),
|
||||
role: 'cancel'
|
||||
},
|
||||
{
|
||||
text: 'Igen',
|
||||
text: this.translationService.translate('yes'),
|
||||
role: 'confirm',
|
||||
handler: () => {
|
||||
if (this.serviceJudgeEnabled() && serviceJudge) {
|
||||
this.addUmpiresToCourt(courtNo, umpire, serviceJudge);
|
||||
} else {
|
||||
this.addUmpireToCourt(courtNo, umpire);
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -465,4 +546,9 @@ export class Tab1Page {
|
||||
await this.waitingUmpireService.removeByUmpireId(umpire.id);
|
||||
await this.waitingServiceJudgeService.removeByUmpireId(serviceJudge.id);
|
||||
}
|
||||
|
||||
private async addUmpireToCourt(courtNo: number, umpire: Umpire) {
|
||||
await this.courtUmpireService.save({ courtNo, umpireId: umpire.id });
|
||||
await this.waitingUmpireService.removeByUmpireId(umpire.id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<ion-header [translucent]="true">
|
||||
<ion-toolbar>
|
||||
<ion-title> Játékvezetők </ion-title>
|
||||
<ion-title> {{ 'courtOfficials' | translate }} </ion-title>
|
||||
<ion-buttons [slot]="'end'">
|
||||
<ion-button [color]="'primary'" [fill]="'solid'" id="open-modal">
|
||||
<ion-icon slot="start" name="add"></ion-icon>
|
||||
Hozzáadás
|
||||
{{ 'add' | translate }}
|
||||
</ion-button>
|
||||
</ion-buttons>
|
||||
</ion-toolbar>
|
||||
@@ -32,7 +32,7 @@
|
||||
</ion-button>
|
||||
</ion-item>
|
||||
} @empty {
|
||||
<ion-item> Nincsenek játékvezetők </ion-item>
|
||||
<ion-item> {{ 'noCourtOfficials' | translate }} </ion-item>
|
||||
}
|
||||
</ion-list>
|
||||
</ion-col>
|
||||
@@ -44,15 +44,17 @@
|
||||
<ion-header>
|
||||
<ion-toolbar>
|
||||
<ion-buttons slot="start">
|
||||
<ion-button (click)="cancel()">Mégse</ion-button>
|
||||
<ion-button (click)="cancel()"
|
||||
>{{ 'cancel' | translate }}</ion-button
|
||||
>
|
||||
</ion-buttons>
|
||||
<ion-title>Új játékvezető</ion-title>
|
||||
<ion-title>{{ 'newCourtOfficial' | translate }}</ion-title>
|
||||
<ion-buttons slot="end">
|
||||
<ion-button
|
||||
[disabled]="!isValidUmpire()"
|
||||
(click)="confirm()"
|
||||
[strong]="true">
|
||||
Mentés
|
||||
{{ 'save' | translate }}
|
||||
</ion-button>
|
||||
</ion-buttons>
|
||||
</ion-toolbar>
|
||||
@@ -61,33 +63,36 @@
|
||||
<ion-list>
|
||||
<ion-item>
|
||||
<ion-input
|
||||
label="Vezetéknév"
|
||||
[label]="'lastName' | translate"
|
||||
labelPlacement="stacked"
|
||||
type="text"
|
||||
placeholder="Vezetéknév"
|
||||
placeholder="{{ 'lastName' | translate }}"
|
||||
[(ngModel)]="lastName" />
|
||||
</ion-item>
|
||||
<ion-item>
|
||||
<ion-input
|
||||
label="Keresztnév"
|
||||
[label]="'firstName' | translate"
|
||||
labelPlacement="stacked"
|
||||
type="text"
|
||||
placeholder="Keresztnév"
|
||||
placeholder="{{ 'firstName' | translate }}"
|
||||
[(ngModel)]="firstName" />
|
||||
</ion-item>
|
||||
<ion-item>
|
||||
<ion-input
|
||||
label="Ország"
|
||||
[label]="'country' | translate"
|
||||
labelPlacement="stacked"
|
||||
type="text"
|
||||
placeholder="Ország"
|
||||
placeholder="{{ 'country' | translate }}"
|
||||
[(ngModel)]="country" />
|
||||
</ion-item>
|
||||
<ion-item>
|
||||
<ion-select label="Nem" placeholder="Válassz" [(ngModel)]="gender">
|
||||
<ion-select
|
||||
[label]="'gender' | translate"
|
||||
placeholder="{{ 'gender' | translate }}"
|
||||
[(ngModel)]="gender">
|
||||
@for (item of genders; track item.code) {
|
||||
<ion-select-option [value]="item.code">
|
||||
{{item.label}}
|
||||
{{item.label | translate }}
|
||||
</ion-select-option>
|
||||
}
|
||||
</ion-select>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Component, ViewChild } from '@angular/core';
|
||||
import { Component, inject, ViewChild } from '@angular/core';
|
||||
import {
|
||||
IonHeader,
|
||||
IonToolbar,
|
||||
@@ -26,6 +26,9 @@ import { add, trash } from 'ionicons/icons';
|
||||
import { OverlayEventDetail } from '@ionic/core/components';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { FullnamePipe } from '../fullname-pipe';
|
||||
import { TranslatePipe } from '../i18n/translation.pipe';
|
||||
import { TranslationKey } from '../i18n/translations';
|
||||
import { TranslationService } from '../i18n/translation.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-tab2',
|
||||
@@ -51,12 +54,19 @@ import { FullnamePipe } from '../fullname-pipe';
|
||||
IonSelect,
|
||||
IonSelectOption,
|
||||
IonList,
|
||||
FullnamePipe
|
||||
FullnamePipe,
|
||||
TranslatePipe
|
||||
]
|
||||
})
|
||||
export class Tab2Page {
|
||||
readonly translationService = inject(TranslationService);
|
||||
|
||||
@ViewChild(IonModal) modal!: IonModal;
|
||||
|
||||
public readonly umpireService = inject(UmpireService);
|
||||
public readonly fullnamePipe = inject(FullnamePipe);
|
||||
public readonly alertController = inject(AlertController);
|
||||
|
||||
public readonly umpires = this.umpireService.umpires;
|
||||
|
||||
public lastName: string = '';
|
||||
@@ -64,16 +74,12 @@ export class Tab2Page {
|
||||
public country: string = '';
|
||||
public gender: string = '';
|
||||
|
||||
public genders = [
|
||||
{ label: 'gender.male', code: 'M' },
|
||||
{ label: 'gender.female', code: 'W' }
|
||||
public genders: { label: TranslationKey; code: string }[] = [
|
||||
{ label: 'male', code: 'M' },
|
||||
{ label: 'female', code: 'W' }
|
||||
];
|
||||
|
||||
constructor(
|
||||
private umpireService: UmpireService,
|
||||
private alertController: AlertController,
|
||||
private fullnamePipe: FullnamePipe
|
||||
) {
|
||||
constructor() {
|
||||
addIcons({ add, trash });
|
||||
}
|
||||
|
||||
@@ -112,18 +118,18 @@ export class Tab2Page {
|
||||
return this.lastName !== '' && this.firstName !== '';
|
||||
}
|
||||
|
||||
public async showDeleteConfirmation(umpire: Umpire) {
|
||||
public async showDeleteConfirmation(umpire: Umpire): Promise<void> {
|
||||
const alert = await this.alertController.create({
|
||||
header: 'Megerősítés',
|
||||
subHeader: 'Biztos törlöd a következő játékvezetőt?',
|
||||
header: this.translationService.translate('confirmation'),
|
||||
subHeader: this.translationService.translate('confirmDeleteUmpire'),
|
||||
message: this.fullnamePipe.transform(umpire),
|
||||
buttons: [
|
||||
{
|
||||
text: 'Nem',
|
||||
text: this.translationService.translate('no'),
|
||||
role: 'cancel'
|
||||
},
|
||||
{
|
||||
text: 'Igen',
|
||||
text: this.translationService.translate('yes'),
|
||||
role: 'confirm',
|
||||
handler: () => {
|
||||
// TODO: also remove from first tab
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<ion-header>
|
||||
<ion-toolbar>
|
||||
<ion-title>Beállítások</ion-title>
|
||||
<ion-title>{{ 'settings' | translate }}</ion-title>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
|
||||
@@ -11,11 +11,23 @@
|
||||
@if (settings(); as currentSettings) {
|
||||
|
||||
<ion-list>
|
||||
<ion-item>
|
||||
<ion-select
|
||||
[label]="'language' | translate"
|
||||
[value]="translationService.language()"
|
||||
(ionChange)="updateLanguage($event)"
|
||||
interface="popover">
|
||||
<ion-select-option value="en"> English </ion-select-option>
|
||||
|
||||
<ion-select-option value="hu"> Magyar </ion-select-option>
|
||||
</ion-select>
|
||||
</ion-item>
|
||||
|
||||
<ion-item>
|
||||
<ion-toggle
|
||||
[checked]="currentSettings.withServiceJudge"
|
||||
(ionChange)="updateWithServiceJudge($event)">
|
||||
Adogatásbíró
|
||||
{{ 'serviceJudge' | translate }}
|
||||
</ion-toggle>
|
||||
</ion-item>
|
||||
|
||||
@@ -23,13 +35,13 @@
|
||||
<ion-toggle
|
||||
[checked]="currentSettings.showAlert"
|
||||
(ionChange)="updateShowAlert($event)">
|
||||
Figyelmeztetések megjelenítése a gyors gomboknál
|
||||
{{ 'showAlerts' | translate }}
|
||||
</ion-toggle>
|
||||
</ion-item>
|
||||
|
||||
<ion-item>
|
||||
<ion-input
|
||||
label="Pályák száma"
|
||||
[label]="'numberOfCourts' | translate"
|
||||
type="number"
|
||||
min="1"
|
||||
labelPlacement="floating"
|
||||
@@ -42,5 +54,12 @@
|
||||
}
|
||||
</ion-col>
|
||||
</ion-row>
|
||||
<ion-row>
|
||||
<ion-col sizeLg="6" pushLg="3">
|
||||
<ion-item>
|
||||
<ion-label class="ion-text-center">{{ 'version' | translate }}: 1.0.0</ion-label>
|
||||
</ion-item>
|
||||
</ion-col>
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
</ion-content>
|
||||
|
||||
@@ -10,11 +10,19 @@ import {
|
||||
IonInput,
|
||||
IonGrid,
|
||||
IonCol,
|
||||
IonRow
|
||||
IonRow,
|
||||
IonSelect,
|
||||
IonSelectOption,
|
||||
IonLabel
|
||||
} from '@ionic/angular/standalone';
|
||||
import { SettingsService } from '../services/settings-service';
|
||||
import { CourtUmpireService } from '../services/court.umpire.service';
|
||||
import { CourtServiceJudgeService } from '../services/court.service.judge.service';
|
||||
import { CourtServiceJudge } from 'db';
|
||||
import { WaitingServiceJudgesService } from '../services/waiting-service-judges.service';
|
||||
import { TranslationService } from '../i18n/translation.service';
|
||||
import { Language } from '../i18n/translations';
|
||||
import { TranslatePipe } from '../i18n/translation.pipe';
|
||||
|
||||
@Component({
|
||||
selector: 'app-tab3',
|
||||
@@ -31,13 +39,19 @@ import { CourtServiceJudgeService } from '../services/court.service.judge.servic
|
||||
IonHeader,
|
||||
IonToolbar,
|
||||
IonTitle,
|
||||
IonContent
|
||||
IonContent,
|
||||
IonSelect,
|
||||
IonSelectOption,
|
||||
TranslatePipe,
|
||||
IonLabel
|
||||
]
|
||||
})
|
||||
export class Tab3Page {
|
||||
readonly settingsService = inject(SettingsService);
|
||||
readonly courtUmpireService = inject(CourtUmpireService);
|
||||
readonly courtServiceJudgeService = inject(CourtServiceJudgeService);
|
||||
readonly waitingServiceJudgeService = inject(WaitingServiceJudgesService);
|
||||
readonly translationService = inject(TranslationService);
|
||||
|
||||
readonly settings = this.settingsService.settings;
|
||||
|
||||
@@ -69,6 +83,16 @@ export class Tab3Page {
|
||||
await this.settingsService.update({
|
||||
withServiceJudge: event.detail.checked
|
||||
});
|
||||
|
||||
if (!event.detail.checked) {
|
||||
this.courtServiceJudgeService.umpires().map((csj: CourtServiceJudge) => {
|
||||
this.courtServiceJudgeService.delete(csj.id);
|
||||
});
|
||||
|
||||
this.waitingServiceJudgeService.waitingServiceJudges().map((wsj) => {
|
||||
this.waitingServiceJudgeService.remove(wsj.id);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async updateShowAlert(event: CustomEvent): Promise<void> {
|
||||
@@ -76,4 +100,8 @@ export class Tab3Page {
|
||||
showAlert: event.detail.checked
|
||||
});
|
||||
}
|
||||
|
||||
updateLanguage(event: CustomEvent): void {
|
||||
this.translationService.setLanguage(event.detail.value as Language);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,17 +2,17 @@
|
||||
<ion-tab-bar slot="bottom">
|
||||
<ion-tab-button tab="pilot" href="/tabs/pilot">
|
||||
<ion-icon aria-hidden="true" name="grid-outline"></ion-icon>
|
||||
<ion-label>Pályák</ion-label>
|
||||
<ion-label>{{ 'courts' | translate }}</ion-label>
|
||||
</ion-tab-button>
|
||||
|
||||
<ion-tab-button tab="umpires" href="/tabs/umpires">
|
||||
<ion-icon aria-hidden="true" name="people-outline"></ion-icon>
|
||||
<ion-label>Játékvezetők</ion-label>
|
||||
<ion-label>{{ 'courtOfficials' | translate }}</ion-label>
|
||||
</ion-tab-button>
|
||||
|
||||
<ion-tab-button tab="settings" href="/tabs/settings">
|
||||
<ion-icon aria-hidden="true" name="settings-outline"></ion-icon>
|
||||
<ion-label>Beállítások</ion-label>
|
||||
<ion-label>{{ 'settings' | translate }}</ion-label>
|
||||
</ion-tab-button>
|
||||
</ion-tab-bar>
|
||||
</ion-tabs>
|
||||
|
||||
@@ -8,12 +8,13 @@ import {
|
||||
} from '@ionic/angular/standalone';
|
||||
import { addIcons } from 'ionicons';
|
||||
import { gridOutline, peopleOutline, settingsOutline } from 'ionicons/icons';
|
||||
import { TranslatePipe } from '../i18n/translation.pipe';
|
||||
|
||||
@Component({
|
||||
selector: 'app-tabs',
|
||||
templateUrl: 'tabs.page.html',
|
||||
styleUrls: ['tabs.page.scss'],
|
||||
imports: [IonTabs, IonTabBar, IonTabButton, IonIcon, IonLabel]
|
||||
imports: [IonTabs, IonTabBar, IonTabButton, IonIcon, IonLabel, TranslatePipe]
|
||||
})
|
||||
export class TabsPage {
|
||||
public environmentInjector = inject(EnvironmentInjector);
|
||||
|
||||
|
After Width: | Height: | Size: 1.3 MiB |
@@ -18,7 +18,7 @@
|
||||
"importHelpers": true,
|
||||
"target": "es2022",
|
||||
"module": "es2020",
|
||||
"lib": ["es2018", "dom"],
|
||||
"lib": ["es2021", "dom"],
|
||||
"skipLibCheck": true,
|
||||
"useDefineForClassFields": false
|
||||
},
|
||||
|
||||