Revize 5d32cbea

Error and information messages modified - correct error messages from backend are displayed and information messages are translated

webapp/src/app/add-vacation-dialog/add-vacation-dialog.component.ts

@@ -3 +3 @@
 import {VacationType} from '../enums/common.enum';
 import {FormControl} from '@angular/forms';
 import {DateFormatterService} from '../services/util/date-formatter.service';
+import {TranslateService} from '@ngx-translate/core';
 
 @Component({
   selector: 'app-add-days-off-dialog',
@@ -22 +23 @@
     public dialogRef: MatDialogRef<AddVacationDialogComponent>,
     @Inject(MAT_DIALOG_DATA) public data: AddVacationDialogData,
     private snackBar: MatSnackBar,
-    private dateFormatterService: DateFormatterService
+    private dateFormatterService: DateFormatterService,
+    private translateService: TranslateService
   ) {
     if (this.data.fromTime == null) {
       this.data.fromTime = '08:00';
@@ -36 +38 @@
 
   onConfirmClick(): void {
     if (this.selectedVacationType == null) {
-      this.snackBar.open('Nevybrán typ volna', 'Zavřít', { duration: 5000 });
+      this.translateService.get('error.vacationTypeNotSelected').subscribe((res: string) => {
+        this.snackBar.open(res, 'X', { duration: 5000 });
+      });
     } else {
       let data;
       const formattedDate = this.dateFormatterService.formatDate(this.data.date);

webapp/src/app/add-vacation-dialog/add-vacation-dialog.module.ts

@@ -14 +14 @@
 import {BrowserModule} from '@angular/platform-browser';
 import {SharedModule} from '../shared/shared.module';
 import {NgxMaterialTimepickerModule} from 'ngx-material-timepicker';
-import {TranslateModule} from "@ngx-translate/core";
+import {TranslateModule} from '@ngx-translate/core';
 
 
 @NgModule({

webapp/src/app/employees/default-settings-dialog/default-settings-dialog.component.ts

@@ -1 +1 @@
 import {Component, Inject} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef, MatSnackBar} from '@angular/material';
+import {TranslateService} from '@ngx-translate/core';
 
 @Component({
   selector: 'app-default-settings',
@@ -13 +14 @@
     public dialogRef: MatDialogRef<DefaultSettingsDialogComponent>,
     @Inject(MAT_DIALOG_DATA) public data: DefaultSettingsDialogData,
     private snackBar: MatSnackBar,
+    private translateService: TranslateService
   ) {
   }
 
@@ -26 +28 @@
         }
       );
     } else {
-      this.snackBar.open('Nevyplněny všechny potřebné položky');
+      this.translateService.get('error.missingField').subscribe((res: string) => {
+        this.snackBar.open(res, 'X', { duration: 5000 });
+      });
     }
   }
 

webapp/src/app/employees/edit-employee-dialog/edit-employee-dialog.component.ts

@@ -3 +3 @@
 import {UserType} from '../../enums/common.enum';
 import {UserProfile} from '../../models/user.model';
 import {UserSettings} from '../../models/settings.model';
+import {TranslateService} from '@ngx-translate/core';
 
 
 @Component({
@@ -21 +22 @@
 
   constructor(public dialogRef: MatDialogRef<EditEmployeeDialogComponent>,
               @Inject(MAT_DIALOG_DATA) public data: UserProfile,
-              private snackBar: MatSnackBar) {
+              private snackBar: MatSnackBar,
+              private translateService: TranslateService
+  ) {
     this._sickDaysCount = data.sickDayCount;
     this._addVacationHoursCount = 0;
     this._userType = data.role;
@@ -33 +36 @@
 
   onConfirmClick(): void {
     if (this._sickDaysCount == null || this._addVacationHoursCount == null || this._userType == null) {
-      this.snackBar.open('Vyplňte prosím všechny údaje', 'Zavřít');
+      this.translateService.get('error.missingField').subscribe((res: string) => {
+        this.snackBar.open(res, 'X', { duration: 5000 });
+      });
     } else {
       this.postUserSettings.emit({
         id: this._userId,

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

@@ -14 +14 @@
 import {FileService} from '../services/api/file.service';
 import {ProfileService} from '../services/util/profile.service';
 import {UserProfileDialogComponent} from './user-profile/user-profile-dialog.component';
+import {TranslateService} from '@ngx-translate/core';
 
 const daysOfWeek: string[] = [
   'dayShortName.mon',
@@ -48 +49 @@
     private fileService: FileService,
     private profileService: ProfileService,
     public dialog: MatDialog,
-    private snackBar: MatSnackBar) {
+    private snackBar: MatSnackBar,
+    private translateService: TranslateService
+  ) {
     this.generateDays();
     this.generateDates();
     this.editDates();
@@ -70 +73 @@
           linkElement.href = link;
           linkElement.download = 'dochazka.pdf';
           linkElement.click();
-        },
-        error1 => this.showSnackBarError(error1, 'Export PDF souboru se nezdařil'));
+        });
   }
 
   /**
@@ -81 +83 @@
    */
   uploadXlsxFile(files: FileList): void {
     this.fileService.uploadXlsFile(files)
-      .subscribe(() => this.snackBar.open('Import souboru se provedl', 'Zavřít', {duration: 5000}),
-        error1 => this.showSnackBarError(error1, 'Import soubor se nezdařil')
-      );
+      .subscribe(() => {
+        this.translateService.get('infoMessage.importSuccessful').subscribe((res: string) => {
+          this.snackBar.open(res, 'X', { duration: 5000 });
+        });
+      });
   }
 
   openUserProfile(user: User): void {
@@ -110 +114 @@
 
           dialogRef.componentInstance.postUserSettings.subscribe((emittedData) => {
             this.userService.putUserSettings(emittedData)
-              .subscribe(() => this.snackBar.open('Povedlo se', 'Zavrit', {duration: 5000}));
+              .subscribe();
           });
-        },
-        error1 => this.showSnackBarError(error1, 'Komunikace se serverem se nezdařila')
+        }
       );
   }
 
@@ -138 +141 @@
                 .subscribe();
             }
           });
