From d23ba6e2978f6d87e98506878c59ea8ba5d3f590 Mon Sep 17 00:00:00 2001 From: FlayInAHook Date: Wed, 16 Dec 2020 15:16:27 +0100 Subject: [PATCH 1/2] fixed um paginator --- .../admin-data-page/admin-data-page.component.html | 4 ++-- .../admin-data-page/admin-data-page.component.ts | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/app/components/admin-data-page/admin-data-page.component.html b/src/app/components/admin-data-page/admin-data-page.component.html index d8166e9..1a5e3b6 100644 --- a/src/app/components/admin-data-page/admin-data-page.component.html +++ b/src/app/components/admin-data-page/admin-data-page.component.html @@ -62,11 +62,11 @@ + > diff --git a/src/app/components/admin-data-page/admin-data-page.component.ts b/src/app/components/admin-data-page/admin-data-page.component.ts index 49f650c..13fb26a 100644 --- a/src/app/components/admin-data-page/admin-data-page.component.ts +++ b/src/app/components/admin-data-page/admin-data-page.component.ts @@ -162,8 +162,13 @@ export class AdminDataPageComponent implements OnInit { } afterLoad(){ - this.dataSource.paginator = this.paginator; - this.dataSource.sort = this.sort; + + setTimeout(() => { + this.dataSource.paginator = this.paginator; + this.dataSource.sort = this.sort; + }, ); + + //this.refreshTable(); } orderData(id: string, start?: "asc" | "desc") { From e6133c009cc0db1084aebb9e97635acb8baf8d62 Mon Sep 17 00:00:00 2001 From: FlayInAHook Date: Wed, 16 Dec 2020 16:02:18 +0100 Subject: [PATCH 2/2] implemented json downlpad --- package-lock.json | 5 +++ package.json | 1 + .../admin-data-page.component.html | 8 +++++ .../admin-data-page.component.scss | 5 +++ .../admin-data-page.component.ts | 33 +++++++++++++++++-- src/app/services/actionLog.service.ts | 2 +- src/app/services/download.service.ts | 32 ++++++++++++++++++ 7 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 src/app/services/download.service.ts diff --git a/package-lock.json b/package-lock.json index c50ca67..0c4f083 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8596,6 +8596,11 @@ } } }, + "file-saver": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", diff --git a/package.json b/package.json index 55fdb80..53a6bec 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "apollo-angular": "^2.1.0", "apollo-angular-link-http": "^1.11.0", "apollo-link-http": "^1.5.17", + "file-saver": "^2.0.5", "graphql": "^15.4.0", "graphql-anywhere": "^4.2.7", "rxjs": "~6.5.5", diff --git a/src/app/components/admin-data-page/admin-data-page.component.html b/src/app/components/admin-data-page/admin-data-page.component.html index 1a5e3b6..7747954 100644 --- a/src/app/components/admin-data-page/admin-data-page.component.html +++ b/src/app/components/admin-data-page/admin-data-page.component.html @@ -55,6 +55,10 @@ + + @@ -68,6 +72,10 @@ [pageSizeOptions]="[5, 10, 25, 100]" > + diff --git a/src/app/components/admin-data-page/admin-data-page.component.scss b/src/app/components/admin-data-page/admin-data-page.component.scss index 0b00caa..1fd7319 100644 --- a/src/app/components/admin-data-page/admin-data-page.component.scss +++ b/src/app/components/admin-data-page/admin-data-page.component.scss @@ -45,3 +45,8 @@ .filterfield { margin-left: 1.5rem; } + +#actionLogDownload { + float: right; + right: 3.5rem; +} \ No newline at end of file diff --git a/src/app/components/admin-data-page/admin-data-page.component.ts b/src/app/components/admin-data-page/admin-data-page.component.ts index 13fb26a..078e56d 100644 --- a/src/app/components/admin-data-page/admin-data-page.component.ts +++ b/src/app/components/admin-data-page/admin-data-page.component.ts @@ -25,6 +25,9 @@ import {EditDialogComponent} from '../../components/dialogs/edit/edit.dialog.com import {deepCopy} from '../../helperFunctions/deepCopy'; import { SnackBarService } from 'src/app/services/snackbar.service'; import { AuthService } from 'src/app/services/auth.service'; +import { DownloadService } from 'src/app/services/download.service'; +import { ActionLogService } from 'src/app/services/actionLog.service'; +import { DomSanitizer, SafeUrl } from '@angular/platform-browser'; @Component({ selector: 'app-admin-data-page', @@ -40,13 +43,17 @@ export class AdminDataPageComponent implements OnInit { id: number; roles; isLoaded : boolean = false; + downloadJsonHref; constructor(public httpClient: HttpClient, public dialog: MatDialog, private userService: UserService, private roleService: RoleService, - private snackBarSerivice: SnackBarService, - private authService: AuthService) {} + private snackBarService: SnackBarService, + private authService: AuthService, + private sanitizer: DomSanitizer, + private downloadService: DownloadService, + private actionLogService : ActionLogService) {} @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator; @ViewChild(MatSort, {static: true}) sort: MatSort; @@ -105,7 +112,7 @@ export class AdminDataPageComponent implements OnInit { deleteItem(user : User) { if (user.id === this.authService.getCurrentUserValue.user.id){ - this.snackBarSerivice.openSnackBar("Du kannst dich nciht selbst löschen","Ok Im an Idiot", true); + this.snackBarService.openSnackBar("Du kannst dich nicht selbst löschen","Ok Im an Idiot", true); return; } const dialogRef = this.dialog.open(DeleteDialogComponent, { @@ -161,6 +168,8 @@ export class AdminDataPageComponent implements OnInit { } + + afterLoad(){ setTimeout(() => { @@ -180,6 +189,24 @@ export class AdminDataPageComponent implements OnInit { this.dataSource.sort = this.sort; } + + donwloadLog(user?: User){ + if (user === undefined){ + this.actionLogService.getActionLogAll().pipe(first()) + .subscribe( + data => { + this.downloadService.exportJSONFile(data, "actionLog_global"); + }, + ); + } else { + this.actionLogService.getActionLogByUserId({id : "" + user.id}).pipe(first()) + .subscribe( + data => { + this.downloadService.exportJSONFile(data, "actionLog_" + user.email); + }, + ); + } + } } diff --git a/src/app/services/actionLog.service.ts b/src/app/services/actionLog.service.ts index 9c22d42..077a2e6 100644 --- a/src/app/services/actionLog.service.ts +++ b/src/app/services/actionLog.service.ts @@ -9,7 +9,7 @@ import { @Injectable({ providedIn: 'root', }) -export class PersonsService { +export class ActionLogService { constructor( private getActionLogGQL: GetActionLogGQL, private getActionLogByUserIdGQL: GetActionLogByUserIdGQL diff --git a/src/app/services/download.service.ts b/src/app/services/download.service.ts new file mode 100644 index 0000000..6188018 --- /dev/null +++ b/src/app/services/download.service.ts @@ -0,0 +1,32 @@ +import { Injectable } from "@angular/core"; +import * as FileSaver from 'file-saver'; + +const EXCEL_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8'; +const JSON_TYPE = 'data:text/json;charset=UTF-8'; + +const EXCEL_EXTENSION = '.xlsx'; +const JSON_EXTENSION = '.json'; + + +@Injectable({ providedIn: "root" }) +export class DownloadService { + csvChar: string = ";"; + + + /*public exportAsExcelFile(json: any[], excelFileName: string, sheetName: string): void { + const worksheet: XLSX.WorkSheet = XLSX.utils.json_to_sheet(json); + const workbook: XLSX.WorkBook = { Sheets: { [sheetName] : worksheet }, SheetNames: [sheetName] }; + const excelBuffer: any = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' }); + this.saveAsExcelFile(excelBuffer, excelFileName); + }*/ + + private saveAsExcelFile(buffer: any, fileName: string): void { + const data: Blob = new Blob([buffer], {type: EXCEL_TYPE}); + FileSaver.saveAs(data, fileName + '_export_' + new Date().getTime() + EXCEL_EXTENSION); + } + + public exportJSONFile(json: any, fileName: string){ + const data: Blob = new Blob([JSON.stringify(json, null, 2)], {type: JSON_TYPE}); + FileSaver.saveAs(data, fileName + '_export_' + new Date().getTime() + JSON_EXTENSION); + } +}