references, work history updates

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

@@ -91,9 +91,7 @@ export class WorkStyleComponent extends BaseComponent implements OnInit, OnDestr
     }
 
     exit(): void {
-        if (this.wasUpdated) {
-            this.toasterService.success('Profile updated!');
-        }
+        this.toasterService.success('Work style updated!');
         this.router.navigate(['/my-career-web/dashboard/home']);
     }
 

frontend/angular/src/app/my-career-web/career-history/career-history/references/references.component.html

@@ -9,12 +9,13 @@
         </div>
     </div>
 
-    <form #form="ngForm" *ngIf="!careerProfile?.NoReference" style="margin-top: 15px;">
+    <form #form="ngForm" style="margin-top: 15px;">
 
+        <ng-container *ngIf="!careerProfile?.NoReference">
             <div class="row reference-wrapper" *ngFor="let referee of careerProfile.Referees; let i = index;">
 
-            <div class="remove-record">
-                <i class="fa fa-remove" (click)="removeReferee(referee)"></i>
+                <div class="remove-record" (click)="removeReferee(referee)">
+                    <i class="fa fa-remove"></i>
                 </div>
 
                 <div class="col-md-9">
@@ -73,6 +74,7 @@
 
 
             </div>
+        </ng-container>
 
 
         <div class="row">

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

@@ -10,6 +10,7 @@ import { RefereeModel } from '../../../models/referee.model';
 import { environment } from '../../../../../environments/environment';
 import { Router } from '@angular/router';
 import { HelperService } from '../../../services/helper.service';
+import { ToasterService } from '../../../services/toaster.service';
 
 @Component({
   selector: 'app-references',
@@ -31,6 +32,7 @@ export class ReferencesComponent extends BaseComponent implements OnInit {
         private confirmationService: ConfirmationService,
         private utilsService: UtilsService,
         private helperService: HelperService,
+        private toasterService: ToasterService,
         private router: Router
     ) {
         super();
@@ -89,6 +91,7 @@ export class ReferencesComponent extends BaseComponent implements OnInit {
         this.personalDetailsService.saveProfile(this.createdObjs, this.updatedObjs, this.deletedObjs)
             .pipe(takeUntil(this.componentInView))
             .subscribe(res => {
+                this.toasterService.success('References updated');
                 this.isSaving = false;
                 if (customRoute) {
                     this.router.navigate([customRoute])

frontend/angular/src/app/my-career-web/career-history/career-history/work-history/work-history.component.html

 <div class="position-relative">
-    <app-overlay [isActive]="isLoading"></app-overlay>
+    <app-overlay [isActive]="isLoading || isSaving"></app-overlay>
 
     <h4 class="tab-heading">Tell us about your most recent job</h4>
 
@@ -10,12 +10,14 @@
         </div>
     </div>
 
-    <form #form="ngForm" *ngIf="!careerProfile.NoWorkExperience" style="margin-top: 15px;">
+    <form #form="ngForm" style="margin-top: 15px;">
+
+        <ng-container *ngIf="!careerProfile.NoWorkExperience">
 
             <div class="row experience-wrapper" *ngFor="let experience of careerProfile.WorkExperiences; let i = index;">
 
-            <div class="remove-record">
-                <i class="fa fa-remove" (click)="removeExperience(experience)"></i>
+                <div class="remove-record" (click)="removeExperience(experience)">
+                    <i class="fa fa-remove"></i>
                 </div>
 
                 <div class="col-md-9">
@@ -87,6 +89,8 @@
 
             </div>
 
+        </ng-container>
+
         <div class="row">
             <div class="col-md-12">
                 <button pButton class="btn btn-info-outline add-more" label="Add work experience +" (click)="addWorkExperience()"></button>

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

@@ -103,8 +103,8 @@ export class WorkHistoryComponent extends BaseComponent implements OnInit {
             .pipe(takeUntil(this.componentInView))
             .subscribe(res => {
                 this.isSaving = false;
-                if (customRoute) {
                 this.toastService.success('Work history updated');
+                if (customRoute) {
                     this.router.navigate([customRoute])
                 } else {
                     this.workSaved.emit();