Commit 627fbca7 by Nattana Chaiyamat

ประเมินโดยหัวหน้า

parent 5eb663fb
.no-interaction {
pointer-events: none;
cursor: not-allowed;
}
\ No newline at end of file
import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { AppraisalCompentencyModel2 } from 'src/app/shared/model/appraisal-competency.model'; import { AppraisalCompentencyModel2, MasfromEvaluationAssessment2List } from 'src/app/shared/model/appraisal-competency.model';
import { TypeList } from 'src/app/shared/model/appraisal-subordinate.model'; import { TypeList } from 'src/app/shared/model/appraisal-subordinate.model';
import { EmployeeModel, MyEmployeeModel } from 'src/app/shared/model/employee.model'; import { EmployeeModel, MyEmployeeModel } from 'src/app/shared/model/employee.model';
import { SettingAssessmentModel, MySettingAssessmentModel } from 'src/app/shared/model/setting-assessment.model'; import { SettingAssessmentModel, MySettingAssessmentModel } from 'src/app/shared/model/setting-assessment.model';
...@@ -79,6 +79,7 @@ export class PmsCompetencyComponent { ...@@ -79,6 +79,7 @@ export class PmsCompetencyComponent {
getAppraisalCompentencyForm(index: number) { getAppraisalCompentencyForm(index: number) {
if (this.allCompetencyTypeId.length) { if (this.allCompetencyTypeId.length) {
this.appraisalCompentency.loading = true this.appraisalCompentency.loading = true
this.appraisalCompentency.data = undefined
this.appraisalService.getFormCompentencyById(this.evaluationRoundId, this.evaluateeId, this.allCompetencyTypeId[index].competencyTypeId).subscribe({ this.appraisalService.getFormCompentencyById(this.evaluationRoundId, this.evaluateeId, this.allCompetencyTypeId[index].competencyTypeId).subscribe({
next: response => { next: response => {
this.appraisalCompentency.data = JSON.parse(JSON.stringify(response)) this.appraisalCompentency.data = JSON.parse(JSON.stringify(response))
...@@ -425,4 +426,8 @@ export class PmsCompetencyComponent { ...@@ -425,4 +426,8 @@ export class PmsCompetencyComponent {
} }
}) })
} }
onFormCompleted(data: MasfromEvaluationAssessment2List) {
return data.groupAssessment1.competencyIndicatorsCourses1Mini.behavioralIndicatorsList.every(x => x.competencyBehavioral.scoreTopicExpectation != 0)
}
} }
...@@ -58,7 +58,6 @@ export class HttpRequestInterceptor { ...@@ -58,7 +58,6 @@ export class HttpRequestInterceptor {
return this.authService.refreshToken(token.replace("Bearer ", "")).pipe( return this.authService.refreshToken(token.replace("Bearer ", "")).pipe(
switchMap((token: any) => { switchMap((token: any) => {
this.isRefreshing = true; this.isRefreshing = true;
console.log("🚀 2222222222222222222222222222222222222", this.isRefreshing)
this.refreshTokenSubject.next(token.accessToken); this.refreshTokenSubject.next(token.accessToken);
return next.handle(this.addTokenHeader(request, "Bearer " + token.accessToken, fullUrl)); return next.handle(this.addTokenHeader(request, "Bearer " + token.accessToken, fullUrl));
}), }),
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// The list of file replacements can be found in `angular.json`. // The list of file replacements can be found in `angular.json`.
export const environment = { export const environment = {
production: false, production: false,
baseUrl: 'https://myskill-x.myhr.co.th/api', baseUrl: 'https://myskill-x-uat.myhr.co.th/api',
}; };
/* /*
......
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