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

Implement updating of feeds

Browse Source
This commit is contained in:
Tobias Eidelpes 2021-05-03 12:07:06 +02:00
parent 28749401e3
commit 5b69354737
2 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,13 +6,13 @@
<div class=" input-row"> <div class=" input-row">
<mat-form-field appearance="standard" class="input"> <mat-form-field appearance="standard" class="input">
<mat-label>Vollständige URL des RSS-Feeds</mat-label> <mat-label>Vollständige URL des RSS-Feeds</mat-label>
<input matInput formControlName="url" placeholder="https://rss.orf.at/news.xml"> <input matInput formControlName="url" placeholder="https://rss.orf.at/news.xml" required>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="input-row text-left"> <div class="input-row text-left">
<mat-form-field appearance="standard" class="input"> <mat-form-field appearance="standard" class="input">
<mat-label>Gesuchte Stichwörter</mat-label> <mat-label>Gesuchte Stichwörter</mat-label>
<input matInput formControlName="keywords" placeholder="Spiel,Spaß,Schokolade"> <input matInput formControlName="keywords" placeholder="Spiel,Spaß,Schokolade" required>
</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>
@ -29,11 +29,11 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div class="input-row text-left"> <div class="input-row text-left">
<mat-slide-toggle color="primary" formControlName="active">Slide me!</mat-slide-toggle> <mat-slide-toggle color="primary" formControlName="active">Feed als aktiv markieren</mat-slide-toggle>
</div> </div>
<div class="input-row margin-auto einstellungen_buttons_wrapper"> <div class="input-row margin-auto einstellungen_buttons_wrapper">
<button routerLink="/einstellungen" mat-raised-button>Abbrechen</button> <button routerLink="/einstellungen" mat-raised-button>Abbrechen</button>
<button mat-raised-button (click)="saveFeed(feedForm.value)"> <button mat-raised-button (click)="saveFeed(feedForm.value)" [disabled]="feedForm.invalid">
<mat-icon>save</mat-icon> <mat-icon>save</mat-icon>
Speichern Speichern
</button> </button>

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

@ -51,13 +51,26 @@ export class EditierenComponent implements OnInit {
} }
loadFeed(id) { loadFeed(id) {
// TODO: direkt vor laden alle inputs deaktivieren (od hiden) und erst nach fertigem laden wieder entsperren this.http.get('http://127.0.0.1:8000/feeds/' + id + '/').subscribe(
// TODO: load feed from backend and fill (data: any) => {
console.log('TODO: Load feed settings with id ' + id); this._logger.debug('Data: ' + JSON.stringify(data));
this.url = data.url;
this.active = data.active;
this.keywords = data.keywords;
this.match_all_keywords = data.match_all_keywords;
this.feedForm.patchValue({
url: data.url,
active: data.active,
keywords: data.keywords,
match_all_keywords: data.match_all_keywords
});
this._logger.debug('Icon in loadFeed' + this.icon);
},
err => this._logger.error(err),
() => this._logger.debug('Loaded feed with ID ' + id)
);
} }
// TODO: bei Input-Words die Leerzeichen vor- und nach dem letzten Zeichen entfernen: " Formel 1 " wird zu "Formel 1"
saveFeed(feedData) { saveFeed(feedData) {
const form: FormData = new FormData(); const form: FormData = new FormData();
form.append('url', feedData.url); form.append('url', feedData.url);
@ -70,14 +83,26 @@ export class EditierenComponent implements OnInit {
if (feedData.icon != null) { if (feedData.icon != null) {
form.append('icon', feedData.icon._files['0']); form.append('icon', feedData.icon._files['0']);
} }
this.http.post('http://127.0.0.1:8000/feeds/', form).subscribe( if (this.id == null) {
() => { this.http.post('http://127.0.0.1:8000/feeds/', form).subscribe(
this._snackbar.open('Feed erfolgreich gespeichert!', 'Schließen', {duration: 3000}); () => {
}, this._snackbar.open('Feed erfolgreich gespeichert!', 'Schließen', {duration: 3000});
err => { },
this._logger.error(err); err => {
return throwError(err); this._logger.error(err);
} return throwError(err);
); }
);
} else {
this.http.put('http://127.0.0.1:8000/feeds/' + this.id + '/', form).subscribe(
() => {
this._snackbar.open('Feed erfolgreich gespeichert!', 'Schließen', {duration: 3000});
},
err => {
this._logger.error(err);
return throwError(err);
}
);
}
} }
} }