Merge branch 'develop' into dev

.github/workflows/discord-notify.yml

@@ -0,0 +1,22 @@
+name: Discord PR Notify
+
+on:
+  pull_request:
+    types: [opened]
+
+jobs:
+  discord:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Discord
+        run: |
+          curl -X POST "${{ secrets.DISCORD_WEBHOOK_PULLREQUEST }}" \
+            -H "Content-Type: application/json" \
+            -d '{
+              "embeds": [{
+                "title": "🔔 **Service:** ${{ github.repository }}",
+                "description": "👤 **Author:** ${{ github.event.pull_request.user.login }}\n🌿 **Branch:** ${{ github.event.pull_request.head.ref }} → ${{ github.event.pull_request.base.ref }}\n📦 **Pull Request:** [#${{ github.event.pull_request.number }} - ${{ github.event.pull_request.title }}](${{ github.event.pull_request.html_url }})",
+                "color": 5814783,
+                "timestamp": "${{ github.event.pull_request.created_at }}"
+              }]
+            }'

src/controllers/DevelopmentController.ts

@@ -2022,6 +2022,8 @@ export class DevelopmentController extends Controller {
     @Query("nodeId") nodeId?: string | null,
     @Query("node") node?: number | null,
     @Query("keyword") keyword?: string,
+    @Query("sortBy") sortBy?: string,
+    @Query("descending") descending?: boolean,
   ) {
     let _data = await new permission().PermissionOrgList(request, "SYS_DEV_PROJECT");
     await new CallAPI()
@@ -2030,7 +2032,7 @@ export class DevelopmentController extends Controller {
         _data = x;
       })
       .catch((x) => {});
-    const [development, total] = await AppDataSource.getRepository(Development)
+    let query = await AppDataSource.getRepository(Development)
       .createQueryBuilder("development")
       .andWhere(year > 0 ? "development.year LIKE :year" : "1=1", {
         year: `${year.toString()}`,
@@ -2129,8 +2131,18 @@ export class DevelopmentController extends Controller {
         "development.child3",
         "development.child4",
       ])
-      .orderBy("development.year", "DESC")
+
-      .addOrderBy("development.createdAt", "DESC")
+      if (sortBy) {
+        query = query.orderBy(
+          `development.${sortBy}`,
+          descending ? "DESC" : "ASC"
+        );
+      }else{
+        query = query.orderBy("development.year", "DESC")
+          .addOrderBy("development.createdAt", "DESC")
+      }
+
+      const [development, total] = await query
       .skip((page - 1) * pageSize)
       .take(pageSize)
       .getManyAndCount();

src/controllers/DevelopmentEmployeeHistoryController.ts

@@ -249,11 +249,13 @@ export class DevelopmentEmployeeHistoryController extends Controller {
       keyword?: string;
       year?: number;
       root: string | null;
+      sortBy?: string;
+      descending?: boolean;
     },
   ) {
     await new permission().PermissionList(request, "SYS_DEV_HISTORY_EMP");
     const type = "EMPLOYEE";
-    const [development, total] = await AppDataSource.getRepository(DevelopmentHistory)
+    let query = await AppDataSource.getRepository(DevelopmentHistory)
       .createQueryBuilder("developmentHistory")
       .leftJoinAndSelect("developmentHistory.development", "development")
       .leftJoinAndSelect("developmentHistory.employeePosLevel", "employeePosLevel")
@@ -326,8 +328,39 @@ export class DevelopmentEmployeeHistoryController extends Controller {
             );
         }),
       )
-      .orderBy("development.year", "DESC")
+
-      .addOrderBy("developmentHistory.createdAt", "DESC")
+    if (body.sortBy) {
+        if(body.sortBy === "year" || body.sortBy === "projectName"){
+          query = query.orderBy(
+            `development.${body.sortBy}`,
+            body.descending ? "DESC" : "ASC"
+          );
+        }else if(body.sortBy === "posType"){
+          query = query.orderBy(
+            `employeePosType.posTypeName`,
+            body.descending ? "DESC" : "ASC"
+          );
+        }else if(body.sortBy === "posLevel"){
+          query = query
+          .orderBy(`employeePosType.posTypeShortName`,body.descending ? "DESC" : "ASC")
+          .addOrderBy(`employeePosLevel.posLevelName`,body.descending ? "DESC" : "ASC")
+        }else if(body.sortBy === "fullName"){
+          query = query
+          .orderBy(`developmentHistory.prefix`,body.descending ? "DESC" : "ASC")
+          .addOrderBy(`developmentHistory.firstName`,body.descending ? "DESC" : "ASC")
+          .addOrderBy(`developmentHistory.lastName`,body.descending ? "DESC" : "ASC")
+        }else{
+          query = query.orderBy(
+            `developmentHistory.${body.sortBy}`,
+            body.descending ? "DESC" : "ASC"
+          );
+        }
+      }else{
+         query = query.orderBy("development.year", "DESC")
+          .addOrderBy("developmentHistory.createdAt", "DESC")
+      }
+
+      const [development, total] = await query
       .skip((body.page - 1) * body.pageSize)
       .take(body.pageSize)
       .getManyAndCount();

src/controllers/DevelopmentHistoryController.ts

