rez_core 2.2.44 → 2.2.47

package/package.json

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

package/src/module/meta/entity/view-master.entity.ts

@@ -12,24 +12,27 @@ export class ViewMaster extends BaseEntity {
   @Column({ length: 50, nullable: true })
   mapped_entity_type: string;
 
+  @Column({ type: 'int', nullable: true })
+  mapped_entity_id: number;
+
   @Column({ length: 50, nullable: true })
   identifier: string;
 
-  @Column({nullable: true})
+  @Column({ nullable: true })
   description: string;
 
-  @Column({type: 'json', nullable: true})
+  @Column({ type: 'json', nullable: true })
   published_form_layout: string;
 
-  @Column({type: 'json', nullable: true})
+  @Column({ type: 'json', nullable: true })
   published_form_fields: string;
 
-  @Column({type: 'json',nullable:true})
-  meta_json:string;
+  @Column({ type: 'json', nullable: true })
+  meta_json: string;
 
-  @Column({ nullable:true})
+  @Column({ nullable: true })
   type: string;
 
-  @Column({type: 'int'})
+  @Column({ type: 'int' })
   is_default: number;
 }

package/src/module/meta/service/view-master.service.ts

@@ -42,9 +42,10 @@ export class ViewMasterService extends EntityServiceImpl {
 
   async updateEntity(
     entityData: ViewMaster,
-    loggedInUserData: UserData | null,
+    loggedInUserData: UserData,
   ): Promise<BaseEntity> {
-    return entityData;
+    const res = await super.updateEntity(entityData, loggedInUserData);
+    return res;
   }
 
   async getEntityJson(entityType: string, type: string) {
@@ -69,7 +70,7 @@ export class ViewMasterService extends EntityServiceImpl {
     entityType: string,
     id: number,
     loggedInUserData?: UserData | null,
-  ) { 
-    return await super.getEntityData(entityType, id,loggedInUserData);
+  ) {
+    return await super.getEntityData(entityType, id, loggedInUserData);
   }
 }

package/src/module/workflow/entity/stage-movement-data.entity.ts

@@ -21,10 +21,10 @@ export class StageMovementData extends BaseEntity {
   @Column({ type: 'int', nullable: true })
   stage_id: number;
 
-  @Column({ type: 'date', nullable: true })
+  @Column({ nullable: true })
   start_date: Date;
 
-  @Column({ type: 'date', nullable: true })
+  @Column({ nullable: true })
   end_date: Date;
 
   @Column({ type: 'varchar', nullable: true })

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

@@ -89,7 +89,8 @@ export class StageGroupService extends EntityServiceImpl {
       stageMovementMap.set(movement.stage_id, movement);
     }
 
-    // 6. Attach movement info to each stage
+    let foundInProgressGroup = false;
+
     for (const group of stageGroupAndStageHierarchy) {
       for (const stage of group.stages || []) {
         const movement = stageMovementMap.get(Number(stage.id));
@@ -105,7 +106,7 @@ export class StageGroupService extends EntityServiceImpl {
             : null;
           stage.time_spent = await this.calculateTimeSpent(
             movement.start_date,
-            movement.end_date ?? new Date(), // fallback to current datetime
+            movement.end_date ?? new Date(),
           );
         } else {
           stage.is_current = false;
@@ -117,13 +118,24 @@ export class StageGroupService extends EntityServiceImpl {
         }
       }
 
-      // 7. Set stage_group_status based on all its stages
-      group.stage_group_status =
-        group.stages && group.stages.length > 0
-          ? group.stages.every((stage) => stage.is_done)
-            ? 'COMPLETED'
-            : 'IN_PROGRESS'
-          : 'NOT_STARTED';
+      if (group.stages.length === 0) {
+        group.stage_group_status = 'TODO';
+        continue;
+      }
+
+      const allDone = group.stages.every((s) => s.is_done);
+      const noneStarted = group.stages.every(
+        (s) => !s.is_current && !s.is_done,
+      );
+
+      if (allDone) {
+        group.stage_group_status = 'COMPLETED';
+      } else if (!foundInProgressGroup && !noneStarted) {
+        group.stage_group_status = 'IN_PROGRESS';
+        foundInProgressGroup = true;
+      } else {
+        group.stage_group_status = 'TODO';
+      }
     }
 
     return stageGroupAndStageHierarchy;

package/src/module/workflow/service/workflow-meta.service.ts

@@ -138,7 +138,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
         orgnization_id: loggedInUser.organization_id,
         stage_group_id: stageGroup.id,
         stage_id: firstStage.id,
-        start_date: new Date(),
+        start_date: Date.now(),
         is_current: 'Y',
       });