rez_core 2.2.36 → 2.2.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.2.36",
+  "version": "2.2.38",
   "description": "",
   "author": "",
   "private": false,

package/src/module/workflow/controller/stage.controller.ts

@@ -11,7 +11,6 @@ import {
 } from '@nestjs/common';
 import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
 import { StageService } from '../service/stage.service';
-import { level } from 'winston';
 
 @Controller('/stage')
 @UseGuards(JwtAuthGuard)

package/src/module/workflow/entity/action-data.entity.ts

@@ -40,4 +40,7 @@ export class ActionDataEntity extends BaseEntity {
 
   @Column({ type: 'varchar', nullable: true })
   is_current: string;
+
+  @Column({ nullable: true, type: 'varchar' })
+  category: string;
 }

package/src/module/workflow/entity/stage-group.entity.ts

@@ -14,4 +14,10 @@ export class StageGroup extends BaseEntity {
 
   @Column({ type: 'int', nullable: true })
   sequence: number;
+
+  @Column({ type: 'varchar', nullable: true })
+  color: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  dark_color: string;
 }

package/src/module/workflow/entity/task-data.entity.ts

@@ -64,4 +64,7 @@ export class TaskDataEntity extends BaseEntity {
 
   @Column({ nullable: true, type: 'varchar' })
   mode: string;
+
+  @Column({ nullable: true, type: 'varchar' })
+  category: string;
 }

package/src/module/workflow/repository/action-data.repository.ts

@@ -40,6 +40,7 @@ export class ActionDataRepository {
           is_current: isFirst ? 'Y' : null,
           start_time: isFirst ? new Date() : null,
           is_mandatory: is_mandatory[0]?.code === 'mandatory' ? true : false,
+          category: act?.action_category_code,
         } as ActionDataEntity);
         await this.actionDataRepo.save(actionData);
       }

package/src/module/workflow/repository/stage-movement.repository.ts

@@ -182,10 +182,16 @@ export class StageMovementRepository {
 
   async getAllActionByStageId(stageId: number): Promise<any> {
     const result = await this.dataSource.query(
-      `SELECT a.*, m.stage_id
-     FROM cr_wf_action a
-     INNER JOIN cr_wf_stage_action_mapping m ON a.id = m.action_id
-     WHERE m.stage_id = ?`,
+      `
+    SELECT 
+      a.*, 
+      m.stage_id, 
+      ac.code AS action_category_code
+    FROM cr_wf_action a
+    INNER JOIN cr_wf_stage_action_mapping m ON a.id = m.action_id
+    LEFT JOIN cr_wf_action_category ac ON a.action_category = ac.id
+    WHERE m.stage_id = ?
+    `,
       [stageId],
     );
     return result;

package/src/module/workflow/repository/task.repository.ts

@@ -57,6 +57,7 @@ export class TaskRepository {
 
           is_system: true,
           status: todoListMasterItemId[0]?.id,
+          category: act?.action_category_code,
         } as TaskDataEntity);
         await this.TaskRepository.save(taskData);
       }

package/src/module/workflow/service/stage.service.ts

@@ -105,7 +105,7 @@ export class StageService extends EntityServiceImpl {
 
     const result = allStages.map((stage) => ({
       stage_id: stage.id,
-      full_name: `${groupNameMap.get(stage.stage_group_id)} - ${stage.name}`,
+      full_name: stage.name,
     }));
     return result;
   }

package/src/module/workflow/service/task.service.ts

@@ -82,11 +82,15 @@ export class TaskService extends EntityServiceImpl {
       t.*,
       sg.name AS stage_group_name,
       s.name AS stage_name,
-      a.name AS action_name
+      a.name AS action_name,
+      u.name AS created_by_name,
+      u2.name AS task_owner_name
     FROM cr_wf_task_data t
     LEFT JOIN cr_wf_stage s ON t.stage_id = s.id
     LEFT JOIN cr_wf_stage_group sg ON s.stage_group_id = sg.id
     LEFT JOIN cr_wf_action a ON t.action_id = a.id
+    LEFT JOIN cr_user u ON t.created_by = u.id
+    LEFT JOIN cr_user u2 ON t.task_owner = u2.id
     WHERE ${whereClauses.join(' AND ')}
     ORDER BY t.due_date ASC, t.due_time ASC
   `;