Revize 93fb3695

sickday refactored to sickDay

webapp/src/app/dashboard/employer-dashboard/employer-dashboard.component.html

@@ -39 +39 @@
 
       <div class="days-off-info" *ngIf="profile">
         <app-vacation-info
-          [sickDaysRemaining]="profile.sickdayCount"
+          [sickDaysRemaining]="profile.sickDayCount"
           [extraVacationRemaining]="profile.vacationCount"
         ></app-vacation-info>
       </div>

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

@@ -7 +7 @@
   <div class="sickday-count">
     <label for="sickdays-count-input" class="dialog-label">Počet sickdays:</label>
     <mat-form-field>
-      <input id="sickdays-count-input" type="number" matInput [(ngModel)]="data.sickdaysCount">
+      <input id="sickdays-count-input" type="number" matInput [(ngModel)]="data.sickDayCount">
     </mat-form-field>
   </div>
 </div>

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

@@ -19 +19 @@
     this.dialogRef.close({
       isConfirmed: true,
       notificationDatetime: this.toNotificationDatetime(),
-      sickdayCount: this.data.sickdaysCount
+      sickDayCount: this.data.sickDayCount
     });
   }
 
@@ -46 +46 @@
 export class DefaultSettingsDialogData {
   notificationDate: Date;
   notificationTime: string;
-  sickdaysCount: number;
+  sickDayCount: number;
 }

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

