add missing field, approval, requested_by
This commit is contained in:
@ -26,6 +26,11 @@ export class RequestSubmission {
|
||||
@JoinColumn({ name: 'request_order_id' })
|
||||
request_order: RequestOrder;
|
||||
|
||||
@Column({ type: 'varchar', nullable: false })
|
||||
requested_by: string;
|
||||
|
||||
@Column({ type: 'varchar', nullable: false })
|
||||
department: string;
|
||||
|
||||
@Column({ type: 'varchar', nullable: false, unique: true })
|
||||
code_id: string;
|
||||
@ -36,9 +41,6 @@ export class RequestSubmission {
|
||||
@Column({ type: 'text', nullable: true })
|
||||
remarks: string;
|
||||
|
||||
@Column({ type: 'varchar', nullable: true })
|
||||
department: string;
|
||||
|
||||
@Column({ length: 64, nullable: false })
|
||||
status: string;
|
||||
|
||||
@ -54,19 +56,6 @@ export class RequestSubmission {
|
||||
@Column({ type: 'decimal', precision: 12, scale: 2, nullable: false, default: 0.0 })
|
||||
amount: number;
|
||||
|
||||
@Column({ type: 'decimal', precision: 12, scale: 2, nullable: false, default: 0.0 })
|
||||
total: number;
|
||||
|
||||
// Supervisor Approval
|
||||
@Column({ type: 'varchar', nullable: true })
|
||||
approved_by_spv: string | null;
|
||||
|
||||
@Column({ type: 'timestamp', nullable: true })
|
||||
spv_approval_date: Date | null;
|
||||
|
||||
@Column({ type: 'enum', enum: ApprovalStatus, default: ApprovalStatus.PENDING })
|
||||
spv_approval_status: ApprovalStatus;
|
||||
|
||||
// General Manager Approval
|
||||
@Column({ type: 'varchar', nullable: true })
|
||||
approved_by_gm: string | null;
|
||||
@ -77,16 +66,9 @@ export class RequestSubmission {
|
||||
@Column({ type: 'enum', enum: ApprovalStatus, default: ApprovalStatus.PENDING })
|
||||
gm_approval_status: ApprovalStatus;
|
||||
|
||||
// General Affairs (GA) Approval
|
||||
@Column({ type: 'varchar', nullable: true })
|
||||
approved_by_ga: string | null;
|
||||
|
||||
@Column({ type: 'timestamp', nullable: true })
|
||||
ga_approval_date: Date | null;
|
||||
|
||||
@Column({ type: 'enum', enum: ApprovalStatus, default: ApprovalStatus.PENDING })
|
||||
ga_approval_status: ApprovalStatus;
|
||||
|
||||
@Column({ type: 'text', nullable: true })
|
||||
gm_approval_remarks: string | null;
|
||||
|
||||
@CreateDateColumn()
|
||||
created_at: Date;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user