career builder & templates updates

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

@@ -14,7 +14,9 @@
         </div>
         <p-progressBar [value]="20"></p-progressBar>
 
-        <div class="assessment-body container">
+        <div class="assessment-body container position-relative">
+
+            <app-overlay [isActive]="isLoading"></app-overlay>
 
             <div class="assessment-body-header">
                 <div class="assessment-heading">Career History</div>

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

@@ -86,7 +86,7 @@ export class EducationComponent extends BaseComponent implements OnInit {
         if (this.form.invalid) {
             return this.helperService.validateAllFormFields(this.form);
         }
-        if (!this.careerProfile.NoEducationQualification) {
+        if (this.careerProfile.NoEducationQualification) {
             while (this.careerProfile.EducationCertificates.length > 0) {
                 this.utilsService.removeMultiRefObject(this.careerProfile.EducationCertificates[0], this.careerProfile, 'EducationCertificates', this.createdObjs, this.updatedObjs, this.deletedObjs);
             }

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

@@ -88,7 +88,7 @@ export class ReferencesComponent extends BaseComponent implements OnInit {
         if (this.form.invalid) {
             return this.helperService.validateAllFormFields(this.form);
         }
-        if (!this.careerProfile.NoReference) {
+        if (this.careerProfile.NoReference) {
             while (this.careerProfile.Referees.length > 0) {
                 this.utilsService.removeMultiRefObject(this.careerProfile.Referees[0], this.careerProfile, 'Referees', this.createdObjs, this.updatedObjs, this.deletedObjs);
             }

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

@@ -64,6 +64,7 @@ export class TemplatesComponent extends BaseComponent implements OnInit {
             .pipe(takeUntil(this.componentInView))
             .subscribe(() => {
                 this.isLoading = false;
+                this.templatesShown = false;
             });
     }
 

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

@@ -95,7 +95,7 @@ export class WorkHistoryComponent extends BaseComponent implements OnInit {
         if (this.form.invalid) {
             return this.helperService.validateAllFormFields(this.form);
         }
-        if (!this.careerProfile.NoWorkExperience) {
+        if (this.careerProfile.NoWorkExperience) {
             while (this.careerProfile.WorkExperiences.length > 0) {
                 this.utilsService.removeMultiRefObject(this.careerProfile.WorkExperiences[0], this.careerProfile, 'WorkExperiences', this.createdObjs, this.updatedObjs, this.deletedObjs);
             }

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

@@ -56,7 +56,7 @@
                 <div class="feature-action">Get this feature</div>
             </div>
             <div class="extra-feature">
-                <div class="feature-heading">Development Reports</div>
+                <div class="feature-heading" style="white-space: nowrap;">Development Reports</div>
                 <div class="feature-content">Information about feature that gives user context as to why to upgrade.</div>
                 <div class="feature-action">Get this feature</div>
             </div>
@@ -139,7 +139,7 @@
                     <div class="feature-action">Get this feature</div>
                 </div>
                 <div class="feature">
-                    <div class="feature-heading" style="white-space: nowrap;">Development Reports</div>
+                    <div class="feature-heading">Development Reports</div>
                     <div class="feature-content">Information about feature that gives user context as to why to upgrade.</div>
                     <div class="feature-action">Get this feature</div>
                 </div>

frontend/angular/src/app/my-career-web/mc-shared/personal-details/personal-details.component.html

@@ -115,20 +115,41 @@
 
 
         <div class="col-md-12 form-group" *ngIf="asChildComponent">
-            <label class="with-help-text">Personal Statement <span class="help-text"><i class="fa fa-question"
-                                                                                        pTooltip="Your Personal Statement will appear on your Career Profile. It describes the type of work you are looking for, your career plans and what makes you unique. You don’t need to add a Personal Statement now (or at all) … you can add it later via the Career Profile editor. If you want more help with creating a Personal Statement, see the article on our Knowledgebase."
-                                                                                        tooltipStyleClass="t-w300"></i></span></label>
+            <label class="with-help-text">Personal Statement
+                <span class="help-text">
+
+                    <ng-container *ngIf="!isMobileView">
+                        <i *ngIf="!isMobileView" class="fa fa-question" tooltipStyleClass="t-w300"  tooltipEvent="focus" pTooltip="Your Personal Statement will appear on your Career Profile. It describes the type of work you are looking for, your career plans and what makes you unique. You don’t need to add a Personal Statement now (or at all) … you can add it later via the Career Profile editor. If you want more help with creating a Personal Statement, see the article on our Knowledgebase"></i>
+                    </ng-container>
+
+                    <ng-container *ngIf="isMobileView">
+                        <i class="fa fa-question" (click)="tooltip1.focus()"></i>
+                        <input type="text" tooltipStyleClass="t-w300" pTooltip="Your Personal Statement will appear on your Career Profile. It describes the type of work you are looking for, your career plans and what makes you unique. You don’t need to add a Personal Statement now (or at all) … you can add it later via the Career Profile editor. If you want more help with creating a Personal Statement, see the article on our Knowledgebase" tooltipEvent="focus" #tooltip1 style="border: 0; width: 0; height: 0;">
+                    </ng-container>
+
+
+
+                </span>
+            </label>
             <app-form-control>
-                <textarea class="form-control" [(ngModel)]="careerProfile.PersonalStatement"
-                          name="PersonalStatement"></textarea>
+                <textarea class="form-control" [(ngModel)]="careerProfile.PersonalStatement" name="PersonalStatement"></textarea>
             </app-form-control>
         </div>
 
 
         <div class="col-md-12 form-group" *ngIf="asChildComponent">
-            <label class="with-help-text">Achievements <span class="help-text"><i class="fa fa-question"
-                                                                                  tooltipStyleClass="t-w300"
-                                                                                  pTooltip="Your Achievements will appear on your Career Profile. It describes the significant events in your work career. This can include projects you worked on, awards, recognition or just activities you have performed well. You don’t need to add Achievements now (or at all) … you can add it later via the Career Profile editor. If you want more help with describing your Achievements, see the article on our Knowledgebase."></i></span></label>
+            <label class="with-help-text">Achievements
+                <span class="help-text">
+                    <ng-container *ngIf="!isMobileView">
+                        <i *ngIf="!isMobileView" class="fa fa-question" tooltipStyleClass="t-w300"  tooltipEvent="focus" pTooltip="Your Achievements will appear on your Career Profile. It describes the significant events in your work career. This can include projects you worked on, awards, recognition or just activities you have performed well. You don’t need to add Achievements now (or at all) … you can add it later via the Career Profile editor. If you want more help with describing your Achievements, see the article on our Knowledgebase."></i>
+                    </ng-container>
+
+                    <ng-container *ngIf="isMobileView">
+                        <i class="fa fa-question" (click)="tooltip2.focus()"></i>
+                        <input type="text" tooltipStyleClass="t-w300" pTooltip="Your Achievements will appear on your Career Profile. It describes the significant events in your work career. This can include projects you worked on, awards, recognition or just activities you have performed well. You don’t need to add Achievements now (or at all) … you can add it later via the Career Profile editor. If you want more help with describing your Achievements, see the article on our Knowledgebase." tooltipEvent="focus" #tooltip2 style="border: 0; width: 0; height: 0;">
+                    </ng-container>
+                </span>
+            </label>
 
             <app-form-control>
                 <textarea class="form-control" [(ngModel)]="careerProfile.Achievements" name="Achievements"></textarea>
@@ -136,8 +157,7 @@
         </div>
 
         <div class="col-md-6 mt-4 d-flex justify-content-center" *ngIf="!asChildComponent">
-            <button type="button" pButton label="Connect With Google" class="ui-button-google"
-                    (click)="connectWithSocial('Google')"
+            <button type="button" pButton label="Connect With Google" class="ui-button-google" (click)="connectWithSocial('Google')"
                     *ngIf="!careerProfile.IsGoogleConnected"></button>
         </div>
 

frontend/angular/src/app/my-career-web/mc-shared/personal-details/personal-details.component.ts

@@ -110,7 +110,7 @@ export class PersonalDetailsComponent extends BaseComponent implements OnInit {
         }
         this.careerProfile.Candidate.User.UserName = this.careerProfile.Candidate.User.Email;
         this.isSaving = true;
-        if (this.asChildComponent && customRoute) {
+        if (this.asChildComponent) {
             this.careerProfile.CurrentProfileBuilderTab = CAREER_TABS.WORK_HISTORY;
         }
         this.personalDetailsService.saveProfile(this.createdObjs, this.updatedObjs, this.deletedObjs)

frontend/angular/src/styles/my-career-styles/_misc.scss

@@ -114,6 +114,20 @@ label.with-help-text {
 }
 
 
+
+
+
+.ui-tooltip {
+    &.t-w300 {
+        min-width: 300px !important;
+    }
+
+    &.t-w200 {
+        min-width: 200px !important;
+    }
+}
+
+
 @media only screen and (max-width: 768px) {
 
     .mc-card {

frontend/angular/src/styles/my-career-styles/_styles.scss

@@ -33,7 +33,3 @@
 
 }
 
-
-.ui-tooltip.t-w300 {
-    min-width: 300px !important;
-}