@admc-go-th/admc-library 1.0.113 → 1.0.114

package/databases/schema/index.ts

@@ -46,6 +46,8 @@ export * from "./member";
 export * from "./menu";
 export * from "./msExecutive";
 export * from "./msExecutiveBoard";
+export * from "./msExecutiveGroup";
+export * from "./msExecutivePosition";
 export * from "./msGuidelines";
 export * from "./msHoliday";
 export * from "./msModule";

package/databases/schema/msExecutive.ts

@@ -4,13 +4,21 @@ import {
 
 export interface msExecutiveAttributes {
     id?: number;
+    groupId?: number;
+    positionId?: number;
+    positionOther?: string;
     titleId?: number;
     firstName?: string;
     lastName?: string;
-    firstNameEn?: string;
-    lastNameEn?: string;
     email?: string;
+    phone?: string;
+    fax?: string;
+    education?: string;
+    experience?: string;
+    image?: string;
+    sort?: number;
     status?: string;
+    info?: object;
     createdBy?: string;
     createdDate?: Date;
     updatedBy?: string;
@@ -30,6 +38,27 @@ export class msExecutive extends Model<msExecutiveAttributes, msExecutiveAttribu
     })
     	declare id?: number;
 
+    @Column({
+    	field: "group_id",
+    	allowNull: true,
+    	type: DataType.INTEGER 
+    })
+    	declare groupId?: number;
+
+    @Column({
+    	field: "position_id",
+    	allowNull: true,
+    	type: DataType.INTEGER 
+    })
+    	declare positionId?: number;
+
+    @Column({
+    	field: "position_other",
+    	allowNull: true,
+    	type: DataType.STRING(255) 
+    })
+    	declare positionOther?: string;
+
     @Column({
     	field: "title_id",
     	allowNull: true,
@@ -52,24 +81,46 @@ export class msExecutive extends Model<msExecutiveAttributes, msExecutiveAttribu
     	declare lastName?: string;
 
     @Column({
-    	field: "first_name_en",
     	allowNull: true,
     	type: DataType.STRING(255) 
     })
-    	declare firstNameEn?: string;
+    	declare email?: string;
 
     @Column({
-    	field: "last_name_en",
     	allowNull: true,
     	type: DataType.STRING(255) 
     })
-    	declare lastNameEn?: string;
+    	declare phone?: string;
 
     @Column({
     	allowNull: true,
     	type: DataType.STRING(255) 
     })
-    	declare email?: string;
+    	declare fax?: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.STRING(255) 
+    })
+    	declare education?: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.STRING(255) 
+    })
+    	declare experience?: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.STRING(255) 
+    })
+    	declare image?: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.INTEGER 
+    })
+    	declare sort?: number;
 
     @Column({
     	allowNull: true,
@@ -77,6 +128,12 @@ export class msExecutive extends Model<msExecutiveAttributes, msExecutiveAttribu
     })
     	declare status?: string;
 
