Commit f560cd50 by Muhammad Usman

diversity profile updates fixes

parent 05151971
......@@ -9,7 +9,7 @@
<div class="header-actions">
<span class="auto-saved" *ngIf="autoSaveLabel">Auto saved {{autoSaveLabel}}</span>
<button pButton label="Save & exit" [disabled]="isSaving" (click)="exit()" class="ui-button-info"></button>
<button pButton [label]="isComplete ? 'Complete' : 'Save & exit'" [disabled]="isSaving" (click)="exit()" class="ui-button-info"></button>
</div>
</div>
......
......@@ -61,6 +61,12 @@ export class DiversityProfileComponent extends BaseComponent implements OnInit {
});
}
get isComplete(): boolean {
return this.diversityProfiles.every(div => {
return div.MultipleAnswers ? this.selectedAnswers[div.ObjectID].length > 0 : !!this.selectedAnswers[div.ObjectID];
});
}
exit(): void {
this.isSaving = true;
const answers = [];
......
......@@ -81,7 +81,7 @@
<button pButton style="min-width: 180px;" label="Download" class="mc-btn-secondary" (click)="getIntroLetter(true)" *ngIf="isEditMode"></button>
</div>
<div class="col-md-6 d-flex justify-content-end">
<button (click)="saveIntroLetter()" pButton label="Update" class="mc-btn-primary"></button>
<button (click)="saveIntroLetter()" pButton label="Update" class="mc-btn-primary" [disabled]="isLoading"></button>
</div>
</div>
......
......@@ -13,6 +13,7 @@ import { ILWorkExperienceModel } from '../../models/il-work-experience.model';
import { ILSkillModel } from '../../models/il-skill.model';
import * as FileSaver from 'file-saver';
import { ToasterService } from '../../services/toaster.service';
@Component({
selector: 'app-intro-letter',
......@@ -34,6 +35,7 @@ export class IntroLetterComponent extends BaseComponent implements OnInit {
private introLetterService: IntroLetterService,
private utilsService: UtilsService,
private helperService: HelperService,
private toastService: ToasterService,
private router: Router
) {
super();
......@@ -97,6 +99,7 @@ export class IntroLetterComponent extends BaseComponent implements OnInit {
ilWorkExperience.IntroductionLetter = this.introductionLetter.ObjectID;
ilWorkExperience.WorkExperience = w;
ilWorkExperience.SortOrder = i;
ilWorkExperience.IsSelected = true;
this.utilsService.addMultiRefObject(ilWorkExperience, this.introductionLetter, 'WorkExperiences', this.createdObjs);
});
this.careerProfile.Skills.forEach((s, i) => {
......@@ -104,6 +107,7 @@ export class IntroLetterComponent extends BaseComponent implements OnInit {
ilSkillModel.IntroductionLetter = this.introductionLetter.ObjectID;
ilSkillModel.Skill = s.Skill;
ilSkillModel.SortOrder = i;
ilSkillModel.IsSelected = false;
this.utilsService.addMultiRefObject(ilSkillModel, this.introductionLetter, 'Skills', this.createdObjs);
});
}
......@@ -125,11 +129,10 @@ export class IntroLetterComponent extends BaseComponent implements OnInit {
this.isLoading = true;
this.introLetterService.saveIntroLetters(this.createdObjs, this.updatedObjs, this.deletedObjs)
.pipe(takeUntil(this.componentInView))
.subscribe(response => {
.subscribe(() => {
this.isLoading = false;
if (response.created && response.created[this.introductionLetter.ObjectID]) {
this.router.navigate([`my-career-web/intro-letters/${response.created[this.introductionLetter.ObjectID]}`])
}
this.toastService.success('Intro letter saved');
this.router.navigate([`my-career-web/intro-letters`])
}, err => {
this.utilsService.handleError(err);
this.isLoading = false;
......
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-job',
templateUrl: './job.component.html',
styleUrls: ['./job.component.css']
})
export class JobComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { JobsRouting } from './jobs.routing';
import { JobsComponent } from './jobs/jobs.component';
import { JobComponent } from './job/job.component';
@NgModule({
imports: [
CommonModule,
JobsRouting
],
declarations: [JobsComponent, JobComponent]
})
export class JobsModule { }
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
const routes: Routes = [];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
export class JobsRouting { }
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-jobs',
templateUrl: './jobs.component.html',
styleUrls: ['./jobs.component.css']
})
export class JobsComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
......@@ -35,6 +35,11 @@ const routes: Routes = [
loadChildren: './intro-letters/intro-letters.module#IntroLettersModule',
canActivate: [HomeGuard]
},
{
path: 'jobs',
loadChildren: './jobs/jobs.module#JobsModule',
canActivate: [HomeGuard]
},
{path: '', component: WelcomeComponent, canActivate: [PublicGuard]}
]
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment