rez_core 2.2.77 → 2.2.79

package/package.json

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

package/src/module/listmaster/repository/list-master.repository.ts

@@ -29,7 +29,7 @@ export class ListMasterRepository {
       .createQueryBuilder('item')
       .where('item.source = :source', { source: 'master' })
       .andWhere('item.organization_id = :organizationId', { organizationId })
-      .andWhere('item.is_factory = :isFactory', { isFactory: false });
+      // .andWhere('item.is_factory = :isFactory', { isFactory: false });
 
     if (search?.trim()) {
       qb.andWhere(

package/src/module/workflow/repository/form-master.repository.ts

@@ -21,15 +21,12 @@ export class FormMasterRepository {
   ) {}
 
   async getForms(organization_id: number, source_entity_type: string) {
-    const forms = await this.dataSource
-      .createQueryBuilder()
-      .select(['fm.id', 'fm.form_name'])
-      .from('cr_form_master', 'fm')
-      // .where('fm.organization_id = :orgId', { orgId: organization_id })
-      .where('fm.source_entity_type = :sourceEntityType', {
-        sourceEntityType: source_entity_type,
-      })
-      .getRawMany();
+    const forms = await this.dataSource.query(
+      `SELECT fm.id as fm_id, fm.name as fm_form_name
+       FROM cr_view_master fm
+       WHERE fm.organization_id = ? AND fm.mapped_entity_type = ?`,
+      [organization_id, source_entity_type],
+    );
 
     const formatted = forms.map((form: any) => ({
       label: form.fm_form_name,

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

@@ -189,7 +189,6 @@ export class TaskService extends EntityServiceImpl {
       whereClauses.push(`t.is_mandatory = ?`);
       params.push(mandatory ? 1 : 0);
     }
-
     if (overdue) {
       whereClauses.push(
         `(t.due_date < CURDATE() OR (t.due_date = CURDATE() AND t.due_time < CURTIME()))`,
@@ -219,6 +218,31 @@ export class TaskService extends EntityServiceImpl {
 
     const taskData = await this.dataSource.query(sql, params);
 
+    // Loop through each task and resolve task_status
+    for (const task of taskData) {
+      if (!task.status) {
+        task.task_status = null;
+        continue;
+      }
+
+      const taskStatusQuery = `
+      SELECT name 
+      FROM cr_list_master_items 
+      WHERE id = ? 
+        AND organization_id = ? 
+        AND listtype = 'TKST'
+      LIMIT 1;
+    `;
+
+      const [statusRow] = await this.dataSource.query(taskStatusQuery, [
+        task.status,
+        loggedInUser.organization_id,
+      ]);
+
+      task.task_status = statusRow?.name || null;
+    }
+
+    // Normalize is_mandatory to '0'/'1' as string
     return taskData.map((task) => ({
       ...task,
       is_mandatory: task.is_mandatory ? '1' : '0',