Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

src/controllers/ProfileEducationsController.ts

@@ -70,6 +70,7 @@ export class ProfileEducationsController extends Controller {
         educationLevelId: "string",
         positionPath: "string",
         positionPathId: "string",
+        note: "string",
         isDate: true,
         isEducation: true,
       },
@@ -113,6 +114,7 @@ export class ProfileEducationsController extends Controller {
         educationLevelId: "string",
         positionPath: "string",
         positionPathId: "string",
+        note: "string",
         isDate: true,
         isEducation: true,
         profileEducationId: "f6c693b4-1a9b-4fbe-95c5-ed4da50d35b6",
@@ -142,6 +144,7 @@ export class ProfileEducationsController extends Controller {
         educationLevelId: "string",
         positionPath: "string",
         positionPathId: "string",
+        note: "string",
         isDate: true,
         isEducation: true,
         profileEducationId: "f6c693b4-1a9b-4fbe-95c5-ed4da50d35b6",

src/controllers/ProfileInsigniaController.ts

@@ -61,6 +61,7 @@ export class ProfileInsigniaController extends Controller {
         volumeNo: "string",
         refCommandDate: "2024-03-12T10:05:02.000Z",
         refCommandNo: "string",
+        note: "string",
       },
     ],
   })
@@ -96,6 +97,7 @@ export class ProfileInsigniaController extends Controller {
         volumeNo: "volumeNo",
         refCommandDate: "2024-03-12T10:05:44.000Z",
         refCommandNo: "refCommandNo",
+        note: "string",
         profileInsigniaId: "c9d4dd52-25f5-491a-852d-28bfe00d66cb",
       },
       {
@@ -120,6 +122,7 @@ export class ProfileInsigniaController extends Controller {
         volumeNo: "string",
         refCommandDate: "2024-03-12T10:05:02.000Z",
         refCommandNo: "string",
+        note: "string",
         profileInsigniaId: "c9d4dd52-25f5-491a-852d-28bfe00d66cb",
       },
     ],

src/entities/ProfileEducation.ts

@@ -115,7 +115,7 @@ export class ProfileEducation extends EntityBase {
   @Column({
     nullable: true,
     comment: "ระดับศึกษา",
-    type: "text",  // ใช้ "text" แทน "string" เพื่อรองรับ long text
+    type: "text", // ใช้ "text" แทน "string" เพื่อรองรับ long text
     default: null,
   })
   educationLevel: string;
@@ -164,14 +164,16 @@ export class ProfileEducation extends EntityBase {
     default: null,
   })
   isEducation: boolean;
-  
+
-  @OneToMany(() => ProfileEducationHistory, (profileEducationHistory) => profileEducationHistory.histories)
+  @OneToMany(
+    () => ProfileEducationHistory,
+    (profileEducationHistory) => profileEducationHistory.histories,
+  )
   profileEducationHistories: ProfileEducationHistory[];
 
   @ManyToOne(() => Profile, (profile) => profile.profileEducations)
   @JoinColumn({ name: "profileId" })
   profile: Profile;
