Revize c40c10c6

Re#7472 Refactored services implemenation

webapp/package-lock.json

@@ -121 +121 @@
         "rxjs": "6.3.3"
       }
     },
+    "@angular/animations": {
+      "version": "7.2.15",
+      "resolved": "https://repo.plus4u.net/repository/npm/@angular/animations/-/animations-7.2.15.tgz",
+      "integrity": "sha512-8oBt3HLgd2+kyJHUgsd7OzKCCss67t2sch15XNoIWlOLfxclqU+EfFE6t/vCzpT8/+lpZS6LU9ZrTnb+UBj5jg==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/cdk": {
+      "version": "7.3.7",
+      "resolved": "https://repo.plus4u.net/repository/npm/@angular/cdk/-/cdk-7.3.7.tgz",
+      "integrity": "sha512-xbXxhHHKGkVuW6K7pzPmvpJXIwpl0ykBnvA2g+/7Sgy5Pd35wCC+UtHD9RYczDM/mkygNxMQtagyCErwFnDtQA==",
+      "requires": {
+        "parse5": "^5.0.0",
+        "tslib": "^1.7.1"
+      },
+      "dependencies": {
+        "parse5": {
+          "version": "5.1.0",
+          "resolved": "https://repo.plus4u.net/repository/npm/parse5/-/parse5-5.1.0.tgz",
+          "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
+          "optional": true
+        }
+      }
+    },
     "@angular/cli": {
       "version": "7.3.8",
       "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.8.tgz",
@@ -412 +437 @@
         "tslib": "^1.9.0"
       }
     },
+    "@angular/http": {
+      "version": "7.2.15",
+      "resolved": "https://repo.plus4u.net/repository/npm/@angular/http/-/http-7.2.15.tgz",
+      "integrity": "sha512-TR7PEdmLWNIre3Zn8lvyb4lSrvPUJhKLystLnp4hBMcWsJqq5iK8S3bnlR4viZ9HMlf7bW7+Hm4SI6aB3tdUtw==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
     "@angular/language-service": {
       "version": "7.2.13",
       "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.13.tgz",
@@ -610 +643 @@
         }
       }
     },
+    "@ng-bootstrap/ng-bootstrap": {
+      "version": "4.1.2",
+      "resolved": "https://repo.plus4u.net/repository/npm/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-4.1.2.tgz",
+      "integrity": "sha512-1kzxC32I1RgZiGp7O+QmZUJq+ENvov+z1RqfhtnD7zhJll+UdGPs+rPfIQ3jLqd+BgrfkSI+W4krVKAbXp1AKA==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
     "@ngtools/webpack": {
       "version": "7.3.8",
       "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.8.tgz",
@@ -997 +1038 @@
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
       "dev": true
     },
+    "angular-calendar": {
+      "version": "0.27.7",
+      "resolved": "https://repo.plus4u.net/repository/npm/angular-calendar/-/angular-calendar-0.27.7.tgz",
+      "integrity": "sha512-7b9FEDdF7X291fPvR5QndQXTtGWsJMd2eXDiZ8hDfUd4/NJ9ESaHEEg5Exth7Ntuwx19XmkjONLQkAvCiN3yqA==",
+      "requires": {
+        "angular-draggable-droppable": "^4.3.0",
+        "angular-resizable-element": "^3.2.4",
+        "calendar-utils": "^0.3.1",
+        "positioning": "^1.4.0",
+        "tslib": "^1.9.0"
+      }
+    },
+    "angular-draggable-droppable": {
+      "version": "4.3.0",
+      "resolved": "https://repo.plus4u.net/repository/npm/angular-draggable-droppable/-/angular-draggable-droppable-4.3.0.tgz",
+      "integrity": "sha512-IDUeUxZ0+0Y+ya/CDV5PMc5b3sjr4/aIVcTmo+jJhUusOWrCSKogxZDW7cK61B34/YVllb2K5gkzfzvLiYfQZw==",
+      "requires": {
+        "dom-autoscroller": "^2.3.4",
+        "tslib": "^1.9.0"
+      }
+    },
+    "angular-resizable-element": {
+      "version": "3.2.4",
+      "resolved": "https://repo.plus4u.net/repository/npm/angular-resizable-element/-/angular-resizable-element-3.2.4.tgz",
+      "integrity": "sha512-Qd/WRTaJgmDJoeWzmK0F52I3X0nLtFPirmsVC2ceic4EQ/3X2yYFCOWgCtH+PvMZct6Whoky3OQLqCpFXQsKHQ==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "angularx-flatpickr": {
+      "version": "6.1.0",
+      "resolved": "https://repo.plus4u.net/repository/npm/angularx-flatpickr/-/angularx-flatpickr-6.1.0.tgz",
+      "integrity": "sha512-qhToIDVrCZ8Z/Z+sNi1+1eUkDtM3pxRsd8IXfZAd3Pp2dEjU5QfEyyrWJ7t3SzbhMnTA+dIKH6XfXF4HxBddSg==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "animation-frame-polyfill": {
+      "version": "1.0.1",
+      "resolved": "https://repo.plus4u.net/repository/npm/animation-frame-polyfill/-/animation-frame-polyfill-1.0.1.tgz",
+      "integrity": "sha1-X1rZk6eHlL0Xas3lttzmKGdBDJ0="
+    },
     "ansi-colors": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
@@ -1112 +1195 @@
       "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
       "dev": true
     },
