rez_core 4.0.80 → 4.0.81

package/package.json

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

package/src/module/meta/service/resolver.service.ts

@@ -1,9 +1,9 @@
 import { DataSource } from 'typeorm';
 import { Inject, Injectable } from '@nestjs/common';
 import { UserData } from '../../user/entity/user.entity';
+import * as moment from 'moment';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 import { ModuleRef } from '@nestjs/core';
-import moment from 'moment-timezone';
 
 @Injectable()
 export class ResolverService {
@@ -91,14 +91,12 @@ export class ResolverService {
         attr.element_type === 'date' ||
         attr.element_type === 'datetime'
       ) {
-        // Interpret DB value as UTC, then convert to IST
-        const dateValue = moment.utc(codeValue).tz('Asia/Kolkata');
-
+        const dateValue = moment(codeValue).utcOffset('+05:30'); // IST
         if (dateValue.isValid()) {
           resolvedEntityData[field] =
             attr.element_type === 'date'
-              ? dateValue.format('DD-MMM-YYYY')
-              : dateValue.format('YYYY-MM-DD HH:mm:ss');
+              ? dateValue.format('DD-MM-YYYY')
+              : dateValue.format('DD-MM-YYYY HH:mm:ss');
         }
       }
 

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

@@ -74,6 +74,10 @@ export class ActionDataRepository extends EntityServiceImpl {
             loggedInUser,
           );
 
+          const now = new Date();
+          const istOffset = 5.5 * 60; // IST is UTC +5:30 in minutes
+          const istDate = new Date(now.getTime() + istOffset * 60 * 1000);
+
           const data = {
             entity_type: 'LFRM',
             name: viewMaster?.name,
@@ -84,6 +88,7 @@ export class ActionDataRepository extends EntityServiceImpl {
             form_url: dynamicFormURL,
             status: FORM_STATUS_TO_BE_SENT,
             action_id: act.id,
+            created_date: istDate,
           };
 
           const createdEntity = await super.createEntity(

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

@@ -51,15 +51,25 @@ export class TaskRepository {
         );
 
         const now = new Date();
-
-        const dueDateTime = new Date(now.setDate(now.getDate() + 2));
-
-        const due_date = dueDateTime.toISOString().split('T')[0];
-        const due_time = dueDateTime.toLocaleTimeString('en-US', {
-          hour12: true,
-          hour: '2-digit',
-          minute: '2-digit',
+        const dueDateTime = new Date(now);
+        dueDateTime.setDate(dueDateTime.getDate() + 2);
+        
+        // Force conversion to IST
+        const istFormatterDate = new Intl.DateTimeFormat('en-CA', { 
+          timeZone: 'Asia/Kolkata' 
+        });
+        const istFormatterTime = new Intl.DateTimeFormat('en-US', { 
+          timeZone: 'Asia/Kolkata', 
+          hour: '2-digit', 
+          minute: '2-digit', 
+          hour12: true 
         });
+        
+        const due_date = istFormatterDate.format(dueDateTime); // YYYY-MM-DD in IST
+        const due_time = istFormatterTime.format(dueDateTime); // e.g. "03:14 AM"
+        
+        console.log({ due_date, due_time });
+        
 
         const taskData = this.TaskRepository.create({
           stage_id: act.stage_id,