zenon/web-application-engineering
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Marco Zeisler 2021-05-03 18:38:55 +02:00
commit dd4eff842c
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/app/component/einstellungen/editieren/editieren.component.html
View File

@ -14,11 +14,17 @@
<mat-form-field appearance="standard" class="input"> <mat-form-field appearance="standard" class="input">
<mat-label>Gesuchte Stichworte</mat-label> <mat-label>Gesuchte Stichworte</mat-label>
<input matInput formControlName="keywords" placeholder="Spiel,Spaß,Schokolade" required> <input matInput formControlName="keywords" placeholder="Spiel,Spaß,Schokolade" required>
<mat-error *ngIf="feedForm.get('keywords').hasError('invalidKeywords')">Maximal 3 Wörter und jedes Wort mindestens 3 Zeichen</mat-error> <mat-error *ngIf="feedForm.get('keywords').hasError('invalidKeywords')">Maximal 3 Wörter und jedes Wort
mindestens 3 Zeichen
</mat-error>
</mat-form-field> </mat-form-field>
<mat-checkbox formControlName="match_all_keywords">Alle Stichworte müssen enthalten sein</mat-checkbox> <mat-checkbox formControlName="match_all_keywords">Alle Stichworte müssen enthalten sein</mat-checkbox>
</div> </div>
<div class="input-row text-left"> <div class="row" style="padding: 10px 0">
<div class="col-auto" *ngIf="this.id">
<img class="feed-icon" src="{{this.icon}}" alt="Feed-Icon">
</div>
<div class="col">
<mat-form-field class="col"> <mat-form-field class="col">
<ngx-mat-file-input accept=".png,.svg" formControlName="icon" placeholder="Optionales Icon" <ngx-mat-file-input accept=".png,.svg" formControlName="icon" placeholder="Optionales Icon"
></ngx-mat-file-input> ></ngx-mat-file-input>
@ -30,6 +36,7 @@
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
</div>
<div class="input-row text-left"> <div class="input-row text-left">
<mat-slide-toggle color="primary" formControlName="active">Feed als aktiv markieren</mat-slide-toggle> <mat-slide-toggle color="primary" formControlName="active">Feed als aktiv markieren</mat-slide-toggle>
</div> </div>

1
frontend/src/app/component/einstellungen/editieren/editieren.component.ts
View File

@ -59,6 +59,7 @@ export class EditierenComponent implements OnInit {
(data: any) => { (data: any) => {
this.url = data.url; this.url = data.url;
this.active = data.active; this.active = data.active;
this.icon = data.icon;
this.keywords = data.keywords; this.keywords = data.keywords;
this.match_all_keywords = data.match_all_keywords; this.match_all_keywords = data.match_all_keywords;
this.feedForm.patchValue({ this.feedForm.patchValue({