From 8ec6123cc803cb9e39ef55d95337d41b2950efd8 Mon Sep 17 00:00:00 2001 From: asansal Date: Tue, 18 Nov 2025 18:46:24 +0700 Subject: [PATCH 1/5] fixing approval --- src/entity/earchive_approval.ts | 3 +++ src/types/earchive.ts | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/entity/earchive_approval.ts b/src/entity/earchive_approval.ts index 42f745d..1e9f1e2 100644 --- a/src/entity/earchive_approval.ts +++ b/src/entity/earchive_approval.ts @@ -32,6 +32,9 @@ export class EarchiveApproval { @Column({ type: 'int', nullable: true , default : 0}) isapproved: Number; + @Column({ name: 'remarks', nullable: true }) + remarks: string; + @Column() @CreateDateColumn() created_at: Date; diff --git a/src/types/earchive.ts b/src/types/earchive.ts index 6cae39d..a2c98c8 100644 --- a/src/types/earchive.ts +++ b/src/types/earchive.ts @@ -1,9 +1,11 @@ export enum StatusDocument { "rejected" = -3, + "returned" = -2, "draft" = -1, "submitted" = 0, - "approval" = 1, - "disposition" = 2, + "checker" = 1, + "approval" = 2, + "disposition" = 3, }; export enum TypeDocument { From bc57d4e9be6cc71b04c31fa93379159030f70122 Mon Sep 17 00:00:00 2001 From: asansal Date: Tue, 18 Nov 2025 21:01:16 +0700 Subject: [PATCH 2/5] add checker earchie --- src/entity/earchive_checker.ts | 62 ++++++++++++++++++++++++++++++++++ src/schema/earchive.ts | 1 + 2 files changed, 63 insertions(+) create mode 100644 src/entity/earchive_checker.ts diff --git a/src/entity/earchive_checker.ts b/src/entity/earchive_checker.ts new file mode 100644 index 0000000..bc1ef48 --- /dev/null +++ b/src/entity/earchive_checker.ts @@ -0,0 +1,62 @@ +import { Column, CreateDateColumn, DeleteDateColumn, Entity, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm"; +import { User } from "./users"; +import { EarchiveDoc } from "./earchive_doc"; + +@Entity("earchive_checker", { schema: "earchive" }) +export class EarchiveChecker { + @PrimaryGeneratedColumn("uuid") + id: string; + + @Column({ type: 'int', nullable: true , default : 0}) + sorts: Number; + + @Column({ name: 'docid', type: 'uuid', nullable: true }) + docid: string; + + @ManyToOne(() => EarchiveDoc, { nullable: true }) + @JoinColumn({ name: 'docid' }) + doc: EarchiveDoc; + + @Column({ name: 'nik', nullable: true }) + nik: string; + + @Column({ name: 'employeename', nullable: true }) + employeename: string; + + @Column({ name: 'uuidchecker', type: 'uuid', nullable: true }) + uuidchecker: string; + + @Column({ name: 'checkerdate', nullable: true }) + checkerdate: Date; + + @Column({ type: 'int', nullable: true , default : 0}) + ischecked: Number; + + @Column({ name: 'remarks', nullable: true }) + remarks: string; + + @Column() + @CreateDateColumn() + created_at: Date; + + @Column({ name: 'createdbyid', type: 'uuid', nullable: true }) + createdbyid: string; + + @ManyToOne(() => User, { nullable: true }) + @JoinColumn({ name: 'createdbyid' }) + createdby: User + + @Column({ nullable: true }) + @UpdateDateColumn() + updated_at: Date; + + @Column({ nullable: true, length: 256 }) + updated_by: string; + + @Column({ nullable: true }) + @DeleteDateColumn() + deleted_at: Date; + + @Column({ nullable: true, length: 256 }) + deleted_by: string; +} diff --git a/src/schema/earchive.ts b/src/schema/earchive.ts index 2c99816..1fccb60 100644 --- a/src/schema/earchive.ts +++ b/src/schema/earchive.ts @@ -2,6 +2,7 @@ export * from "../entity/earchive_doc"; export * from "../entity/earchive_doctype"; export * from "../entity/earchive_doclogs"; export * from "../entity/earchive_receiver"; +export * from "../entity/earchive_checker"; export * from "../entity/earchive_approval"; export * from "../entity/earchive_link"; export * from "../entity/earchive_disposisi"; From 9a0782510ec21e8412f92876e7274f555043cb7e Mon Sep 17 00:00:00 2001 From: asansal Date: Tue, 18 Nov 2025 21:04:53 +0700 Subject: [PATCH 3/5] add relation checker --- src/entity/earchive_doc.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/entity/earchive_doc.ts b/src/entity/earchive_doc.ts index 0d59bda..d984f22 100644 --- a/src/entity/earchive_doc.ts +++ b/src/entity/earchive_doc.ts @@ -6,6 +6,7 @@ import { EarchiveReceiver } from "./earchive_receiver"; import { EarchiveApproval } from "./earchive_approval"; import { EarchiveLink } from "./earchive_link"; import { EarchiveDisposisi } from "./earchive_disposisi"; +import { EarchiveChecker } from "./earchive_checker"; @Entity("earchive_doc", { schema: "earchive" }) export class EarchiveDoc { @@ -116,6 +117,9 @@ export class EarchiveDoc { @OneToMany(() => EarchiveLink, (r) => r.doc) link: EarchiveLink[]; + @OneToMany(() => EarchiveChecker, (r) => r.doc) + checker: EarchiveChecker[]; + @OneToMany(() => EarchiveApproval, (r) => r.doc) approval: EarchiveApproval[]; From 3b4293b0abf7f505ce6f850575257519fa580497 Mon Sep 17 00:00:00 2001 From: "fazri.is" Date: Thu, 20 Nov 2025 04:03:28 +0900 Subject: [PATCH 4/5] update --- src/entity/trx_customer_users.ts | 50 +++++++++++++++++++++++---- src/entity/trx_customers.ts | 58 ++++++++++++++++++++++++-------- 2 files changed, 87 insertions(+), 21 deletions(-) diff --git a/src/entity/trx_customer_users.ts b/src/entity/trx_customer_users.ts index 858f47f..9fe66cb 100644 --- a/src/entity/trx_customer_users.ts +++ b/src/entity/trx_customer_users.ts @@ -51,12 +51,6 @@ export class TrxCustomerUser { }) name: string; - @Column({ - nullable: false, - length: 256, - }) - file: string; - @Column({ type: "jsonb", nullable: true, @@ -89,7 +83,49 @@ export class TrxCustomerUser { nullable: true, length: 256, }) - identity_number: string; + identity_number_electoral: string; + + @Column({ + nullable: true, + length: 256, + }) + identity_file_electoral: string; + + @Column({ + nullable: true, + length: 256, + }) + identity_number_passport: string; + + @Column({ + nullable: true, + length: 256, + }) + identity_file_passport: string; + + @Column({ + nullable: true, + length: 256, + }) + identity_number_bi: string; + + @Column({ + nullable: true, + length: 256, + }) + identity_file_bi: string; + + @Column({ + nullable: true, + length: 256, + }) + identity_number_visa: string; + + @Column({ + nullable: true, + length: 256, + }) + identity_file_visa: string; @Column({ nullable: true, diff --git a/src/entity/trx_customers.ts b/src/entity/trx_customers.ts index 158044e..3bfc6d7 100644 --- a/src/entity/trx_customers.ts +++ b/src/entity/trx_customers.ts @@ -56,10 +56,52 @@ export class TrxCustomer { pic_email: string; @Column({ - nullable: false, + nullable: true, length: 256, }) - pic_file: string; + pic_file_electoral: string; + + @Column({ + nullable: true, + length: 256, + }) + pic_number_electoral: string; + + @Column({ + nullable: true, + length: 256, + }) + pic_file_bi: string; + + @Column({ + nullable: true, + length: 256, + }) + pic_number_bi: string; + + @Column({ + nullable: true, + length: 256, + }) + pic_file_passport: string; + + @Column({ + nullable: true, + length: 256, + }) + pic_number_passport: string; + + @Column({ + nullable: true, + length: 256, + }) + pic_number_visa: string; + + @Column({ + nullable: true, + length: 256, + }) + pic_file_visa: string; @Column({ nullable: false, @@ -87,18 +129,6 @@ export class TrxCustomer { @JoinTable() country: TrxCountry; - @Column({ - nullable: true, - length: 256, - }) - identity_number: string; - - @Column({ - nullable: true, - length: 256, - }) - identity_type: TrxIdentityType; - @Column({ nullable: true, length: 256, From f1c7add92aa19dd12830e2f55e57938df376614d Mon Sep 17 00:00:00 2001 From: "fazri.is" Date: Thu, 20 Nov 2025 04:04:58 +0900 Subject: [PATCH 5/5] update --- src/entity/trx_customer_users.ts | 6 ++++++ src/entity/trx_customers.ts | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/src/entity/trx_customer_users.ts b/src/entity/trx_customer_users.ts index 9fe66cb..38da788 100644 --- a/src/entity/trx_customer_users.ts +++ b/src/entity/trx_customer_users.ts @@ -51,6 +51,12 @@ export class TrxCustomerUser { }) name: string; + @Column({ + nullable: false, + length: 256, + }) + file: string; + @Column({ type: "jsonb", nullable: true, diff --git a/src/entity/trx_customers.ts b/src/entity/trx_customers.ts index 3bfc6d7..b40c439 100644 --- a/src/entity/trx_customers.ts +++ b/src/entity/trx_customers.ts @@ -129,6 +129,18 @@ export class TrxCustomer { @JoinTable() country: TrxCountry; + @Column({ + nullable: true, + length: 256, + }) + identity_number: string; + + @Column({ + nullable: true, + length: 256, + }) + identity_type: TrxIdentityType; + @Column({ nullable: true, length: 256,