Merge pull request #786 from luechtdiode/feature/try-new-gc-j21-zgc-gen

Feature/try new gc j21 zgc gen
luechtdiode · Jan 1, 2024 · c282025 · c282025
2 parents 17f9992 + e445d04
commit c282025
Show file tree

Hide file tree

Showing 32 changed files with 78 additions and 59 deletions.
diff --git a/newclient/resultcatcher/src/app/app.scss b/newclient/resultcatcher/src/app/app.scss
@@ -119,7 +119,10 @@ ion-note {
 
 ion-select, ion-radio-group {
 //   width: 80%;
-  max-width: 80% !important;
+//  max-width: 80% !important;
+}
+input[type=date] {
+  text-align: right !important;
 }
 
 .select-alert {

diff --git a/newclient/resultcatcher/src/app/home/home.page.html b/newclient/resultcatcher/src/app/home/home.page.html
@@ -44,22 +44,20 @@
   </ion-list>
   <ion-list *ngIf="!isLocked">
     <ion-item>
-      <ion-label>Wettkampf</ion-label>
-      <ion-select placeholder='Bitte auswählen' *ngIf="getCompetitions()" [(ngModel)]='competition' okText='Okay' cancelText='Abbrechen'>
+      <ion-select label="Wettkampf" aria-placeholder='Bitte auswählen' *ngIf="getCompetitions()" [(ngModel)]='competition' okText='Okay' cancelText='Abbrechen'>
         <ion-select-option *ngFor='let comp of getCompetitions()' [value]='comp.uuid'>
           {{comp.titel + ' ' + (comp.datum | date:'dd-MM-yy')}}</ion-select-option>
       </ion-select>
     </ion-item>
     <ion-item>
-      <ion-label>Durchgang</ion-label>
-      <ion-select placeholder='Bitte auswählen' *ngIf="competition && getDurchgaenge() && getDurchgaenge().length > 0" [(ngModel)]='durchgang'
+      <ion-select label='Durchgang' placeholder='Bitte auswählen' *ngIf="competition && getDurchgaenge() && getDurchgaenge().length > 0" [(ngModel)]='durchgang'
         okText='Okay' cancelText='Abbrechen'>
         <ion-select-option *ngFor='let d of getDurchgaenge()' [value]='d'>{{d}}</ion-select-option>
       </ion-select>
     </ion-item>
     <ion-item>
       <ion-label>Gerät</ion-label>
-      <ion-select placeholder='Bitte auswählen' *ngIf="durchgang && getGeraete() && getGeraete().length > 0" [(ngModel)]='geraet' okText='Okay'
+      <ion-select label='Gerät' placeholder='Bitte auswählen' *ngIf="durchgang && getGeraete() && getGeraete().length > 0" [(ngModel)]='geraet' okText='Okay'
         cancelText='Abbrechen'>
         <ion-select-option *ngFor='let g of getGeraete()' [value]='g.id'>{{g.name}}</ion-select-option>
       </ion-select>

diff --git a/newclient/resultcatcher/src/app/last-results/last-results.page.html b/newclient/resultcatcher/src/app/last-results/last-results.page.html
@@ -15,8 +15,7 @@
           </ion-col>
           <ion-col *ngIf="!competition">
             <ion-item>
-              <ion-label>Wettkampf</ion-label>
-              <ion-select placeholder='Bitte auswählen' *ngIf="getCompetitions().length > 0" [(ngModel)]='competition' okText='Okay' cancelText='Abbrechen'>
+              <ion-select label="Wettkampf" placeholder='Bitte auswählen' *ngIf="getCompetitions().length > 0" [(ngModel)]='competition' okText='Okay' cancelText='Abbrechen'>
                   <ion-select-option *ngFor='let comp of getCompetitions()' [value]='comp.uuid'>
                     {{comp.titel + ' ' + (comp.datum | date:'dd-MM-yy')}}</ion-select-option>
                 </ion-select>

diff --git a/newclient/resultcatcher/src/app/last-top-results/last-top-results.page.html b/newclient/resultcatcher/src/app/last-top-results/last-top-results.page.html
@@ -15,8 +15,7 @@
           </ion-col>
           <ion-col *ngIf="!competition">
             <ion-item>
-              <ion-label>Wettkampf</ion-label>
-              <ion-select placeholder='Bitte auswählen' *ngIf="getCompetitions().length > 0" [(ngModel)]='competition'
+              <ion-select label="Wettkampf" placeholder='Bitte auswählen' *ngIf="getCompetitions().length > 0" [(ngModel)]='competition'
                 okText='Okay' cancelText='Abbrechen'>
                 <ion-select-option *ngFor='let comp of getCompetitions()' [value]='comp.uuid'>
                   {{comp.titel + ' ' + (comp.datum | date:'dd-MM-yy')}}</ion-select-option>

diff --git a/newclient/resultcatcher/src/app/registration/reg-athlet-editor/reg-athlet-editor.page.html b/newclient/resultcatcher/src/app/registration/reg-athlet-editor/reg-athlet-editor.page.html
@@ -14,37 +14,43 @@
       <ion-item-divider>
         <ion-avatar slot="start">
           <img src="assets/imgs/athlete.png">
-        </ion-avatar><ion-label>Athlet / Athletin</ion-label>
-        <ion-select *ngIf="registration.id === 0 && clubAthletList.length > 0" placeholder='Auswahl aus Liste' name="clubAthletid" [(ngModel)]='selectedClubAthletId' okText='Okay' cancelText='Abbrechen'>
+        </ion-avatar>
+        <ion-label *ngIf="registration.id > 0">
+          Athlet / Athletin
+        </ion-label>
+        <ion-select label="Athlet / Athletin" *ngIf="registration.id === 0 && clubAthletList.length > 0" placeholder='Auswahl aus Liste' name="clubAthletid" [(ngModel)]='selectedClubAthletId' okText='Okay' cancelText='Abbrechen'>
           <ion-select-option *ngFor='let athlet of clubAthletList' [value]='athlet.athletId'>
             <ion-avatar slot="end">
               <img src="assets/imgs/athlete.png">
             </ion-avatar>
-            <ion-label>{{athlet.name}}, {{athlet.vorname}} ({{athlet.geschlecht}})<br><small>({{athlet.gebdat | date}})</small>
+            <ion-label>{{athlet.name}}, {{athlet.vorname}} ({{athlet.geschlecht}})<br><small> ({{athlet.gebdat | date}})</small>
             </ion-label>
           </ion-select-option>
-        </ion-select>
+        </ion-select>        
       </ion-item-divider>
       <ion-item>
         <ion-avatar slot="start">
           &nbsp;
         </ion-avatar>
-        <ion-input required placeholder="Name" type="text"  [disabled]="false" [(ngModel)]='registration.name' name="name" required></ion-input>
-        <ion-input required placeholder="Vorname" type="text"  [disabled]="false" [(ngModel)]='registration.vorname' name="vorname" required></ion-input>
+        <ion-input label="Name" required placeholder="Name" type="text"  [disabled]="false" [(ngModel)]='registration.name' name="name" required></ion-input>
+      </ion-item>
+      <ion-item>
+        <ion-avatar slot="start">
+          &nbsp;
+        </ion-avatar>
+        <ion-input label="Vorname" required placeholder="Vorname" type="text"  [disabled]="false" [(ngModel)]='registration.vorname' name="vorname" required></ion-input>
       </ion-item>
       <ion-item>
         <ion-avatar slot="start">
           &nbsp;
         </ion-avatar>
-        <ion-label color="primary">Geburtsdatum</ion-label>
-        <ion-input required placeholder="Geburtsdatum" type="date" display-timezone="utc" [disabled]="false" [(ngModel)]='registration.gebdat' name="gebdat" required></ion-input>
+        <ion-input label="Geburtsdatum" required placeholder="Geburtsdatum" type="date" display-timezone="utc" [disabled]="false" [(ngModel)]='registration.gebdat' name="gebdat" required></ion-input>
       </ion-item>
       <ion-item>
         <ion-avatar slot="start">
           &nbsp;
         </ion-avatar>
-        <ion-label color="primary">Geschlecht</ion-label>
-        <ion-select required placeholder='Geschlecht' [(ngModel)]='registration.geschlecht' name="geschlecht" okText='Okay' cancelText='Abbrechen' required>
+        <ion-select label="Geschlecht" required placeholder='bitte auswählen' [(ngModel)]='registration.geschlecht' name="geschlecht" okText='Okay' cancelText='Abbrechen' required>
           <ion-select-option [value]='"W"'>weiblich</ion-select-option>
           <ion-select-option [value]='"M"'>männlich</ion-select-option>
         </ion-select>
@@ -59,8 +65,7 @@
         <ion-avatar slot="start">
           &nbsp;
         </ion-avatar>
-        <ion-label color="primary">Programm/Kategorie</ion-label>
-        <ion-select required placeholder='Programm/Kategorie' [(ngModel)]='registration.programId' name="programId" okText='Okay' cancelText='Abbrechen'>
+        <ion-select label="Programm/Kategorie" required placeholder='bitte auswählen' [(ngModel)]='registration.programId' name="programId" okText='Okay' cancelText='Abbrechen'>
           <ion-select-option *ngFor='let pgm of filterPGMsForAthlet(registration)' [value]='pgm.id'>{{pgm.name}}</ion-select-option>
         </ion-select>
       </ion-item>
@@ -72,14 +77,11 @@
       </ion-item-divider>
       <ion-item *ngIf="teamsAllowed()">
         <ion-avatar slot="start">
-          &nbsp;
         </ion-avatar>
         <ion-grid no-padding>
-          <ion-row *ngFor="let rule of teamrules">
-            <ion-col>für {{rule}}</ion-col></ion-row>
+          <ion-row *ngFor="let rule of teamrules">für {{rule}}</ion-row>
           <ion-row>
-            <ion-col><ion-label class="teamlabel" color="primary">Team<br></ion-label></ion-col>
-            <ion-select placeholder='Team' [(ngModel)]='registration.team' name="team" okText='Okay' cancelText='Abbrechen'>
+            <ion-select label="Team" placeholder='Team' [(ngModel)]='registration.team' name="team" okText='Okay' cancelText='Abbrechen'>
               <ion-select-option [value]='0'>Keine Teamzuordnung</ion-select-option>
               <ion-select-option *ngFor='let team of teams' [value]='team.index'>{{mapTeam(team.index)}}</ion-select-option>
             </ion-select>

diff --git a/newclient/resultcatcher/src/app/registration/reg-athletlist/reg-athletlist.page.html b/newclient/resultcatcher/src/app/registration/reg-athletlist/reg-athletlist.page.html
@@ -11,8 +11,7 @@
           </ion-col>
           <ion-col *ngIf="!competition">
             <ion-item>
-              <ion-label>Wettkampf</ion-label>
-              <ion-select placeholder='Bitte auswählen' *ngIf="getCompetitions().length > 0" [(ngModel)]='competition' okText='Okay' cancelText='Abbrechen'>
+              <ion-select label="Wettkampf" placeholder='Bitte auswählen' *ngIf="getCompetitions().length > 0" [(ngModel)]='competition' okText='Okay' cancelText='Abbrechen'>
                   <ion-select-option *ngFor='let comp of getCompetitions()' [value]='comp.uuid'>
                     {{comp.titel + ' ' + (comp.datum | date:'dd-MM-yy')}}</ion-select-option>
                 </ion-select>

diff --git a/newclient/resultcatcher/src/app/registration/reg-judge-editor/reg-judge-editor.page.html b/newclient/resultcatcher/src/app/registration/reg-judge-editor/reg-judge-editor.page.html
@@ -16,15 +16,25 @@
         <ion-avatar slot="start">
           <img src="assets/imgs/chief.png">
         </ion-avatar>
-        <ion-input required placeholder="Name" type="text"  [disabled]="false" [(ngModel)]='registration.name' name="name" required></ion-input>
-        <ion-input required placeholder="Vorname" type="text"  [disabled]="false" [(ngModel)]='registration.vorname' name="vorname" required></ion-input>
+        <ion-label>Wertungsrichter / Wertungsrichterin</ion-label>
       </ion-item>
       <ion-item>
         <ion-avatar slot="start">
           &nbsp;
         </ion-avatar>
-        <ion-label color="primary">Geschlecht</ion-label>
-        <ion-select required placeholder='Geschlecht' [(ngModel)]='registration.geschlecht' name="geschlecht" okText='Okay' cancelText='Abbrechen' required>
+        <ion-input label="Name" required placeholder="Name" type="text"  [disabled]="false" [(ngModel)]='registration.name' name="name" required></ion-input>
+      </ion-item>
+      <ion-item>
+        <ion-avatar slot="start">
+          &nbsp;
+        </ion-avatar>
+        <ion-input label="Vorname" required placeholder="Vorname" type="text"  [disabled]="false" [(ngModel)]='registration.vorname' name="vorname" required></ion-input>
+      </ion-item>
+      <ion-item>
+        <ion-avatar slot="start">
+          &nbsp;
+        </ion-avatar>
+        <ion-select label="Geschlecht" required placeholder='Geschlecht' [(ngModel)]='registration.geschlecht' name="geschlecht" okText='Okay' cancelText='Abbrechen' required>
           <ion-select-option [value]='"W"'>weiblich</ion-select-option>
           <ion-select-option [value]='"M"'>männlich</ion-select-option>
         </ion-select>

diff --git a/newclient/resultcatcher/src/app/registration/reg-judgelist/reg-judgelist.page.html b/newclient/resultcatcher/src/app/registration/reg-judgelist/reg-judgelist.page.html
@@ -12,7 +12,7 @@
           <ion-col *ngIf="!competition">
             <ion-item>
               <ion-label>Wettkampf</ion-label>
-              <ion-select placeholder='Bitte auswählen' *ngIf="getCompetitions().length > 0" [(ngModel)]='competition' okText='Okay' cancelText='Abbrechen'>
+              <ion-select label="Wettkampf" placeholder='Bitte auswählen' *ngIf="getCompetitions().length > 0" [(ngModel)]='competition' okText='Okay' cancelText='Abbrechen'>
                   <ion-select-option *ngFor='let comp of getCompetitions()' [value]='comp.uuid'>
                     {{comp.titel + ' ' + (comp.datum | date:'dd-MM-yy')}}</ion-select-option>
                 </ion-select>

diff --git a/newclient/resultcatcher/src/app/registration/registration.page.html b/newclient/resultcatcher/src/app/registration/registration.page.html
@@ -11,7 +11,7 @@
             <ion-label>Wettkampf-Anmeldungen</ion-label>
     </ion-title>
     <ion-buttons slot="end">
-      <ion-select placeholder='Bitte auswählen' *ngIf="getCompetitions().length > 0" [(ngModel)]='competition' okText='Okay' cancelText='Abbrechen'>
+      <ion-select label="Wettkampf" placeholder='Bitte auswählen' *ngIf="getCompetitions().length > 0" [(ngModel)]='competition' okText='Okay' cancelText='Abbrechen'>
         <ion-select-option *ngFor='let comp of getCompetitions()' [value]='comp.uuid'>
           {{comp.titel + ' ' + (comp.datum | date:'dd-MM-yy')}}</ion-select-option>
       </ion-select>

diff --git a/newclient/resultcatcher/src/app/search-athlet/search-athlet.page.html b/newclient/resultcatcher/src/app/search-athlet/search-athlet.page.html
@@ -15,8 +15,7 @@
           </ion-col>
           <ion-col *ngIf="!competition">
             <ion-item>
-              <ion-label>Wettkampf</ion-label>
-              <ion-select placeholder='Bitte auswählen' *ngIf="getCompetitions().length > 0" [(ngModel)]='competition' okText='Okay' cancelText='Abbrechen'>
+              <ion-select label="Wettkampf" placeholder='Bitte auswählen' *ngIf="getCompetitions().length > 0" [(ngModel)]='competition' okText='Okay' cancelText='Abbrechen'>
                   <ion-select-option *ngFor='let comp of getCompetitions()' [value]='comp.uuid'>
                     {{comp.titel + ' ' + (comp.datum | date:'dd-MM-yy')}}</ion-select-option>
                 </ion-select>