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/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/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[]; diff --git a/src/entity/trx_customer_users.ts b/src/entity/trx_customer_users.ts index 858f47f..38da788 100644 --- a/src/entity/trx_customer_users.ts +++ b/src/entity/trx_customer_users.ts @@ -89,7 +89,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..b40c439 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, 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"; 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 {