-        },
-        error1 => this.showSnackBarError(error1, 'Komunikace se serverem se nezdařila'));
+        });
   }
 
   private toSettings(data): Settings {
@@ -217 +219 @@
     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();
-        },
-        error1 => this.showSnackBarError(error1, 'Komunikace se serverem se nezdařila'));
+        });
   }
 
 }

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

@@ -3 +3 @@
 import {throwError} from 'rxjs';
 import {environment} from '../../../environments/environment';
 import {MatSnackBar} from '@angular/material';
-
+import {TranslateService} from '@ngx-translate/core';
 @Injectable({
   providedIn: 'root'
 })
 export class BasicService {
   protected baseUrl = environment.apiUrl;
 
-  constructor(protected http: HttpClient, protected snackBar: MatSnackBar) { }
+  constructor(protected http: HttpClient, protected snackBar: MatSnackBar, protected translateService: TranslateService) { }
 
   protected handleError(error: HttpErrorResponse) {
-    if (error.error instanceof ErrorEvent) {
-      console.error('An error occurred:', error.error.message);
+    let errMsg;
+    if (!error.error.error) {
+      this.translateService.get('error.serverCommunication').subscribe((res: string) => {
+        errMsg = res;
+      });
     } else {
-      console.error(
-        `Backend returned code ${error.status}, ` +
-        `body was: ${error.error}`);
+      errMsg = error.error.message;
     }
 
-    this.snackBar.open('Komunikace se serverem se nezdařila', 'Zavřít');
-    return throwError(
-      'Something bad happened; please try again later.');
+    this.snackBar.open(errMsg, 'X');
+
+    return throwError(errMsg);
   }
 
   /**

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

@@ -4 +4 @@
 import {catchError} from 'rxjs/operators';
 import {Languages} from '../../enums/common.enum';
 import {MatSnackBar} from '@angular/material';
+import {TranslateService} from '@ngx-translate/core';
 
 @Injectable({
   providedIn: 'root'
 })
 export class FileService extends BasicService {
 
-  constructor(protected http: HttpClient, protected snackBar: MatSnackBar) {
-    super(http, snackBar);
+  constructor(protected http: HttpClient, protected snackBar: MatSnackBar, protected translateService: TranslateService) {
+    super(http, snackBar, translateService);
   }
 
   /**

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

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

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

@@ -10 +10 @@
 import {UserRequest} from '../../models/requests.model';
 import {MatSnackBar} from '@angular/material';
 import {DateFormatterService} from '../util/date-formatter.service';
+import {TranslateService} from '@ngx-translate/core';
 
 @Injectable({
   providedIn: 'root'
@@ -17 +18 @@
 export class UserService extends BasicService { // dost podobny k usersService, mozna zmenit v rest api
   private _userUrl = this.baseUrl + '/api/user/';
 
-  constructor(protected http: HttpClient, protected snackBar: MatSnackBar, private dateFormater: DateFormatterService) {
-    super(http, snackBar);
+  constructor(protected http: HttpClient, protected snackBar: MatSnackBar, protected translateService: TranslateService, private dateFormater: DateFormatterService) {
+    super(http, snackBar, translateService);
   }
 
   /**

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

@@ -8 +8 @@
 import {Observable} from 'rxjs';
 import {UserBasicInformation} from '../../models/user.model';
 import {MatSnackBar} from '@angular/material';
+import {TranslateService} from '@ngx-translate/core';
 
 @Injectable({
   providedIn: 'root'
@@ -15 +16 @@
 export class UsersService extends BasicService {
   private _usersUrl = this.baseUrl + '/api/users';
 
-  constructor(protected http: HttpClient, protected snackBar: MatSnackBar) {
-    super(http, snackBar);
+  constructor(protected http: HttpClient, protected snackBar: MatSnackBar, protected translateService: TranslateService) {
+    super(http, snackBar, translateService);
   }
 
   /**

webapp/src/assets/i18n/cs.json

@@ -63 +63 @@
     "confirm": "Potvrdit",
     "close": "Zavřít"
   },
+  "infoMessage": {
+    "importSuccessful": "Successfully imported"
+  },
+  "error": {
+    "serverCommunication": "Komunikace se serverem se nezdařila",
+    "vacationTypeNotSelected": "Nevybrán typ volna",
+    "missingField": "Nevyplněny všechny údaje"
+  },
   "ACCEPTED": "Schváleno",
   "AUTHORIZED": "Autorizováno",
   "PENDING": "Čekající",

webapp/src/assets/i18n/en.json

@@ -49 +49 @@
     "to": "To",
     "vacationType": "Type"
   },
-  "dayShortName" : {
+  "dayShortName": {
     "mon": "mon",
     "tue": "tue",
     "wed": "wed",
@@ -62 +62 @@
     "confirm": "Confirm",
     "close": "Close"
   },
+  "infoMessage": {
+    "importSuccessful": "Successfully imported"
+  },
+  "error": {
+    "serverCommunication": "Communication with server failed",
+    "vacationTypeNotSelected": "Vacation type not selected",
+    "missingField": "Not everything is filled in"
+  },
   "ACCEPTED": "Accepted",
   "AUTHORIZED": "Authorized",
   "PENDING": "Pending",