@@ -241,11 +241,13 @@ export class DevelopmentOfficerHistoryController extends Controller {
       keyword?: string;
       year?: number;
       root: string | null;
+      sortBy?: string;
+      descending?: boolean;
     },
   ) {
     await new permission().PermissionList(request, "SYS_DEV_HISTORY_OFFICER");
     const type = "OFFICER";
-    const [development, total] = await AppDataSource.getRepository(DevelopmentHistory)
+    let query = await AppDataSource.getRepository(DevelopmentHistory)
       .createQueryBuilder("developmentHistory")
       .leftJoinAndSelect("developmentHistory.development", "development")
       .leftJoinAndSelect("developmentHistory.posLevel", "posLevel")
@@ -314,11 +316,44 @@ export class DevelopmentOfficerHistoryController extends Controller {
             );
         }),
       )
-      .orderBy("development.year", "DESC")
+
-      .addOrderBy("developmentHistory.createdAt", "DESC")
+      if (body.sortBy) {
+        if(body.sortBy === "year" || body.sortBy === "root" || body.sortBy === "projectName"){
+          query = query.orderBy(
+            `development.${body.sortBy}`,
+            body.descending ? "DESC" : "ASC"
+          );
+        }else if(body.sortBy === "posType"){
+          query = query.orderBy(
+            `posType.posTypeName`,
+            body.descending ? "DESC" : "ASC"
+          );
+        }else if(body.sortBy === "posLevel"){
+          query = query.orderBy(
+            `posLevel.posLevelName`,
+            body.descending ? "DESC" : "ASC"
+          );
+        }else if(body.sortBy === "fullName"){
+          query = query
+          .orderBy(`developmentHistory.prefix`,body.descending ? "DESC" : "ASC")
+          .addOrderBy(`developmentHistory.firstName`,body.descending ? "DESC" : "ASC")
+          .addOrderBy(`developmentHistory.lastName`,body.descending ? "DESC" : "ASC")
+        }else{
+          query = query.orderBy(
+            `developmentHistory.${body.sortBy}`,
+            body.descending ? "DESC" : "ASC"
+          );
+        }
+      }else{
+        query = query.orderBy("development.year", "DESC")
+        .addOrderBy("developmentHistory.createdAt", "DESC")
+      }
+
+      const [development, total] = await query
       .skip((body.page - 1) * body.pageSize)
       .take(body.pageSize)
       .getManyAndCount();
+
     const formattedData = development.map((item) => ({
       id: item.id,
       citizenId: item.citizenId,

src/controllers/DevelopmentScholarshipController.ts

@@ -160,6 +160,8 @@ export class DevelopmentScholarshipController extends Controller {
     @Query("keyword") keyword?: string,
     @Query("year") year?: number,
     @Query("scholarshipType") scholarshipType?: string,
+    @Query("sortBy") sortBy?: string,
+    @Query("descending") descending?: boolean,
   ) {
     let _data = await new permission().PermissionOrgList(request, "SYS_DEV_SCHOLARSHIP");
     await new CallAPI()
@@ -168,7 +170,7 @@ export class DevelopmentScholarshipController extends Controller {
         _data = x;
       })
       .catch((x) => {});
-    const [development, total] = await AppDataSource.getRepository(DevelopmentScholarship)
+    let query = await AppDataSource.getRepository(DevelopmentScholarship)
       .createQueryBuilder("developmentScholarship")
       .leftJoinAndSelect("developmentScholarship.posLevel", "posLevel")
       .leftJoinAndSelect("developmentScholarship.posType", "posType")
@@ -242,11 +244,44 @@ export class DevelopmentScholarshipController extends Controller {
           root: _data.root,
         },
       )
-      .orderBy("developmentScholarship.scholarshipYear", "DESC")
+
-      .addOrderBy("developmentScholarship.createdAt", "DESC")
+      if (sortBy) {
+        if(sortBy === "posType"){
+          query = query.orderBy(
+            `posType.posTypeName`,
+            descending ? "DESC" : "ASC"
+          );
+        }else if(sortBy === "posLevel"){
+          query = query.orderBy(
+            `posLevel.posLevelName`,
+            descending ? "DESC" : "ASC"
+          );
+        }else if(sortBy === "year"){
+          query = query.orderBy(
+            `developmentScholarship.scholarshipYear`,
+            descending ? "DESC" : "ASC"
+          );
+        }else if(sortBy === "fullName"){
+          query = query
+          .orderBy(`developmentScholarship.prefix`,descending ? "DESC" : "ASC")
+          .addOrderBy(`developmentScholarship.firstName`,descending ? "DESC" : "ASC")
+          .addOrderBy(`developmentScholarship.lastName`,descending ? "DESC" : "ASC")
+        }else{
+          query = query.orderBy(
+            `developmentScholarship.${sortBy}`,
+            descending ? "DESC" : "ASC"
+          );
+        }
+      }else{
+        query = query.orderBy("developmentScholarship.scholarshipYear", "DESC")
+          .addOrderBy("developmentScholarship.createdAt", "DESC")
+      }
+
+    const [development, total] = await query
       .skip((page - 1) * pageSize)
       .take(pageSize)
       .getManyAndCount();
+
     const formattedData = development.map((item) => ({
       id: item.id,
       year: item.scholarshipYear,
@@ -338,6 +373,7 @@ export class DevelopmentScholarshipController extends Controller {
         : null,
       scholarshipYear: getDevelopment.scholarshipYear ? getDevelopment.scholarshipYear : null,
       budgetSource: getDevelopment.budgetSource ? getDevelopment.budgetSource : null,
+      budgetSourceOther: getDevelopment.budgetSourceOther ? getDevelopment.budgetSourceOther : null,
       budgetApprove: getDevelopment.budgetApprove ? getDevelopment.budgetApprove : null,
       bookNo: getDevelopment.bookNo ? getDevelopment.bookNo : null,
       bookNoDate: getDevelopment.bookNoDate ? getDevelopment.bookNoDate : null,