Revize 1d169f6d

Re#7527 SnackBar opens if the error occurs

webapp/src/app/employees/employees-list.component.html

@@ -1 +1 @@
 <div class="employee-component">
-  <h3> <span class="align-baseline">Zaměstnanci</span>
+  <div>
+    <span class="align-baseline" style="font-size: x-large">Zaměstnanci</span>
 
     <button
       id="settings-button"
@@ -19 +20 @@
       (change)="uploadXlsxFile(fileInput.files); fileInput.value = null;"
     />
 
-    <label for="input-file" class="btn btn-primary align-baseline">Import</label>
-    <button class="btn btn-danger align-baseline" (click)="downloadPdf()">
+    <label for="input-file" class="btn btn-primary " style="margin-right: 5px">Import</label>
+    <label class="btn btn-danger" (click)="downloadPdf()">
       Export
-    </button>
+    </label>
 
-  </h3>
+  </div>
 
   <table class="table text-center table-hover">
     <thead class="thead-light">

webapp/src/app/employees/employees-list.component.sass

@@ -28 +28 @@
 
 
 .input-file
-  width: 0.1px
-  height: 0.1px
-  opacity: 0
-  overflow: hidden
-  position: absolute
-  z-index: -1
+  display: none
+
 

webapp/src/app/employees/employees-list.component.ts