+    @Column({
+    	allowNull: true,
+    	type: DataType.JSON 
+    })
+    	declare info?: object;
+
     @Column({
     	field: "created_by",
     	allowNull: true,

package/databases/schema/msExecutiveGroup.ts

@@ -0,0 +1,112 @@
+import {
+	Model, Table, Column, DataType, Index, Sequelize, ForeignKey 
+} from "sequelize-typescript";
+
+export interface msExecutiveGroupAttributes {
+    id?: number;
+    uuid?: string;
+    name?: string;
+    description?: string;
+    startDate?: string;
+    endDate?: string;
+    sort?: number;
+    status?: number;
+    info?: object;
+    createdBy?: string;
+    createdDate?: Date;
+    updatedBy?: string;
+    updatedDate?: Date;
+}
+
+@Table({
+	tableName: "ms_executive_group",
+	timestamps: false 
+})
+export class msExecutiveGroup extends Model<msExecutiveGroupAttributes, msExecutiveGroupAttributes> implements msExecutiveGroupAttributes {
+
+    @Column({
+    	primaryKey: true,
+    	autoIncrement: true,
+    	type: DataType.INTEGER 
+    })
+    	declare id?: number;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.STRING(60) 
+    })
+    	declare uuid?: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.STRING(255) 
+    })
+    	declare name?: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.STRING(255) 
+    })
+    	declare description?: string;
+
+    @Column({
+    	field: "start_date",
+    	allowNull: true,
+    	type: DataType.DATEONLY 
+    })
+    	declare startDate?: string;
+
+    @Column({
+    	field: "end_date",
+    	allowNull: true,
+    	type: DataType.DATEONLY 
+    })
+    	declare endDate?: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.INTEGER 
+    })
+    	declare sort?: number;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.INTEGER 
+    })
+    	declare status?: number;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.JSON 
+    })
+    	declare info?: object;
+
+    @Column({
+    	field: "created_by",
+    	allowNull: true,
+    	type: DataType.STRING(60) 
+    })
+    	declare createdBy?: string;
+
+    @Column({
+    	field: "created_date",
+    	allowNull: true,
+    	type: DataType.DATE 
+    })
+    	declare createdDate?: Date;
+
+    @Column({
+    	field: "updated_by",
+    	allowNull: true,
+    	type: DataType.STRING(60) 
+    })
+    	declare updatedBy?: string;
+
+    @Column({
+    	field: "updated_date",
+    	allowNull: true,
+    	type: DataType.DATE 
+    })
+    	declare updatedDate?: Date;
+
+}

package/databases/schema/msExecutivePosition.ts

@@ -0,0 +1,89 @@
+import {
+	Model, Table, Column, DataType, Index, Sequelize, ForeignKey 
+} from "sequelize-typescript";
+
+export interface msExecutivePositionAttributes {
+    id?: number;
+    name?: string;
+    description?: string;
+    sort?: number;
+    status?: number;
+    info?: object;
+    createdBy?: string;
+    createdDate?: Date;
+    updatedBy?: string;
+    updatedDate?: Date;
+}
+
+@Table({
+	tableName: "ms_executive_position",
+	timestamps: false 
+})
+export class msExecutivePosition extends Model<msExecutivePositionAttributes, msExecutivePositionAttributes> implements msExecutivePositionAttributes {
+
+    @Column({
+    	primaryKey: true,
+    	autoIncrement: true,
+    	type: DataType.INTEGER 
+    })
+    	declare id?: number;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.STRING(255) 
+    })
+    	declare name?: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.STRING(255) 
+    })
+    	declare description?: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.INTEGER 
+    })
+    	declare sort?: number;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.INTEGER 
+    })
+    	declare status?: number;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.JSON 
+    })
+    	declare info?: object;
+
+    @Column({
+    	field: "created_by",
+    	allowNull: true,
+    	type: DataType.STRING(60) 
+    })
+    	declare createdBy?: string;
+
+    @Column({
+    	field: "created_date",
+    	allowNull: true,
+    	type: DataType.DATE 
+    })
+    	declare createdDate?: Date;
+
+    @Column({
+    	field: "updated_by",
+    	allowNull: true,
+    	type: DataType.STRING(60) 
+    })
+    	declare updatedBy?: string;
+
+    @Column({
+    	field: "updated_date",
+    	allowNull: true,
+    	type: DataType.DATE 
+    })
+    	declare updatedDate?: Date;
+
+}

package/databases/tables/index.d.ts

@@ -29,6 +29,8 @@ export { mdWords, mdWordsAttributes } from './mdWords.js';
 export { member, memberAttributes } from './member.js';
 export { msExecutive, msExecutiveAttributes } from './msExecutive.js';
 export { msExecutiveBoard, msExecutiveBoardAttributes } from './msExecutiveBoard.js';
+export { msExecutiveGroup, msExecutiveGroupAttributes } from './msExecutiveGroup.js';
+export { msExecutivePosition, msExecutivePositionAttributes } from './msExecutivePosition.js';
 export { msGuidelines, msGuidelinesAttributes } from './msGuidelines.js';
 export { msHoliday, msHolidayAttributes } from './msHoliday.js';
 export { msProvince, msProvinceAttributes } from './msProvince.js';