Revize aab2b127

Profile reload on add/remove vacation + removed uncecessary API calls when employee is logged in

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

@@ -36 +36 @@
   ngOnInit() {
     this.selectedMonth = this.dateToolsService.toStartOfMonth(new Date());
 
-    this.loadProfile();
-    this.loadAuthorizationRequests();
-    this.loadVacationRequests();
+    this.userService.getLoggedUserProfile()
+      .subscribe((data: UserProfile) => {
+        this.profile = data;
+        if (this.isEmployer()) {
+          this.loadAuthorizationRequests();
+          this.loadVacationRequests();
+        }
+      });
+
     this.loadMonthVacation(this.selectedMonth);
     this.loadOncomingVacation();
   }
@@ -67 +73 @@
       .subscribe(() => {
         this.loadOncomingVacation();
         this.loadMonthVacation(this.selectedMonth);
+        this.loadProfile();
       });
   }
 
@@ -90 +97 @@
           ).subscribe(() => {
             this.loadMonthVacation(this.selectedMonth);
             this.loadOncomingVacation();
+            this.loadProfile();
           });
         }
       });
@@ -107 +115 @@
       return false;
     }
   }
+
   private loadProfile() {
     this.userService.getLoggedUserProfile()
       .subscribe((data: UserProfile) => this.profile = data);

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

@@ -284 +284 @@
     const httpParams: HttpParams = this.createParams({lang: language});
     const options = {params: httpParams};
 
-    return this.http.delete(this._userUrl + 'calendar/' + id + '/delete', options)
+    return this.http.delete(this.baseUrl + '/calendar/' + id + '/delete', options)
       .pipe(
         catchError(err => this.handleError(err))
       );