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

updated api after test connect frontend

Browse source
This commit is contained in:
Warunee Tamkoo 2024-09-06 14:38:37 +07:00
parent 4b55b8cf20
commit b48df26505
10 changed files with 275 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/controllers/AssignController.ts
View file

@ -451,6 +451,7 @@ export class AssignController extends Controller {
lists.map(async (item) => {
const director = await this.assignDirectorRepository.find({
where: { assign_id: item.id },
order: { ordering: "ASC" },
});
let mentors = "";
@ -500,6 +501,7 @@ export class AssignController extends Controller {
"round_no",
"date_start",
"date_finish",
"other_desc",
"other4_desc",
"other5_no1_desc",
"experimenter_dated",
@ -575,12 +577,21 @@ export class AssignController extends Controller {
where: { active: 1 },
});
const laws = await lawData.map((x) => ({
id: x.id,
selected: x.assignLaw ? 1 : 0,
description: x.description,
status_select: x.status_select,
}));
const laws = await Promise.all(
lawData.map(async (x) => {
const assignLaw = await this.assignLawRepository.countBy({
assign_id: assign_id,
law_id: x.id,
});
return {
id: x.id,
selected: assignLaw > 0 ? 1 : 0,
description: x.description,
status_select: x.status_select,
};
}),
);
const skillsData = await this.assignSkillRepository.find({
relations: ["skill"],
@ -640,6 +651,7 @@ export class AssignController extends Controller {
const director = await this.assignDirectorRepository.find({
where: { assign_id },
order: { ordering: "ASC" },
});
let mentors = [];

118
src/controllers/EvaluateChairmanController.ts
View file

@ -90,29 +90,70 @@ export class EvaluateChairmanController extends Controller {
const directorData = await this.assignDirectorRepository.find({
where: { assign_id },
order: { ordering: "ASC" },
});
if (!directorData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
}
let mentors = "";
let mentors = [];
const mentorList = await directorData.filter((x) => x.role == "mentor");
if (mentorList.length > 0) {
for (let index = 0; index < mentorList.length; index++) {
const e = await mentorList[index];
mentors += e.fullname;
if (index < mentorList.length - 1) {
mentors += ", ";
}
mentors.push({
personal_id: e.personal_id,
dated: e.dated,
name: e.fullname,
label:
e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
position: e.position,
posType: e.posType,
posLevel: e.posLevel,
});
}
}
const commanderData = await (directorData.find((x) => x.role == "commander") ?? null);
const commander = commanderData ? commanderData.fullname : null;
const commander =
commanderData != null
? {
personal_id: commanderData.personal_id,
dated: commanderData.dated,
name: commanderData.fullname,
label:
commanderData.fullname +
" " +
(commanderData.position
? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`
: ""),
position: commanderData.position,
posType: commanderData.posType,
posLevel: commanderData.posLevel,
}
: null;
const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null);
const chairman = chairmanData ? chairmanData.fullname : null;
const chairman =
chairmanData != null
? {
personal_id: chairmanData.personal_id,
dated: chairmanData.dated,
name: chairmanData.fullname,
label:
chairmanData.fullname +
" " +
(chairmanData.position
? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})`
: ""),
position: chairmanData.position,
posType: chairmanData.posType,
posLevel: chairmanData.posLevel,
}
: null;
return new HttpSuccess({
person: profile ? profile : null,
@ -156,12 +197,18 @@ export class EvaluateChairmanController extends Controller {
},
});
} else {
evaluate = await this.evaluateChairmanRepository.findOne({
evaluate = await this.evaluateChairmanRepository.find({
where: {
director_id,
assign_id,
},
});
if (evaluate)
evaluate = await evaluate.map((element: EvaluateChairman) => ({
...element,
no: Number(element.no),
}));
}
if (!evaluate) {
@ -196,29 +243,70 @@ export class EvaluateChairmanController extends Controller {
const directorData = await this.assignDirectorRepository.find({
where: { assign_id },
order: { ordering: "ASC" },
});
if (!directorData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
}
let mentors = "";
let mentors = [];
const mentorList = await directorData.filter((x) => x.role == "mentor");
if (mentorList.length > 0) {
for (let index = 0; index < mentorList.length; index++) {
const e = await mentorList[index];
mentors += e.fullname;
if (index < mentorList.length - 1) {
mentors += ", ";
}
mentors.push({
personal_id: e.personal_id,
dated: e.dated,
name: e.fullname,
label:
e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
position: e.position,
posType: e.posType,
posLevel: e.posLevel,
});
}
}
const commanderData = await (directorData.find((x) => x.role == "commander") ?? null);
const commander = commanderData ? commanderData.fullname : null;
const commander =
commanderData != null
? {
personal_id: commanderData.personal_id,
dated: commanderData.dated,
name: commanderData.fullname,
label:
commanderData.fullname +
" " +
(commanderData.position
? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`
: ""),
position: commanderData.position,
posType: commanderData.posType,
posLevel: commanderData.posLevel,
}
: null;
const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null);
const chairman = chairmanData ? chairmanData.fullname : null;
const chairman =
chairmanData != null
? {
personal_id: chairmanData.personal_id,
dated: chairmanData.dated,
name: chairmanData.fullname,
label:
chairmanData.fullname +
" " +
(chairmanData.position
? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})`
: ""),
position: chairmanData.position,
posType: chairmanData.posType,
posLevel: chairmanData.posLevel,
}
: null;
return new HttpSuccess({
experimentee: experimentee,

24
src/controllers/EvaluateController.ts
View file

@ -88,16 +88,18 @@ export class EvaluateController extends Controller {
? assign.date_start
: findEndDate(evaluate_amount * 3, assign.date_start);
const commanderData = await this.assignDirectorRepository.find({
const commanderData = await this.assignDirectorRepository.findOne({
select: ["personal_id", "dated", "fullname", "position", "posType", "posLevel"],
where: { personal_id: director_id },
});
const commander = await commanderData.map((element) => ({
...element,
name: element.fullname,
label: `${element.fullname} (${element.position}, ${element.posType}: ${element.posLevel})`,
}));
if (!commanderData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้บังคับบัญชา");
}
const commander = await {
...commanderData,
name: commanderData.fullname,
label: `${commanderData.fullname} (${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`,
};
return new HttpSuccess({
person: profile,
@ -139,12 +141,18 @@ export class EvaluateController extends Controller {
},
});
} else {
evaluate = await this.evaluateCommanderRepository.findOne({
evaluate = await this.evaluateCommanderRepository.find({
where: {
director_id,
assign_id,
},
});
if (evaluate)
evaluate = await evaluate.map((element: EvaluateCommander) => ({
...element,
no: Number(element.no),
}));
}
if (!evaluate) {

8
src/controllers/EvaluateRecordController.ts
View file

@ -211,7 +211,7 @@ export class EvaluateRecordController extends Controller {
id: evaluate.id,
director_id: evaluate.director_id,
assign_id,
no: evaluate.no,
no: Number(evaluate.no),
date_start: evaluate.date_start,
date_finish: evaluate.date_finish,
assessor_dated: evaluate.assessor_dated,
@ -288,7 +288,7 @@ export class EvaluateRecordController extends Controller {
id: element.id,
director_id: element.director_id,
assign_id,
no: element.no,
no: Number(element.no),
date_start: element.date_start,
date_finish: element.date_finish,
assessor_dated: element.assessor_dated,
@ -755,7 +755,7 @@ export class EvaluateRecordController extends Controller {
id: evaluate.id,
director_id: evaluate.director_id,
assign_id,
no: evaluate.no,
no: Number(evaluate.no),
date_start: evaluate.date_start,
date_finish: evaluate.date_finish,
assessor_dated: evaluate.assessor_dated,
@ -832,7 +832,7 @@ export class EvaluateRecordController extends Controller {
id: element.id,
director_id: element.director_id,
assign_id,
no: element.no,
no: Number(element.no),
date_start: element.date_start,
date_finish: element.date_finish,
assessor_dated: element.assessor_dated,

119
src/controllers/EvaluateResultController.ts
View file

@ -68,29 +68,70 @@ export class EvaluateResultController extends Controller {
const directorData = await this.assignDirectorRepository.find({
where: { assign_id },
order: { ordering: "ASC" },
});
if (!directorData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
}
let mentors = "";
let mentors = [];
const mentorList = await directorData.filter((x) => x.role == "mentor");
if (mentorList.length > 0) {
for (let index = 0; index < mentorList.length; index++) {
const e = await mentorList[index];
mentors += e.fullname;
if (index < mentorList.length - 1) {
mentors += ", ";
}
mentors.push({
personal_id: e.personal_id,
dated: e.dated,
name: e.fullname,
label:
e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
position: e.position,
posType: e.posType,
posLevel: e.posLevel,
});
}
}
const commanderData = await (directorData.find((x) => x.role == "commander") ?? null);
const commander = commanderData ? commanderData.fullname : null;
const commander =
commanderData != null
? {
personal_id: commanderData.personal_id,
dated: commanderData.dated,
name: commanderData.fullname,
label:
commanderData.fullname +
" " +
(commanderData.position
? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`
: ""),
position: commanderData.position,
posType: commanderData.posType,
posLevel: commanderData.posLevel,
}
: null;
const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null);
const chairman = chairmanData ? chairmanData.fullname : null;
const chairman =
chairmanData != null
? {
personal_id: chairmanData.personal_id,
dated: chairmanData.dated,
name: chairmanData.fullname,
label:
chairmanData.fullname +
" " +
(chairmanData.position
? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})`
: ""),
position: chairmanData.position,
posType: chairmanData.posType,
posLevel: chairmanData.posLevel,
}
: null;
const resultData = await this.evaluateChairmanRepository.findOne({
select: [
@ -152,7 +193,7 @@ export class EvaluateResultController extends Controller {
}
const director_id = director.personal_id;
const evaluate = await this.evaluateChairmanRepository.findOne({
const evaluate = await this.evaluateResultRepository.findOne({
where: {
director_id,
assign_id,
@ -160,7 +201,7 @@ export class EvaluateResultController extends Controller {
});
if (!evaluate) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบประเมิน");
return new HttpSuccess(null);
}
const assign = await this.assignRepository.findOne({
@ -191,29 +232,70 @@ export class EvaluateResultController extends Controller {
const directorData = await this.assignDirectorRepository.find({
where: { assign_id },
order: { ordering: "ASC" },
});
if (!directorData) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้ดูแล ผู้บังคับบัญชาและประธาน");
}
let mentors = "";
let mentors = [];
const mentorList = await directorData.filter((x) => x.role == "mentor");
if (mentorList.length > 0) {
for (let index = 0; index < mentorList.length; index++) {
const e = await mentorList[index];
mentors += e.fullname;
if (index < mentorList.length - 1) {
mentors += ", ";
}
mentors.push({
personal_id: e.personal_id,
dated: e.dated,
name: e.fullname,
label:
e.fullname + " " + (e.position ? `(${e.position}, ${e.posType}: ${e.posLevel})` : ""),
position: e.position,
posType: e.posType,
posLevel: e.posLevel,
});
}
}
const commanderData = await (directorData.find((x) => x.role == "commander") ?? null);
const commander = commanderData ? commanderData.fullname : null;
const commander =
commanderData != null
? {
personal_id: commanderData.personal_id,
dated: commanderData.dated,
name: commanderData.fullname,
label:
commanderData.fullname +
" " +
(commanderData.position
? `(${commanderData.position}, ${commanderData.posType}: ${commanderData.posLevel})`
: ""),
position: commanderData.position,
posType: commanderData.posType,
posLevel: commanderData.posLevel,
}
: null;
const chairmanData = await (directorData.find((x) => x.role == "chairman") ?? null);
const chairman = chairmanData ? chairmanData.fullname : null;
const chairman =
chairmanData != null
? {
personal_id: chairmanData.personal_id,
dated: chairmanData.dated,
name: chairmanData.fullname,
label:
chairmanData.fullname +
" " +
(chairmanData.position
? `(${chairmanData.position}, ${chairmanData.posType}: ${chairmanData.posLevel})`
: ""),
position: chairmanData.position,
posType: chairmanData.posType,
posLevel: chairmanData.posLevel,
}
: null;
return new HttpSuccess({
commander,
@ -342,7 +424,10 @@ export class EvaluateResultController extends Controller {
evaluate.date_finish = requestBody.date_finish;
evaluate.develop_complete = requestBody.develop_complete;
evaluate.pass_result = requestBody.pass_result;
evaluate.expand_month = requestBody.pass_result == 3 ? requestBody.expand_month : 0;
evaluate.expand_month =
requestBody.pass_result && requestBody.pass_result == 3
? Number(requestBody.expand_month)
: 0;
evaluate.reson = requestBody.reson;
evaluate.chairman_dated = requestBody.chairman_dated;

6
src/entities/Assign.ts
View file

@ -80,6 +80,12 @@ export class Assign extends EntityBase {
})
active: number;
@Column({
nullable: true,
comment: "กฎหมายอื่นๆ",
})
other_desc!: string;
@ManyToOne(() => Personal, (person: Personal) => person.personal_id)
@JoinColumn({ name: "personal_id" })
profile: Personal;

10
src/entities/AssignLaw.ts
View file

@ -1,4 +1,4 @@
import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm";
import { Entity, Column, ManyToOne, JoinColumn, OneToMany, OneToOne } from "typeorm";
import { EntityBase } from "./base/Base";
import { Assign } from "./Assign";
import { Law } from "./Law";
@ -27,13 +27,13 @@ export class AssignLaw extends EntityBase {
})
ordering: number;
@ManyToOne(() => Assign, (assign: Assign) => assign.laws)
@ManyToOne(() => Assign, (assign: Assign) => assign.id)
@JoinColumn({ name: "assign_id" })
assign: Assign;
@OneToMany(() => Law, (law: Law) => law.assignLaw)
@JoinColumn({ name: "law_id" })
law: Law;
// @ManyToOne(() => Law, (law: Law) => law.assignLaw)
// @JoinColumn({ name: "law_id" })
// law: Law;
}
export class CreateAssignLaw {

10
src/entities/EvaluateResult.ts
View file

@ -1,10 +1,4 @@
import {
Entity,
Column,
ManyToOne,
JoinColumn,
PrimaryGeneratedColumn,
} from "typeorm";
import { Entity, Column, ManyToOne, JoinColumn, PrimaryGeneratedColumn } from "typeorm";
import { EntityBase } from "./base/Base";
import { Assign } from "./Assign";
@ -103,7 +97,7 @@ export class CreateEvaluateResult {
date_finish: Date;
develop_complete: number;
pass_result: number;
expand_month: number;
expand_month?: number;
reson: string;
chairman_dated: Date | null;
director1_dated: Date | null;

14
src/entities/Law.ts
View file

@ -1,10 +1,4 @@
import {
Entity,
Column,
PrimaryGeneratedColumn,
OneToMany,
JoinColumn,
} from "typeorm";
import { Entity, Column, PrimaryGeneratedColumn, OneToMany, JoinColumn, OneToOne } from "typeorm";
import { EntityBase } from "./base/Base";
import { AssignLaw } from "./AssignLaw";
@ -41,7 +35,7 @@ export class Law extends EntityBase {
})
active: number;
@OneToMany(() => AssignLaw, (assignLaw: AssignLaw) => assignLaw.law_id)
@JoinColumn({ name: "id" })
assignLaw: AssignLaw[];
// @OneToMany(() => AssignLaw, (l: AssignLaw) => l.law_id)
// @JoinColumn({ name: "id" })
// assignLaw: AssignLaw[];
}

15
src/migration/1725594553970-update-assigntb.ts Normal file
View file

@ -0,0 +1,15 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateAssigntb1725594553970 implements MigrationInterface {
name = "UpdateAssigntb1725594553970";
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE \`assign\` ADD \`other_desc\` varchar(255) NULL COMMENT 'กฎหมายอื่นๆ'`,
);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`assign\` DROP COLUMN \`other_desc\``);
}
}