Commit 4c6f788d by Muhammad Usman

UI issues resloved for work-style & perferences

parent b1d542cf
...@@ -6,6 +6,7 @@ import { takeUntil } from 'rxjs/operators'; ...@@ -6,6 +6,7 @@ import { takeUntil } from 'rxjs/operators';
import * as moment from 'moment'; import * as moment from 'moment';
import { DiversityProfileQuestionModel } from '../../models/diversity-profile-question.model'; import { DiversityProfileQuestionModel } from '../../models/diversity-profile-question.model';
import { UtilsService } from '../../../oneit/services/utils.service'; import { UtilsService } from '../../../oneit/services/utils.service';
import { ToasterService } from '../../services/toaster.service';
@Component({ @Component({
selector: 'app-diversity-profile', selector: 'app-diversity-profile',
...@@ -24,6 +25,7 @@ export class DiversityProfileComponent extends BaseComponent implements OnInit { ...@@ -24,6 +25,7 @@ export class DiversityProfileComponent extends BaseComponent implements OnInit {
constructor( constructor(
private assessmentService: AssessmentService, private assessmentService: AssessmentService,
private utilsService: UtilsService, private utilsService: UtilsService,
private toasterService: ToasterService,
private router: Router private router: Router
) { ) {
super(); super();
...@@ -73,6 +75,7 @@ export class DiversityProfileComponent extends BaseComponent implements OnInit { ...@@ -73,6 +75,7 @@ export class DiversityProfileComponent extends BaseComponent implements OnInit {
.pipe(takeUntil(this.componentInView)) .pipe(takeUntil(this.componentInView))
.subscribe(() => { .subscribe(() => {
this.isSaving = false; this.isSaving = false;
this.toasterService.success('Preferences updated!');
this.router.navigate(['/my-career-web/dashboard/home']); this.router.navigate(['/my-career-web/dashboard/home']);
}, err => { }, err => {
this.isSaving = false; this.isSaving = false;
......
...@@ -7,6 +7,7 @@ import { AssessmentService } from '../../services/assessment.service'; ...@@ -7,6 +7,7 @@ import { AssessmentService } from '../../services/assessment.service';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { QuestionModel } from '../../models/question.model'; import { QuestionModel } from '../../models/question.model';
import { UtilsService } from '../../../oneit/services/utils.service'; import { UtilsService } from '../../../oneit/services/utils.service';
import { ToasterService } from '../../services/toaster.service';
@Component({ @Component({
selector: 'app-work-preference', selector: 'app-work-preference',
...@@ -18,6 +19,7 @@ export class WorkPreferenceComponent extends BaseComponent implements OnInit, On ...@@ -18,6 +19,7 @@ export class WorkPreferenceComponent extends BaseComponent implements OnInit, On
workPreferenceQuestion = new WorkPreferenceQuestionModel(); workPreferenceQuestion = new WorkPreferenceQuestionModel();
assocs = ['CultureElement', 'CultureElement.Questions']; assocs = ['CultureElement', 'CultureElement.Questions'];
wasUpdated = false;
autoSaveInterval; autoSaveInterval;
autoSavedOn; autoSavedOn;
autoSaveLabel = 'a few seconds ago'; autoSaveLabel = 'a few seconds ago';
...@@ -25,6 +27,7 @@ export class WorkPreferenceComponent extends BaseComponent implements OnInit, On ...@@ -25,6 +27,7 @@ export class WorkPreferenceComponent extends BaseComponent implements OnInit, On
constructor( constructor(
private assessmentService: AssessmentService, private assessmentService: AssessmentService,
private utilService: UtilsService, private utilService: UtilsService,
private toasterService: ToasterService,
private router: Router private router: Router
) { ) {
super(); super();
...@@ -43,6 +46,7 @@ export class WorkPreferenceComponent extends BaseComponent implements OnInit, On ...@@ -43,6 +46,7 @@ export class WorkPreferenceComponent extends BaseComponent implements OnInit, On
this.isLoading = false; this.isLoading = false;
this.autoSavedOn = new Date(); this.autoSavedOn = new Date();
this.autoSave(); this.autoSave();
this.wasUpdated = true;
if (response.length > 0) { if (response.length > 0) {
this.workPreferenceQuestion = response[0]; this.workPreferenceQuestion = response[0];
} else { } else {
...@@ -67,6 +71,9 @@ export class WorkPreferenceComponent extends BaseComponent implements OnInit, On ...@@ -67,6 +71,9 @@ export class WorkPreferenceComponent extends BaseComponent implements OnInit, On
} }
exit(): void { exit(): void {
if (this.wasUpdated) {
this.toasterService.success('Preferences updated!');
}
this.router.navigate(['/my-career-web/dashboard/home']); this.router.navigate(['/my-career-web/dashboard/home']);
} }
......
...@@ -36,18 +36,25 @@ ...@@ -36,18 +36,25 @@
<div class="question-tag">{{workStyleQuestion.Question?.Description}}</div> <div class="question-tag">{{workStyleQuestion.Question?.Description}}</div>
<div class="answer-wrapper"> <div class="answer-wrapper" *ngIf="!isMobileView">
<span class="extreme-label-left">{{workStyleQuestion.LeftScaleText}}</span> <span class="extreme-label-left">{{workStyleQuestion.LeftScaleText}}</span>
<div class="answer-options"> <div class="answer-options">
<span class="option-value" *ngFor="let scale of answerScales;" (click)="submitAnswer(scale)">{{scale}}</span> <span class="option-value" *ngFor="let scale of answerScales;" (click)="submitAnswer(scale)">{{scale}}</span>
</div> </div>
<span class="extreme-label-right">{{workStyleQuestion.RightScaleText}}</span>
</div>
<div class="answer-wrapper" *ngIf="isMobileView">
<div class="answer-options">
<span class="option-value" *ngFor="let scale of answerScales;" (click)="submitAnswer(scale)">{{scale}}</span>
</div>
<div class="answer-option-labels">
<span class="extreme-label-left">{{workStyleQuestion.LeftScaleText}}</span>
<span class="extreme-label-right">{{workStyleQuestion.RightScaleText}}</span> <span class="extreme-label-right">{{workStyleQuestion.RightScaleText}}</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
...@@ -125,6 +125,14 @@ ...@@ -125,6 +125,14 @@
font-size: 18px; font-size: 18px;
} }
.extreme-label-left {
margin-right: 10px;
}
.extreme-label-right {
margin-left: 10px;
}
.answer-options { .answer-options {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -227,20 +235,18 @@ ...@@ -227,20 +235,18 @@
.answer-wrapper { .answer-wrapper {
position: relative; position: relative;
display: block !important;
.answer-option-labels {
display: flex;
justify-content: space-between;
.extreme-label-right, .extreme-label-left { .extreme-label-right, .extreme-label-left {
font-size: 12px !important; font-size: 12px !important;
font-family: $bodyFont; font-family: $bodyFont;
position: absolute; flex: 0.8;
bottom: -24px; max-width: 140px;
} }
.extreme-label-right {
right: 0;
}
.extreme-label-left {
left: 0;
} }
.answer-options { .answer-options {
......
...@@ -6,6 +6,7 @@ import { WorkStyleQuestionModel } from '../../models/work-style-question.model'; ...@@ -6,6 +6,7 @@ import { WorkStyleQuestionModel } from '../../models/work-style-question.model';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import * as moment from 'moment'; import * as moment from 'moment';
import { UtilsService } from '../../../oneit/services/utils.service'; import { UtilsService } from '../../../oneit/services/utils.service';
import { ToasterService } from '../../services/toaster.service';
@Component({ @Component({
selector: 'app-work-style', selector: 'app-work-style',
...@@ -20,10 +21,12 @@ export class WorkStyleComponent extends BaseComponent implements OnInit, OnDestr ...@@ -20,10 +21,12 @@ export class WorkStyleComponent extends BaseComponent implements OnInit, OnDestr
autoSaveInterval; autoSaveInterval;
autoSavedOn; autoSavedOn;
autoSaveLabel = 'a few seconds ago'; autoSaveLabel = 'a few seconds ago';
wasUpdated = false;
constructor( constructor(
private assessmentService: AssessmentService, private assessmentService: AssessmentService,
private utilService: UtilsService, private utilService: UtilsService,
private toasterService: ToasterService,
private router: Router private router: Router
) { ) {
super(); super();
...@@ -48,8 +51,8 @@ export class WorkStyleComponent extends BaseComponent implements OnInit, OnDestr ...@@ -48,8 +51,8 @@ export class WorkStyleComponent extends BaseComponent implements OnInit, OnDestr
this.setAnswerScales(); this.setAnswerScales();
}, err => { }, err => {
this.isLoading = false; this.isLoading = false;
this.utilService.handleError(err);
this.exit(); this.exit();
// this.hs.handleHttpError(err);
}); });
} }
...@@ -74,6 +77,7 @@ export class WorkStyleComponent extends BaseComponent implements OnInit, OnDestr ...@@ -74,6 +77,7 @@ export class WorkStyleComponent extends BaseComponent implements OnInit, OnDestr
this.isLoading = false; this.isLoading = false;
this.autoSavedOn = new Date(); this.autoSavedOn = new Date();
this.autoSave(); this.autoSave();
this.wasUpdated = true;
if (response.NextQuestion) { if (response.NextQuestion) {
this.workStyleQuestion = response.NextQuestion; this.workStyleQuestion = response.NextQuestion;
this.setAnswerScales(); this.setAnswerScales();
...@@ -87,6 +91,9 @@ export class WorkStyleComponent extends BaseComponent implements OnInit, OnDestr ...@@ -87,6 +91,9 @@ export class WorkStyleComponent extends BaseComponent implements OnInit, OnDestr
} }
exit(): void { exit(): void {
if (this.wasUpdated) {
this.toasterService.success('Profile updated!');
}
this.router.navigate(['/my-career-web/dashboard/home']); this.router.navigate(['/my-career-web/dashboard/home']);
} }
......
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