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

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

Browse source
This commit is contained in:
Kittapath 2024-05-08 16:45:09 +07:00
commit 305fd51c99
4 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/entities/kpiRole.ts
View file

@ -285,8 +285,8 @@ export class createKpiRole {
meaning: string | null;
@Column()
formula: string | null;
@Column()
kpiPeriodId: string | null;
// @Column()
// kpiPeriodId: string | null;
@Column()
documentInfoEvidence: string | null;
}
@ -328,8 +328,8 @@ export class updateKpiRole {
meaning: string | null;
@Column()
formula: string | null;
@Column()
kpiPeriodId: string | null;
// @Column()
// kpiPeriodId: string | null;
@Column()
documentInfoEvidence: string | null;
}

16
src/entities/kpiUserPlanned.ts
View file

@ -155,10 +155,10 @@ export class CreateKpiUserPlanned {
kpiPlanId: string;
@Column()
documentInfoEvidence: string;
@Column()
startDate: Date;
@Column()
endDate: Date;
@Column({ nullable: true })
startDate?: Date;
@Column({ nullable: true })
endDate?: Date;
@Column()
achievement1: string;
@Column()
@ -188,10 +188,10 @@ export class UpdateKpiUserPlanned {
kpiPlanId: string;
@Column()
documentInfoEvidence: string;
@Column()
startDate: Date;
@Column()
endDate: Date;
@Column({ nullable: true })
startDate?: Date;
@Column({ nullable: true })
endDate?: Date;
@Column()
achievement1: string;
@Column()