+    "array-from": {
+      "version": "2.1.1",
+      "resolved": "https://repo.plus4u.net/repository/npm/array-from/-/array-from-2.1.1.tgz",
+      "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU="
+    },
     "array-union": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -1844 +1932 @@
         "unset-value": "^1.0.0"
       }
     },
+    "calendar-utils": {
+      "version": "0.3.1",
+      "resolved": "https://repo.plus4u.net/repository/npm/calendar-utils/-/calendar-utils-0.3.1.tgz",
+      "integrity": "sha512-0XSJ/dP6QDeO9higbWZmf/ZE9mAUq05HdUONbSNpmwhKfKQ8zf6fMdU6M0ySv0q+TkdwjaGy0DFTRzSUZMsTVw=="
+    },
     "callsite": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
@@ -2412 +2505 @@
         "sha.js": "^2.4.8"
       }
     },
+    "create-point-cb": {
+      "version": "1.2.0",
+      "resolved": "https://repo.plus4u.net/repository/npm/create-point-cb/-/create-point-cb-1.2.0.tgz",
+      "integrity": "sha1-G85H/E/AGFXuEhONZ2sMsqfLznE=",
+      "requires": {
+        "type-func": "^1.0.1"
+      }
+    },
     "cross-spawn": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
@@ -2505 +2606 @@
         "assert-plus": "^1.0.0"
       }
     },
+    "date-fns": {
+      "version": "1.30.1",
+      "resolved": "https://repo.plus4u.net/repository/npm/date-fns/-/date-fns-1.30.1.tgz",
+      "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="
+    },
     "date-format": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz",
@@ -2762 +2868 @@
         "buffer-indexof": "^1.0.0"
       }
     },
+    "dom-autoscroller": {
+      "version": "2.3.4",
+      "resolved": "https://repo.plus4u.net/repository/npm/dom-autoscroller/-/dom-autoscroller-2.3.4.tgz",
+      "integrity": "sha512-HcAdt/2Dq9x4CG6LWXc2x9Iq0MJPAu8fuzHncclq7byufqYEYVtx9sZ/dyzR+gdj4qwEC9p27Lw1G2HRRYX6jQ==",
+      "requires": {
+        "animation-frame-polyfill": "^1.0.0",
+        "create-point-cb": "^1.0.0",
+        "dom-mousemove-dispatcher": "^1.0.1",
+        "dom-plane": "^1.0.1",
+        "dom-set": "^1.0.1",
+        "type-func": "^1.0.1"
+      }
+    },
+    "dom-mousemove-dispatcher": {
+      "version": "1.0.1",
+      "resolved": "https://repo.plus4u.net/repository/npm/dom-mousemove-dispatcher/-/dom-mousemove-dispatcher-1.0.1.tgz",
+      "integrity": "sha1-okpt35Oye7NpT3IIdUalf8fpFA8="
+    },
+    "dom-plane": {
+      "version": "1.0.2",
+      "resolved": "https://repo.plus4u.net/repository/npm/dom-plane/-/dom-plane-1.0.2.tgz",
+      "integrity": "sha1-+MheaXxYfxR+j8L6wd4HjB/kFyw=",
+      "requires": {
+        "create-point-cb": "^1.0.0"
+      }
+    },
     "dom-serialize": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
@@ -2774 +2906 @@
         "void-elements": "^2.0.0"
       }
     },
+    "dom-set": {
+      "version": "1.1.1",
+      "resolved": "https://repo.plus4u.net/repository/npm/dom-set/-/dom-set-1.1.1.tgz",
+      "integrity": "sha1-XCxhDuSDm1IO1fmN28vjFMD6lUo=",
+      "requires": {
+        "array-from": "^2.1.1",
+        "is-array": "^1.0.1",
+        "iselement": "^1.1.4"
+      }
+    },
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -3432 +3574 @@
         "locate-path": "^2.0.0"
       }
     },
+    "flatpickr": {
+      "version": "4.5.7",
+      "resolved": "https://repo.plus4u.net/repository/npm/flatpickr/-/flatpickr-4.5.7.tgz",
+      "integrity": "sha512-JqPfihUc9A/j9QAsh6otoARmMyUauPE17vRBEG+ThJwbl8zAq4ssGpxlPK3wWM/i8EFxkHg9UuVo0ds7XluKxw=="
+    },
     "flatted": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz",
@@ -4910 +5057 @@
         }
       }
     },