@@ -21 +21 @@
   constructor(public dialogRef: MatDialogRef<EditEmployeeDialogComponent>,
               @Inject(MAT_DIALOG_DATA) public data: UserProfile,
               private snackBar: MatSnackBar) {
-    this._sickDaysCount = data.sickdayCount;
+    this._sickDaysCount = data.sickDayCount;
     this._vacationDaysCount = data.vacationCount;
     this._userType = data.role;
     this._userId = data.id;
@@ -37 +37 @@
       this.postUserSettings.emit({
         id: this._userId,
         role: this._userType,
-        sickdayCount: this._sickDaysCount,
+        sickDayCount: this._sickDaysCount,
         vacationCount: this._vacationDaysCount
       });
 

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
+            sickdaysCount: settingsData.sickDayCount
           };
 
           this.dialog.open(DefaultSettingsDialogComponent, {
@@ -142 +142 @@
 
   private toSettings(data): Settings {
     return {
-      sickdayCount: data.sickdayCount,
+      sickDayCount: data.sickDayCount,
       notification: this.dateFormatterService.formatDatetime(data.notificationDatetime)
     };
   }

webapp/src/app/employees/user-profile/user-profile-dialog.component.html

@@ -12 +12 @@
         <span class="user-name">{{profile.firstName}} {{profile.lastName}}</span>
       </div>
       <app-vacation-info
-        [sickDaysRemaining]="profile.sickdayCount"
+        [sickDaysRemaining]="profile.sickDayCount"
         [extraVacationRemaining]="profile.vacationCount"
       ></app-vacation-info>
     </div>

webapp/src/app/enums/common.enum.ts

@@ -17 +17 @@
 
 export enum VacationType {
   VACATION = 'VACATION',
-  SICKDAY = 'SICKDAY',
+  SICKDAY = 'SICK_DAY',
   NONE = 'NONE',
 }
 

webapp/src/app/models/settings.model.ts

@@ -1 +1 @@
 import {UserType} from '../enums/common.enum';
 
 export interface Settings {
-  sickdayCount: number;
+  sickDayCount: number;
   notification: string;
 }
 
 export interface UserSettings {
   id: number;
   vacationCount: number;
-  sickdayCount: number;
+  sickDayCount: number;
   role: UserType;
 }
 

webapp/src/app/models/user.model.ts

@@ -23 +23 @@
   lastName: string;
   photo: string;
   vacationCount: number;
-  sickdayCount: number;
+  sickDayCount: number;
   status: RequestStatus;
   role: UserType;
   notification: Date;

webapp/src/app/services/tests/settings.service.spec.ts

@@ -23 +23 @@
 
   it('getDefaultSettings', () => {
     const dummyData = {
-      sickdayCount: 3,
+      sickDayCount: 3,
       notification: '2019/05/25 14:41:31'
     };
 
     service.getDefaultSettings().subscribe((data: any) => {
-      expect(data.sickdayCount).toBeDefined();
-      expect(data.sickdayCount).toBe(3);
+      expect(data.sickDayCount).toBeDefined();
+      expect(data.sickDayCount).toBe(3);
       expect(data.notification).toBeDefined();
     });
 
@@ -40 +40 @@
 
   it('getDefaultSettingsWithLanguage', () => {
     const dummyData = {
-      sickdayCount: 3,
+      sickDayCount: 3,
       notification: '2019/05/25 14:41:31'
     };
 
     service.getDefaultSettingsWithLanguage(Languages.ENGLISH).subscribe((data: any) => {
-      expect(data.sickdayCount).toBeDefined();
-      expect(data.sickdayCount).toBe(3);
+      expect(data.sickDayCount).toBeDefined();
+      expect(data.sickDayCount).toBe(3);
       expect(data.notification).toBeDefined();
     });
 
@@ -61 +61 @@
       answer: 'ok',
     };
 
-    service.postDefaultSettings({sickdayCount: 3, notification: '2019/04/25 18:23:36'})
+    service.postDefaultSettings({sickDayCount: 3, notification: '2019/04/25 18:23:36'})
       .subscribe((data: any) => expect(data.answer).toBe('ok'));
 
     const req = httpMock.expectOne(baseUrl + '/api/settings');
@@ -74 +74 @@
       answer: 'ok',
     };
 
-    service.postDefaultSettingsWithLanguage({sickdayCount: 3, notification: '2019/04/25 18:23:36'}, Languages.ENGLISH)
+    service.postDefaultSettingsWithLanguage({sickDayCount: 3, notification: '2019/04/25 18:23:36'}, Languages.ENGLISH)
       .subscribe((data: any) => expect(data.answer).toBe('ok'));
 
     const req = httpMock.expectOne(baseUrl + '/api/settings?lang=EN');

webapp/src/app/services/tests/user.service.spec.ts

@@ -28 +28 @@
       lastName: 'Novak',
       photo: 'https://st2.depositphotos.com/9223672/12056/v/950/depositphotos_120568236-stock-illustration-male-face-avatar-logo-template.jpg',
       vacationCount: 8.5,
-      sickdayCount: 3,
+      sickDayCount: 3,
       status: 'ACCEPTED',
       role: 'EMPLOYER',
       notification: '2000/12/01 09:00:00'
@@ -38 +38 @@
     service.getLoggedUserProfile().subscribe((data: any) => {
       expect(data.id).toBe(1);
       expect(data.vacationCount).toBe(8.5);
-      expect(data.sickdayCount).toBe(3);
+      expect(data.sickDayCount).toBe(3);
       expect(data.status).toBe(RequestStatus.ACCEPTED);
       expect(data.role).toBe(UserType.EMPLOYER);
       expect(data.notification).toBeDefined();
@@ -56 +56 @@
       lastName: 'Novak',
       photo: 'https://st2.depositphotos.com/9223672/12056/v/950/depositphotos_120568236-stock-illustration-male-face-avatar-logo-template.jpg',
       vacationCount: 8.5,
-      sickdayCount: 3,
+      sickDayCount: 3,
       status: 'ACCEPTED',
       role: 'EMPLOYER',
       notification: '2000/12/01 09:00:00'
@@ -66 +66 @@
     service.getLoggedUserProfileWithLanguage(Languages.ENGLISH).subscribe((data: any) => {
       expect(data.id).toBe(1);
       expect(data.vacationCount).toBe(8.5);
-      expect(data.sickdayCount).toBe(3);
+      expect(data.sickDayCount).toBe(3);
       expect(data.status).toBe(RequestStatus.ACCEPTED);
       expect(data.role).toBe(UserType.EMPLOYER);
       expect(data.notification).toBeDefined();