Skip to content

M
myAppraisal
Commit 4c6d793f by Nakarin Luankla
Options

Merge branch 'DEV' of https://mygit.myhr.co.th/angular/myAppraisal into DEV 

# Conflicts:
#	src/app/components/dashboard/dashboard.module.ts
parents dee8abcf 50249a87
Showing with 429 additions and 52 deletions
src/app/components/competency-assessment/competency-management/group-competencies/edit-group-competencies/edit-group-competencies.component.html
......@@ -159,7 +159,7 @@
</label>
</td>
<td style="font-size: 12px; width: 60%;">
{{item.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.tdesc}}
{{item.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.tdesc}}
</td>
<td style="font-size: 12px;text-align: center;">
{{item.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.expectation}}
......@@ -310,7 +310,7 @@
{{item.data.competencyIndicatorsCourses0.competencyTopic.competencyTopicId}}
</td>
<td style="font-size: 12px; width: 60%;">
{{item.data.competencyIndicatorsCourses0.tdesc}}
{{item.data.competencyIndicatorsCourses0.competencyTopic.tdesc}}
</td>
<td style="font-size: 12px;text-align: center; width: 20%;">
{{item.data.competencyIndicatorsCourses0.expectation}}</td>
......
src/app/components/competency-assessment/competency-management/group-competencies/edit-group-competencies/edit-group-competencies.component.ts
......@@ -117,6 +117,7 @@ export class EditGroupCompetenciesComponent {
})
})
this.isDataListCheckedAll = false
this.searchChange()
this.dataListCheckAll()
}
......
src/app/components/competency-assessment/competency-management/indicators-and-curriculum/edit-group-indicators/edit-group-indicators.component.ts
......@@ -107,7 +107,7 @@ export class EditGroupIndicators implements OnInit {
};
});
this.dataList.sort((a, b) => +a.code - +b.code)
let maxCode = Math.max(-1, ...this.dataList.map(x => +x.code))
let maxCode = Math.max(0, ...this.dataList.map(x => +x.code))
while (this.dataList.length < +this.indicatorsCourses.competencyTopic.expectationLevel) {
this.dataList.push({
code: (++maxCode) + "",
......
src/app/components/dashboard/dashboard.module.ts
......@@ -151,6 +151,7 @@ import { PmsGradeManagementComponent } from '../performance-management-evaluatio
import { PmsSubGradeRegistrationComponent } from '../performance-management-evaluation/pms-grade-registration/pms-grade-management/pms-sub-grade-registration/pms-sub-grade-registration.component';
import { PmsGroupGradeComponent } from '../performance-management-evaluation/pms-grade-registration/pms-grade-management/pms-group-grade/pms-group-grade.component';
import { EvaluationAssessmentService } from 'src/app/shared/services/evaluation-assessment.service';
import { AppraisalService } from 'src/app/shared/services/appraisal.service';
export const MY_DATE_FORMATS = {
parse: {
......@@ -332,6 +333,7 @@ export class CustomDateAdapter extends NativeDateAdapter {
PmsGroupGradeService,
PmsSettingAssessmentService,
EvaluationAssessmentService,
AppraisalService,
{
provide: HTTP_INTERCEPTORS,
useClass: HttpRequestInterceptor,
......
src/app/components/performance-management-evaluation/assessment-management/assigning-approvers/assigning-approvers.component.ts
......@@ -158,12 +158,21 @@ export class AssigningApproversComponent {
this.page = Array.from({ length: Math.ceil(this.groupapprove_listFilter().length / 10) }, (_, i) => i + 1);
}
groupapprove_listFilter() {
return this.groupapprove_list.filter(x => x.apsapprove1.employeeId || x.apsapprove2.employeeId || x.apsapprove3.employeeId || x.apsapprove4.employeeId || x.apsapprove5.employeeId.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove1.fname || x.apsapprove1.lname.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove2.fname || x.apsapprove2.lname.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove3.fname || x.apsapprove3.lname.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove4.fname || x.apsapprove4.lname.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove5.fname || x.apsapprove5.lname.toLowerCase().includes(this.search.toLowerCase()))
return this.groupapprove_list.filter(x => x.apsapprove1.employeeId.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove2.employeeId.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove3.employeeId.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove4.employeeId.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove5.employeeId.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove1.fname.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove1.lname.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove2.fname.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove2.lname.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove3.fname.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove3.lname.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove4.fname.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove4.lname.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove5.fname.toLowerCase().includes(this.search.toLowerCase()) ||
x.apsapprove5.lname.toLowerCase().includes(this.search.toLowerCase()))
}
selectGroupapprove(groupapprove?: GroupApproveModel) {
......
src/app/components/performance-management-evaluation/name-registration-perfomance/assessment-topics/assessment-topics.component.html
......@@ -229,6 +229,27 @@
<input type="text" class="ti-form-input" [(ngModel)]="pmstopic.select.indicatorsDetail">
<label class="ti-form-label mt-2rem">เป้าหมายผลงาน</label>
<input type="text" class="ti-form-input" [(ngModel)]="pmstopic.select.performanceGoalsDetail">
<label class="ti-form-label mt-2rem">ค่าเป้าหมาย</label>
<div class="grid grid-cols-12 gap-x-2 mt-2rem">
<label class="ti-form-label col-span-3 align-center m-0">A (5 คะแนน)</label>
<input type="text" class="ti-form-input col-span-9" [(ngModel)]="pmstopic.select.targetAdetail">
</div>
<div class="grid grid-cols-12 gap-x-2 mt-2rem">
<label class="ti-form-label col-span-3 align-center m-0">B (4 คะแนน)</label>
<input type="text" class="ti-form-input col-span-9" [(ngModel)]="pmstopic.select.targetBdetail">
</div>
<div class="grid grid-cols-12 gap-x-2 mt-2rem">
<label class="ti-form-label col-span-3 align-center m-0">C (3 คะแนน)</label>
<input type="text" class="ti-form-input col-span-9" [(ngModel)]="pmstopic.select.targetCdetail">
</div>
<div class="grid grid-cols-12 gap-x-2 mt-2rem">
<label class="ti-form-label col-span-3 align-center m-0">D (2 คะแนน)</label>
<input type="text" class="ti-form-input col-span-9" [(ngModel)]="pmstopic.select.targetDdetail">
</div>
<div class="grid grid-cols-12 gap-x-2 mt-2rem">
<label class="ti-form-label col-span-3 align-center m-0">F (1 คะแนน)</label>
<input type="text" class="ti-form-input col-span-9" [(ngModel)]="pmstopic.select.targetFdetail">
</div>
<div class="flex justify-end mt-2rem mb-1rem">
<button type="button"
class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
......
src/app/shared/model/appraisal-form.model.ts 0 → 100644
import { EmployeeModel, MyEmployeeModel } from "./employee.model"
import { EvaluationCycleModel, MyEvaluationCycleModel } from "./evaluation-cycle.model"
import { MasfromEvaluationAssessment1Model, MyMasfromEvaluationAssessment1Model } from "./masfrom-evaluation-assessment1.model"
import { MyPLModel, PLModel } from "./pl.model"
export interface AppraisalFormModel {
personalLevel: PLModel
masfromEvaluationRoundModel: EvaluationCycleModel
companyId: string
fromDetail: string
apsassessy: EmployeeModel
apsapprove1: EmployeeModel
apsapprove2: EmployeeModel
apsapprove3: EmployeeModel
apsapprove4: EmployeeModel
apsapprove5: EmployeeModel
apsassessyStatus: string
apsapprove1Status: string
apsapprove2Status: string
apsapprove3Status: string
apsapprove4Status: string
apsapprove5Status: string
targetScore1: number
targetScore2: number
targetScore3: number
targetScore4: number
targetScore5: number
weightedTotal: number
averageScore: number
apsapprove1Comment: string
apsapprove2Comment: string
apsapprove3Comment: string
apsapprove4Comment: string
apsapprove5Comment: string
evaluationResults: string
sumEvaluationResults: string
masfromEvaluationAssessment1lList: MasfromEvaluationAssessment1Model[]
}
export class MyAppraisalFormModel implements AppraisalFormModel {
personalLevel: PLModel
masfromEvaluationRoundModel: EvaluationCycleModel
companyId: string
fromDetail: string
apsassessy: EmployeeModel
apsapprove1: EmployeeModel
apsapprove2: EmployeeModel
apsapprove3: EmployeeModel
apsapprove4: EmployeeModel
apsapprove5: EmployeeModel
apsassessyStatus: string
apsapprove1Status: string
apsapprove2Status: string
apsapprove3Status: string
apsapprove4Status: string
apsapprove5Status: string
targetScore1: number
targetScore2: number
targetScore3: number
targetScore4: number
targetScore5: number
weightedTotal: number
averageScore: number
apsapprove1Comment: string
apsapprove2Comment: string
apsapprove3Comment: string
apsapprove4Comment: string
apsapprove5Comment: string
evaluationResults: string
sumEvaluationResults: string
masfromEvaluationAssessment1lList: MasfromEvaluationAssessment1Model[]
constructor(data?: Partial<AppraisalFormModel>) {
this.personalLevel = new MyPLModel(data?.personalLevel)
this.masfromEvaluationRoundModel = new MyEvaluationCycleModel(data?.masfromEvaluationRoundModel)
this.companyId = data?.companyId || ""
this.fromDetail = data?.fromDetail || ""
this.apsassessy = new MyEmployeeModel(data?.apsassessy)
this.apsapprove1 = new MyEmployeeModel(data?.apsapprove1)
this.apsapprove2 = new MyEmployeeModel(data?.apsapprove2)
this.apsapprove3 = new MyEmployeeModel(data?.apsapprove3)
this.apsapprove4 = new MyEmployeeModel(data?.apsapprove4)
this.apsapprove5 = new MyEmployeeModel(data?.apsapprove5)
this.apsassessyStatus = data?.apsassessyStatus || ""
this.apsapprove1Status = data?.apsapprove1Status || ""
this.apsapprove2Status = data?.apsapprove2Status || ""
this.apsapprove3Status = data?.apsapprove3Status || ""
this.apsapprove4Status = data?.apsapprove4Status || ""
this.apsapprove5Status = data?.apsapprove5Status || ""
this.targetScore1 = data?.targetScore1 ?? 0
this.targetScore2 = data?.targetScore2 ?? 0
this.targetScore3 = data?.targetScore3 ?? 0
this.targetScore4 = data?.targetScore4 ?? 0
this.targetScore5 = data?.targetScore5 ?? 0
this.weightedTotal = data?.weightedTotal ?? 0
this.averageScore = data?.averageScore ?? 0
this.apsapprove1Comment = data?.apsapprove1Comment || ""
this.apsapprove2Comment = data?.apsapprove2Comment || ""
this.apsapprove3Comment = data?.apsapprove3Comment || ""
this.apsapprove4Comment = data?.apsapprove4Comment || ""
this.apsapprove5Comment = data?.apsapprove5Comment || ""
this.evaluationResults = data?.evaluationResults || ""
this.sumEvaluationResults = data?.sumEvaluationResults || ""
this.masfromEvaluationAssessment1lList = data?.masfromEvaluationAssessment1lList?.map(x => new MyMasfromEvaluationAssessment1Model(x)) || []
}
}
src/app/shared/model/appraisal.model.ts 0 → 100644
import { EmployeeModel, MyEmployeeModel } from "./employee.model"
import { EvaluationCycleModel, MyEvaluationCycleModel } from "./evaluation-cycle.model"
import { MyPLModel, PLModel } from "./pl.model"
import { MyStatusCodeModel, StatusCodeModel } from "./status-code.model"
export interface AppraisalModel {
personalLevel: PLModel
masfromEvaluationRoundModel: EvaluationCycleModel
companyId: string
masfromStatusType: StatusCodeModel
fromDetail: string
apsassessy: EmployeeModel
apsapprove1: EmployeeModel
apsapprove2: EmployeeModel
apsapprove3: EmployeeModel
apsapprove4: EmployeeModel
apsapprove5: EmployeeModel
apsassessyStatus: string
apsapprove1Status: string
apsapprove2Status: string
apsapprove3Status: string
apsapprove4Status: string
apsapprove5Status: string
targetScore1: number
targetScore2: number
targetScore3: number
targetScore4: number
targetScore5: number
weightedTotal: number
averageScore: number
apsapprove1Comment: string
apsapprove2Comment: string
apsapprove3Comment: string
apsapprove4Comment: string
apsapprove5Comment: string
evaluationResults: string
sumEvaluationResults: string
}
export class MyAppraisalModel implements AppraisalModel {
personalLevel: PLModel
masfromEvaluationRoundModel: EvaluationCycleModel
companyId: string
masfromStatusType: StatusCodeModel
fromDetail: string
apsassessy: EmployeeModel
apsapprove1: EmployeeModel
apsapprove2: EmployeeModel
apsapprove3: EmployeeModel
apsapprove4: EmployeeModel
apsapprove5: EmployeeModel
apsassessyStatus: string
apsapprove1Status: string
apsapprove2Status: string
apsapprove3Status: string
apsapprove4Status: string
apsapprove5Status: string
targetScore1: number
targetScore2: number
targetScore3: number
targetScore4: number
targetScore5: number
weightedTotal: number
averageScore: number
apsapprove1Comment: string
apsapprove2Comment: string
apsapprove3Comment: string
apsapprove4Comment: string
apsapprove5Comment: string
evaluationResults: string
sumEvaluationResults: string
constructor(data?: Partial<AppraisalModel>) {
this.personalLevel = new MyPLModel(data?.personalLevel)
this.masfromEvaluationRoundModel = new MyEvaluationCycleModel(data?.masfromEvaluationRoundModel)
this.companyId = data?.companyId || ""
this.masfromStatusType = new MyStatusCodeModel(data?.masfromStatusType)
this.fromDetail = data?.fromDetail || ""
this.apsassessy = new MyEmployeeModel(data?.apsassessy)
this.apsapprove1 = new MyEmployeeModel(data?.apsapprove1)
this.apsapprove2 = new MyEmployeeModel(data?.apsapprove2)
this.apsapprove3 = new MyEmployeeModel(data?.apsapprove3)
this.apsapprove4 = new MyEmployeeModel(data?.apsapprove4)
this.apsapprove5 = new MyEmployeeModel(data?.apsapprove5)
this.apsassessyStatus = data?.apsassessyStatus || ""
this.apsapprove1Status = data?.apsapprove1Status || ""
this.apsapprove2Status = data?.apsapprove2Status || ""
this.apsapprove3Status = data?.apsapprove3Status || ""
this.apsapprove4Status = data?.apsapprove4Status || ""
this.apsapprove5Status = data?.apsapprove5Status || ""
this.targetScore1 = data?.targetScore1 ?? 0
this.targetScore2 = data?.targetScore2 ?? 0
this.targetScore3 = data?.targetScore3 ?? 0
this.targetScore4 = data?.targetScore4 ?? 0
this.targetScore5 = data?.targetScore5 ?? 0
this.weightedTotal = data?.weightedTotal ?? 0
this.averageScore = data?.averageScore ?? 0
this.apsapprove1Comment = data?.apsapprove1Comment || ""
this.apsapprove2Comment = data?.apsapprove2Comment || ""
this.apsapprove3Comment = data?.apsapprove3Comment || ""
this.apsapprove4Comment = data?.apsapprove4Comment || ""
this.apsapprove5Comment = data?.apsapprove5Comment || ""
this.evaluationResults = data?.evaluationResults || ""
this.sumEvaluationResults = data?.sumEvaluationResults || ""
}
}
src/app/shared/model/competency-behavioral.model.ts 0 → 100644
export interface CompetencyBehavioralModel {
scoreTopicExpectation: number
companyId: string
}
export class MyCompetencyBehavioralModel implements CompetencyBehavioralModel {
scoreTopicExpectation: number
companyId: string
constructor(data?: Partial<CompetencyBehavioralModel>) {
this.scoreTopicExpectation = data?.scoreTopicExpectation ?? 0
this.companyId = data?.companyId || ""
}
}
src/app/shared/model/competency-indicators-courses1-mini.model.ts
import { CompetencyCourseModel, MyCompetencyCourseModel } from "./competency-course.model"
import { CompetencyIndicatorsCourses0Model, MyCompetencyIndicatorsCourses0Model } from "./competency-indicators-courses0.model"
import { CompetencyIndicatorsCourses2ListModel, MyCompetencyIndicatorsCourses2ListModel } from "./competency-indicators-courses2-list.model"
export interface CompetencyIndicatorsCourses1MiniModel {
competencyIndicatorsCourses0: CompetencyIndicatorsCourses0Model
......@@ -7,6 +8,7 @@ export interface CompetencyIndicatorsCourses1MiniModel {
companyId: string
competencyCourseId: string
competencyCourse: CompetencyCourseModel[]
behavioralIndicatorsList: CompetencyIndicatorsCourses2ListModel[]
}
export class MyCompetencyIndicatorsCourses1MiniModel implements CompetencyIndicatorsCourses1MiniModel {
competencyIndicatorsCourses0: CompetencyIndicatorsCourses0Model
......@@ -14,12 +16,14 @@ export class MyCompetencyIndicatorsCourses1MiniModel implements CompetencyIndica
companyId: string
competencyCourseId: string
competencyCourse: CompetencyCourseModel[]
behavioralIndicatorsList: CompetencyIndicatorsCourses2ListModel[]
constructor(data?: Partial<CompetencyIndicatorsCourses1MiniModel>) {
this.competencyIndicatorsCourses0 = new MyCompetencyIndicatorsCourses0Model(data?.competencyIndicatorsCourses0 || {})
this.lineNo = data?.lineNo ?? 0
this.companyId = data?.companyId || ""
this.competencyCourseId = data?.competencyCourseId || ""
this.competencyCourse = data?.competencyCourse?.map(x => new MyCompetencyCourseModel(x)) || []
this.behavioralIndicatorsList = data?.behavioralIndicatorsList?.map(x => new MyCompetencyIndicatorsCourses2ListModel(x)) || []
}
}
src/app/shared/model/competency-indicators-courses2-list.model.ts
import { CompetencyAssessmentModel, MyCompetencyAssessmentModel } from "./competency-assessment.model"
import { CompetencyBehavioralModel, MyCompetencyBehavioralModel } from "./competency-behavioral.model"
export interface CompetencyIndicatorsCourses2ListModel {
runNo: number
......@@ -6,6 +7,7 @@ export interface CompetencyIndicatorsCourses2ListModel {
assessmentId: string
behavioralIndicators: string
competencyAssessment: CompetencyAssessmentModel[]
competencyBehavioral: CompetencyBehavioralModel
}
export class MyCompetencyIndicatorsCourses2ListModel implements CompetencyIndicatorsCourses2ListModel {
runNo: number
......@@ -13,12 +15,14 @@ export class MyCompetencyIndicatorsCourses2ListModel implements CompetencyIndica
assessmentId: string
behavioralIndicators: string
competencyAssessment: CompetencyAssessmentModel[]
constructor(data: Partial<CompetencyIndicatorsCourses2ListModel>) {
this.runNo = data.runNo ?? 0
this.companyId = data.companyId || ""
this.assessmentId = data.assessmentId || ""
this.behavioralIndicators = data.behavioralIndicators || ""
this.competencyAssessment = data.competencyAssessment?.map(x => new MyCompetencyAssessmentModel(x)) || []
competencyBehavioral: CompetencyBehavioralModel
constructor(data?: Partial<CompetencyIndicatorsCourses2ListModel>) {
this.runNo = data?.runNo ?? 0
this.companyId = data?.companyId || ""
this.assessmentId = data?.assessmentId || ""
this.behavioralIndicators = data?.behavioralIndicators || ""
this.competencyAssessment = data?.competencyAssessment?.map(x => new MyCompetencyAssessmentModel(x)) || []
this.competencyBehavioral = new MyCompetencyBehavioralModel(data?.competencyBehavioral)
}
}
src/app/shared/model/development-plan.model.ts 0 → 100644
export interface DevelopmentPlanModel {
planId: string;
companyId: string;
ojtJobAssignment: boolean;
coachMentor: boolean;
training: boolean;
}
export class MyDevelopmentPlanModel implements DevelopmentPlanModel {
planId: string;
companyId: string;
ojtJobAssignment: boolean;
coachMentor: boolean;
training: boolean;
constructor(data?: Partial<DevelopmentPlanModel>) {
this.planId = data?.planId || '';
this.companyId = data?.companyId || '';
this.ojtJobAssignment = data?.ojtJobAssignment ?? false
this.coachMentor = data?.coachMentor ?? false
this.training = data?.training ?? false
}
}
src/app/shared/model/evaluation-cycle.model.ts
......@@ -19,14 +19,14 @@ export class MyEvaluationCycleModel implements EvaluationCycleModel {
apsPeriodEnd: string;
statusCode: StatusCodeModel;
constructor(data: Partial<EvaluationCycleModel>) {
this.evaluationRoundId = data.evaluationRoundId || "";
this.tdesc = data.tdesc || "";
this.edesc = data.edesc || "";
this.apsyear = data.apsyear || "";
this.apsPeriodStart = data.apsPeriodStart || "";
this.apsPeriodEnd = data.apsPeriodEnd || "";
this.statusCode =new MyStatusCodeModel(data.statusCode || {})
constructor(data?: Partial<EvaluationCycleModel>) {
this.evaluationRoundId = data?.evaluationRoundId || "";
this.tdesc = data?.tdesc || "";
this.edesc = data?.edesc || "";
this.apsyear = data?.apsyear || "";
this.apsPeriodStart = data?.apsPeriodStart || "";
this.apsPeriodEnd = data?.apsPeriodEnd || "";
this.statusCode =new MyStatusCodeModel(data?.statusCode || {})
}
}
src/app/shared/model/group-assessment-mini.model.ts 0 → 100644
import { CompetencyIndicatorsCourses1MiniModel, MyCompetencyIndicatorsCourses1MiniModel } from "./competency-indicators-courses1-mini.model"
import { MyPLModel, PLModel } from "./pl.model"
export interface GroupAssessmentMiniModel {
personalLevel: PLModel
competencyIndicatorsCourses1Mini: CompetencyIndicatorsCourses1MiniModel
companyId: string
edesc: string
tdesc: string
}
export class MyGroupAssessmentMiniModel implements GroupAssessmentMiniModel {
personalLevel: PLModel
competencyIndicatorsCourses1Mini: CompetencyIndicatorsCourses1MiniModel
companyId: string
edesc: string
tdesc: string
constructor(data?: Partial<GroupAssessmentMiniModel>) {
this.personalLevel = new MyPLModel(data?.personalLevel)
this.competencyIndicatorsCourses1Mini = new MyCompetencyIndicatorsCourses1MiniModel(data?.competencyIndicatorsCourses1Mini)
this.companyId = data?.companyId || ""
this.edesc = data?.edesc || ""
this.tdesc = data?.tdesc || ""
}
}
src/app/shared/model/group-assessment1.model.ts 0 → 100644
import { CompetencyIndicatorsCourses1MiniModel, MyCompetencyIndicatorsCourses1MiniModel } from "./competency-indicators-courses1-mini.model"
import { GroupAssessmentMiniModel, MyGroupAssessmentMiniModel } from "./group-assessment-mini.model"
import { MyPLModel, PLModel } from "./pl.model"
export interface GroupAssessment1Model {
personalLevelModel: PLModel
competencyIndicatorsCourses1Mini: CompetencyIndicatorsCourses1MiniModel
companyId: string
groupAssessmentMini: GroupAssessmentMiniModel
}
export class MyGroupAssessment1Model implements GroupAssessment1Model {
personalLevelModel: PLModel
competencyIndicatorsCourses1Mini: CompetencyIndicatorsCourses1MiniModel
companyId: string
groupAssessmentMini: GroupAssessmentMiniModel
constructor(data?: Partial<GroupAssessment1Model>) {
this.personalLevelModel = new MyPLModel(data?.personalLevelModel)
this.competencyIndicatorsCourses1Mini = new MyCompetencyIndicatorsCourses1MiniModel(data?.competencyIndicatorsCourses1Mini)
this.companyId = data?.companyId || ""
this.groupAssessmentMini = new MyGroupAssessmentMiniModel(data?.groupAssessmentMini)
}
}
src/app/shared/model/idp-development.model.ts
export interface DevelopmentPlan {
planId: string;
companyId: string;
ojtJobAssignment: boolean;
coachMentor: boolean;
training: boolean;
import { DevelopmentPlanModel, MyDevelopmentPlanModel } from "./development-plan.model";
export interface IdpDevelopmentModel {
evaluationId: string;
companyId: string;
score: number;
developmentPlan: DevelopmentPlanModel[];
}
export class MyIdpDevelopmentModel implements IdpDevelopmentModel {
evaluationId: string;
companyId: string;
score: number;
developmentPlan: DevelopmentPlanModel[];
constructor(data?: Partial<IdpDevelopmentModel>) {
this.evaluationId = data?.evaluationId || '';
this.companyId = data?.companyId || '';
this.score = data?.score ?? 0;
this.developmentPlan = data?.developmentPlan?.map(x => new MyDevelopmentPlanModel(x)) || [];
}
export interface IdpDevelopmentModel {
evaluationId: string;
companyId: string;
score: number;
developmentPlan: DevelopmentPlan[];
}
export class MyIdpDevelopmentModel implements IdpDevelopmentModel {
evaluationId: string;
companyId: string;
score: number;
developmentPlan: DevelopmentPlan[];
constructor(data: Partial<IdpDevelopmentModel>) {
this.evaluationId = data.evaluationId || '';
this.companyId = data.companyId || '';
this.score = data.score ?? 0;
this.developmentPlan = data.developmentPlan || [];
}
}
\ No newline at end of file
}
src/app/shared/model/masfrom-evaluation-assessment1.model.ts 0 → 100644
import { GroupAssessment1Model, MyGroupAssessment1Model } from "./group-assessment1.model"
export interface MasfromEvaluationAssessment1Model {
companyId: string
lineNo: number
groupAssessment1: GroupAssessment1Model
}
export class MyMasfromEvaluationAssessment1Model implements MasfromEvaluationAssessment1Model {
companyId: string
lineNo: number
groupAssessment1: GroupAssessment1Model
constructor(data?: Partial<MasfromEvaluationAssessment1Model>) {
this.companyId = data?.companyId || ""
this.lineNo = data?.lineNo ?? 0
this.groupAssessment1 = new MyGroupAssessment1Model(data?.groupAssessment1)
}
}
src/app/shared/services/appraisal.service.ts 0 → 100644
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { environment } from 'src/environments/environment';
import { PLModel } from '../model/pl.model';
import { AlertModel } from '../model/alert.model';
import { AppraisalModel } from '../model/appraisal.model';
import { AppraisalFormModel } from '../model/appraisal-form.model';
@Injectable({
providedIn: 'root'
})
export class AppraisalService {
api = "/appraisal"
urlApi = environment.baseUrl + this.api
constructor(private http: HttpClient) {
}
getFormCompentencyById(evaluationRoundId: string, apsassessy: string): Observable<AppraisalFormModel> {
return this.http.get<AppraisalFormModel>(this.urlApi + "/competency/" + evaluationRoundId + "/" + apsassessy)
}
getList(): Observable<AppraisalModel[]> {
return this.http.get<AppraisalModel[]>(this.urlApi + "/competency/emp")
}
post(body: AppraisalModel): Observable<AlertModel> {
return this.http.post<AlertModel>(this.urlApi, body)
}
}
\ No newline at end of file
src/app/shared/services/employee.service.ts
......@@ -34,6 +34,9 @@ export class EmployeeService {
getById(employeeId: string): Observable<EmployeeModel> {
return this.http.get<EmployeeModel>(this.urlApi + "/profile?employeeId=" + employeeId)
}
getProfile(): Observable<EmployeeModel> {
return this.http.get<EmployeeModel>(this.urlApi + "/profile")
}
add(body: EmployeeModel): Observable<AlertModel> {
return this.http.post<AlertModel>(this.urlApi + '/profile-create', body)
}
......
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