Skip to content

P
PERFORMA_REPLICA
Commit ba739848 by Muhammad Usman
Options

references, work history updates

parent 47f4f00e
Showing with 123 additions and 116 deletions
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 ...@@ -91,9 +91,7 @@ export class WorkStyleComponent extends BaseComponent implements OnInit, OnDestr
} }
exit(): void { exit(): void {
if (this.wasUpdated) { this.toasterService.success('Work style updated!');
this.toasterService.success('Profile updated!');
}
this.router.navigate(['/my-career-web/dashboard/home']); this.router.navigate(['/my-career-web/dashboard/home']);
} }
......
frontend/angular/src/app/my-career-web/career-history/career-history/references/references.component.html
...@@ -9,70 +9,72 @@ ...@@ -9,70 +9,72 @@
</div> </div>
</div> </div>
<form #form="ngForm" *ngIf="!careerProfile?.NoReference" style="margin-top: 15px;"> <form #form="ngForm" style="margin-top: 15px;">
<div class="row reference-wrapper" *ngFor="let referee of careerProfile.Referees; let i = index;"> <ng-container *ngIf="!careerProfile?.NoReference">
<div class="row reference-wrapper" *ngFor="let referee of careerProfile.Referees; let i = index;">
<div class="remove-record"> <div class="remove-record" (click)="removeReferee(referee)">
<i class="fa fa-remove" (click)="removeReferee(referee)"></i> <i class="fa fa-remove"></i>
</div>
<div class="col-md-9">
<div class="row">
<div class="col-md-6 form-group">
<label>Referee Name</label>
<app-form-control>
<input type="text" class="form-control" placeholder="Referee Name" name="RefereeName{{i}}" [(ngModel)]="referee.RefereeName">
</app-form-control>
</div>
</div> </div>
<div class="row"> <div class="col-md-9">
<div class="col-md-6 form-group"> <div class="row">
<label>Email</label> <div class="col-md-6 form-group">
<app-form-control> <label>Referee Name</label>
<input type="text" class="form-control" placeholder="Email address" name="Email{{i}}" [(ngModel)]="referee.Email" email> <app-form-control>
</app-form-control> <input type="text" class="form-control" placeholder="Referee Name" name="RefereeName{{i}}" [(ngModel)]="referee.RefereeName">
</app-form-control>
</div>
</div> </div>
<div class="col-md-6 form-group"> <div class="row">
<label>Phone</label> <div class="col-md-6 form-group">
<app-form-control> <label>Email</label>
<p-inputMask (focusout)="checkMobilePattern(referee)" slotChar="-" [unmask]="true" [autoClear]="true" mask="9999 999 9999" <app-form-control>
styleClass="form-control" placeholder="Mobile No" [(ngModel)]="referee.Phone" name="Mobile{{i}}"> <input type="text" class="form-control" placeholder="Email address" name="Email{{i}}" [(ngModel)]="referee.Email" email>
</p-inputMask> </app-form-control>
</app-form-control> </div>
</div>
</div>
<div class="row"> <div class="col-md-6 form-group">
<div class="col-md-6 form-group"> <label>Phone</label>
<label>Role</label> <app-form-control>
<app-form-control> <p-inputMask (focusout)="checkMobilePattern(referee)" slotChar="-" [unmask]="true" [autoClear]="true" mask="9999 999 9999"
<input type="text" class="form-control" placeholder="Role" name="Role{{i}}" [(ngModel)]="referee.Role"> styleClass="form-control" placeholder="Mobile No" [(ngModel)]="referee.Phone" name="Mobile{{i}}">
</app-form-control> </p-inputMask>
</app-form-control>
</div>
</div> </div>
<div class="col-md-3 col-md-offset-3 form-group"> <div class="row">
<label>Written Reference</label> <div class="col-md-6 form-group">
<p-fileUpload *ngIf="!referee?.WrittenReference" name="File" withCredentials="true" auto="true" chooseLabel="Browse" [disabled]="uploadingFile" <label>Role</label>
url="{{apiUrl}}uploadFile" (onUpload)="onUpload($event, referee)" (onBeforeUpload)="uploadStarted()"> <app-form-control>
<ng-template let-file pTemplate="file"> <input type="text" class="form-control" placeholder="Role" name="Role{{i}}" [(ngModel)]="referee.Role">
<div>Uploading...</div> </app-form-control>
</ng-template> </div>
</p-fileUpload>
<div class="uploaded-attachment" *ngIf="referee?.WrittenReference"> <div class="col-md-3 col-md-offset-3 form-group">
<span *ngIf="!referee.WrittenReference.URI">{{referee.WrittenReference.Name}}</span> <label>Written Reference</label>
<a *ngIf="referee.WrittenReference.URI" target="_blank" [href]="apiUrl + referee.WrittenReference.URI">{{referee.WrittenReference.Name}}</a> <p-fileUpload *ngIf="!referee?.WrittenReference" name="File" withCredentials="true" auto="true" chooseLabel="Browse" [disabled]="uploadingFile"
<i class="pi pi-times" (click)="removeAttachment(referee)"></i> url="{{apiUrl}}uploadFile" (onUpload)="onUpload($event, referee)" (onBeforeUpload)="uploadStarted()">
<ng-template let-file pTemplate="file">
<div>Uploading...</div>
</ng-template>
</p-fileUpload>
<div class="uploaded-attachment" *ngIf="referee?.WrittenReference">
<span *ngIf="!referee.WrittenReference.URI">{{referee.WrittenReference.Name}}</span>
<a *ngIf="referee.WrittenReference.URI" target="_blank" [href]="apiUrl + referee.WrittenReference.URI">{{referee.WrittenReference.Name}}</a>
<i class="pi pi-times" (click)="removeAttachment(referee)"></i>
</div>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>
</ng-container>
<div class="row"> <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'; ...@@ -10,6 +10,7 @@ import { RefereeModel } from '../../../models/referee.model';
import { environment } from '../../../../../environments/environment'; import { environment } from '../../../../../environments/environment';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { HelperService } from '../../../services/helper.service'; import { HelperService } from '../../../services/helper.service';
import { ToasterService } from '../../../services/toaster.service';
@Component({ @Component({
selector: 'app-references', selector: 'app-references',
...@@ -31,6 +32,7 @@ export class ReferencesComponent extends BaseComponent implements OnInit { ...@@ -31,6 +32,7 @@ export class ReferencesComponent extends BaseComponent implements OnInit {
private confirmationService: ConfirmationService, private confirmationService: ConfirmationService,
private utilsService: UtilsService, private utilsService: UtilsService,
private helperService: HelperService, private helperService: HelperService,
private toasterService: ToasterService,
private router: Router private router: Router
) { ) {
super(); super();
...@@ -89,6 +91,7 @@ export class ReferencesComponent extends BaseComponent implements OnInit { ...@@ -89,6 +91,7 @@ export class ReferencesComponent extends BaseComponent implements OnInit {
this.personalDetailsService.saveProfile(this.createdObjs, this.updatedObjs, this.deletedObjs) this.personalDetailsService.saveProfile(this.createdObjs, this.updatedObjs, this.deletedObjs)
.pipe(takeUntil(this.componentInView)) .pipe(takeUntil(this.componentInView))
.subscribe(res => { .subscribe(res => {
this.toasterService.success('References updated');
this.isSaving = false; this.isSaving = false;
if (customRoute) { if (customRoute) {
this.router.navigate([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"> <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> <h4 class="tab-heading">Tell us about your most recent job</h4>
...@@ -10,82 +10,86 @@ ...@@ -10,82 +10,86 @@
</div> </div>
</div> </div>
<form #form="ngForm" *ngIf="!careerProfile.NoWorkExperience" style="margin-top: 15px;"> <form #form="ngForm" style="margin-top: 15px;">
<div class="row experience-wrapper" *ngFor="let experience of careerProfile.WorkExperiences; let i = index;"> <ng-container *ngIf="!careerProfile.NoWorkExperience">
<div class="remove-record"> <div class="row experience-wrapper" *ngFor="let experience of careerProfile.WorkExperiences; let i = index;">
<i class="fa fa-remove" (click)="removeExperience(experience)"></i>
</div>
<div class="col-md-9"> <div class="remove-record" (click)="removeExperience(experience)">
<div class="row"> <i class="fa fa-remove"></i>
<div class="col-md-6 form-group"> </div>
<label>Employer</label>
<app-form-control>
<input type="text" class="form-control" placeholder="Employeer name" name="Employer{{i}}" [(ngModel)]="experience.Employer" required>
</app-form-control>
</div>
<div class="col-md-4" *ngIf="experience.Employer">
<div class="row">
<div class="col-md-6 form-group">
<label>Start</label>
<app-form-control>
<p-calendar [maxDate]="experience.EndMonthField" placeholder="MM/YYYY" dateFormat="mm/yy" view="month" [icon]="true" [(ngModel)]="experience.StartMonthField" required name="StartMonth{{i}}">
</p-calendar>
</app-form-control>
</div>
<div class="col-md-6 form-group" *ngIf="!experience.StillInRole"> <div class="col-md-9">
<label>End</label> <div class="row">
<app-form-control> <div class="col-md-6 form-group">
<p-calendar [minDate]="experience.StartMonthField" placeholder="MM/YYYY" dateFormat="mm/yy" view="month" [icon]="true" [(ngModel)]="experience.EndMonthField" required name="EndMonth{{i}}"> <label>Employer</label>
</p-calendar> <app-form-control>
</app-form-control> <input type="text" class="form-control" placeholder="Employeer name" name="Employer{{i}}" [(ngModel)]="experience.Employer" required>
</app-form-control>
</div>
<div class="col-md-4" *ngIf="experience.Employer">
<div class="row">
<div class="col-md-6 form-group">
<label>Start</label>
<app-form-control>
<p-calendar [maxDate]="experience.EndMonthField" placeholder="MM/YYYY" dateFormat="mm/yy" view="month" [icon]="true" [(ngModel)]="experience.StartMonthField" required name="StartMonth{{i}}">
</p-calendar>
</app-form-control>
</div>
<div class="col-md-6 form-group" *ngIf="!experience.StillInRole">
<label>End</label>
<app-form-control>
<p-calendar [minDate]="experience.StartMonthField" placeholder="MM/YYYY" dateFormat="mm/yy" view="month" [icon]="true" [(ngModel)]="experience.EndMonthField" required name="EndMonth{{i}}">
</p-calendar>
</app-form-control>
</div>
</div> </div>
</div> </div>
</div> <div class="col-md-2 currently-work-checkbox" *ngIf="experience.Employer">
<div class="col-md-2 currently-work-checkbox" *ngIf="experience.Employer"> <p-checkbox label="I currently work here" [binary]="true" [(ngModel)]="experience.StillInRole" name="StillInRole{{i}}">
<p-checkbox label="I currently work here" [binary]="true" [(ngModel)]="experience.StillInRole" name="StillInRole{{i}}"> </p-checkbox>
</p-checkbox> </div>
</div> </div>
</div> </div>
</div>
<div class="col-md-9" *ngIf="experience.Employer"> <div class="col-md-9" *ngIf="experience.Employer">
<div class="row"> <div class="row">
<div class="col-md-6 form-group"> <div class="col-md-6 form-group">
<label>Actual job title</label> <label>Actual job title</label>
<app-form-control> <app-form-control>
<input type="text" class="form-control" placeholder="Actual Title" name="ActualJobTitle{{i}}" [(ngModel)]="experience.ActualJobTitle"> <input type="text" class="form-control" placeholder="Actual Title" name="ActualJobTitle{{i}}" [(ngModel)]="experience.ActualJobTitle">
</app-form-control> </app-form-control>
</div> </div>
<div class="col-md-6 form-group"> <div class="col-md-6 form-group">
<label class="with-help-text">ILO job title <span class="help-text"><i class="fa fa-question" pTooltip="This is the set of International Labour Organisation (ILO) job titles. It helps Matchd to determine the type of occupation for this job." tooltipStyleClass="t-w300"></i></span></label> <label class="with-help-text">ILO job title <span class="help-text"><i class="fa fa-question" pTooltip="This is the set of International Labour Organisation (ILO) job titles. It helps Matchd to determine the type of occupation for this job." tooltipStyleClass="t-w300"></i></span></label>
<app-form-control> <app-form-control>
<p-autoComplete [suggestions]="jobTitles" name="ILOJobTitle{{i}}" [(ngModel)]="experience.ILOJobTitle" placeholder="ILO Job Title" <p-autoComplete [suggestions]="jobTitles" name="ILOJobTitle{{i}}" [(ngModel)]="experience.ILOJobTitle" placeholder="ILO Job Title"
(completeMethod)="getJobTitles($event)" [forceSelection]="true" dataKey="ObjectID" field="JobTitle"> (completeMethod)="getJobTitles($event)" [forceSelection]="true" dataKey="ObjectID" field="JobTitle">
</p-autoComplete> </p-autoComplete>
</app-form-control> </app-form-control>
</div>
</div> </div>
</div> </div>
</div>
<div class="col-md-6 form-group" *ngIf="experience.Employer"> <div class="col-md-6 form-group" *ngIf="experience.Employer">
<label>Reason for Leaving (OPTIONAL)</label> <label>Reason for Leaving (OPTIONAL)</label>
<app-form-control> <app-form-control>
<textarea class="form-control" [(ngModel)]="experience.ReasonForLeaving" name="ReasonForLeaving{{i}}"></textarea> <textarea class="form-control" [(ngModel)]="experience.ReasonForLeaving" name="ReasonForLeaving{{i}}"></textarea>
</app-form-control> </app-form-control>
</div> </div>
<div class="col-md-6 form-group" *ngIf="experience.Employer">
<label>Duties and Responsibilities</label>
<app-form-control>
<textarea class="form-control" [(ngModel)]="experience.JobRoleSummary" name="JobRoleSummary{{i}}"></textarea>
</app-form-control>
</div>
<div class="col-md-6 form-group" *ngIf="experience.Employer">
<label>Duties and Responsibilities</label>
<app-form-control>
<textarea class="form-control" [(ngModel)]="experience.JobRoleSummary" name="JobRoleSummary{{i}}"></textarea>
</app-form-control>
</div> </div>
</div> </ng-container>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
......
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 { ...@@ -103,8 +103,8 @@ export class WorkHistoryComponent extends BaseComponent implements OnInit {
.pipe(takeUntil(this.componentInView)) .pipe(takeUntil(this.componentInView))
.subscribe(res => { .subscribe(res => {
this.isSaving = false; this.isSaving = false;
this.toastService.success('Work history updated');
if (customRoute) { if (customRoute) {
this.toastService.success('Work history updated');
this.router.navigate([customRoute]) this.router.navigate([customRoute])
} else { } else {
this.workSaved.emit(); this.workSaved.emit();
......
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