- 
 }
 
 export class CreateProfileEducation {
@@ -234,6 +236,9 @@ export class CreateProfileEducation {
 
   @Column()
   isEducation: boolean | null;
+
+  @Column()
+  note: string | null;
 }
 
 export type UpdateProfileEducation = Partial<CreateProfileEducation>;

src/entities/ProfileEducationHistory.ts

@@ -5,7 +5,6 @@ import { ProfileEducation } from "./ProfileEducation";
 
 @Entity("profileEducationHistory")
 export class ProfileEducationHistory extends EntityBase {
-
   @Column({
     comment: "สถานะการใช้งาน",
     default: false,
@@ -108,7 +107,7 @@ export class ProfileEducationHistory extends EntityBase {
   @Column({
     nullable: true,
     comment: "ระดับศึกษา",
-    type: "text",  // ใช้ "text" แทน "string" เพื่อรองรับ long text
+    type: "text", // ใช้ "text" แทน "string" เพื่อรองรับ long text
     default: null,
   })
   educationLevel: string;
@@ -151,6 +150,13 @@ export class ProfileEducationHistory extends EntityBase {
   })
   isEducation: boolean;
 
+  @Column({
+    nullable: true,
+    comment: "หมายเหตุ",
+    default: null,
+  })
+  note: string;
+
   @Column({
     nullable: true,
     length: 40,
@@ -158,15 +164,16 @@ export class ProfileEducationHistory extends EntityBase {
     default: null,
   })
   profileEducationId: string;
-  
+
-  @ManyToOne(() => ProfileEducation, (profileEducation) => profileEducation.profileEducationHistories)
+  @ManyToOne(
+    () => ProfileEducation,
+    (profileEducation) => profileEducation.profileEducationHistories,
+  )
   @JoinColumn({ name: "profileEducationId" })
   histories: ProfileEducation;
- 
 }
 
 export class CreateProfileEducationHistory {
-
   @Column()
   isActive: boolean;
 
@@ -227,6 +234,8 @@ export class CreateProfileEducationHistory {
   @Column("uuid")
   profileEducationId: string | null;
 
+  @Column()
+  note: string | null;
 }
 
 export type UpdateProfileEducationHistory = Partial<CreateProfileEducationHistory>;

src/entities/ProfileInsignia.ts

@@ -47,7 +47,7 @@ export class ProfileInsignia extends EntityBase {
     default: null,
   })
   section: string;
- 
+
   @Column({
     nullable: true,
     length: 30,
@@ -63,7 +63,7 @@ export class ProfileInsignia extends EntityBase {
     default: null,
   })
   receiveDate: Date;
-  
+
   @Column({
     nullable: true,
     length: 40,
@@ -71,7 +71,7 @@ export class ProfileInsignia extends EntityBase {
     default: null,
   })
   insigniaId: string;
-  
+
   @Column({
     nullable: true,
     comment: "ประเภท",
@@ -127,7 +127,10 @@ export class ProfileInsignia extends EntityBase {
   })
   note: string;
 
-  @OneToMany(() => ProfileInsigniaHistory, (profileInsigniaHistory) => profileInsigniaHistory.histories)
+  @OneToMany(
+    () => ProfileInsigniaHistory,
+    (profileInsigniaHistory) => profileInsigniaHistory.histories,
+  )
   profileInsigniaHistories: ProfileInsigniaHistory[];
 
   @ManyToOne(() => Profile, (profile) => profile.profileInsignias)
@@ -141,7 +144,7 @@ export class CreateProfileInsignia {
 
   @Column()
   isActive: boolean;
-  
+
   @Column()
   year: number;
 
@@ -153,16 +156,16 @@ export class CreateProfileInsignia {
 
   @Column()
   section: string | null;
- 
+
   @Column()
   page: string | null;
 
   @Column()
   receiveDate: Date | null;
-  
+
   @Column("uuid")
   insigniaId: string | null;
-  
+
   @Column()
   insigniaType: string | null;
 
@@ -180,6 +183,9 @@ export class CreateProfileInsignia {
 
   @Column()
   refCommandNo: string | null;
+
+  @Column()
+  note: string | null;
 }
 
 export type UpdateProfileInsignia = Partial<CreateProfileInsignia>;

src/entities/ProfileInsigniaHistory.ts

@@ -5,7 +5,6 @@ import { ProfileInsignia } from "./ProfileInsignia";
 
 @Entity("profileInsigniaHistory")
 export class ProfileInsigniaHistory extends EntityBase {
-
   @Column({
     comment: "สถานะการใช้งาน",
     default: false,
@@ -40,7 +39,7 @@ export class ProfileInsigniaHistory extends EntityBase {
     default: null,
   })
   section: string;
- 
+
   @Column({
     nullable: true,
     length: 30,
@@ -56,7 +55,7 @@ export class ProfileInsigniaHistory extends EntityBase {
     default: null,
   })
   receiveDate: Date;
-  
+
   @Column({
     nullable: true,
     length: 40,
@@ -64,7 +63,7 @@ export class ProfileInsigniaHistory extends EntityBase {
     default: null,
   })
   insigniaId: string;
-  
+
   @Column({
     nullable: true,
     comment: "ประเภท",
@@ -113,6 +112,13 @@ export class ProfileInsigniaHistory extends EntityBase {
   })
   refCommandNo: string;
 
+  @Column({
+    nullable: true,
+    comment: "หมายเหตุ",
+    default: null,
+  })
+  note: string;
+
   @Column({
     nullable: true,
     length: 40,
@@ -127,10 +133,9 @@ export class ProfileInsigniaHistory extends EntityBase {
 }
 
 export class CreateProfileInsigniaHistory {
-
   @Column()
   isActive: boolean;
-  
+
   @Column()
   year: number;
 
@@ -142,16 +147,16 @@ export class CreateProfileInsigniaHistory {
 
   @Column()
   section: string | null;
- 
+
   @Column()
   page: string | null;
 
   @Column()
   receiveDate: Date | null;
-  
+
   @Column("uuid")
   insigniaId: string | null;
-  
+
   @Column()
   insigniaType: string | null;
 
@@ -170,6 +175,9 @@ export class CreateProfileInsigniaHistory {
   @Column()
   refCommandNo: string | null;
 
+  @Column()
+  note: string | null;
+
   @Column("uuid")
   profileInsigniaId: string | null;
 }

src/migration/1710749867773-update_table_profile_history_add_note.ts

@@ -0,0 +1,16 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class UpdateTableProfileHistoryAddNote1710749867773 implements MigrationInterface {
+    name = 'UpdateTableProfileHistoryAddNote1710749867773'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`profileEducationHistory\` ADD \`note\` varchar(255) NULL COMMENT 'หมายเหตุ'`);
+        await queryRunner.query(`ALTER TABLE \`profileInsigniaHistory\` ADD \`note\` varchar(255) NULL COMMENT 'หมายเหตุ'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`profileInsigniaHistory\` DROP COLUMN \`note\``);
+        await queryRunner.query(`ALTER TABLE \`profileEducationHistory\` DROP COLUMN \`note\``);
+    }
+
+}