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

Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop

Browse source 
# Conflicts:
#	src/controllers/SalaryPeriodController.ts
This commit is contained in:
AdisakKanthawilang 2024-02-29 10:38:45 +07:00
commit e711a26335
3 changed files with 117 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/entities/SalaryProfile.ts
View file

@ -235,34 +235,39 @@ export class SalaryProfile extends EntityBase {
child4: string; child4: string;
@Column({ @Column({
nullable: true,
comment: "ผลการประเมิน", comment: "ผลการประเมิน",
default: false, default: null,
}) })
result: boolean; result: string;
@Column({ @Column({
nullable: true,
comment: "ระยะเวลา", comment: "ระยะเวลา",
default: false, default: null,
}) })
duration: boolean; duration: string;
@Column({ @Column({
nullable: true,
comment: "การลงโทษ", comment: "การลงโทษ",
default: false, default: null,
}) })
punish: boolean; punish: string;
@Column({ @Column({
nullable: true,
comment: "พักราชการ", comment: "พักราชการ",
default: false, default: null,
}) })
retired: boolean; retired: string;
@Column({ @Column({
nullable: true,
comment: "ขาดราชการ", comment: "ขาดราชการ",
default: false, default: null,
}) })
retired2: boolean; retired2: string;
@ManyToOne(() => SalaryOrg, (salaryOrg) => salaryOrg.salaryProfiles) @ManyToOne(() => SalaryOrg, (salaryOrg) => salaryOrg.salaryProfiles)
@JoinColumn({ name: "salaryOrgId" }) @JoinColumn({ name: "salaryOrgId" })

113
src/interfaces/extension.ts
View file

@ -1,54 +1,81 @@
class Extension { class Extension {
public static ToThaiMonth(value: number) {
public static ToThaiMonth(value: number) { switch (value) {
switch (value) { case 1:
case 1: return "มกราคม"; return "มกราคม";
case 2: return "กุมภาพันธ์"; case 2:
case 3: return "มีนาคม"; return "กุมภาพันธ์";
case 4: return "เมษายน"; case 3:
case 5: return "พฤษภาคม"; return "มีนาคม";
case 6: return "มิถุนายน"; case 4:
case 7: return "กรกฎาคม"; return "เมษายน";
case 8: return "สิงหาคม"; case 5:
case 9: return "กันยายน"; return "พฤษภาคม";
case 10: return "ตุลาคม"; case 6:
case 11: return "พฤศจิกายน"; return "มิถุนายน";
case 12: return "ธันวาคม"; case 7:
default: return ""; return "กรกฎาคม";
} case 8:
return "สิงหาคม";
case 9:
return "กันยายน";
case 10:
return "ตุลาคม";
case 11:
return "พฤศจิกายน";
case 12:
return "ธันวาคม";
default:
return "";
} }
}
public static ToThaiYear(value: number) { public static ToThaiYear(value: number) {
if (value < 2400) if (value < 2400) return value + 543;
return value + 543; else return value;
else return value; }
}
public static ToCeYear(value: number) { public static ToCeYear(value: number) {
if (value >= 2400) if (value >= 2400) return value - 543;
return value - 543; else return value;
else return value; }
}
public static ToThaiNumber(value: string) { public static ToThaiNumber(value: string) {
let arabicNumbers = "0123456789"; let arabicNumbers = "0123456789";
let thaiNumbers = "๐๑๒๓๔๕๖๗๘๙"; let thaiNumbers = "๐๑๒๓๔๕๖๗๘๙";
let result = ""; let result = "";
for (let digit of value) { for (let digit of value) {
let index = arabicNumbers.indexOf(digit); let index = arabicNumbers.indexOf(digit);
if (index >= 0) { if (index >= 0) {
result += thaiNumbers[index]; result += thaiNumbers[index];
} else { } else {
result += digit; result += digit;
} }
}
return result;
} }
return result;
}
public static ToThaiFullDate(value: Date) { public static ToThaiFullDate(value: Date) {
let yy = value.getFullYear() < 2400 ? value.getFullYear() + 543 : value.getFullYear(); let yy = value.getFullYear() < 2400 ? value.getFullYear() + 543 : value.getFullYear();
return "วันที่ "+ value.getDate() +" เดือน "+ Extension.ToThaiMonth(value.getMonth() + 1)+ " พ.ศ. " + yy; return (
"วันที่ " +
value.getDate() +
" เดือน " +
Extension.ToThaiMonth(value.getMonth() + 1) +
" พ.ศ. " +
yy
);
}
public static sumObjectValues(array: any, propertyName: any) {
let sum = 0;
for (let i = 0; i < array.length; i++) {
if (array[i][propertyName] !== undefined) {
sum += array[i][propertyName];
}
} }
return sum;
}
} }
export default Extension; export default Extension;

32
src/migration/1709113262974-update_table_salaryProfile_add_retired3.ts Normal file
View file

@ -0,0 +1,32 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateTableSalaryProfileAddRetired31709113262974 implements MigrationInterface {
name = 'UpdateTableSalaryProfileAddRetired31709113262974'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`result\``);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` ADD \`result\` varchar(255) NULL COMMENT 'ผลการประเมิน'`);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`duration\``);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` ADD \`duration\` varchar(255) NULL COMMENT 'ระยะเวลา'`);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`punish\``);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` ADD \`punish\` varchar(255) NULL COMMENT 'การลงโทษ'`);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`retired\``);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` ADD \`retired\` varchar(255) NULL COMMENT 'พักราชการ'`);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`retired2\``);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` ADD \`retired2\` varchar(255) NULL COMMENT 'ขาดราชการ'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`retired2\``);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` ADD \`retired2\` tinyint NOT NULL COMMENT 'ขาดราชการ' DEFAULT '0'`);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`retired\``);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` ADD \`retired\` tinyint NOT NULL COMMENT 'พักราชการ' DEFAULT '0'`);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`punish\``);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` ADD \`punish\` tinyint NOT NULL COMMENT 'การลงโทษ' DEFAULT '0'`);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`duration\``);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` ADD \`duration\` tinyint NOT NULL COMMENT 'ระยะเวลา' DEFAULT '0'`);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`result\``);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` ADD \`result\` tinyint NOT NULL COMMENT 'ผลการประเมิน' DEFAULT '0'`);
}
}