skills issue resolved

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

@@ -79,6 +79,8 @@ export class CareerHistoryComponent extends BaseComponent implements OnInit {
             case 'references':
                 this.referencesComponent.saveReferees('/my-career-web/dashboard/home');
                 break;
+            default:
+                this.router.navigate([['/my-career-web/dashboard/home']]);
         }
     }
 

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

@@ -3,7 +3,7 @@
 
     <h4 class="tab-heading">Tell us about your Skills</h4>
 
-    <div class="row" style="margin-top: 24px;">
+    <div class="row" style="margin: 24px 0 12px;">
         <div class="col-md-12">
             <span>We have identified the following skills based on your Work experience, Educational qualifications or certification. How would you rate yourself? </span>
         </div>
@@ -19,11 +19,14 @@
             </div>
 
             <div class="col-md-12 form-group">
-                <app-form-control>
+                <app-form-control *ngIf="skill.IsNew">
                     <p-autoComplete [suggestions]="skills" name="Skill{{i}}" [(ngModel)]="skill.Skill" placeholder="Enter Skill" required
-                                    (completeMethod)="getSkills($event)" dataKey="ObjectID" field="Description">
+                                    (completeMethod)="getSkills($event)" dataKey="ObjectID" field="Description" [forceSelection]="true">
                     </p-autoComplete>
                 </app-form-control>
+                <div *ngIf="!skill.IsNew">
+                    {{skill?.Skill?.Description}}
+                </div>
             </div>
 
             <div class="col-md-6">
@@ -32,6 +35,9 @@
                     </p-selectButton>
                 </app-form-control>
             </div>
+            <div class="col-md-8" *ngIf="skill?.Skill">
+                <div class="added-frm-text">{{skill?.Skill?.AddedFromWhereText}}</div>
+            </div>
 
         </div>
 

frontend/angular/src/app/my-career-web/career-history/career-history/skills/skills.component.scss

@@ -7,3 +7,9 @@
         }
     }
 }
+
+.added-frm-text {
+    font-size: 12px;
+    margin-top: 10px;
+    padding: 0 5px;
+}

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

@@ -57,7 +57,7 @@ export class SkillsComponent extends BaseComponent implements OnInit {
     }
 
     getSkills($event): void {
-        this.personalDetailsService.getSkills({Description: $event.query})
+        this.personalDetailsService.getSkills({Details: $event.query})
             .pipe(takeUntil(this.componentInView))
             .subscribe(response => {
                 this.skills = response;
@@ -78,6 +78,7 @@ export class SkillsComponent extends BaseComponent implements OnInit {
 
     addSkill(initLoad = false): void {
         const newModel = new CareerSkillModel();
+        newModel.IsNew = true;
         newModel.CareerProfile = this.careerProfile.ObjectID;
         if (initLoad && (!this.careerProfile.Skills || this.careerProfile.Skills.length === 0)) {
             this.utilsService.addMultiRefObject(newModel, this.careerProfile, 'Skills', this.createdObjs);
@@ -100,21 +101,21 @@ export class SkillsComponent extends BaseComponent implements OnInit {
             return this.helperService.validateAllFormFields(this.form);
         }
         this.isSaving = true;
-        console.log(this.careerProfile);
-        // console.log(this.createdObjs, this.updatedObjs, this.deletedObjs);
-        // this.personalDetailsService.saveProfile(this.createdObjs, this.updatedObjs, this.deletedObjs)
-        //     .pipe(takeUntil(this.componentInView))
-        //     .subscribe(res => {
-        //         this.isSaving = false;
-        //         if (customRoute) {
-        //             this.router.navigate([customRoute])
-        //         } else {
-        //             this.skillsSaved.emit();
-        //         }
-        //     }, err => {
-        //         this.isSaving = false;
-        //         this.utilsService.handleError(err);
-        //     })
+        console.log(this.createdObjs, this.updatedObjs, this.deletedObjs);
+        this.personalDetailsService.saveProfile(this.createdObjs, this.updatedObjs, this.deletedObjs)
+            .pipe(takeUntil(this.componentInView))
+            .subscribe(res => {
+                this.isSaving = false;
+                this.careerProfile.Skills.forEach(s => s.IsNew = false);
+                if (customRoute) {
+                    this.router.navigate([customRoute])
+                } else {
+                    this.skillsSaved.emit();
+                }
+            }, err => {
+                this.isSaving = false;
+                this.utilsService.handleError(err);
+            })
     }
 
 }

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

@@ -5,7 +5,6 @@ import { PersonalDetailsService } from '../../../services/personal-details.servi
 import { UtilsService } from '../../../../oneit/services/utils.service';
 import { takeUntil } from 'rxjs/operators';
 import { environment } from '../../../../../environments/environment';
-import { CandidateTemplateModel } from '../../../models/candidate-template.model';
 import { SaveService } from '../../../../oneit/services/save.service';
 
 @Component({
@@ -52,7 +51,6 @@ export class TemplatesComponent extends BaseComponent implements OnInit {
                     });
                     this.careerProfile.Candidate.AllTempletes.sort((t1, t2) => t1.SortOrder - t2.SortOrder);
                 }
-                console.log(this.careerProfile);
             }, err => {
                 this.isLoading = false;
                 this.utilsService.handleError(err);
@@ -61,10 +59,11 @@ export class TemplatesComponent extends BaseComponent implements OnInit {
 
     selectTemplate(template): void {
         this.careerProfile.Template = template;
+        this.isLoading = true;
         this.saveService.saveObjectsWithDefaultSvc(this.createdObjs, this.updatedObjs, this.deletedObjs)
             .pipe(takeUntil(this.componentInView))
-            .subscribe(response => {
-                console.log(response);
+            .subscribe(() => {
+                this.isLoading = false;
             });
     }
 

frontend/angular/src/app/my-career-web/models/base.model.ts

@@ -2,4 +2,5 @@ export class BaseModel {
     ObjectID = '';
     ObjectCreatedStr = null;
     ObjectLastModifiedStr = null;
+    IsNew: boolean;
 }

frontend/angular/src/app/my-career-web/models/career-skill.model.ts

@@ -13,5 +13,6 @@ export class CareerSkillModel extends BaseModel {
 
 export class SkillModel extends BaseModel {
     ObjectClass = CLASSES.SKILL;
+    AddedFromWhereText: string;
     Description: string;
 }