hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

edit

Browse source
This commit is contained in:
mamoss 2025-05-26 10:13:03 +07:00
parent 71aac0dd52
commit 36c6abcfdf
1 changed files with 68 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

116
src/controllers/OrganizationDotnetController.ts
View file

@ -2391,53 +2391,53 @@ export class OrganizationDotnetController extends Controller {
}, },
}); });
// const currentYear = new Date().getFullYear(); const currentYear = new Date().getFullYear();
// const years = [currentYear, currentYear - 1, currentYear - 2, currentYear - 3, currentYear - 4]; const years = [currentYear, currentYear - 1, currentYear - 2, currentYear - 3, currentYear - 4];
// // APR Averages // APR Averages
// const aprAverages: { [year: number]: number | null } = {}; const aprAverages: { [year: number]: number | null } = {};
// const aprSums: { [year: number]: number } = {}; const aprSums: { [year: number]: number } = {};
// const aprCounts: { [year: number]: number } = {}; const aprCounts: { [year: number]: number } = {};
// // OCT Averages // OCT Averages
// const octAverages: { [year: number]: number | null } = {}; const octAverages: { [year: number]: number | null } = {};
// const octSums: { [year: number]: number } = {}; const octSums: { [year: number]: number } = {};
// const octCounts: { [year: number]: number } = {}; const octCounts: { [year: number]: number } = {};
// years.forEach((year) => { years.forEach((year) => {
// aprAverages[year] = null; aprAverages[year] = null;
// aprSums[year] = 0; aprSums[year] = 0;
// aprCounts[year] = 0; aprCounts[year] = 0;
// octAverages[year] = null; octAverages[year] = null;
// octSums[year] = 0; octSums[year] = 0;
// octCounts[year] = 0; octCounts[year] = 0;
// }); });
// profiles.forEach((profile) => { profiles.forEach((profile) => {
// const assessments = profile.profileAssessments || []; const assessments = profile.profileAssessments || [];
// assessments.forEach((assessment) => { assessments.forEach((assessment) => {
// const year = Number(assessment.year); const year = Number(assessment.year);
// if (years.includes(year)) { if (years.includes(year)) {
// if (assessment.period === "APR") { if (assessment.period === "APR") {
// aprSums[year] += assessment.pointSum; aprSums[year] += assessment.pointSum;
// aprCounts[year] += 1; aprCounts[year] += 1;
// } }
// if (assessment.period === "OCT") { if (assessment.period === "OCT") {
// octSums[year] += assessment.pointSum; octSums[year] += assessment.pointSum;
// octCounts[year] += 1; octCounts[year] += 1;
// } }
// } }
// }); });
// }); });
// years.forEach((year) => { years.forEach((year) => {
// aprAverages[year] = aprCounts[year] > 0 ? aprSums[year] / aprCounts[year] : null; aprAverages[year] = aprCounts[year] > 0 ? aprSums[year] / aprCounts[year] : null;
// octAverages[year] = octCounts[year] > 0 ? octSums[year] / octCounts[year] : null; octAverages[year] = octCounts[year] > 0 ? octSums[year] / octCounts[year] : null;
// }); });
const findRevision = await this.orgRevisionRepo.findOne({ const findRevision = await this.orgRevisionRepo.findOne({
where: { orgRevisionIsCurrent: true }, where: { orgRevisionIsCurrent: true },
@ -2619,16 +2619,36 @@ export class OrganizationDotnetController extends Controller {
markLeave: false, markLeave: false,
markRate: profile.profileAssessments.length > 0 ? true : false, markRate: profile.profileAssessments.length > 0 ? true : false,
markInsignia: profile.profileInsignias.length > 0 ? true : false, markInsignia: profile.profileInsignias.length > 0 ? true : false,
// apr1:aprAverages[currentYear] ? Extension.textPoint(aprAverages[currentYear] as number) : null, apr1: aprAverages[currentYear]
// apr2:aprAverages[currentYear - 1] ? Extension.textPoint(aprAverages[currentYear - 1] as number) : null, ? Extension.textPoint(aprAverages[currentYear] as number)
// apr3:aprAverages[currentYear - 2] ? Extension.textPoint(aprAverages[currentYear - 2] as number) : null, : null,
// apr4:aprAverages[currentYear - 3] ? Extension.textPoint(aprAverages[currentYear - 3] as number) : null, apr2: aprAverages[currentYear - 1]
// apr5:aprAverages[currentYear - 4] ? Extension.textPoint(aprAverages[currentYear - 4] as number) : null, ? Extension.textPoint(aprAverages[currentYear - 1] as number)
// oct1:octAverages[currentYear] ? Extension.textPoint(octAverages[currentYear] as number) : null, : null,
// oct2:octAverages[currentYear - 1] ? Extension.textPoint(octAverages[currentYear - 1] as number) : null, apr3: aprAverages[currentYear - 2]
// oct3:octAverages[currentYear - 2] ? Extension.textPoint(octAverages[currentYear - 2] as number) : null, ? Extension.textPoint(aprAverages[currentYear - 2] as number)
// oct4:octAverages[currentYear - 3] ? Extension.textPoint(octAverages[currentYear - 3] as number) : null, : null,
// oct5:octAverages[currentYear - 4] ? Extension.textPoint(octAverages[currentYear - 4] as number) : null, apr4: aprAverages[currentYear - 3]
? Extension.textPoint(aprAverages[currentYear - 3] as number)
: null,
apr5: aprAverages[currentYear - 4]
? Extension.textPoint(aprAverages[currentYear - 4] as number)
: null,
oct1: octAverages[currentYear]
? Extension.textPoint(octAverages[currentYear] as number)
: null,
oct2: octAverages[currentYear - 1]
? Extension.textPoint(octAverages[currentYear - 1] as number)
: null,
oct3: octAverages[currentYear - 2]
? Extension.textPoint(octAverages[currentYear - 2] as number)
: null,
oct4: octAverages[currentYear - 3]
? Extension.textPoint(octAverages[currentYear - 3] as number)
: null,
oct5: octAverages[currentYear - 4]
? Extension.textPoint(octAverages[currentYear - 4] as number)
: null,
}; };
}); });