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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-05-08 14:33:19 +07:00
commit 386a7f72d0
2 changed files with 49 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/controllers/KpiUserPlannedController.ts
View file

@ -91,6 +91,14 @@ export class KpiUserPlannedController extends Controller {
kpiUserPlanned.createdFullName = request.user.name; kpiUserPlanned.createdFullName = request.user.name;
kpiUserPlanned.lastUpdateUserId = request.user.sub; kpiUserPlanned.lastUpdateUserId = request.user.sub;
kpiUserPlanned.lastUpdateFullName = request.user.name; kpiUserPlanned.lastUpdateFullName = request.user.name;
kpiUserPlanned.documentInfoEvidence = request.user.documentInfoEvidence;
kpiUserPlanned.startDate = request.user.startDate;
kpiUserPlanned.endDate = request.user.endDate;
kpiUserPlanned.achievement1 = request.user.achievement1;
kpiUserPlanned.achievement2 = request.user.achievement2;
kpiUserPlanned.achievement3 = request.user.achievement3;
kpiUserPlanned.achievement4 = request.user.achievement4;
kpiUserPlanned.achievement5 = request.user.achievement5;
await this.kpiUserPlannedRepository.save(kpiUserPlanned); await this.kpiUserPlannedRepository.save(kpiUserPlanned);
return new HttpSuccess(kpiUserPlanned.id); return new HttpSuccess(kpiUserPlanned.id);
} }
@ -129,6 +137,15 @@ export class KpiUserPlannedController extends Controller {
kpiUserPlanned.lastUpdateUserId = request.user.sub; kpiUserPlanned.lastUpdateUserId = request.user.sub;
kpiUserPlanned.lastUpdateFullName = request.user.name; kpiUserPlanned.lastUpdateFullName = request.user.name;
kpiUserPlanned.documentInfoEvidence = request.user.documentInfoEvidence;
kpiUserPlanned.startDate = request.user.startDate;
kpiUserPlanned.endDate = request.user.endDate;
kpiUserPlanned.achievement1 = request.user.achievement1;
kpiUserPlanned.achievement2 = request.user.achievement2;
kpiUserPlanned.achievement3 = request.user.achievement3;
kpiUserPlanned.achievement4 = request.user.achievement4;
kpiUserPlanned.achievement5 = request.user.achievement5;
this.kpiUserPlannedRepository.merge(kpiUserPlanned, requestBody); this.kpiUserPlannedRepository.merge(kpiUserPlanned, requestBody);
await this.kpiUserPlannedRepository.save(kpiUserPlanned); await this.kpiUserPlannedRepository.save(kpiUserPlanned);
return new HttpSuccess(kpiUserPlanned.id); return new HttpSuccess(kpiUserPlanned.id);

32
src/entities/kpiUserPlanned.ts
View file

@ -153,6 +153,22 @@ export class CreateKpiUserPlanned {
kpiUserEvaluationId: string; kpiUserEvaluationId: string;
@Column("uuid") @Column("uuid")
kpiPlanId: string; kpiPlanId: string;
@Column()
documentInfoEvidence: string;
@Column()
startDate: Date;
@Column()
endDate: Date;
@Column()
achievement1: string;
@Column()
achievement2: string;
@Column()
achievement3: string;
@Column()
achievement4: string;
@Column()
achievement5: string;
} }
export class UpdateKpiUserPlanned { export class UpdateKpiUserPlanned {
@ -170,6 +186,22 @@ export class UpdateKpiUserPlanned {
kpiUserEvaluationId: string; kpiUserEvaluationId: string;
@Column("uuid") @Column("uuid")
kpiPlanId: string; kpiPlanId: string;
@Column()
documentInfoEvidence: string;
@Column()
startDate: Date;
@Column()
endDate: Date;
@Column()
achievement1: string;
@Column()
achievement2: string;
@Column()
achievement3: string;
@Column()
achievement4: string;
@Column()
achievement5: string;
} }
export class KpiUserPlannedDataPoint { export class KpiUserPlannedDataPoint {