rez_core 4.0.152 → 4.0.154

package/package.json

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

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

@@ -91,6 +91,7 @@ export class ActionDataRepository extends EntityServiceImpl {
             status: FORM_STATUS_TO_BE_SENT,
             action_id: act.id,
             created_date: istDate,
+            pdf_template: act.pdf_template
           };
 
           const createdEntity = await super.createEntity(

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

@@ -154,6 +154,29 @@ export class TaskService extends EntityServiceImpl {
       loggedInUser.organization_id,
     ]);
 
+    const oldStatusQuery = `
+    SELECT * 
+    FROM frm_wf_task_data
+    WHERE id = ? 
+      AND organization_id = ?
+    LIMIT 1;
+  `;
+
+    const [oldRow] = await this.dataSource.query(oldStatusQuery, [
+      entityData.id,
+      loggedInUser.organization_id,
+    ]);
+
+    const oldStatusRows = await this.dataSource.query(taskStatusQuery, [
+      oldRow.status,
+      loggedInUser.organization_id,
+    ]);
+
+    const isStatusChanged =
+      statusRows.length > 0 &&
+      oldStatusRows.length > 0 &&
+      statusRows[0].name !== oldStatusRows[0].name;
+
     const isCompletedStatus =
       statusRows.length > 0 &&
       statusRows[0].name?.toLowerCase() === 'completed';
@@ -183,20 +206,7 @@ export class TaskService extends EntityServiceImpl {
     }
 
     try {
-      // Always log edit
-      const editLogData = {
-        mapped_entity_id: updatedEntity.mapped_entity_id,
-        mapped_entity_type: updatedEntity.mapped_entity_type,
-        title: `Task edited`,
-        description: `${updatedEntity.code} was edited`,
-        category: ACTIVITY_CATEGORIES.TASK,
-        action: 'edit',
-        appcode: loggedInUser.appcode,
-      };
-
-      await this.activityLogService.logActivity(editLogData, loggedInUser);
-
-      if (isCompletedStatus) {
+      if (isCompletedStatus && isStatusChanged) {
         const completedLogData = {
           mapped_entity_id: updatedEntity.mapped_entity_id,
           mapped_entity_type: updatedEntity.mapped_entity_type,
@@ -211,6 +221,18 @@ export class TaskService extends EntityServiceImpl {
           completedLogData,
           loggedInUser,
         );
+      } else {
+        const editLogData = {
+          mapped_entity_id: updatedEntity.mapped_entity_id,
+          mapped_entity_type: updatedEntity.mapped_entity_type,
+          title: `Task edited`,
+          description: `${updatedEntity.code} was edited`,
+          category: ACTIVITY_CATEGORIES.TASK,
+          action: 'edit',
+          appcode: loggedInUser.appcode,
+        };
+
+        await this.activityLogService.logActivity(editLogData, loggedInUser);
       }
     } catch (error) {
       console.error(