rez_core 2.1.91 → 2.1.93

package/package.json

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

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

@@ -14,6 +14,7 @@ import { EntityManager } from 'typeorm';
 import { EntityMasterService } from 'src/module/meta/service/entity-master.service';
 import { UserData } from 'src/module/user/entity/user.entity';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { STATUS_ACTIVE, STATUS_INACTIVE } from 'src/constant/global.constant';
 
 @Injectable()
 export class ListMasterService {
@@ -97,10 +98,7 @@ export class ListMasterService {
     );
     const tableName = entityMaster.db_table_name;
 
-    const applyCommonFilters = (
-      qb: any,
-      status: 'active' | null = 'active',
-    ) => {
+    const applyCommonFilters = (qb: any, status?: number) => {
       if (status) {
         qb.where(`${tableName}.status = :status`, { status });
       }
@@ -141,13 +139,18 @@ export class ListMasterService {
       return qb;
     };
 
+    const resolveStatus = await this.getResolvedListCode(
+      STATUS_ACTIVE,
+      loggedInUser?.organization_id || 0,
+    );
+
     // Fetch active records
     const activeQuery = applyCommonFilters(
       this.entityManager
         .createQueryBuilder()
         .select('*')
         .from(tableName, tableName),
-      'active',
+      resolveStatus.id || null,
     );
 
     const activeResults = await activeQuery.getRawMany();
@@ -158,6 +161,11 @@ export class ListMasterService {
       result.push({ label: r.name, value: r.id });
     });
 
+    const resolveInactiveStatus = await this.getResolvedListCode(
+      STATUS_INACTIVE,
+      loggedInUser?.organization_id || 0,
+    );
+
     // Fetch inactive records (with same filters but without status condition)
     if (inactiveIdsArray?.length) {
       const inactiveQuery = applyCommonFilters(
@@ -165,7 +173,7 @@ export class ListMasterService {
           .createQueryBuilder()
           .select('*')
           .from(tableName, tableName),
-        null, // exclude status filter
+        resolveInactiveStatus.id || null,
       );
 
       inactiveQuery.andWhere(`${tableName}.id IN (:...ids)`, {
@@ -178,7 +186,7 @@ export class ListMasterService {
       inactiveResults.forEach((item) => {
         if (!activeIds.has(item.id)) {
           result.push({
-            label: `${item.name}_INACTIVE`,
+            label: `${item.name} [INACTIVE]`,
             value: item.id,
           });
         }

package/src/module/meta/service/entity-table.service.ts

@@ -96,12 +96,42 @@ export class EntityTableService {
           entityTable.entity_type,
         );
       entityTableDto.operation_list = {
-        text: await this.listMasterService.getDropdownOptions('OPT', {}),
-        number: await this.listMasterService.getDropdownOptions('OPN', {}),
-        date: await this.listMasterService.getDropdownOptions('OPD', {}),
-        select: await this.listMasterService.getDropdownOptions('OPS', {}),
-        multiselect: await this.listMasterService.getDropdownOptions('OPM', {}),
-        year: await this.listMasterService.getDropdownOptions('OPY', {}),
+        text: await this.listMasterService.getDropdownOptions(
+          'OPT',
+          {},
+          [],
+          loggedInUser,
+        ),
+        number: await this.listMasterService.getDropdownOptions(
+          'OPN',
+          {},
+          [],
+          loggedInUser,
+        ),
+        date: await this.listMasterService.getDropdownOptions(
+          'OPD',
+          {},
+          [],
+          loggedInUser,
+        ),
+        select: await this.listMasterService.getDropdownOptions(
+          'OPS',
+          {},
+          [],
+          loggedInUser,
+        ),
+        multiselect: await this.listMasterService.getDropdownOptions(
+          'OPM',
+          {},
+          [],
+          loggedInUser,
+        ),
+        year: await this.listMasterService.getDropdownOptions(
+          'OPY',
+          {},
+          [],
+          loggedInUser,
+        ),
         // Add any other operations you want to include
       };
       entityTableDto.default_filter =