+    "is-array": {
+      "version": "1.0.1",
+      "resolved": "https://repo.plus4u.net/repository/npm/is-array/-/is-array-1.0.1.tgz",
+      "integrity": "sha1-6YUMwsyGDDvAl36EzPDdRkWEJ5o="
+    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -5120 +5272 @@
         "buffer-alloc": "^1.2.0"
       }
     },
+    "iselement": {
+      "version": "1.1.4",
+      "resolved": "https://repo.plus4u.net/repository/npm/iselement/-/iselement-1.1.4.tgz",
+      "integrity": "sha1-flW1Ko68pQp+LoDluNKEDzI1MUY="
+    },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -7237 +7394 @@
         }
       }
     },
+    "positioning": {
+      "version": "1.4.0",
+      "resolved": "https://repo.plus4u.net/repository/npm/positioning/-/positioning-1.4.0.tgz",
+      "integrity": "sha512-LbN+mgAXtcDdN46xMJ3yZwjndqqYJODaO5qKmU+MVMu5tL3K2dlm1Qha/zh1k2JAFym5HDaZpnPfO4gr91VTRw=="
+    },
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -9518 +9680 @@
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
       "dev": true
     },
+    "type-func": {
+      "version": "1.0.3",
+      "resolved": "https://repo.plus4u.net/repository/npm/type-func/-/type-func-1.0.3.tgz",
+      "integrity": "sha1-qxhCNK6A2NUAV87+/zstl9CK6bA="
+    },
     "type-is": {
       "version": "1.6.16",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",

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

@@ -9 +9 @@
   REJECTED = 'REJECTED',
 }
 
+export enum ProfileStatus {
+  AUTHORIZED = 'AUTHORIZED',
+  PENDING = 'PENDING',
+  REJECTED = 'REJECTED',
+}
+
 export enum VacationType {
   VACATION = 'VACATION',
   SICKDAY = 'SICKDAY',
+  NONE = 'NONE',
 }
 
 export enum TimeUnit {

webapp/src/app/models/user-basic-information.model.ts

@@ -1 +1 @@
 import {VacationType} from '../enums/common.enum';
+import {Time} from '@angular/common';
 
 export interface UserBasicInformation {
   id: number;
@@ -10 +11 @@
   calendar: [
     {
       date: Date,
-      from: Date,
-      to: Date,
+      from: Time,
+      to: Time,
       type: VacationType;
     }
   ];

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

@@ -8 +8 @@
 })
 export class BasicService {
   protected baseUrl = environment.apiUrl;
-  protected withResponse = {
-    headers: new HttpHeaders({
-      observe: 'response',
-    })
-  };
 
   protected handleError(error: HttpErrorResponse) {
     if (error.error instanceof ErrorEvent) {

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

@@ -1 +1 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { BasicService } from './basic.service';
-import { catchError } from 'rxjs/operators';
+import {catchError, map} from 'rxjs/operators';
 
-import { UserBasicInformation } from '../models/user-basic-information.model';
+import {UserBasicInformation} from '../models/user-basic-information.model';
 import { Requests } from '../models/requests.model';
+import {ProfileStatus, RequestTypes} from '../enums/common.enum';
+import {Observable} from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
@@ -14 +16 @@
   private requestsUrl = this.baseUrl + '/users/requests?type=';
 
   getAuthorizedUsers() {
-    return this.getUsersWithStatus('AUTHORIZED');
+    return this.getUsersWithStatus(ProfileStatus.AUTHORIZED);
   }
 
   getPendingUsers() {
-    return this.getUsersWithStatus('PENDING');
+    return this.getUsersWithStatus(ProfileStatus.PENDING);
   }
 
   getRejectedUsers() {
-    return this.getUsersWithStatus('REJECTED');
+    return this.getUsersWithStatus(ProfileStatus.REJECTED);
   }
 
-  private getUsersWithStatus(status: string) {
+  private getUsersWithStatus(status: string): Observable<UserBasicInformation[]> {
+    console.log(this.usersUrl + status);
     return this.http.get<UserBasicInformation[]>(this.usersUrl + status)
       .pipe(
         catchError(err => this.handleError(err))
@@ -33 +36 @@
   }
 
   getVacationRequests() {
-    return this.getRequestsWithType('VACATION');
+    return this.getRequestsWithType(RequestTypes.VACATION);
   }
 
   getAuthorizationRequests() {
-    return this.getRequestsWithType('AUTHORIZATION');
+    return this.getRequestsWithType(RequestTypes.AUTHORIZATION);
   }
 
   private getRequestsWithType(type: string) {

webapp/src/environments/environment.ts

@@ -1 +1 @@
 export const environment = {
   production: false,
-  apiUrl: 'http://192.168.99.100:9080/'
+  apiUrl: 'http://localhost:9080'
 };

webapp/tslint.json

@@ -70 +70 @@
     "use-life-cycle-interface": true,
     "use-pipe-transform-interface": true,
     "component-class-suffix": true,
-    "directive-class-suffix": true
+    "directive-class-suffix": true,
+    "variable-name": [true,
+      "check-format",
+      "allow-leading-underscore"
+    ]
   }
 }