-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #705 from luechtdiode/custom-wettkampf-mode
v2r3b0 candidate
- Loading branch information
Showing
100 changed files
with
6,241 additions
and
3,279 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,4 @@ | ||
| CREATE SCHEMA IF NOT EXISTS kutu; | ||
| CREATE USER kutuadmin; | ||
| CREATE ROLE kutu_admin WITH SUPERUSER USER kutuadmin; | ||
| CREATE SCHEMA IF NOT EXISTS kutu AUTHORIZATION kutu_admin; | ||
| SET search_path TO kutu; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
newclient/resultcatcher/src/app/component/wertung-avg-calc/wertung-avg-calc.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| <ion-item [hidden]="hidden"> | ||
| <ion-label *ngIf="singleValues.length < 2">{{title}}</ion-label> | ||
| <ion-input #noteInput *ngIf="singleValues.length < 2" autofocus placeholder="Notenwert im Format ##.## (2-3 Nachkommastellen mit Dezimalpunkt)" | ||
| name="noteInput" type="number" [disabled]="waiting || disabled" | ||
| [(ngModel)]='singleValueContainer' | ||
| step="0.05" min="0.00" max="100.00" required></ion-input> | ||
| <ion-button *ngIf="singleValues.length < 2" [disabled]="waiting || disabled" slot="end" expand="block" color="secondary" (click)='add()'> | ||
| <ion-icon name="add-circle-outline"></ion-icon></ion-button> | ||
| <ion-grid *ngIf="singleValues.length > 1" class="table" no-padding> | ||
| <ion-row > | ||
| <ion-col class="table-header">{{title}} ø {{avgValue}}</ion-col> | ||
| <ion-col class="table-action"><ion-button [disabled]="waiting || disabled || fixed <= 0" color="secondary" (click)='removeKomma()'> | ||
| <ion-icon name="remove-outline"></ion-icon></ion-button></ion-col> | ||
| <ion-col class="decimals" no-padding><div>Kommastellen</div><ion-input | ||
| [(ngModel)]="fixed" | ||
| type="number" name=decimals | ||
| step="1" min="0" max="3" | ||
| required | ||
| [disabled]="waiting || disabled" | ||
| ></ion-input></ion-col> | ||
| <ion-col class="table-action"><ion-button [disabled]="waiting || disabled || fixed >= 3" color="secondary" (click)='addKomma()'> | ||
| <ion-icon name="add-outline"></ion-icon></ion-button></ion-col> | ||
| </ion-row> | ||
| <ion-row *ngFor="let item of singleValues; let i = index"> | ||
| <ion-col class="number">{{i+1}}. Wertung</ion-col> | ||
| <ion-col id="input-group" no-padding> | ||
| <div id="validity"></div> | ||
| <ion-input #noteInput *ngIf="i === 0" placeholder="Notenwert im Format ##.## (2-3 Nachkommastellen mit Dezimalpunkt)" | ||
| type="number" name={{valueTitle}}{{i}} | ||
| step="0.05" min="0.00" max="100.00" | ||
| required | ||
| [disabled]="waiting || disabled" | ||
| [ngModel]="item.value" | ||
| (ionChange)="onItemChange($event, item)" | ||
| (ionBlur)="onBlur($event, item)"> | ||
| </ion-input> | ||
| <ion-input *ngIf="i>0" placeholder="Notenwert im Format ##.## (2-3 Nachkommastellen mit Dezimalpunkt)" | ||
| type="number" name={{valueTitle}}{{i}} | ||
| step="0.05" min="0.00" max="100.00" | ||
| required | ||
| [disabled]="waiting || disabled" | ||
| [ngModel]="item.value" | ||
| (ionChange)="onItemChange($event, item)" | ||
| (ionBlur)="onBlur($event, item)"> | ||
| </ion-input> | ||
| </ion-col> | ||
| <ion-col class="table-action"><ion-button [disabled]="waiting || disabled" color="danger" (click)='remove(i)'> | ||
| <ion-icon name="trash-outline"></ion-icon></ion-button></ion-col> | ||
| </ion-row> | ||
| <ion-row *ngIf="!disabled" class="table-header"> | ||
| <ion-col><ion-button [disabled]="waiting || disabled" expand="block" color="secondary" (click)='add()'> | ||
| <ion-icon name="add-circle-outline"></ion-icon>Weitere Wertung hinzufügen</ion-button></ion-col> | ||
| </ion-row> | ||
| </ion-grid> | ||
| </ion-item> |
97 changes: 97 additions & 0 deletions
97
newclient/resultcatcher/src/app/component/wertung-avg-calc/wertung-avg-calc.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| .table { | ||
| background-color: var(--ion-background-color); | ||
| //font-size: 0.8rem; | ||
| height: 100%; | ||
| overflow: hidden; | ||
| overflow-y: auto; | ||
| .table-header, | ||
| .table-subject { | ||
| color: var(--ion-color-primary); | ||
| font-weight: bold; | ||
| } | ||
| ion-row { | ||
| //margin: 5px; | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| flex-wrap: nowrap; | ||
| ion-col { | ||
| //flex-basis: 20%; | ||
| &.decimals { | ||
| flex: 0 0 6em; | ||
| position:relative; top: -0.6em; | ||
| ion-input { | ||
| height: 100%; | ||
| outline: none; | ||
| text-align: right; | ||
| border: 1px solid #a9a9a9; | ||
| } | ||
| } | ||
| &.table-action { | ||
| flex: 0 0 1.5em; | ||
| } | ||
| &.number { | ||
| flex: 0 0 6em; | ||
| letter-spacing: 0.5px; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @media all and (min-height: 720px) { | ||
| .table { | ||
| ion-row { | ||
| margin: 10px; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #decimals-group { | ||
| height: 70%; | ||
| overflow: hidden; | ||
| ion-input { | ||
| height: 100%; | ||
| outline: none; | ||
| text-align: right; | ||
| border: 1px solid #a9a9a9; | ||
| } | ||
| } | ||
|
|
||
| #input-group { | ||
| height: 70%; | ||
| overflow: hidden; | ||
| #validity { | ||
| width: 0; | ||
| height: 0; | ||
| position: absolute; | ||
| top: 0%; | ||
| right: 0%; | ||
| border-left: 15px solid transparent; | ||
| border-top: 15px solid transparent; | ||
| } | ||
| ion-input { | ||
| height: 100%; | ||
| width: 100%; | ||
| outline: none; | ||
| text-align: right; | ||
| border: 1px solid #a9a9a9; | ||
| } | ||
| &.valid { | ||
| #validity { | ||
| border-left: 15px solid transparent; | ||
| border-top: 15px solid var(--ion-color-success); | ||
| } | ||
| ion-input { | ||
| border: 1px solid var(--ion-color-success); | ||
| } | ||
| } | ||
| &.invalid { | ||
| #validity { | ||
| border-left: 15px solid transparent; | ||
| border-top: 15px solid var(--ion-color-danger) | ||
| } | ||
| ion-input { | ||
| border: 1px solid var(--ion-color-danger); | ||
| } | ||
| } | ||
| } |
24 changes: 24 additions & 0 deletions
24
...lient/resultcatcher/src/app/component/wertung-avg-calc/wertung-avg-calc.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; | ||
| import { IonicModule } from '@ionic/angular'; | ||
|
|
||
| import { WertungAvgCalcComponent } from './wertung-avg-calc.component'; | ||
|
|
||
| describe('WertungAvgCalcComponent', () => { | ||
| let component: WertungAvgCalcComponent; | ||
| let fixture: ComponentFixture<WertungAvgCalcComponent>; | ||
|
|
||
| beforeEach(waitForAsync(() => { | ||
| TestBed.configureTestingModule({ | ||
| declarations: [ WertungAvgCalcComponent ], | ||
| imports: [IonicModule.forRoot()] | ||
| }).compileComponents(); | ||
|
|
||
| fixture = TestBed.createComponent(WertungAvgCalcComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| })); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
Oops, something went wrong.