slasherss/ipwa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: ng update core 20

Browse Source
This commit is contained in:
Jan Szumotalski
2025-06-09 14:12:21 +02:00
parent 5781f4ba61
commit 0e2e61ac34
25 changed files with 2153 additions and 6678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
angular.json
View File

@@ -16,7 +16,7 @@
"prefix": "app", "prefix": "app",
"architect": { "architect": {
"build": { "build": {
"builder": "@angular-devkit/build-angular:application", "builder": "@angular/build:application",
"options": { "options": {
"outputPath": { "outputPath": {
"base": "dist/ipwa" "base": "dist/ipwa"
@@ -96,7 +96,7 @@
"defaultConfiguration": "production" "defaultConfiguration": "production"
}, },
"serve": { "serve": {
"builder": "@angular-devkit/build-angular:dev-server", "builder": "@angular/build:dev-server",
"configurations": { "configurations": {
"production": { "production": {
"buildTarget": "ipwa:build:production" "buildTarget": "ipwa:build:production"
@@ -112,13 +112,13 @@
"defaultConfiguration": "development" "defaultConfiguration": "development"
}, },
"extract-i18n": { "extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n", "builder": "@angular/build:extract-i18n",
"options": { "options": {
"buildTarget": "ipwa:build" "buildTarget": "ipwa:build"
} }
}, },
"test": { "test": {
"builder": "@angular-devkit/build-angular:karma", "builder": "@angular/build:karma",
"options": { "options": {
"polyfills": [ "polyfills": [
"zone.js", "zone.js",
@@ -139,5 +139,31 @@
} }
} }
} }
},
"schematics": {
"@schematics/angular:component": {
"type": "component"
},
"@schematics/angular:directive": {
"type": "directive"
},
"@schematics/angular:service": {
"type": "service"
},
"@schematics/angular:guard": {
"typeSeparator": "."
},
"@schematics/angular:interceptor": {
"typeSeparator": "."
},
"@schematics/angular:module": {
"typeSeparator": "."
},
"@schematics/angular:pipe": {
"typeSeparator": "."
},
"@schematics/angular:resolver": {
"typeSeparator": "."
}
} }
} }

7433
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

26
package.json
View File

@@ -12,19 +12,19 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^19.2.14", "@angular/animations": "^20.0.2",
"@angular/cdk": "^19.2.18", "@angular/cdk": "^19.2.18",
"@angular/cli": "^19.2.14", "@angular/cli": "^20.0.1",
"@angular/common": "^19.2.14", "@angular/common": "^20.0.2",
"@angular/compiler": "^19.2.14", "@angular/compiler": "^20.0.2",
"@angular/core": "^19.2.14", "@angular/core": "^20.0.2",
"@angular/forms": "^19.2.14", "@angular/forms": "^20.0.2",
"@angular/material": "^19.2.18", "@angular/material": "^19.2.18",
"@angular/material-moment-adapter": "^19.2.18", "@angular/material-moment-adapter": "^19.2.18",
"@angular/platform-browser": "^19.2.14", "@angular/platform-browser": "^20.0.2",
"@angular/platform-browser-dynamic": "^19.2.14", "@angular/platform-browser-dynamic": "^20.0.2",
"@angular/router": "^19.2.14", "@angular/router": "^20.0.2",
"@angular/service-worker": "^19.2.14", "@angular/service-worker": "^20.0.2",
"marked": "^12.0.1", "marked": "^12.0.1",
"moment": "^2.29.4", "moment": "^2.29.4",
"rxjs": "~7.5.0", "rxjs": "~7.5.0",
@@ -32,8 +32,8 @@
"zone.js": "~0.15.1" "zone.js": "~0.15.1"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "^19.2.14", "@angular/build": "^20.0.1",
"@angular/compiler-cli": "^19.2.14", "@angular/compiler-cli": "^20.0.2",
"@types/jasmine": "~4.3.0", "@types/jasmine": "~4.3.0",
"jasmine-core": "~4.5.0", "jasmine-core": "~4.5.0",
"karma": "~6.4.0", "karma": "~6.4.0",
@@ -43,4 +43,4 @@
"karma-jasmine-html-reporter": "~2.0.0", "karma-jasmine-html-reporter": "~2.0.0",
"typescript": "~5.8.3" "typescript": "~5.8.3"
} }
} }

62
src/app/admin-view/account-mgmt/account-mgmt.component.html
View File

@@ -1,35 +1,37 @@
<div id="upper-bar"> <div id="upper-bar">
<mat-form-field> <mat-form-field>
<mat-label>Wyszukaj</mat-label> <mat-label>Wyszukaj</mat-label>
<input matInput (keyup)="filter($event)"> <input matInput (keyup)="filter($event)">
</mat-form-field> </mat-form-field>
<button mat-icon-button (click)="openUserCard()"><mat-icon>add</mat-icon></button> <button mat-icon-button (click)="openUserCard()"><mat-icon>add</mat-icon></button>
</div> </div>
<mat-spinner *ngIf="loading"></mat-spinner> @if (loading) {
<mat-spinner></mat-spinner>
}
<table mat-table [dataSource]="users"> <table mat-table [dataSource]="users">
<div matColumnDef="name"> <div matColumnDef="name">
<th mat-header-cell *matHeaderCellDef>Imię</th> <th mat-header-cell *matHeaderCellDef>Imię</th>
<td mat-cell *matCellDef="let element">{{element.fname}}</td> <td mat-cell *matCellDef="let element">{{element.fname}}</td>
</div> </div>
<div matColumnDef="surname"> <div matColumnDef="surname">
<th mat-header-cell *matHeaderCellDef>Nazwisko</th> <th mat-header-cell *matHeaderCellDef>Nazwisko</th>
<td mat-cell *matCellDef="let element">{{element.surname}}</td> <td mat-cell *matCellDef="let element">{{element.surname}}</td>
</div> </div>
<div matColumnDef="room"> <div matColumnDef="room">
<th mat-header-cell *matHeaderCellDef>Pokój</th> <th mat-header-cell *matHeaderCellDef>Pokój</th>
<td mat-cell *matCellDef="let element">{{element.room}}</td> <td mat-cell *matCellDef="let element">{{element.room}}</td>
</div> </div>
<div matColumnDef="uname"> <div matColumnDef="uname">
<th mat-header-cell *matHeaderCellDef>Nazwa użytkownika</th> <th mat-header-cell *matHeaderCellDef>Nazwa użytkownika</th>
<td mat-cell *matCellDef="let element">{{element.uname}}</td> <td mat-cell *matCellDef="let element">{{element.uname}}</td>
</div> </div>
<div matColumnDef="actions"> <div matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef>Karta użytkownika</th> <th mat-header-cell *matHeaderCellDef>Karta użytkownika</th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
<button mat-mini-fab (click)="openUserCard(element._id)"><mat-icon>manage_accounts</mat-icon></button> <button mat-mini-fab (click)="openUserCard(element._id)"><mat-icon>manage_accounts</mat-icon></button>
</td> </td>
</div> </div>
<tr mat-header-row *matHeaderRowDef="collumns"></tr> <tr mat-header-row *matHeaderRowDef="collumns"></tr>
<tr mat-row *matRowDef="let row; columns: collumns"></tr> <tr mat-row *matRowDef="let row; columns: collumns"></tr>
</table> </table>
<mat-paginator pageSize="9" [pageSizeOptions]="[9, 15, 20, 50, 160]"></mat-paginator> <mat-paginator pageSize="9" [pageSizeOptions]="[9, 15, 20, 50, 160]"></mat-paginator>

142
src/app/admin-view/account-mgmt/user-edit/user-edit.component.html
View File

@@ -1,67 +1,85 @@
<h1 mat-dialog-title>Karta użytkownika</h1> <h1 mat-dialog-title>Karta użytkownika</h1>
<mat-dialog-content> <mat-dialog-content>
<form [formGroup]="form"> <form [formGroup]="form">
<div> <div>
<mat-form-field appearance="outline" color="accent"> <mat-form-field appearance="outline" color="accent">
<mat-label>Imię</mat-label> <mat-label>Imię</mat-label>
<input type="text" matInput formControlName="fname"> <input type="text" matInput formControlName="fname">
</mat-form-field> </mat-form-field>
<mat-form-field appearance="outline" color="accent"> <mat-form-field appearance="outline" color="accent">
<mat-label>Nazwisko</mat-label> <mat-label>Nazwisko</mat-label>
<input type="text" matInput formControlName="surname"> <input type="text" matInput formControlName="surname">
</mat-form-field> </mat-form-field>
<mat-form-field appearance="outline" color="accent"> <mat-form-field appearance="outline" color="accent">
<mat-label>Pokój</mat-label> <mat-label>Pokój</mat-label>
<input type="text" matInput formControlName="room"> <input type="text" matInput formControlName="room">
</mat-form-field> </mat-form-field>
<mat-form-field appearance="outline" color="accent"> <mat-form-field appearance="outline" color="accent">
<mat-label>Grupy</mat-label> <mat-label>Grupy</mat-label>
<mat-select multiple formControlName="groups"> <mat-select multiple formControlName="groups">
@for (item of groups; track $index) { @for (item of groups; track $index) {
<mat-option [value]="item._id">{{item.name}}</mat-option> <mat-option [value]="item._id">{{item.name}}</mat-option>
} }
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<span *ngIf="data.type == 'edit'">Data rejestracji:<br>{{regDate?.format('DD.MM.YYYY')}}</span> @if (data.type == 'edit') {
</div> <span>Data rejestracji:<br>{{regDate?.format('DD.MM.YYYY')}}</span>
<div> }
<mat-form-field appearance="outline" color="accent"> </div>
<mat-label>Nazwa użytkownika</mat-label> <div>
<input type="text" matInput required formControlName="uname"> <mat-form-field appearance="outline" color="accent">
</mat-form-field> <mat-label>Nazwa użytkownika</mat-label>
@if (data.type == "edit") { <input type="text" matInput required formControlName="uname">
<button mat-stroked-button color="accent" (click)="resetPass()">Resetuj hasło</button> </mat-form-field>
@if (locked) { @if (data.type == "edit") {
<button mat-stroked-button color="warn" (click)="toggleLock(false)"><mat-icon>lock</mat-icon>Blokada ręczna</button> <button mat-stroked-button color="accent" (click)="resetPass()">Resetuj hasło</button>
} @else { @if (locked) {
<button mat-stroked-button color="accent" (click)="toggleLock(true)">Zablokuj konto</button> <button mat-stroked-button color="warn" (click)="toggleLock(false)"><mat-icon>lock</mat-icon>Blokada ręczna</button>
} } @else {
@if (lockout) { <button mat-stroked-button color="accent" (click)="toggleLock(true)">Zablokuj konto</button>
<button mat-stroked-button color="warn" (click)="disableLockout()"><mat-icon>lock_clock</mat-icon>Auto-Blokada</button> }
} @else { @if (lockout) {
<button mat-stroked-button disabled>Auto-Blokada nieczynna</button> <button mat-stroked-button color="warn" (click)="disableLockout()"><mat-icon>lock_clock</mat-icon>Auto-Blokada</button>
} } @else {
<mat-form-field *ngIf="ls.permChecker(32)" color="accent"> <button mat-stroked-button disabled>Auto-Blokada nieczynna</button>
<mat-label>Uprawnienia</mat-label> }
<mat-select multiple formControlName="flags"> @if (ls.permChecker(32)) {
<mat-option [value]="1" *ngIf="ls.capCheck(1)">Wiadomości</mat-option> <mat-form-field color="accent">
<mat-option [value]="2" *ngIf="ls.capCheck(2)">Jadłospis</mat-option> <mat-label>Uprawnienia</mat-label>
<mat-option [value]="4" *ngIf="ls.capCheck(4)">Powiadomienia</mat-option> <mat-select multiple formControlName="flags">
<mat-option [value]="8" *ngIf="ls.capCheck(8)">Grupy</mat-option> @if (ls.capCheck(1)) {
<mat-option [value]="16">Konta</mat-option> <mat-option [value]="1">Wiadomości</mat-option>
<mat-option [value]="64" *ngIf="ls.capCheck(32)">Klucze</mat-option> }
<mat-option [value]="128" *ngIf="ls.capCheck(16)">Czystość</mat-option> @if (ls.capCheck(2)) {
</mat-select> <mat-option [value]="2">Jadłospis</mat-option>
</mat-form-field> }
} @if (ls.capCheck(4)) {
</div> <mat-option [value]="4">Powiadomienia</mat-option>
</form> }
@if (ls.capCheck(8)) {
<mat-option [value]="8">Grupy</mat-option>
}
<mat-option [value]="16">Konta</mat-option>
@if (ls.capCheck(32)) {
<mat-option [value]="64">Klucze</mat-option>
}
@if (ls.capCheck(16)) {
<mat-option [value]="128">Czystość</mat-option>
}
</mat-select>
</mat-form-field>
}
}
</div>
</form>
</mat-dialog-content> </mat-dialog-content>
<mat-dialog-actions> <mat-dialog-actions>
@if (data.type == "edit") { @if (data.type == "edit") {
<button mat-stroked-button color="warn" style="margin-right: auto;">Usuń konto</button> <button mat-stroked-button color="warn" style="margin-right: auto;">Usuń konto</button>
} }
<button mat-stroked-button mat-dialog-close>Zamknij</button> <button mat-stroked-button mat-dialog-close>Zamknij</button>
<button mat-flat-button color="accent" (click)="submit()">Zapisz</button> <button mat-flat-button color="accent" (click)="submit()">Zapisz</button>
<mat-spinner diameter="32" color="accent" *ngIf="loading"></mat-spinner> @if (loading) {
<mat-spinner diameter="32" color="accent"></mat-spinner>
}
</mat-dialog-actions> </mat-dialog-actions>

38
src/app/admin-view/grades/attendence-summary/attendence-summary.component.html
View File

@@ -1,25 +1,29 @@
<div id="guide"> <div id="guide">
<p><b>Uwaga:</b> Obecność resetuje się o codziennie o 00:00</p> <p><b>Uwaga:</b> Obecność resetuje się o codziennie o 00:00</p>
<div id="legend"> <div id="legend">
<b>Legenda: </b> <b>Legenda: </b>
<span class="circle">Wychowanek obecny</span> <span class="circle">Wychowanek obecny</span>
<span class="circle">Wyjście w ciągu 30 min.</span> <span class="circle">Wyjście w ciągu 30 min.</span>
<span class="circle">Wychowanek nieobecny</span> <span class="circle">Wychowanek nieobecny</span>
</div> </div>
</div> </div>
<table mat-table [dataSource]="data" matSort> <table mat-table [dataSource]="data" matSort>
<div matColumnDef="room"> <div matColumnDef="room">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Pokój</th> <th mat-header-cell *matHeaderCellDef mat-sort-header>Pokój</th>
<td mat-cell *matCellDef="let item">{{item.room}}</td> <td mat-cell *matCellDef="let item">{{item.room}}</td>
</div> </div>
<div matColumnDef="hours"> <div matColumnDef="hours">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Godziny</th> <th mat-header-cell *matHeaderCellDef mat-sort-header>Godziny</th>
<td mat-cell *matCellDef="let item"><span *ngFor="let i of item.hours.sort().reverse(); let isLast=last"><app-hour-display [value]="i"></app-hour-display>{{ isLast ? '' : ', '}}</span><span>{{item.notes}}</span></td> <td mat-cell *matCellDef="let item">@for (i of item.hours.sort().reverse(); track i; let isLast = $last) {
<span><app-hour-display [value]="i"></app-hour-display>{{ isLast ? '' : ', '}}</span>
}<span>{{item.notes}}</span></td>
</div> </div>
<div matColumnDef="actions"> <div matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef>Usuń</th> <th mat-header-cell *matHeaderCellDef>Usuń</th>
<td mat-cell *matCellDef="let item"><button mat-mini-fab color="warn" (click)="delete(item.room)" *ngIf="!item.auto"><mat-icon>delete</mat-icon></button></td> <td mat-cell *matCellDef="let item">@if (!item.auto) {
<button mat-mini-fab color="warn" (click)="delete(item.room)"><mat-icon>delete</mat-icon></button>
}</td>
</div> </div>
<tr mat-header-row *matHeaderRowDef="collumns"></tr> <tr mat-header-row *matHeaderRowDef="collumns"></tr>
<tr mat-row *matRowDef="let rowData; columns: collumns"></tr> <tr mat-row *matRowDef="let rowData; columns: collumns"></tr>
</table> </table>

52
src/app/admin-view/grades/grades.component.html
View File

@@ -1,28 +1,34 @@
<app-date-selector [(date)]="date" [filter]="filter" (dateChange)="downloadData()"></app-date-selector> <app-date-selector [(date)]="date" [filter]="filter" (dateChange)="downloadData()"></app-date-selector>
<app-room-chooser [rooms]="rooms" (room)="roomNumber($event)"/> <app-room-chooser [rooms]="rooms" (room)="roomNumber($event)"/>
<form [formGroup]="form"> <form [formGroup]="form">
<p>Czystość pokoju {{room}} na dzień {{date.format("dddd")}}</p> <p>Czystość pokoju {{room}} na dzień {{date.format("dddd")}}</p>
<p>Ocena: {{grade}}</p> <p>Ocena: {{grade}}</p>
<div id="buttons"> <div id="buttons">
<button mat-mini-fab (click)="downloadData()" color="accent"><mat-icon>cancel</mat-icon></button> <button mat-mini-fab (click)="downloadData()" color="accent"><mat-icon>cancel</mat-icon></button>
<button mat-mini-fab (click)="attendence()" color="accent"><mat-icon>overview</mat-icon></button> <button mat-mini-fab (click)="attendence()" color="accent"><mat-icon>overview</mat-icon></button>
<button mat-mini-fab (click)="save()" color="accent"><mat-icon>save</mat-icon></button> <button mat-mini-fab (click)="save()" color="accent"><mat-icon>save</mat-icon></button>
<button mat-mini-fab color="warn" (click)="remove()" *ngIf="id"><mat-icon>delete</mat-icon></button> @if (id) {
<button mat-mini-fab color="warn" (click)="remove()"><mat-icon>delete</mat-icon></button>
}
</div>
@for (item of things.controls; track item; let i = $index) {
<div formArrayName="things" id="things">
<div formGroupName="{{i}}">
<mat-checkbox formControlName="cb" #cb>
<span control="label"></span>
@if (cb.checked) {
<span>
<button mat-icon-button (click)="group.sub(i)"><mat-icon>remove</mat-icon></button>
<span control="weight"></span>
<button mat-icon-button (click)="group.add(i)"><mat-icon>add</mat-icon></button>
</span>
}
</mat-checkbox>
</div>
</div> </div>
<div *ngFor="let item of things.controls; let i = index" formArrayName="things" id="things"> }
<div formGroupName="{{i}}"> <mat-form-field style="width: 100%;">
<mat-checkbox formControlName="cb" #cb> <mat-label>Dodatkowe uwagi</mat-label>
<span control="label"></span> <textarea matNativeControl cdkTextareaAutosize formControlName="tips"></textarea>
<span *ngIf="cb.checked"> </mat-form-field>
<button mat-icon-button (click)="group.sub(i)"><mat-icon>remove</mat-icon></button>
<span control="weight"></span>
<button mat-icon-button (click)="group.add(i)"><mat-icon>add</mat-icon></button>
</span>
</mat-checkbox>
</div>
</div>
<mat-form-field style="width: 100%;">
<mat-label>Dodatkowe uwagi</mat-label>
<textarea matNativeControl cdkTextareaAutosize formControlName="tips"></textarea>
</mat-form-field>
</form> </form>

10
src/app/admin-view/groups/groups.component.html
View File

@@ -1,9 +1,11 @@
<button mat-raised-button color="accent" (click)="newGroup()">Nowa grupa</button> <button mat-raised-button color="accent" (click)="newGroup()">Nowa grupa</button>
<mat-card *ngFor="let item of groups"> @for (item of groups; track item) {
<mat-card>
<mat-card-header> <mat-card-header>
<mat-card-title contenteditable appCe (edit)="nameEdit(item._id, $event)">{{item.name}}</mat-card-title> <mat-card-title contenteditable appCe (edit)="nameEdit(item._id, $event)">{{item.name}}</mat-card-title>
</mat-card-header> </mat-card-header>
<mat-card-actions> <mat-card-actions>
<button mat-button color="warn" (click)="remove(item._id)">Usuń</button> <button mat-button color="warn" (click)="remove(item._id)">Usuń</button>
</mat-card-actions> </mat-card-actions>
</mat-card> </mat-card>
}

78
src/app/admin-view/key/key.component.html
View File

@@ -1,42 +1,46 @@
<div id="upper-bar"> <div id="upper-bar">
<mat-form-field> <mat-form-field>
<mat-label>Wyszukaj</mat-label> <mat-label>Wyszukaj</mat-label>
<input matInput (keyup)="filter($event)"> <input matInput (keyup)="filter($event)">
</mat-form-field> </mat-form-field>
<mat-chip-listbox [(ngModel)]="filters" multiple> <mat-chip-listbox [(ngModel)]="filters" multiple>
<mat-chip-option value="showAll">Pokaż wszystko</mat-chip-option> <mat-chip-option value="showAll">Pokaż wszystko</mat-chip-option>
</mat-chip-listbox> </mat-chip-listbox>
<button mat-icon-button (click)="new()"><mat-icon>add</mat-icon></button> <button mat-icon-button (click)="new()"><mat-icon>add</mat-icon></button>
</div> </div>
<mat-spinner *ngIf="loading" color="accent"></mat-spinner> @if (loading) {
<mat-spinner color="accent"></mat-spinner>
}
<table mat-table [dataSource]="keys"> <table mat-table [dataSource]="keys">
<div matColumnDef="room"> <div matColumnDef="room">
<th mat-header-cell *matHeaderCellDef>Sala</th> <th mat-header-cell *matHeaderCellDef>Sala</th>
<td mat-cell *matCellDef="let element">{{element.room}}</td> <td mat-cell *matCellDef="let element">{{element.room}}</td>
</div> </div>
<div matColumnDef="whom"> <div matColumnDef="whom">
<th mat-header-cell *matHeaderCellDef>Wypożyczający</th> <th mat-header-cell *matHeaderCellDef>Wypożyczający</th>
<td mat-cell *matCellDef="let element">{{element.whom.uname}}</td> <td mat-cell *matCellDef="let element">{{element.whom.uname}}</td>
</div> </div>
<div matColumnDef="borrow"> <div matColumnDef="borrow">
<th mat-header-cell *matHeaderCellDef>Data wypożyczenia</th> <th mat-header-cell *matHeaderCellDef>Data wypożyczenia</th>
<td mat-cell *matCellDef="let element">{{element.borrow.format("HH:mm, ddd D.MM.")}}</td> <td mat-cell *matCellDef="let element">{{element.borrow.format("HH:mm, ddd D.MM.")}}</td>
</div> </div>
<div matColumnDef="tb"> <div matColumnDef="tb">
<th mat-header-cell *matHeaderCellDef>Data zwrotu</th> <th mat-header-cell *matHeaderCellDef>Data zwrotu</th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
@if (element.tb) { @if (element.tb) {
{{element.tb.format("HH:mm, ddd D.MM.")}} {{element.tb.format("HH:mm, ddd D.MM.")}}
} }
</td> </td>
</div> </div>
<div matColumnDef="actions"> <div matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef>Akcje</th> <th mat-header-cell *matHeaderCellDef>Akcje</th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
<button mat-mini-fab (click)="tb(element._id)" *ngIf="!element.tb"><mat-icon>person_cancel</mat-icon></button> @if (!element.tb) {
</td> <button mat-mini-fab (click)="tb(element._id)"><mat-icon>person_cancel</mat-icon></button>
</div> }
<tr mat-header-row *matHeaderRowDef="collumns"></tr> </td>
<tr mat-row *matRowDef="let row; columns: collumns"></tr> </div>
<tr mat-header-row *matHeaderRowDef="collumns"></tr>
<tr mat-row *matRowDef="let row; columns: collumns"></tr>
</table> </table>
<mat-paginator pageSize="9" [pageSizeOptions]="[9, 15, 20, 50, 160]"></mat-paginator> <mat-paginator pageSize="9" [pageSizeOptions]="[9, 15, 20, 50, 160]"></mat-paginator>

38
src/app/admin-view/key/new-key/new-key.component.html
View File

@@ -1,19 +1,23 @@
<mat-dialog-content> <mat-dialog-content>
<form (ngSubmit)="send()" [formGroup]="form"> <form (ngSubmit)="send()" [formGroup]="form">
<mat-form-field color="accent"> <mat-form-field color="accent">
<mat-label>Sala</mat-label> <mat-label>Sala</mat-label>
<mat-select formControlName="room" required> <mat-select formControlName="room" required>
@for (item of rooms; track $index) { @for (item of rooms; track $index) {
<mat-option [value]="item">{{item}}</mat-option> <mat-option [value]="item">{{item}}</mat-option>
} }
</mat-select> </mat-select>
<mat-error *ngIf="form.controls['room'].hasError('required')">Wymagane</mat-error> @if (form.controls['room'].hasError('required')) {
</mat-form-field> <mat-error>Wymagane</mat-error>
<mat-form-field color="accent"> }
<mat-label>Wypożyczający</mat-label> </mat-form-field>
<app-user-search formControlName="user" required/> <mat-form-field color="accent">
<mat-error *ngIf="form.controls['user'].hasError('required')">Wymagane</mat-error> <mat-label>Wypożyczający</mat-label>
</mat-form-field> <app-user-search formControlName="user" required/>
<button mat-button>Wyślij</button> @if (form.controls['user'].hasError('required')) {
</form> <mat-error>Wymagane</mat-error>
}
</mat-form-field>
<button mat-button>Wyślij</button>
</form>
</mat-dialog-content> </mat-dialog-content>

238
src/app/admin-view/menu-new/menu-new.component.html
View File

@@ -1,111 +1,141 @@
<div id="upper-bar"> <div id="upper-bar">
<mat-form-field> <mat-form-field>
<mat-label>Wybierz tydzień</mat-label> <mat-label>Wybierz tydzień</mat-label>
<mat-date-range-input [rangePicker]="picker" [formGroup]="range"> <mat-date-range-input [rangePicker]="picker" [formGroup]="range">
<input matStartDate formControlName="start" (dateChange)="requestData()"> <input matStartDate formControlName="start" (dateChange)="requestData()">
<input matEndDate formControlName="end" (dateChange)="requestData()"> <input matEndDate formControlName="end" (dateChange)="requestData()">
</mat-date-range-input> </mat-date-range-input>
<mat-datepicker-toggle matIconSuffix [for]="picker"></mat-datepicker-toggle> <mat-datepicker-toggle matIconSuffix [for]="picker"></mat-datepicker-toggle>
<mat-date-range-picker #picker></mat-date-range-picker> <mat-date-range-picker #picker></mat-date-range-picker>
</mat-form-field> </mat-form-field>
<button mat-icon-button (click)="requestData()"><mat-icon>refresh</mat-icon></button> <button mat-icon-button (click)="requestData()"><mat-icon>refresh</mat-icon></button>
<button mat-icon-button (click)="addDate()"><mat-icon>add</mat-icon></button> <button mat-icon-button (click)="addDate()"><mat-icon>add</mat-icon></button>
<button mat-icon-button (click)="print()"><mat-icon>print</mat-icon></button> <button mat-icon-button (click)="print()"><mat-icon>print</mat-icon></button>
</div> </div>
<mat-spinner *ngIf="loading"></mat-spinner> @if (loading) {
<mat-spinner></mat-spinner>
}
<table mat-table [dataSource]="dataSource"> <table mat-table [dataSource]="dataSource">
<div matColumnDef="day"> <div matColumnDef="day">
<th mat-header-cell *matHeaderCellDef>Dzień</th> <th mat-header-cell *matHeaderCellDef>Dzień</th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
<span>{{element.day.format('DD.MM.YYYY')}}r.</span> <span>{{element.day.format('DD.MM.YYYY')}}r.</span>
<p>{{element.day.format('dddd')}}</p> <p>{{element.day.format('dddd')}}</p>
<app-field-editor category="Nazwa" [(word)]="element.dayTitle" (wordChange)="editTitle(element._id)"/><br><hr> <app-field-editor category="Nazwa" [(word)]="element.dayTitle" (wordChange)="editTitle(element._id)"/><br><hr>
<button (click)="remove(element._id)">Usuń dzień</button> <button (click)="remove(element._id)">Usuń dzień</button>
</td> </td>
</div> </div>
<div matColumnDef="sn"> <div matColumnDef="sn">
<th mat-header-cell *matHeaderCellDef>Śniadanie</th> <th mat-header-cell *matHeaderCellDef>Śniadanie</th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
<ul class="non-editable"> <ul class="non-editable">
<li *ngFor="let i of ls.defaultItems.sn">{{i}}</li> @for (i of ls.defaultItems.sn; track i) {
</ul><hr> <li>{{i}}</li>
<app-list-editor [(list)]="element.sn.fancy" (edit)="editSn(element._id)" dataList="sn-fancy"/><hr> }
<ul> </ul><hr>
<li><app-field-editor category="II Śniadanie" [(word)]="element.sn.second" list="sn-second" (wordChange)="editSn(element._id)"/></li> <app-list-editor [(list)]="element.sn.fancy" (edit)="editSn(element._id)" dataList="sn-fancy"/><hr>
</ul> <ul>
</td> <li><app-field-editor category="II Śniadanie" [(word)]="element.sn.second" list="sn-second" (wordChange)="editSn(element._id)"/></li>
</div> </ul>
<div matColumnDef="ob"> </td>
<th mat-header-cell *matHeaderCellDef>Obiad</th> </div>
<td mat-cell *matCellDef="let element"> <div matColumnDef="ob">
<ul> <th mat-header-cell *matHeaderCellDef>Obiad</th>
<li><app-field-editor category="Zupa" [(word)]="element.ob.soup" list="ob-soup" (wordChange)="editOb(element._id)"/></li> <td mat-cell *matCellDef="let element">
<li><app-field-editor category="Vege" [(word)]="element.ob.vege" list="ob-vege" (wordChange)="editOb(element._id)"/></li> <ul>
<li><app-field-editor category="Danie główne" [(word)]="element.ob.meal" list="ob-meal" (wordChange)="editOb(element._id)"/></li> <li><app-field-editor category="Zupa" [(word)]="element.ob.soup" list="ob-soup" (wordChange)="editOb(element._id)"/></li>
</ul><hr> <li><app-field-editor category="Vege" [(word)]="element.ob.vege" list="ob-vege" (wordChange)="editOb(element._id)"/></li>
<app-list-editor [(list)]="element.ob.condiments" (edit)="editOb(element._id)" dataList="ob-condiments"/><hr> <li><app-field-editor category="Danie główne" [(word)]="element.ob.meal" list="ob-meal" (wordChange)="editOb(element._id)"/></li>
<ul> </ul><hr>
<li><app-field-editor category="Napój" [(word)]="element.ob.drink" list="ob-drink" (wordChange)="editOb(element._id)"/></li> <app-list-editor [(list)]="element.ob.condiments" (edit)="editOb(element._id)" dataList="ob-condiments"/><hr>
</ul><hr> <ul>
<app-list-editor [(list)]="element.ob.other" (edit)="editOb(element._id)" dataList="ob-other"/> <li><app-field-editor category="Napój" [(word)]="element.ob.drink" list="ob-drink" (wordChange)="editOb(element._id)"/></li>
<button (click)="getStat(element.day, 'ob')"> </ul><hr>
<app-list-editor [(list)]="element.ob.other" (edit)="editOb(element._id)" dataList="ob-other"/>
<button (click)="getStat(element.day, 'ob')">
Opinie wychowanków
</button>
</td>
</div>
<div matColumnDef="kol">
<th mat-header-cell *matHeaderCellDef>Kolacja</th>
<td mat-cell *matCellDef="let element">
<div>
@switch (element.day.isoWeekday()) {
@default {
<div>
<ul class="non-editable">
@for (i of ls.defaultItems.kol; track i) {
<li>{{i}}</li>
}
</ul><hr>
<ul>
<li><app-field-editor category="Kolacja" [(word)]="element.kol" list="kol" (wordChange)="editKol(element._id)"/></li>
</ul>
<button (click)="getStat(element.day, 'kol')">
Opinie wychowanków Opinie wychowanków
</button> </button>
</td>
</div>
<div matColumnDef="kol">
<th mat-header-cell *matHeaderCellDef>Kolacja</th>
<td mat-cell *matCellDef="let element">
<div [ngSwitch]="element.day.isoWeekday()">
<div *ngSwitchDefault>
<ul class="non-editable">
<li *ngFor="let i of ls.defaultItems.kol">{{i}}</li>
</ul><hr>
<ul>
<li><app-field-editor category="Kolacja" [(word)]="element.kol" list="kol" (wordChange)="editKol(element._id)"/></li>
</ul>
<button (click)="getStat(element.day, 'kol')">
Opinie wychowanków
</button>
</div>
<div *ngSwitchCase="5" class="non-editable">
<p>Kolacja w domu!</p>
<p>(Nie edytowalne)</p>
</div>
</div> </div>
</td> }
</div> @case (5) {
<div class="non-editable">
<tr mat-header-row *matHeaderRowDef="dcols"></tr> <p>Kolacja w domu!</p>
<tr mat-row *matRowDef="let row; columns: dcols"></tr> <p>(Nie edytowalne)</p>
</div>
}
}
</div>
</td>
</div>
<tr mat-header-row *matHeaderRowDef="dcols"></tr>
<tr mat-row *matRowDef="let row; columns: dcols"></tr>
</table> </table>
<ng-container *ngIf="options"> @if (options) {
<datalist id="sn-fancy"> <datalist id="sn-fancy">
<option *ngFor="let i of options.sn.fancy">{{i}}</option> @for (i of options.sn.fancy; track i) {
</datalist> <option>{{i}}</option>
<datalist id="sn-second"> }
<option *ngFor="let i of options.sn.second">{{i}}</option> </datalist>
</datalist> <datalist id="sn-second">
<datalist id="ob-soup"> @for (i of options.sn.second; track i) {
<option *ngFor="let i of options.ob.soup">{{i}}</option> <option>{{i}}</option>
</datalist> }
<datalist id="ob-vege"> </datalist>
<option *ngFor="let i of options.ob.vege">{{i}}</option> <datalist id="ob-soup">
</datalist> @for (i of options.ob.soup; track i) {
<datalist id="ob-meal"> <option>{{i}}</option>
<option *ngFor="let i of options.ob.meal">{{i}}</option> }
</datalist> </datalist>
<datalist id="ob-condiments"> <datalist id="ob-vege">
<option *ngFor="let i of options.ob.condiments">{{i}}</option> @for (i of options.ob.vege; track i) {
</datalist> <option>{{i}}</option>
<datalist id="ob-drink"> }
<option *ngFor="let i of options.ob.drink">{{i}}</option> </datalist>
</datalist> <datalist id="ob-meal">
<datalist id="ob-other"> @for (i of options.ob.meal; track i) {
<option *ngFor="let i of options.ob.other">{{i}}</option> <option>{{i}}</option>
</datalist> }
<datalist id="kol"> </datalist>
<option *ngFor="let i of options.kol">{{i}}</option> <datalist id="ob-condiments">
</datalist> @for (i of options.ob.condiments; track i) {
</ng-container> <option>{{i}}</option>
}
</datalist>
<datalist id="ob-drink">
@for (i of options.ob.drink; track i) {
<option>{{i}}</option>
}
</datalist>
<datalist id="ob-other">
@for (i of options.ob.other; track i) {
<option>{{i}}</option>
}
</datalist>
<datalist id="kol">
@for (i of options.kol; track i) {
<option>{{i}}</option>
}
</datalist>
}

52
src/app/admin-view/news-edit/news-edit.component.html
View File

@@ -1,30 +1,44 @@
<button mat-raised-button (click)="newPost()" color="accent">Nowy post</button> <button mat-raised-button (click)="newPost()" color="accent">Nowy post</button>
<mat-spinner *ngIf="loading"></mat-spinner> @if (loading) {
<mat-card *ngFor="let item of news"> <mat-spinner></mat-spinner>
}
@for (item of news; track item) {
<mat-card>
<mat-card-header> <mat-card-header>
<mat-card-title>{{item.title}}</mat-card-title> <mat-card-title>{{item.title}}</mat-card-title>
<mat-icon *ngIf="item.pinned">push_pin</mat-icon> @if (item.pinned) {
<mat-card-subtitle>{{item._id}}</mat-card-subtitle> <mat-icon>push_pin</mat-icon>
}
<mat-card-subtitle>{{item._id}}</mat-card-subtitle>
</mat-card-header> </mat-card-header>
<mat-card-content [innerHTML]="item.formatted"> <mat-card-content [innerHTML]="item.formatted">
</mat-card-content> </mat-card-content>
<mat-card-actions> <mat-card-actions>
<button mat-mini-fab (click)="editPost(item)"><mat-icon>edit</mat-icon></button> <button mat-mini-fab (click)="editPost(item)"><mat-icon>edit</mat-icon></button>
<button mat-mini-fab (click)="pinToggle(item)"><mat-icon>push_pin</mat-icon></button> <button mat-mini-fab (click)="pinToggle(item)"><mat-icon>push_pin</mat-icon></button>
<button mat-mini-fab (click)="visibleToggle(item)"> <button mat-mini-fab (click)="visibleToggle(item)">
<div [ngSwitch]="item.visible"> <div>
<mat-icon *ngSwitchCase="true">visibility</mat-icon> @switch (item.visible) {
<mat-icon *ngSwitchDefault>visibility_off</mat-icon> @case (true) {
</div> <mat-icon>visibility</mat-icon>
</button> }
<button mat-mini-fab (click)="delete(item._id)"><mat-icon>delete_forever</mat-icon></button> @default {
<mat-icon>visibility_off</mat-icon>
}
}
</div>
</button>
<button mat-mini-fab (click)="delete(item._id)"><mat-icon>delete_forever</mat-icon></button>
</mat-card-actions> </mat-card-actions>
<mat-card-footer> <mat-card-footer>
<p>{{item.date | date:'d-LL-yyyy HH:mm'}}</p> <p>{{item.date | date:'d-LL-yyyy HH:mm'}}</p>
</mat-card-footer> </mat-card-footer>
</mat-card> </mat-card>
<mat-card *ngIf="news.length == 0"> }
@if (news.length == 0) {
<mat-card>
<p> <p>
Brak wiadomości. Brak wiadomości.
</p> </p>
</mat-card> </mat-card>
}

76
src/app/admin-view/notifications/notifications.component.html
View File

@@ -1,42 +1,48 @@
<form [formGroup]="form" (ngSubmit)="submit()"> <form [formGroup]="form" (ngSubmit)="submit()">
<div formGroupName="recp"> <div formGroupName="recp">
<mat-radio-group formControlName="type"> <mat-radio-group formControlName="type">
<mat-radio-button value="uid"> <mat-radio-button value="uid">
<mat-form-field> <mat-form-field>
<mat-label>Użytkownik</mat-label> <mat-label>Użytkownik</mat-label>
<app-user-search formControlName="uid" required/> <app-user-search formControlName="uid" required/>
</mat-form-field> </mat-form-field>
</mat-radio-button> </mat-radio-button>
<mat-radio-button value="room"> <mat-radio-button value="room">
<mat-form-field> <mat-form-field>
<mat-label>Pokój</mat-label> <mat-label>Pokój</mat-label>
<input matInput type="text" formControlName="room"> <input matInput type="text" formControlName="room">
</mat-form-field> </mat-form-field>
</mat-radio-button> </mat-radio-button>
<mat-radio-button value="group" *ngIf="ls.capCheck(8)"> @if (ls.capCheck(8)) {
<mat-form-field> <mat-radio-button value="group">
<mat-label>Grupa</mat-label> <mat-form-field>
<mat-select formControlName="group"> <mat-label>Grupa</mat-label>
<mat-option *ngFor="let item of groups" [value]="item._id">{{item.name}}</mat-option> <mat-select formControlName="group">
</mat-select> @for (item of groups; track item) {
</mat-form-field> <mat-option [value]="item._id">{{item.name}}</mat-option>
</mat-radio-button> }
</mat-radio-group> </mat-select>
</div> </mat-form-field>
</mat-radio-button>
}
</mat-radio-group>
</div>
<mat-form-field>
<mat-label>Tytuł</mat-label>
<input matInput type="text" formControlName="title">
</mat-form-field>
<br>
<mat-form-field> <mat-form-field>
<mat-label>Tytuł</mat-label> <mat-label>Zawartość wiadomości</mat-label>
<input matInput type="text" formControlName="title"> <textarea matInput cdkTextareaAutosize formControlName="body"></textarea>
</mat-form-field> </mat-form-field>
<br> <br>
<mat-form-field> <button mat-fab extended type="submit">
<mat-label>Zawartość wiadomości</mat-label>
<textarea matInput cdkTextareaAutosize formControlName="body"></textarea>
</mat-form-field>
<br>
<button mat-fab extended type="submit">
<mat-icon>send</mat-icon> <mat-icon>send</mat-icon>
Wyślij Wyślij
</button> </button>
</form> </form>
<p *ngIf="success">Udało się wysłać {{success.sent}} z {{success.possible}} = {{success.sent/success.possible | percent}}</p> @if (success) {
<p>Udało się wysłać {{success.sent}} z {{success.possible}} = {{success.sent/success.possible | percent}}</p>
}

64
src/app/admin-view/notifications/outbox/message/message.component.html
View File

@@ -1,31 +1,41 @@
<mat-card> <mat-card>
<mat-card-header> <mat-card-header>
<mat-card-title-group> <mat-card-title-group>
<mat-card-title> <mat-card-title>
{{item.title}} {{item.title}}
</mat-card-title> </mat-card-title>
<mat-card-subtitle>{{item.sentDate.format('[Wysłano] dddd DD MMMM YYYYr. o HH:mm')}}</mat-card-subtitle> <mat-card-subtitle>{{item.sentDate.format('[Wysłano] dddd DD MMMM YYYYr. o HH:mm')}}</mat-card-subtitle>
</mat-card-title-group> </mat-card-title-group>
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<p *ngIf="body"> @if (body) {
{{body}} <p>
</p> {{body}}
<hr> </p>
<ul> }
@for (user of rcpts; track $index) { <hr>
<li> <ul>
<span *ngIf="user.room">{{user.room}}: </span>{{user.fname}} {{user.surname}} <span @for (user of rcpts; track $index) {
style="color: gray">({{user.uname}})</span> <li>
</li> @if (user.room) {
} <span>{{user.room}}: </span>
</ul> }{{user.fname}} {{user.surname}} <span
style="color: gray">({{user.uname}})</span>
</li>
}
</ul>
</mat-card-content> </mat-card-content>
<mat-card-footer> <mat-card-footer>
<mat-card-actions> <mat-card-actions>
<button mat-stroked-button (click)="getMessage()" *ngIf="!body">Wczytaj treść</button> @if (!body) {
<button mat-stroked-button (click)="getRcpts()" *ngIf="!rcpts">Wczytaj odbiorców</button> <button mat-stroked-button (click)="getMessage()">Wczytaj treść</button>
<mat-spinner diameter="32" color="accent" *ngIf="loading"></mat-spinner> }
</mat-card-actions> @if (!rcpts) {
<button mat-stroked-button (click)="getRcpts()">Wczytaj odbiorców</button>
}
@if (loading) {
<mat-spinner diameter="32" color="accent"></mat-spinner>
}
</mat-card-actions>
</mat-card-footer> </mat-card-footer>
</mat-card> </mat-card>

24
src/app/admin-view/toolbar/toolbar.component.html
View File

@@ -1,14 +1,20 @@
<mat-toolbar color="accent"> <mat-toolbar color="accent">
<button mat-icon-button (click)="drawer.toggle()"><mat-icon>menu</mat-icon></button> <button mat-icon-button (click)="drawer.toggle()"><mat-icon>menu</mat-icon></button>
<span>{{title.getTitle()}}</span> <span>{{title.getTitle()}}</span>
<span style="flex: 1 1 auto"></span> <span style="flex: 1 1 auto"></span>
<button mat-icon-button *ngIf="toolbar.menu" [matMenuTriggerFor]="menu" (click)="openMenu()"><mat-icon>more_vert</mat-icon></button> @if (toolbar.menu) {
<button mat-icon-button [matMenuTriggerFor]="menu" (click)="openMenu()"><mat-icon>more_vert</mat-icon></button>
}
</mat-toolbar> </mat-toolbar>
<mat-menu #menu="matMenu"> <mat-menu #menu="matMenu">
@for (item of _menu; track $index) { @for (item of _menu; track $index) {
<button mat-menu-item *ngIf="item.check ?? true" (click)="toolbar.comp[item.fn]()"> @if (item.check ?? true) {
<mat-icon *ngIf="item.icon">{{item.icon}}</mat-icon> <button mat-menu-item (click)="toolbar.comp[item.fn]()">
<span>{{item.title}}</span> @if (item.icon) {
</button> <mat-icon>{{item.icon}}</mat-icon>
}
<span>{{item.title}}</span>
</button>
} }
}
</mat-menu> </mat-menu>

140
src/app/app-view/menu/menu.component.html
View File

@@ -1,61 +1,95 @@
<div id="cards"> <div id="cards">
<mat-spinner *ngIf="loading"></mat-spinner> @if (loading) {
<mat-card *ngIf="gettitle"> <mat-spinner></mat-spinner>
<mat-card-header> }
<mat-card-title>{{gettitle}}</mat-card-title> @if (gettitle) {
</mat-card-header> <mat-card>
<mat-card-content></mat-card-content> <mat-card-header>
<mat-card-title>{{gettitle}}</mat-card-title>
</mat-card-header>
<mat-card-content></mat-card-content>
</mat-card> </mat-card>
<mat-card *ngIf="getsn"> }
<mat-card-header> @if (getsn) {
<mat-card-title>Śniadanie</mat-card-title> <mat-card>
</mat-card-header> <mat-card-header>
<mat-card-content> <mat-card-title>Śniadanie</mat-card-title>
<ul> </mat-card-header>
<li *ngFor="let i of ls.defaultItems.sn">{{i}}</li> <mat-card-content>
<li *ngFor="let i of getsn.fancy">{{capitalize(i)}}</li> <ul>
<li *ngIf="getsn.second">{{capitalize(getsn.second)}}</li> @for (i of ls.defaultItems.sn; track i) {
</ul> <li>{{i}}</li>
</mat-card-content> }
@for (i of getsn.fancy; track i) {
<li>{{capitalize(i)}}</li>
}
@if (getsn.second) {
<li>{{capitalize(getsn.second)}}</li>
}
</ul>
</mat-card-content>
</mat-card> </mat-card>
<mat-card *ngIf="getob"> }
<mat-card-header> @if (getob) {
<mat-card-title>Obiad</mat-card-title> <mat-card>
</mat-card-header> <mat-card-header>
<mat-card-content> <mat-card-title>Obiad</mat-card-title>
<ul> </mat-card-header>
<li *ngIf="getob.soup">Z: {{getob.soup}}</li> <mat-card-content>
<li *ngIf="getob.vege" style="color: #43A047">V: {{getob.vege}}</li> <ul>
<li *ngIf="getob.meal">{{getob.meal}}</li> @if (getob.soup) {
<li *ngFor="let i of getob.condiments">{{i}}</li> <li>Z: {{getob.soup}}</li>
<li *ngIf="getob.drink">{{getob.drink}}</li> }
<li *ngFor="let i of getob.other">{{i}}</li> @if (getob.vege) {
</ul> <li style="color: #43A047">V: {{getob.vege}}</li>
</mat-card-content> }
<mat-card-actions> @if (getob.meal) {
<button mat-icon-button (click)="vote('ob', '+')"><mat-icon [color]="menu!.obv == '+' ? 'primary' : null">thumb_up</mat-icon></button> <li>{{getob.meal}}</li>
<span *ngIf="menu?.stat?.ob != 'NaN'">{{menu?.stat?.ob}}%</span> }
<button mat-icon-button (click)="vote('ob', '-')"><mat-icon [color]="menu!.obv == '-' ? 'warn' : null">thumb_down</mat-icon></button> @for (i of getob.condiments; track i) {
</mat-card-actions> <li>{{i}}</li>
}
@if (getob.drink) {
<li>{{getob.drink}}</li>
}
@for (i of getob.other; track i) {
<li>{{i}}</li>
}
</ul>
</mat-card-content>
<mat-card-actions>
<button mat-icon-button (click)="vote('ob', '+')"><mat-icon [color]="menu!.obv == '+' ? 'primary' : null">thumb_up</mat-icon></button>
@if (menu?.stat?.ob != 'NaN') {
<span>{{menu?.stat?.ob}}%</span>
}
<button mat-icon-button (click)="vote('ob', '-')"><mat-icon [color]="menu!.obv == '-' ? 'warn' : null">thumb_down</mat-icon></button>
</mat-card-actions>
</mat-card> </mat-card>
<mat-card *ngIf="getkol"> }
<mat-card-header> @if (getkol) {
<mat-card-title>Kolacja</mat-card-title> <mat-card>
</mat-card-header> <mat-card-header>
<mat-card-content> <mat-card-title>Kolacja</mat-card-title>
<ul [innerHTML]="getkol"></ul> </mat-card-header>
</mat-card-content> <mat-card-content>
<mat-card-actions> <ul [innerHTML]="getkol"></ul>
<button mat-icon-button (click)="vote('kol', '+')"><mat-icon [color]="menu!.kolv == '+' ? 'primary' : null">thumb_up</mat-icon></button> </mat-card-content>
<span *ngIf="menu?.stat?.kol != 'NaN'">{{menu?.stat?.kol}}%</span> <mat-card-actions>
<button mat-icon-button (click)="vote('kol', '-')"><mat-icon [color]="menu!.kolv == '-' ? 'warn' : null">thumb_down</mat-icon></button> <button mat-icon-button (click)="vote('kol', '+')"><mat-icon [color]="menu!.kolv == '+' ? 'primary' : null">thumb_up</mat-icon></button>
</mat-card-actions> @if (menu?.stat?.kol != 'NaN') {
<span>{{menu?.stat?.kol}}%</span>
}
<button mat-icon-button (click)="vote('kol', '-')"><mat-icon [color]="menu!.kolv == '-' ? 'warn' : null">thumb_down</mat-icon></button>
</mat-card-actions>
</mat-card> </mat-card>
<mat-card *ngIf="!(getkol || getob || getsn || loading || gettitle)"> }
<mat-card-content id="no-data"> @if (!(getkol || getob || getsn || loading || gettitle)) {
Brak danych, wybierz inny dzień. <mat-card>
</mat-card-content> <mat-card-content id="no-data">
Brak danych, wybierz inny dzień.
</mat-card-content>
</mat-card> </mat-card>
<button id="alrg" mat-icon-button (click)="alrg()"><mat-icon color="primary">info</mat-icon></button> }
<button id="alrg" mat-icon-button (click)="alrg()"><mat-icon color="primary">info</mat-icon></button>
</div> </div>
<app-date-selector [(date)]="day" [filter]="filter"></app-date-selector> <app-date-selector [(date)]="day" [filter]="filter"></app-date-selector>

26
src/app/app-view/news/news.component.html
View File

@@ -1,17 +1,25 @@
<mat-spinner *ngIf="loading"></mat-spinner> @if (loading) {
<mat-card *ngFor="let item of news"> <mat-spinner></mat-spinner>
}
@for (item of news; track item) {
<mat-card>
<mat-card-header> <mat-card-header>
<mat-icon *ngIf="item.pinned">push_pin</mat-icon> @if (item.pinned) {
<mat-card-title>{{item.title}}</mat-card-title> <mat-icon>push_pin</mat-icon>
}
<mat-card-title>{{item.title}}</mat-card-title>
</mat-card-header> </mat-card-header>
<mat-card-content [innerHTML]="item.content"> <mat-card-content [innerHTML]="item.content">
</mat-card-content> </mat-card-content>
<mat-card-footer> <mat-card-footer>
<p>{{item.date | date:'d-LL-yyyy HH:mm'}}</p> <p>{{item.date | date:'d-LL-yyyy HH:mm'}}</p>
</mat-card-footer> </mat-card-footer>
</mat-card> </mat-card>
<mat-card *ngIf="news.length == 0"> }
@if (news.length == 0) {
<mat-card>
<p> <p>
Brak wiadomości. Brak wiadomości.
</p> </p>
</mat-card> </mat-card>
}

34
src/app/app-view/personal/change-password-dialog/change-password-dialog.component.html
View File

@@ -1,17 +1,21 @@
<form [formGroup]="form" (ngSubmit)="changePass()"> <form [formGroup]="form" (ngSubmit)="changePass()">
<mat-form-field appearance="outline"> <mat-form-field appearance="outline">
<mat-label>Aktualne hasło</mat-label> <mat-label>Aktualne hasło</mat-label>
<input type="password" matInput formControlName="oldPass"> <input type="password" matInput formControlName="oldPass">
</mat-form-field><br> </mat-form-field><br>
<mat-form-field appearance="outline"> <mat-form-field appearance="outline">
<mat-label>Nowe hasło</mat-label> <mat-label>Nowe hasło</mat-label>
<input type="password" matInput formControlName="newPass"> <input type="password" matInput formControlName="newPass">
</mat-form-field><br> </mat-form-field><br>
<mat-form-field appearance="outline"> <mat-form-field appearance="outline">
<mat-label>Powtórz nowe hasło</mat-label> <mat-label>Powtórz nowe hasło</mat-label>
<input type="password" matInput formControlName="newPassRepeat"> <input type="password" matInput formControlName="newPassRepeat">
<mat-error *ngIf="form.errors?.['noMatch']">Hasła muszą się zgadzać</mat-error> @if (form.errors?.['noMatch']) {
</mat-form-field><br> <mat-error>Hasła muszą się zgadzać</mat-error>
<button mat-stroked-button>Zmień hasło</button><br> }
<p *ngIf="error" style="color: red;">{{error}}</p> </mat-form-field><br>
<button mat-stroked-button>Zmień hasło</button><br>
@if (error) {
<p style="color: red;">{{error}}</p>
}
</form> </form>

32
src/app/app-view/personal/clean/clean.component.html
View File

@@ -1,18 +1,24 @@
<h1 mat-dialog-title>Czystość</h1> <h1 mat-dialog-title>Czystość</h1>
<mat-dialog-content> <mat-dialog-content>
@if (grade) { @if (grade) {
<h1>Twoja ocena: <span [ngStyle]="gradeColor()">{{grade}}</span></h1> <h1>Twoja ocena: <span [ngStyle]="gradeColor()">{{grade}}</span></h1>
} }
@else { @else {
<h1>Nie oceniono</h1> <h1>Nie oceniono</h1>
} }
<p *ngIf="notes.length > 0">Uwagi:</p> @if (notes.length > 0) {
<ul> <p>Uwagi:</p>
<li *ngFor="let i of notes">{{i.label}}<span *ngIf="i.weight > 1"> ({{i.weight}})</span></li> }
</ul> <ul>
<p>{{tips}}</p> @for (i of notes; track i) {
<app-date-selector [(date)]="day" [filter]="filter"/> <li>{{i.label}}@if (i.weight > 1) {
<span> ({{i.weight}})</span>
}</li>
}
</ul>
<p>{{tips}}</p>
<app-date-selector [(date)]="day" [filter]="filter"/>
</mat-dialog-content> </mat-dialog-content>
<mat-dialog-actions align="end"> <mat-dialog-actions align="end">
<button mat-icon-button mat-dialog-close><mat-icon>close</mat-icon></button> <button mat-icon-button mat-dialog-close><mat-icon>close</mat-icon></button>
</mat-dialog-actions> </mat-dialog-actions>

18
src/app/app-view/personal/extra/extra.component.html
View File

@@ -1,14 +1,16 @@
<h1 mat-dialog-title>Dodatkowe ustawienia</h1> <h1 mat-dialog-title>Dodatkowe ustawienia</h1>
<mat-dialog-content> <mat-dialog-content>
<mat-action-list> <mat-action-list>
@for (link of LINKS; track link) { @for (link of LINKS; track link) {
<button mat-list-item (click)="open(link.component)"> <button mat-list-item (click)="open(link.component)">
<mat-icon matListItemIcon *ngIf="link.icon">{{link.icon}}</mat-icon> @if (link.icon) {
<div matListItemTitle>{{link.title}}</div> <mat-icon matListItemIcon>{{link.icon}}</mat-icon>
</button>
} }
</mat-action-list> <div matListItemTitle>{{link.title}}</div>
</button>
}
</mat-action-list>
</mat-dialog-content> </mat-dialog-content>
<mat-dialog-actions align="end"> <mat-dialog-actions align="end">
<button mat-dialog-close mat-button>Zamknij</button> <button mat-dialog-close mat-button>Zamknij</button>
</mat-dialog-actions> </mat-dialog-actions>

96
src/app/app-view/personal/personal.component.html
View File

@@ -1,42 +1,58 @@
<mat-action-list> <mat-action-list>
<button mat-list-item (click)="logout()"> <button mat-list-item (click)="logout()">
<mat-icon matListItemIcon color="primary">logout</mat-icon> <mat-icon matListItemIcon color="primary">logout</mat-icon>
<div matListItemTitle>Wyloguj</div> <div matListItemTitle>Wyloguj</div>
</button> </button>
<button mat-list-item (click)="openPassChange()"> <button mat-list-item (click)="openPassChange()">
<mat-icon matListItemIcon color="primary">manage_accounts</mat-icon> <mat-icon matListItemIcon color="primary">manage_accounts</mat-icon>
<div matListItemTitle>Zmiana hasła</div> <div matListItemTitle>Zmiana hasła</div>
</button> </button>
<button mat-list-item (click)="checkUpdate()"> <button mat-list-item (click)="checkUpdate()">
<div matListItemIcon [ngSwitch]="checking"> <div matListItemIcon>
<mat-spinner diameter="25" *ngSwitchCase="true"></mat-spinner> @switch (checking) {
<mat-icon *ngSwitchCase="false">update</mat-icon> @case (true) {
<mat-icon *ngSwitchCase="'err'" color="warn">error</mat-icon> <mat-spinner diameter="25"></mat-spinner>
<mat-icon *ngSwitchCase="'aval'">upgrade</mat-icon> }
</div> @case (false) {
<div matListItemTitle>Sprawdź dostępność aktualizacji</div> <mat-icon>update</mat-icon>
<div matListItemLine>Aktualna wersja: {{version}}</div> }
</button> @case ('err') {
<button mat-list-item (click)="openKey()" *ngIf="ls.capCheck(32)"> <mat-icon color="warn">error</mat-icon>
<mat-icon matListItemIcon>key</mat-icon> }
<div matListItemTitle>Klucze</div> @case ('aval') {
</button> <mat-icon>upgrade</mat-icon>
<button mat-list-item *ngIf="ls.capCheck(16) && ls.hasRoom()" (click)="openClean()"> }
<mat-icon matListItemIcon>cleaning_services</mat-icon> }
<div matListItemTitle>Oceny za czystość</div> </div>
</button> <div matListItemTitle>Sprawdź dostępność aktualizacji</div>
<button mat-list-item (click)="goToAdmin()" *ngIf="ls.admin"> <div matListItemLine>Aktualna wersja: {{version}}</div>
<mat-icon matListItemIcon color="accent">admin_panel_settings</mat-icon> </button>
<div matListItemTitle>Panel administracyjny</div> @if (ls.capCheck(32)) {
<div matListItemLine>Poprzednio Tryb edycji</div> <button mat-list-item (click)="openKey()">
</button> <mat-icon matListItemIcon>key</mat-icon>
<button mat-list-item (click)="openExtra()"> <div matListItemTitle>Klucze</div>
<mat-icon matListItemIcon>settings_applications</mat-icon> </button>
<div matListItemTitle>Dodatkowe ustawienia</div> }
</button> @if (ls.capCheck(16) && ls.hasRoom()) {
<button mat-list-item (click)="openAbout()"> <button mat-list-item (click)="openClean()">
<mat-icon matListItemIcon>info</mat-icon> <mat-icon matListItemIcon>cleaning_services</mat-icon>
<div matListItemTitle>O programie</div> <div matListItemTitle>Oceny za czystość</div>
<div matListItemLine>Autor, licencja, źródło</div> </button>
</button> }
@if (ls.admin) {
<button mat-list-item (click)="goToAdmin()">
<mat-icon matListItemIcon color="accent">admin_panel_settings</mat-icon>
<div matListItemTitle>Panel administracyjny</div>
<div matListItemLine>Poprzednio Tryb edycji</div>
</button>
}
<button mat-list-item (click)="openExtra()">
<mat-icon matListItemIcon>settings_applications</mat-icon>
<div matListItemTitle>Dodatkowe ustawienia</div>
</button>
<button mat-list-item (click)="openAbout()">
<mat-icon matListItemIcon>info</mat-icon>
<div matListItemTitle>O programie</div>
<div matListItemLine>Autor, licencja, źródło</div>
</button>
</mat-action-list> </mat-action-list>

58
src/app/commonComponents/list-editor/list-editor.component.html
View File

@@ -1,29 +1,43 @@
<ul *ngIf="!focused"> @if (!focused) {
<li *ngFor="let item of _list"> <ul>
@for (item of _list; track item) {
<li>
@if (options) { @if (options) {
{{idToOption(item)}} {{idToOption(item)}}
} @else { } @else {
{{item}} {{item}}
} }
</li> </li>
<li *ngIf="_list.length == 0">[Puste]</li> }
</ul> @if (_list.length == 0) {
<div *ngIf="focused" class="vertical"> <li>[Puste]</li>
<button *ngIf="workList.length == 0" (click)="addPos(0)">+</button> }
</ul>
}
@if (focused) {
<div class="vertical">
@if (workList.length == 0) {
<button (click)="addPos(0)">+</button>
}
<div cdkDropList class="vertical" (cdkDropListDropped)="drop($event)"> <div cdkDropList class="vertical" (cdkDropListDropped)="drop($event)">
@for (item of workList; track $index) { @for (item of workList; track $index) {
<span cdkDrag> <span cdkDrag>
<input type="text" [(ngModel)]="workList[$index]" [attr.list]="dataList" (keyup.enter)="addPos($index)" #input> <input type="text" [(ngModel)]="workList[$index]" [attr.list]="dataList" (keyup.enter)="addPos($index)" #input>
<select *ngIf="dropdown" [(ngModel)]="workList[$index]"> @if (dropdown) {
<option *ngFor="let option of options" [value]="option.id" [selected]="option.id == item">{{option.text}}</option> <select [(ngModel)]="workList[$index]">
</select> @for (option of options; track option) {
<button (click)="remPos($index)">-</button> <option [value]="option.id" [selected]="option.id == item">{{option.text}}</option>
<button (click)="addPos($index)">+</button> }
</span> </select>
} }
<button (click)="remPos($index)">-</button>
<button (click)="addPos($index)">+</button>
</span>
}
</div> </div>
<span> <span>
<button (click)="save()">Zapisz</button> <button (click)="save()">Zapisz</button>
<button (click)="cancel()">Anuluj</button> <button (click)="cancel()">Anuluj</button>
</span> </span>
</div> </div>
}

28
src/app/commonComponents/user-search/user-search.component.html
View File

@@ -1,15 +1,19 @@
<div role="group" class="app-user-search-container" (focusin)="onFocusIn($event)" (focusout)="onFocusOut($event)"> <div role="group" class="app-user-search-container" (focusin)="onFocusIn($event)" (focusout)="onFocusOut($event)">
<input type="text" [matAutocomplete]="ac" [formControl]="control" #inputComponent class="input-element"> <input type="text" [matAutocomplete]="ac" [formControl]="control" #inputComponent class="input-element">
<mat-spinner color="accent" diameter="16" *ngIf="loading" matSuffix></mat-spinner> @if (loading) {
<mat-autocomplete #ac="matAutocomplete" autoActiveFirstOption (optionSelected)="saveValue($event)" [displayWith]="displayFn"> <mat-spinner color="accent" diameter="16" matSuffix></mat-spinner>
@for (item of list; track $index) { }
<mat-option [value]="item"> <mat-autocomplete #ac="matAutocomplete" autoActiveFirstOption (optionSelected)="saveValue($event)" [displayWith]="displayFn">
@if (item.fname) { @for (item of list; track $index) {
{{item.fname}} {{item.surname}} <span *ngIf="item.room" class="room">({{item.room}})</span> <mat-option [value]="item">
} @else { @if (item.fname) {
{{item.uname}} {{item.fname}} {{item.surname}} @if (item.room) {
} <span class="room">({{item.room}})</span>
</mat-option>
} }
</mat-autocomplete> } @else {
{{item.uname}}
}
</mat-option>
}
</mat-autocomplete>
</div> </div>

30
src/app/login/login.component.html
View File

@@ -1,16 +1,18 @@
<mat-card> <mat-card>
<mat-card-content> <mat-card-content>
<form [formGroup]="form"> <form [formGroup]="form">
<mat-form-field appearance="outline"> <mat-form-field appearance="outline">
<mat-label>Login</mat-label> <mat-label>Login</mat-label>
<input type="text" matInput formControlName="uname"> <input type="text" matInput formControlName="uname">
</mat-form-field> </mat-form-field>
<mat-form-field appearance="outline"> <mat-form-field appearance="outline">
<mat-label>Hasło</mat-label> <mat-label>Hasło</mat-label>
<input type="password" matInput formControlName="pass"> <input type="password" matInput formControlName="pass">
</mat-form-field> </mat-form-field>
<button mat-stroked-button color="primary" (click)="submit()">Zaloguj</button> <button mat-stroked-button color="primary" (click)="submit()">Zaloguj</button>
<p *ngIf="error" style="color: red;">{{error}}</p> @if (error) {
</form> <p style="color: red;">{{error}}</p>
</mat-card-content> }
</form>
</mat-card-content>
</mat-card> </mat-card>

2
tsconfig.json
View File

@@ -14,7 +14,7 @@
"sourceMap": true, "sourceMap": true,
"declaration": false, "declaration": false,
"experimentalDecorators": true, "experimentalDecorators": true,
"moduleResolution": "node", "moduleResolution": "bundler",
"importHelpers": true, "importHelpers": true,
"target": "ES2022", "target": "ES2022",
"module": "ES2022", "module": "ES2022",