-
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.
* update info text / add link to help text * improve date picker * implement #135
- Loading branch information
Showing
3 changed files
with
76 additions
and
65 deletions.
There are no files selected for viewing
47 changes: 30 additions & 17 deletions
47
frontend/src/app/application/_dialoges/meal-prepare/meal-prepare.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 |
---|---|---|
@@ -1,34 +1,47 @@ | ||
<h3>Mahlzeit an einem anderen Tag vorbereiten</h3> | ||
|
||
<div class="infos"> | ||
<p class="info">Mahlzeiten können an einem anderen Tag vorbereitet werden.<br /> | ||
Die Zutaten werden in diesem Fall bereits am Tag der Vorbereitung aufgeführt. | ||
<div class="mat-dialog-content"> | ||
<p>Gewisse Mahlzeiten müssen bereits am Vortag vorbereitet werden. In diesem Fall werden die Zutaten bereits am Tag | ||
der Vorbereitung in der Tageseinkaufsliste aufgeführt. Mahlzeiten können nur an Tagen vorbereitet werden, die auch | ||
in deiner Woche-Übersicht enthalten sind | ||
(<a (click)="helpService.openHelpPopup('mahlzeit-vorbereiten')">mehr Erfahren</a>). | ||
</p> | ||
|
||
<p *ngIf="prepareForm.value.hasPrepareDate">Die Mahlzeit wird am | ||
{{swissDateAdapter.format(prepareForm.value.prepareDate)}} vorbereitet. | ||
<br> | ||
|
||
<p *ngIf="prepareForm.value.hasPrepareDate"> | ||
<b>Vorbereiten: </b>Diese Mahlzeit ({{data.specificMeal.weekTitle}}) wird vorbereitet. | ||
</p> | ||
<p *ngIf="!prepareForm.value.hasPrepareDate"> | ||
<b>Vorbereiten: </b>Diese Mahlzeit ({{data.specificMeal.weekTitle}}) muss nicht vorbereitet werden. | ||
</p> | ||
<p *ngIf="!prepareForm.value.hasPrepareDate">Die Mahlzeit muss nicht vorbereitet werden.</p> | ||
|
||
<form [formGroup]="prepareForm"> | ||
|
||
<mat-checkbox formControlName="hasPrepareDate" class="checkbox"> | ||
Mahlzeit an einem anderen Tag vorbereiten. | ||
<mat-checkbox formControlName="hasPrepareDate" class="checkbox full-width"> | ||
Mahlzeit an einem anderen Tag vorbereiten | ||
<ng-container *ngIf="dayBeforeDate == undefined">(Diese Mahlzeit kann nicht vorbereitet werden).</ng-container> | ||
</mat-checkbox> | ||
|
||
<mat-form-field class="full-width" *ngIf="prepareForm.value.hasPrepareDate"> | ||
<input matInput [matDatepicker]="picker" [matDatepickerFilter]="dateFilter" placeholder="Vorbereitungsdatum" | ||
formControlName="prepareDate"> | ||
<mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle> | ||
<mat-datepicker #picker></mat-datepicker> | ||
</mat-form-field> | ||
<ng-container *ngIf="prepareForm.value.hasPrepareDate"> | ||
<mat-form-field class="date-picker"> | ||
<input matInput [matDatepicker]="matDatePicker" [matDatepickerFilter]="dateFilter" | ||
placeholder="Vorbereitungsdatum" (click)="matDatePicker.open()" | ||
formControlName="prepareDate"> | ||
<mat-datepicker-toggle matSuffix [for]="matDatePicker"></mat-datepicker-toggle> | ||
<mat-datepicker #matDatePicker></mat-datepicker> | ||
</mat-form-field> | ||
</ng-container> | ||
|
||
</form> | ||
|
||
</div> | ||
|
||
<div mat-dialog-actions class="custom-mat-buttons"> | ||
<p></p> | ||
<button mat-stroked-button [mat-dialog-close]="null"> Abbrechen </button> | ||
<button mat-raised-button [mat-dialog-close]="returnsSpecificMeal()" [disabled]="valueHasNotChanged" color="save">Speichern</button> | ||
<p><a (click)="helpService.openHelpPopup('mahlzeit-vorbereiten')">Hilfe zum Vorbereiten</a></p> | ||
<button mat-stroked-button [mat-dialog-close]="null"> Abbrechen</button> | ||
<button mat-raised-button [mat-dialog-close]="returnsSpecificMeal()" | ||
[disabled]="dataHasNotChanged || !prepareForm.valid" color="save"> | ||
Speichern | ||
</button> | ||
</div> |
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