dashboard & assment module refactored

frontend/angular/src/app/my-career-web/assessment/diversity-profile/diversity-profile.component.ts

 import { Component, OnInit } from '@angular/core';
 import { BaseComponent } from '../../base/base.component';
 import { AssessmentService } from '../../services/assessment.service';
-import { HelperService } from '../../services/helper.service';
 import { Router } from '@angular/router';
 import { takeUntil } from 'rxjs/operators';
 import * as moment from 'moment';
 import { DiversityProfileQuestionModel } from '../../models/diversity-profile-question.model';
+import { UtilsService } from '../../../oneit/services/utils.service';
 
 @Component({
     selector: 'app-diversity-profile',
@@ -22,9 +22,9 @@ export class DiversityProfileComponent extends BaseComponent implements OnInit {
     selectedAnswers = [];
 
     constructor(
-        private as: AssessmentService,
-        private hs: HelperService,
-        private r: Router
+        private assessmentService: AssessmentService,
+        private utilsService: UtilsService,
+        private router: Router
     ) {
         super();
     }
@@ -36,7 +36,7 @@ export class DiversityProfileComponent extends BaseComponent implements OnInit {
 
     initiateDiversityProfile(): void {
         this.isLoading = true;
-        this.as.getDiversityProfile(this.assocs)
+        this.assessmentService.getDiversityProfile(this.assocs)
             .pipe(takeUntil(this.componentInView))
             .subscribe(response => {
                 this.isLoading = false;
@@ -45,7 +45,7 @@ export class DiversityProfileComponent extends BaseComponent implements OnInit {
                 this.setAnswers();
             }, err => {
                 this.isLoading = false;
-                this.hs.handleHttpError(err);
+                this.utilsService.handleError(err);
             });
     }
 
@@ -69,15 +69,14 @@ export class DiversityProfileComponent extends BaseComponent implements OnInit {
                 answers.push(this.selectedAnswers[div.ObjectID])
             }
         });
-        this.as.saveDiversityProfile({Answers: answers})
+        this.assessmentService.saveDiversityProfile({Answers: answers})
             .pipe(takeUntil(this.componentInView))
-            .subscribe(response => {
+            .subscribe(() => {
                 this.isSaving = false;
-                this.hs.oneItHttpResponse(response);
-                this.r.navigate(['/my-career-web/dashboard/home']);
+                this.router.navigate(['/my-career-web/dashboard/home']);
             }, err => {
                 this.isSaving = false;
-                this.hs.handleHttpError(err);
+                this.utilsService.handleError(err);
             });
     }
 

frontend/angular/src/app/my-career-web/assessment/work-preference/work-preference.component.ts

@@ -5,8 +5,8 @@ import { WorkPreferenceQuestionModel } from '../../models/work-preference-questi
 import { takeUntil } from 'rxjs/operators';
 import { AssessmentService } from '../../services/assessment.service';
 import { Router } from '@angular/router';
-import { HelperService } from '../../services/helper.service';
 import { QuestionModel } from '../../models/question.model';
+import { UtilsService } from '../../../oneit/services/utils.service';
 
 @Component({
     selector: 'app-work-preference',
@@ -23,9 +23,9 @@ export class WorkPreferenceComponent extends BaseComponent implements OnInit, On
     autoSaveLabel = 'a few seconds ago';
 
     constructor(
-        private as: AssessmentService,
-        private hs: HelperService,
-        private r: Router
+        private assessmentService: AssessmentService,
+        private utilService: UtilsService,
+        private router: Router
     ) {
         super();
     }
@@ -37,7 +37,7 @@ export class WorkPreferenceComponent extends BaseComponent implements OnInit, On
 
     initiateWorkPreference(): void {
         this.isLoading = true;
-        this.as.getWorkPreferences(this.assocs)
+        this.assessmentService.getWorkPreferences(this.assocs)
             .pipe(takeUntil(this.componentInView))
             .subscribe(response => {
                 this.isLoading = false;
@@ -50,7 +50,7 @@ export class WorkPreferenceComponent extends BaseComponent implements OnInit, On
                 }
             }, err => {
                 this.isLoading = false;
-                this.hs.handleHttpError(err);
+                this.utilService.handleError(err);
             });
     }
 
@@ -67,7 +67,7 @@ export class WorkPreferenceComponent extends BaseComponent implements OnInit, On
     }
 
     exit(): void {
-        this.r.navigate(['/my-career-web/dashboard/home']);
+        this.router.navigate(['/my-career-web/dashboard/home']);
     }
 
     submitAnswer(question: QuestionModel): void {
@@ -77,7 +77,7 @@ export class WorkPreferenceComponent extends BaseComponent implements OnInit, On
             Continue: true
         };
         this.isLoading = true;
-        this.as.saveWorkPreferences(formData)
+        this.assessmentService.saveWorkPreferences(formData)
             .subscribe(response => {
                 this.isLoading = false;
                 this.autoSavedOn = new Date();
@@ -89,7 +89,7 @@ export class WorkPreferenceComponent extends BaseComponent implements OnInit, On
                 }
             }, err => {
                 this.isLoading = false;
-                this.hs.handleHttpError(err);
+                this.utilService.handleError(err);
             });
     }
 

frontend/angular/src/app/my-career-web/assessment/work-style/work-style.component.ts

@@ -2,10 +2,10 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { BaseComponent } from '../../base/base.component';
 import { AssessmentService } from '../../services/assessment.service';
 import { takeUntil } from 'rxjs/operators';
-import { HelperService } from '../../services/helper.service';
 import { WorkStyleQuestionModel } from '../../models/work-style-question.model';
 import { Router } from '@angular/router';
 import * as moment from 'moment';
+import { UtilsService } from '../../../oneit/services/utils.service';
 
 @Component({
     selector: 'app-work-style',
@@ -22,9 +22,9 @@ export class WorkStyleComponent extends BaseComponent implements OnInit, OnDestr
     autoSaveLabel = 'a few seconds ago';
 
     constructor(
-        private as: AssessmentService,
-        private hs: HelperService,
-        private r: Router
+        private assessmentService: AssessmentService,
+        private utilService: UtilsService,
+        private router: Router
     ) {
         super();
     }
@@ -36,7 +36,7 @@ export class WorkStyleComponent extends BaseComponent implements OnInit, OnDestr
 
     initiateWorkStyle(): void {
         this.isLoading = true;
-        this.as.getWorkStyle(this.assocs)
+        this.assessmentService.getWorkStyle(this.assocs)
             .pipe(takeUntil(this.componentInView))
             .subscribe(response => {
                 this.isLoading = false;
@@ -69,7 +69,7 @@ export class WorkStyleComponent extends BaseComponent implements OnInit, OnDestr
             Continue: true
         };
         this.isLoading = true;
-        this.as.saveWorkStyle(formData)
+        this.assessmentService.saveWorkStyle(formData)
             .subscribe(response => {
                 this.isLoading = false;
                 this.autoSavedOn = new Date();
@@ -82,12 +82,12 @@ export class WorkStyleComponent extends BaseComponent implements OnInit, OnDestr
                 }
             }, err => {
                 this.isLoading = false;
-                this.hs.handleHttpError(err);
+                this.utilService.handleError(err);
             });
     }
 
     exit(): void {
-        this.r.navigate(['/my-career-web/dashboard/home']);
+        this.router.navigate(['/my-career-web/dashboard/home']);
     }
 
     setAutoSaveInterval(): void {

frontend/angular/src/app/my-career-web/dashboard/dashboard/dashboard.component.ts

@@ -19,15 +19,15 @@ export class DashboardComponent extends BaseComponent implements OnInit {
     unassumeLink  = `${environment.baseUrl}unassume_mc.jsp`;
 
     constructor(
-        private as: AuthService,
-        private r: Router,
-        private ps: PersonalDetailsService
+        private authService: AuthService,
+        private router: Router,
+        private personalDetailsService: PersonalDetailsService
     ) {
         super();
     }
 
     ngOnInit(): void {
-        this.ps.careerProfileUpdated$
+        this.personalDetailsService.careerProfileUpdated$
             .pipe(takeUntil(this.componentInView))
             .subscribe(response => {
                 this.careerProfile = response;
@@ -35,16 +35,16 @@ export class DashboardComponent extends BaseComponent implements OnInit {
     }
 
     goToPage(route): void {
-        this.r.navigate([route]);
+        this.router.navigate([route]);
         this.showMobileNav = false;
     }
 
     logout(): void {
         this.isLoading = true;
-        this.as.logout()
+        this.authService.logout()
             .pipe(takeUntil(this.componentInView))
             .subscribe(() => {
-                this.r.navigate(['/my-career-web/auth/login']);
+                this.router.navigate(['/my-career-web/auth/login']);
                 this.isLoading = false;
             });
     }

frontend/angular/src/app/my-career-web/dashboard/home/home.component.ts

@@ -4,7 +4,6 @@ import { takeUntil } from 'rxjs/operators';
 import { PersonalDetailsService } from '../../services/personal-details.service';
 import { CareerProfileModel } from '../../models/career-profile.model';
 import { UtilsService } from '../../../oneit/services/utils.service';
-import { HelperService } from '../../services/helper.service';
 
 @Component({
     selector: 'app-home',
@@ -26,33 +25,32 @@ export class HomeComponent extends BaseComponent implements OnInit {
     activeSection;
 
     constructor(
-        private ps: PersonalDetailsService,
-        private hs: HelperService,
-        private us: UtilsService
+        private personalDetailsService: PersonalDetailsService,
+        private utilsService: UtilsService
     ) {
         super();
     }
 
     ngOnInit() {
         this.getCareerProfile();
-        this.ps.careerProfileUpdated$
+        this.personalDetailsService.careerProfileUpdated$
             .pipe(takeUntil(this.componentInView))
             .subscribe(profile => {
-                this.careerProfile = this.us.cloneObject(profile);
+                this.careerProfile = this.utilsService.cloneObject(profile);
             });
     }
 
     getCareerProfile(): void {
         this.isLoading = true;
-        this.ps.getCareerProfile(this.assocs)
+        this.personalDetailsService.getCareerProfile(this.assocs)
             .pipe(takeUntil(this.componentInView))
             .subscribe(response => {
                 this.careerProfile = response;
-                this.ps.careerProfileUpdated = this.careerProfile;
+                this.personalDetailsService.careerProfileUpdated = this.careerProfile;
                 this.isLoading = false;
                 this.setActiveSection();
             }, err => {
-                this.hs.handleHttpError(err);
+                this.utilsService.handleError(err);
                 this.isLoading = false;
             })
     }

frontend/angular/src/app/my-career-web/dashboard/left-sidebar/left-sidebar.component.ts

@@ -21,15 +21,15 @@ export class LeftSidebarComponent extends BaseComponent implements OnInit {
     unassumeLink  = `${environment.baseUrl}unassume_mc.jsp`;
 
     constructor(
-        private as: AuthService,
-        private r: Router,
-        private ps: PersonalDetailsService
+        private authService: AuthService,
+        private router: Router,
+        private personalDetailsService: PersonalDetailsService
     ) {
         super();
     }
 
     ngOnInit(): void {
-        this.ps.careerProfileUpdated$
+        this.personalDetailsService.careerProfileUpdated$
             .pipe(takeUntil(this.componentInView))
             .subscribe(response => {
                 this.careerProfile = response;
@@ -38,10 +38,10 @@ export class LeftSidebarComponent extends BaseComponent implements OnInit {
 
     logout(): void {
         this.isLoading = true;
-        this.as.logout()
+        this.authService.logout()
             .pipe(takeUntil(this.componentInView))
             .subscribe(() => {
-                this.r.navigate(['/my-career-web/auth/login']);
+                this.router.navigate(['/my-career-web/auth/login']);
                 this.isLoading = false;
             });
     }

frontend/angular/src/app/my-career-web/dashboard/profile-tasks/profile-tasks.component.ts

@@ -26,18 +26,17 @@ export class ProfileTasksComponent extends BaseComponent {
     ];
 
     constructor(
-        private ps: PersonalDetailsService,
-        private hs: HelperService,
-        private us: UtilsService
+        private personalDetailsService: PersonalDetailsService,
+        private utilsService: UtilsService
     ) {
         super();
     }
 
     ngOnInit() {
-        this.ps.careerProfileUpdated$
+        this.personalDetailsService.careerProfileUpdated$
             .pipe(takeUntil(this.componentInView))
             .subscribe(profile => {
-                this.careerProfile = this.us.cloneObject(profile);
+                this.careerProfile = this.utilsService.cloneObject(profile);
                 this.getCareerProfile();
             });
         this.getCareerProfile();
@@ -45,7 +44,7 @@ export class ProfileTasksComponent extends BaseComponent {
 
     getCareerProfile(): void {
         this.isLoading = true;
-        this.ps.getCareerProfile(this.assocs)
+        this.personalDetailsService.getCareerProfile(this.assocs)
             .pipe(takeUntil(this.componentInView))
             .subscribe(response => {
                 this.isLoading = false;
@@ -53,7 +52,7 @@ export class ProfileTasksComponent extends BaseComponent {
                 this.setProfileCompletion();
             }, err => {
                 this.isLoading = false;
-                this.hs.handleHttpError(err);
+                this.utilsService.handleError(err);
             })
     }