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 18:04:18 +07:00
commit e7db2fab31
9 changed files with 371 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/entities/kpiSpecial.ts
View file

@ -148,21 +148,21 @@ export class KpiSpecial extends EntityBase {
formula: string;
}
export class CreateKpiUserSpecial {
export class CreateKpiSpecial {
@Column()
including: string | null;
including: string;
@Column()
includingName: string | null;
includingName: string;
@Column()
achievement1: string | null;
achievement1: string;
@Column()
achievement2: string | null;
achievement2: string;
@Column()
achievement3: string | null;
achievement3: string;
@Column()
achievement4: string | null;
achievement4: string;
@Column()
achievement5: string | null;
achievement5: string;
@Column()
target: string;
@Column()
@ -175,23 +175,27 @@ export class CreateKpiUserSpecial {
formula: string;
@Column("uuid")
kpiUserEvaluationId: string;
@Column()
period: string;
@Column()
year: string;
}
export class UpdateKpiUserSpecial {
export class UpdateKpiSpecial {
@Column()
including: string | null;
including: string;
@Column()
includingName: string | null;
includingName: string;
@Column()
achievement1: string | null;
achievement1: string;
@Column()
achievement2: string | null;
achievement2: string;
@Column()
achievement3: string | null;
achievement3: string ;
@Column()
achievement4: string | null;
achievement4: string;
@Column()
achievement5: string | null;
achievement5: string;
@Column()
target: string;
@Column()
@ -204,6 +208,10 @@ export class UpdateKpiUserSpecial {
formula: string;
@Column("uuid")
kpiUserEvaluationId: string;
@Column()
period: string;
@Column()
year: string;
}
export class KpiUserSpecialDataPoint {

48
src/entities/kpiUserDevelopment.ts
View file

@ -87,58 +87,46 @@ export class KpiUserDevelopment extends EntityBase {
export class CreateKpiUserDevelopment {
@Column()
including: string | null;
name: string | null;
@Column()
includingName: string | null;
target: string | null;
@Column()
achievement1: string | null;
summary?: number | null;
@Column()
achievement2: string | null;
achievement10?: string | null;
@Column()
achievement3: string | null;
achievement5?: string | null;
@Column()
achievement4: string | null;
achievement0?: string | null;
@Column()
achievement5: string | null;
isDevelopment70: boolean;
@Column()
target: string;
isDevelopment20: boolean;
@Column()
unit: number;
@Column()
weight: number;
@Column()
meaning: string;
@Column()
formula: string;
isDevelopment10: boolean;
@Column("uuid")
kpiUserEvaluationId: string;
}
export class UpdateKpiUserDevelopment {
@Column()
including: string | null;
name: string | null;
@Column()
includingName: string | null;
target: string | null;
@Column()
achievement1: string | null;
summary?: number | null;
@Column()
achievement2: string | null;
achievement10?: string | null;
@Column()
achievement3: string | null;
achievement5?: string | null;
@Column()
achievement4: string | null;
achievement0?: string | null;
@Column()
achievement5: string | null;
isDevelopment70: boolean;
@Column()
target: string;
isDevelopment20: boolean;
@Column()
unit: number;
@Column()
weight: number;
@Column()
meaning: string;
@Column()
formula: string;
isDevelopment10: boolean;
@Column("uuid")
kpiUserEvaluationId: string;
}