Revize 6496dcfb

Set vacation changed to add vacation

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

@@ -27 +27 @@
       <input
         matInput
         type="number"
-        placeholder="Sickdays"
+        placeholder="{{'editEmployee.setSickdays' | translate}}"
         min="0"
         step="0.5"
         [(ngModel)]="_sickDaysCount"
@@ -41 +41 @@
     <input
       matInput
       type="number"
-      placeholder="{{'basic.vacation' | translate}}"
+      placeholder="{{'editEmployee.addVacation' | translate}}"
       min="0"
       step="0.5"
-      [(ngModel)]="_vacationDaysCount"
+      [(ngModel)]="_addVacationHoursCount"
     >
   </mat-form-field>
 </div>

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

@@ -13 +13 @@
 export class EditEmployeeDialogComponent implements OnInit {
   readonly _userTypes: string[] = ['EMPLOYER', 'EMPLOYEE'];
   private _sickDaysCount: number;
-  private _vacationDaysCount: number;
+  private _addVacationHoursCount: number;
   private _userType: UserType;
   private readonly _userId: number;
+
   @Output() postUserSettings = new EventEmitter<UserSettings>();
 
   constructor(public dialogRef: MatDialogRef<EditEmployeeDialogComponent>,
               @Inject(MAT_DIALOG_DATA) public data: UserProfile,
               private snackBar: MatSnackBar) {
     this._sickDaysCount = data.sickDayCount;
-    this._vacationDaysCount = data.vacationCount;
+    this._addVacationHoursCount = 0;
     this._userType = data.role;
     this._userId = data.id;
   }
@@ -31 +32 @@
   }
 
   onConfirmClick(): void {
-    if (this._sickDaysCount == null || this._vacationDaysCount == null || this._userType == null) {
+    if (this._sickDaysCount == null || this._addVacationHoursCount == null || this._userType == null) {
       this.snackBar.open('Vyplňte prosím všechny údaje', 'Zavřít');
     } else {
       this.postUserSettings.emit({
         id: this._userId,
         role: this._userType,
         sickDayCount: this._sickDaysCount,
-        vacationCount: this._vacationDaysCount
+        vacationCount: this._addVacationHoursCount
       });
 
       this.dialogRef.close();

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

@@ -123 +123 @@
           const parsedSettings = {
             notificationDate: new Date(parsedDate.getFullYear(), parsedDate.getMonth(), parsedDate.getDate()),
             notificationTime: parsedDate.getHours() + ':' + parsedDate.getMinutes(),
-            sickdaysCount: settingsData.sickDayCount
+            sickDayCount: settingsData.sickDayCount
           };
 
           this.dialog.open(DefaultSettingsDialogComponent, {

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

@@ -127 +127 @@
   }
 
   putNotificationSettingsWithLanguage(settings: NotificationSettings, language: Languages) {
-    console.log(settings);
     return this.makePutNotificationSettingsApiCall(settings, language);
   }
   /**
@@ -242 +241 @@
   }
 
   /**
-   * Změna nastavení notifikace uživatele podle id
+   * Změna nastavení notifikace
    * PUT /user/settings?[lang=<CZ,EN>]
    * @param settings notification setting to be set for given user
    * @param language specified language

webapp/src/app/services/util/menu.service.ts

@@ -39 +39 @@
     const menuItems: MenuItem[] = [];
     menuItems.push({name: 'menuItem.dashboard', routePath: 'dashboard'});
     if (profile.role === UserType.EMPLOYER) {
-      menuItems.push({name: 'menuItem.employers', routePath: 'employees'});
+      menuItems.push({name: 'menuItem.employees', routePath: 'employees'});
     }
 
     return menuItems;

webapp/src/assets/i18n/cs.json

@@ -27 +27 @@
   },
   "menuItem": {
     "dashboard": "Dashboard",
-    "employers": "Zaměstnanci"
+    "employees": "Zaměstnanci"
+  },
+  "editEmployee": {
+    "setSickdays": "Nastavení počtu sickdays (dny)",
+    "addVacation": "Přidání dovolené (hodiny)"
   },
   "basic": {
     "name": "Jméno",

webapp/src/assets/i18n/en.json

@@ -27 +27 @@
   },
   "menuItem": {
     "dashboard": "Dashboard",
-    "employers": "Employers"
+    "employees": "Employees"
+  },
+  "editEmployee": {
+    "setSickdays": "Set number of sickdays (days)",
+    "addVacation": "Add vacation (hours)"
   },
   "basic": {
     "name": "Name",