@@ -58 +58 @@
     // https://stackoverflow.com/a/52687792/6204336
     this.fileService.getExportedPdf()
       .subscribe((data: any) => {
-        console.log(data);
-        const blob = new Blob([data], {type: 'application/pdf'});
-        const link = window.URL.createObjectURL(blob);
-        const linkElement = document.createElement('a');
-        linkElement.href = link;
-        linkElement.download = 'super.pdf';
-        linkElement.click();
-      });
+          console.log(data);
+          const blob = new Blob([data], {type: 'application/pdf'});
+          const link = window.URL.createObjectURL(blob);
+          const linkElement = document.createElement('a');
+          linkElement.href = link;
+          linkElement.download = 'dochazka.pdf';
+          linkElement.click();
+        },
+        error1 => this.showSnackBarError(error1, 'Export PDF souboru se nezdařil'));
   }
 
   /**
@@ -75 +76 @@
    */
   uploadXlsxFile(files: FileList): void {
     this.fileService.uploadXlsFile(files)
-      .subscribe(() => this.snackBar.open('Import souboru se provedl', 'Zavřít', {duration: 5000}));
+      .subscribe(() => this.snackBar.open('Import souboru se provedl', 'Zavřít', {duration: 5000}),
+        error1 => this.showSnackBarError(error1, 'Import soubor se nezdařil')
+      );
   }
 
   /**
@@ -87 +90 @@
   openEditUserDialog(user: User): void {
     this.userService.getUserProfile(user.id)
       .subscribe((userProfile: UserProfile) => {
-        const dialogRef = this.dialog.open(EditEmployeeDialogComponent, {
-          data: userProfile,
-        });
-
-        dialogRef.componentInstance.postUserSettings.subscribe((emittedData) => {
-          this.userService.putUserSettings(emittedData)
-            .subscribe(() => this.snackBar.open('Povedlo se', 'Zavrit', {duration: 5000}));
-        });
-      });
+          const dialogRef = this.dialog.open(EditEmployeeDialogComponent, {
+            data: userProfile,
+          });
+
+          dialogRef.componentInstance.postUserSettings.subscribe((emittedData) => {
+            this.userService.putUserSettings(emittedData)
+              .subscribe(() => this.snackBar.open('Povedlo se', 'Zavrit', {duration: 5000}));
+          });
+        },
+        error1 => this.showSnackBarError(error1, 'Komunikace se serverem se nezdařila')
+      );
   }
 
   openDefaultSettingsDialog(): void {
     this.settingsService.getDefaultSettingsWithLanguage(Languages.CZECH)
       .subscribe((settingsData: Settings) => {
-        const parsedDate = new Date(settingsData.notification);
+          const parsedDate = new Date(settingsData.notification);
 
-        const parsedSettings = {
-          notificationDate: new Date(parsedDate.getFullYear(), parsedDate.getMonth(), parsedDate.getDate()),
-          notificationTime: parsedDate.getHours() + ':' + parsedDate.getMinutes(),
-          sickdaysCount: settingsData.sickdayCount
-        };
+          const parsedSettings = {
+            notificationDate: new Date(parsedDate.getFullYear(), parsedDate.getMonth(), parsedDate.getDate()),
+            notificationTime: parsedDate.getHours() + ':' + parsedDate.getMinutes(),
+            sickdaysCount: settingsData.sickdayCount
+          };
 
-        this.dialog.open(DefaultSettingsDialogComponent, {
+          this.dialog.open(DefaultSettingsDialogComponent, {
             data: parsedSettings,
             width: '300px'
           })
-          .afterClosed().subscribe(data => {
+            .afterClosed().subscribe(data => {
             if (data && data.isConfirmed) {
               this.settingsService.postDefaultSettingsWithLanguage(this.toSettings(data), this.localizationService.getCurrentLanguage())
                 .subscribe((foo: any) => console.log(foo));
             }
           });
-      });
+        },
+        error1 => this.showSnackBarError(error1, 'Komunikace se serverem se nezdařila'));
   }
 
   private toSettings(data): Settings {
@@ -197 +203 @@
     return dayInfo;
   }
 
+  private showSnackBarError(error1, message: string) {
+    console.log(error1);
+    this.snackBar.open(message, 'Zavřít', {duration: 5000});
+  }
+
   ngOnInit() {
     this.usersService.getAuthorizedUsers()
       .subscribe((data: UserBasicInformation[]) => {
-        this._employeesBasicInformation = data;
-        this.mapUsers();
-      });
-
-    // const calendar: PostCalendar = { date: '1999/10/10', from: '15:00', to: '17:00', type: VacationType.VACATION };
-    // this.userService.postCalendar(calendar)
-    //   .subscribe((data: any) => console.log(data));
-
-    // const settings: UserSettings = {
-    //   id: 1,
-    //   role: UserType.EMPLOYEE,
-    //   sickdayCount: 1,
-    //   vacationCount: 1,
-    // };
-    //
-    // this.userService.putUserSettings(settings)
-    //   .subscribe((data: any) => console.log(data));
-
+          this._employeesBasicInformation = data;
+          this.mapUsers();
+        },
+        error1 => this.showSnackBarError(error1, 'Komunikace se serverem se nezdařila'));
   }
 
 }

webapp/src/app/services/api/basic.service.ts

@@ -2 +2 @@
 import {HttpClient, HttpErrorResponse, HttpParams} from '@angular/common/http';
 import {throwError} from 'rxjs';
 import {environment} from '../../../environments/environment';
+import {MatSnackBar} from '@angular/material';
 
 @Injectable({
   providedIn: 'root'
@@ -9 +10 @@
 export class BasicService {
   protected baseUrl = environment.apiUrl;
 
-  constructor(protected http: HttpClient) { }
+  constructor(protected http: HttpClient, protected snackBar: MatSnackBar) { }
 
   protected handleError(error: HttpErrorResponse) {
     if (error.error instanceof ErrorEvent) {
@@ -19 +20 @@
         `Backend returned code ${error.status}, ` +
         `body was: ${error.error}`);
     }
+
+    this.snackBar.open('Komunikace se serverem se nezdařila', 'Zavřít');
     return throwError(
       'Something bad happened; please try again later.');
   }

webapp/src/app/services/api/file.service.ts

@@ -3 +3 @@
 import {BasicService} from './basic.service';
 import {catchError} from 'rxjs/operators';
 import {Languages} from '../../enums/common.enum';
+import {MatSnackBar} from '@angular/material';
 
 @Injectable({
   providedIn: 'root'
 })
 export class FileService extends BasicService {
 
-  constructor(protected http: HttpClient) {
-    super(http);
+  constructor(protected http: HttpClient, protected snackBar: MatSnackBar) {
+    super(http, snackBar);
   }
 
   /**
@@ -75 +76 @@
     if (fileCount > 0) {
 
       formData.append('file', file.item(0));
-      console.log('posilam data');
       return this.http.post(this.baseUrl + '/api/import/xls', formData, options);
     }
   }

webapp/src/app/services/api/settings.service.ts

@@ -5 +5 @@
 import { BasicService } from './basic.service';
 import { Settings } from '../../models/settings.model';
 import {Languages} from '../../enums/common.enum';
+import {MatSnackBar} from '@angular/material';
 
 @Injectable({
   providedIn: 'root'
@@ -12 +13 @@
 export class SettingsService extends BasicService {
   defaultSettingsUrl = this.baseUrl + '/api/settings';
 
-  constructor(protected http: HttpClient) {
-    super(http);
+  constructor(protected http: HttpClient, protected snackBar: MatSnackBar) {
+    super(http, snackBar);
   }
 
   /**

webapp/src/app/services/api/user.service.ts

@@ -8 +8 @@
 import {UserSettings} from '../../models/settings.model';
 import {UserProfile} from '../../models/user.model';
 import {UserRequest} from '../../models/requests.model';
+import {MatSnackBar} from '@angular/material';
 
 @Injectable({
   providedIn: 'root'
@@ -15 +16 @@
 export class UserService extends BasicService { // dost podobny k usersService, mozna zmenit v rest api
   private _userUrl = this.baseUrl + '/api/user/';
 
-  constructor(protected http: HttpClient) {
-    super(http);
+  constructor(protected http: HttpClient, protected snackBar: MatSnackBar) {
+    super(http, snackBar);
   }
 
   /**

webapp/src/app/services/api/users.service.ts

@@ -7 +7 @@
 import {Languages, ProfileStatus} from '../../enums/common.enum';
 import {Observable} from 'rxjs';
 import {UserBasicInformation} from '../../models/user.model';
+import {MatSnackBar} from '@angular/material';
 
 @Injectable({
   providedIn: 'root'
@@ -14 +15 @@
 export class UsersService extends BasicService {
   private _usersUrl = this.baseUrl + '/api/users';
 
-  constructor(protected http: HttpClient) {
-    super(http);
+  constructor(protected http: HttpClient, protected snackBar: MatSnackBar) {
+    super(http, snackBar);
   }
 
   /**