tango-app-api-trax 3.2.1 → 3.3.1-airtel-1

package/src/controllers/mobileTrax.controller.js

@@ -113,7 +113,7 @@ export async function startChecklist( req, res ) {
       return res.sendError( 'already check list started', 400 );
     }
 
-    logger.info( `v5 => Checklist Started => store Name: ${getBeforeChecklist[0].storeName}, User Email: ${getBeforeChecklist[0].userEmail}, Checklist Name: ${getBeforeChecklist[0].checkListName}` );
+    logger.info( `v5 => Checklist Started => store Name: ${getBeforeChecklist[0].storeName || ''}, User Email: ${getBeforeChecklist[0].userEmail}, Checklist Name: ${getBeforeChecklist[0].checkListName}` );
     let PCLQusestion = await PCLconfig.findOne( { _id: new ObjectId( getBeforeChecklist[0].checkListId ) } );
     let updateQuery = {};
     updateQuery._id = new ObjectId( requestData.processedcheckListId );
@@ -149,10 +149,14 @@ export async function startChecklist( req, res ) {
     }
 
     let updateData = {};
-    let storeTimeZone = await storeService.findOne( { storeName: getBeforeChecklist[0].storeName }, { 'storeProfile.timeZone': 1 } );
     let currentDateTime;
-    if ( storeTimeZone?.storeProfile?.timeZone ) {
-      currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+    if ( getBeforeChecklist[0].storeName && getBeforeChecklist[0].storeName!='' ) {
+      let storeTimeZone = await storeService.findOne( { storeName: { $regex: getBeforeChecklist[0].storeName, $options: 'i' }, clientId: getBeforeChecklist[0].client_id }, { 'storeProfile.timeZone': 1 } );
+      if ( storeTimeZone?.storeProfile?.timeZone ) {
+        currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+      } else {
+        currentDateTime = dayjs();
+      }
     } else {
       currentDateTime = dayjs();
     }
@@ -171,6 +175,8 @@ export async function startChecklist( req, res ) {
       findQuery.push( {
         $project: {
           checkListName: { $ifNull: [ '$checkListName', '' ] },
+          coverage: { $ifNull: [ '$coverage', '' ] },
+          client_id: { $ifNull: [ '$client_id', '' ] },
           scheduleStartTime: { $ifNull: [ '$scheduleStartTime', '' ] },
           scheduleStartTime_iso: { $ifNull: [ '$scheduleStartTime_iso', '' ] },
           scheduleEndTime: { $ifNull: [ '$scheduleEndTime', '' ] },
@@ -185,7 +191,13 @@ export async function startChecklist( req, res ) {
             $cond: {
               if: { $eq: [ '$client_id', '11' ] },
               then: false,
-              else: { $ifNull: [ '$allowedStoreLocation', false ] },
+              else: {
+                '$cond': {
+                  'if': { '$eq': [ '$coverage', 'user' ] },
+                  'then': false,
+                  'else': { '$ifNull': [ '$allowedStoreLocation', false ] },
+                },
+              },
             },
           },
           questionAnswers: { $ifNull: [ '$questionAnswers', '' ] },
@@ -207,17 +219,19 @@ export async function startChecklist( req, res ) {
         } );
       } );
       let logInsertData = {
-        store_id: getBeforeChecklist[0].store_id,
-        storeName: getBeforeChecklist[0].storeName,
+        store_id: getBeforeChecklist[0]?.store_id || '',
+        storeName: getBeforeChecklist[0]?.storeName || '',
         action: 'started',
         checklistId: getBeforeChecklist[0].sourceCheckList_id,
         processedChecklistId: getBeforeChecklist[0]._id,
         checkListName: getBeforeChecklist[0].checkListName,
         type: getBeforeChecklist[0].checkListType,
         client_id: req.user.clientId,
+        userEmail: getBeforeChecklist[0].userEmail || '',
+        userName: getBeforeChecklist[0].userName || '',
+        coverage: getBeforeChecklist[0].coverage || '',
       };
       await checklistLogs.create( logInsertData );
-
       let getchecklist = getupdatedchecklist;
       let questions = [];
       function processQuestion( question, section, questions, nested=false ) {
@@ -253,6 +267,7 @@ export async function startChecklist( req, res ) {
       return res.sendError( 'something went wrong please try again', 500 );
     }
   } catch ( e ) {
+    console.log( 'e =>', e );
     logger.error( { function: 'startChecklist', error: e, body: req.body } );
     return res.sendError( e, 500 );
   }
@@ -356,7 +371,13 @@ export async function startTask( req, res ) {
           $cond: {
             if: { $eq: [ '$client_id', '11' ] },
             then: false,
-            else: { $ifNull: [ '$allowedStoreLocation', false ] },
+            else: {
+              '$cond': {
+                'if': { '$eq': [ '$coverage', 'user' ] },
+                'then': false,
+                'else': { '$ifNull': [ '$allowedStoreLocation', false ] },
+              },
+            },
           },
         },
         questionAnswers: { $ifNull: [ '$questionAnswers', '' ] },
@@ -689,6 +710,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
@@ -740,6 +762,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
@@ -795,6 +818,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
@@ -855,6 +879,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
@@ -913,6 +938,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
@@ -970,7 +996,6 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
     if ( requestData?.editSubmit && requestData?.editSubmit == 'true' ) {
       let sampleData = reqAnswers[0];
       CLQAnswers.forEach( ( section ) => {
-        console.log( section, 'section' );
         let requestSection = reqAnswers.filter( ( reqSection ) => reqSection.sectionName == section?.sectionOldName || reqSection.sectionName == section?.sectionName );
         if ( requestSection.length ) {
           requestSection.forEach( ( item ) => item.section_id = section.section_id );
@@ -981,6 +1006,7 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
               data.answerType = question.answerType;
               data.qno = question.qno;
               data.qname = question.qname;
+              data.oldQname = question?.oldQname || question.qname;
               data.answer = 'null';
               data.remarks = '';
               data.validationAnswer = '';
@@ -1002,6 +1028,7 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
             data.answerType = ele.answerType;
             data.qno = ele.qno;
             data.qname = ele.qname;
+            data.oldQname = ele?.oldQname || ele.qname;
             data.answer = 'null';
             data.remarks = '';
             data.validationAnswer = '';
@@ -1074,13 +1101,15 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
+                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
                 }
                 if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
                   structure.redo = false;
-                } else if ( requestData.submittype === 'draft' ) {
+                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
                   structure.redo = qaAnswers[j]?.redo;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -1125,13 +1154,15 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
+                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
                 }
                 if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
                   structure.redo = false;
-                } else if ( requestData.submittype === 'draft' ) {
+                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
                   structure.redo = qaAnswers[j]?.redo;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -1180,13 +1211,15 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
+                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
                 }
                 if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
                   structure.redo = false;
-                } else if ( requestData.submittype === 'draft' ) {
+                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
                   structure.redo = qaAnswers[j]?.redo;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -1240,13 +1273,15 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
+                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
                 }
                 if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
                   structure.redo = false;
-                } else if ( requestData.submittype === 'draft' ) {
+                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
                   structure.redo = qaAnswers[j]?.redo;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -1298,13 +1333,15 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
+                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
                 }
                 if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
                   structure.redo = false;
-                } else if ( requestData.submittype === 'draft' ) {
+                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
                   structure.redo = qaAnswers[j]?.redo;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -1700,12 +1737,18 @@ export async function submitChecklist( req, res ) {
       updateQuery._id = new ObjectId( requestData.processedcheckListId );
       updateQuery.userId = req.user._id;
       updateQuery.date_string = requestData.date;
-      let storeTimeZone = await storeService.findOne( { storeName: getchecklist[0].storeName }, { 'storeProfile.timeZone': 1 } );
+
       let currentDateTime;
-      if ( storeTimeZone?.storeProfile?.timeZone ) {
-        currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+      let storeTimeZone;
+      if ( getchecklist[0].storeName && getchecklist[0].storeName !='' ) {
+        storeTimeZone = await storeService.findOne( { storeName: { $regex: getchecklist[0].storeName, $options: 'i' }, clientId: getchecklist[0].client_id }, { 'storeProfile.timeZone': 1 } );
+        if ( storeTimeZone?.storeProfile?.timeZone ) {
+          currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+        } else {
+          currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
+        }
       } else {
-        currentDateTime = dayjs();
+        currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
       }
       let updateData = {};
       let flagCount = QuestionFlag( req, res );
@@ -1749,8 +1792,8 @@ export async function submitChecklist( req, res ) {
         }
 
         let logInsertData = {
-          store_id: getchecklist[0].store_id,
-          storeName: getchecklist[0].storeName,
+          store_id: getchecklist[0].store_id || '',
+          storeName: getchecklist[0].storeName || '',
           action: requestData?.submittype === 'draft' ? 'saved' : 'submitted',
           checklistId: getchecklist[0].sourceCheckList_id,
           processedChecklistId: getchecklist[0]._id,
@@ -1758,8 +1801,11 @@ export async function submitChecklist( req, res ) {
           type: getchecklist[0].checkListType,
           client_id: req.user.clientId,
           redoStatus: requestData?.redoStatus ? true : false,
+          userEmail: getchecklist[0].userEmail || '',
+          userName: getchecklist[0].userName || '',
+          coverage: getchecklist[0].coverage || '',
         };
-
+        console.log( 'logInsertData=>', logInsertData );
         await checklistLogs.create( logInsertData );
         // let time = dayjs().format( 'HH:mm:ss' );
         // let [ hours, minutes ] = time.split( ':' ).map( Number );
@@ -1792,7 +1838,9 @@ export async function submitChecklist( req, res ) {
         //   createdAt: createdAtDate,
         // };
         // await detectionService.create( detectionData );
-        updateOpenSearch( req.user, requestData );
+        if ( requestData.submittype == 'submit' ) {
+          updateOpenSearch( req.user, requestData );
+        }
 
         return res.sendSuccess( 'Checklist Updated Successfully' );
       } else {
@@ -1956,7 +2004,9 @@ export async function submitTask( req, res ) {
       };
       await checklistLogs.create( logInsertData );
 
-      updateOpenSearchTask( user, requestData );
+      if ( submittype == 'submit' ) {
+        updateOpenSearchTask( user, requestData );
+      }
 
       return res.sendSuccess( 'Task Updated Successfully' );
     } else {
@@ -1991,6 +2041,9 @@ async function updateOpenSearch( user, data ) {
       checkListName: getchecklist[0].checkListName,
       type: getchecklist[0].checkListType,
       client_id: user.clientId,
+      userEmail: getchecklist[0].userEmail || '',
+      userName: getchecklist[0].userName || '',
+      coverage: getchecklist[0].coverage || '',
     };
     await checklistLogs.create( logInsertData );
     const requestOptions = {
@@ -2012,6 +2065,9 @@ async function updateOpenSearch( user, data ) {
         checkListName: getchecklist[0].checkListName,
         type: getchecklist[0].checkListType,
         client_id: user.clientId,
+        userEmail: getchecklist[0].userEmail || '',
+        userName: getchecklist[0].userName || '',
+        coverage: getchecklist[0].coverage || '',
       };
       await checklistLogs.create( logInsertData );
     }
@@ -2040,6 +2096,9 @@ async function updateOpenSearchTask( user, data ) {
       checkListName: getchecklist[0].checkListName,
       type: getchecklist[0].checkListType,
       client_id: user.clientId,
+      userEmail: getchecklist[0].userEmail || '',
+      userName: getchecklist[0].userName || '',
+      coverage: getchecklist[0].coverage || '',
     };
     await checklistLogs.create( logInsertData );
     const requestOptions = {
@@ -2061,6 +2120,9 @@ async function updateOpenSearchTask( user, data ) {
         checkListName: getchecklist[0].checkListName,
         type: getchecklist[0].checkListType,
         client_id: user.clientId,
+        userEmail: getchecklist[0].userEmail || '',
+        userName: getchecklist[0].userName || '',
+        coverage: getchecklist[0].coverage || '',
       };
       await checklistLogs.create( logInsertData );
     }
@@ -2153,17 +2215,24 @@ export async function dashboard( req, res ) {
 export async function dashboardv1( req, res ) {
   try {
     // eslint-disable-next-line camelcase
-    const { store_id, date } = req.query;
+    // const { store_id, date } = req.query;
+    const { date } = req.query;
     const userId = req.user._id;
 
+    // //Get User Based Checklist //
+    const clientId = { client_id: req.user.clientId };
+    const storeMatch = { $or: [ { store_id: { $eq: req.query.store_id || '' } }, { store_id: { $eq: '' } } ] };
+    // //End: Get User Based Checklist////
+
     const baseMatch = {
       // eslint-disable-next-line camelcase
-      store_id,
+      // store_id,
       userId,
       date_string: date,
       timeFlagStatus: true,
+      ...clientId,
+      ...storeMatch,
     };
-
     const buildPipeline = ( matchExtraConditions = {} ) => [
       { $match: { ...baseMatch, ...matchExtraConditions } },
       {
@@ -2219,6 +2288,7 @@ export async function dashboardv1( req, res ) {
 
     return res.sendSuccess( totalResult );
   } catch ( e ) {
+    console.log( 'v1 =>', e );
     logger.error( { function: 'dashboardv1', error: e, body: req.body } );
     return res.sendError( e, 500 );
   }
@@ -2287,7 +2357,13 @@ export async function checklist( req, res ) {
           $cond: {
             if: { $eq: [ '$client_id', '11' ] },
             then: false,
-            else: { $ifNull: [ '$allowedStoreLocation', false ] },
+            else: {
+              '$cond': {
+                'if': { '$eq': [ '$coverage', 'user' ] },
+                'then': false,
+                'else': { '$ifNull': [ '$allowedStoreLocation', false ] },
+              },
+            },
           },
         },
         reinitiateStatus: { $ifNull: [ '$reinitiateStatus', '' ] },
@@ -2319,19 +2395,26 @@ export async function checklist( req, res ) {
 export async function checklistv1( req, res ) {
   try {
     // eslint-disable-next-line camelcase
-    const { store_id, date, checklistStatus, searchValue } = req.query;
+    // const { store_id, date, checklistStatus, searchValue } = req.query;
+    const { date, checklistStatus, searchValue } = req.query;
     const userId = req.user._id;
 
-    const buildPipeline = ( matchExtraConditions = [], type ) => {
+    // Get User Based Checklist //
+    const clientId = { client_id: req.user.clientId };
+    const storeMatch = { $or: [ { store_id: { $eq: req.query.store_id || '' } }, { store_id: { $eq: '' } } ] };
+    // End: Get User Based Checklist////
+
+    const buildPipeline = ( matchExtraConditions = [], projectExtraConditions = {} ) => {
       const matchConditions = [
         // eslint-disable-next-line camelcase
-        { store_id },
+        // { store_id },
         { userId },
         { date_string: date },
         { timeFlagStatus: true },
         ...matchExtraConditions,
+        clientId,
+        storeMatch,
       ];
-
       if ( checklistStatus ) {
         matchConditions.push( { checklistStatus } );
       }
@@ -2358,7 +2441,13 @@ export async function checklistv1( req, res ) {
               $cond: {
                 if: { $eq: [ '$client_id', '11' ] },
                 then: false,
-                else: { $ifNull: [ '$allowedStoreLocation', false ] },
+                else: {
+                  '$cond': {
+                    'if': { '$eq': [ '$coverage', 'user' ] },
+                    'then': false,
+                    'else': { '$ifNull': [ '$allowedStoreLocation', false ] },
+                  },
+                },
               },
             },
             reinitiateStatus: { $ifNull: [ '$reinitiateStatus', '' ] },
@@ -2370,6 +2459,10 @@ export async function checklistv1( req, res ) {
             redoStatus: { $ifNull: [ '$redoStatus', false ] },
             type: { $ifNull: [ '$checkListType', '' ] },
             priorityType: { $ifNull: [ '$priorityType', '' ] },
+            ...projectExtraConditions,
+            client_id: { $ifNull: [ '$client_id', '' ] },
+            coverage: { $ifNull: [ '$coverage', '' ] },
+            taskType: { $ifNull: [ '$planoType', '' ] },
           },
         },
       ];
@@ -2378,8 +2471,8 @@ export async function checklistv1( req, res ) {
     };
 
     const [ checklistResult, taskResult ] = await Promise.allSettled( [
-      processedchecklist.aggregate( buildPipeline( [ { checkListType: 'custom' } ], 'checklist' ) ),
-      processedTask.aggregate( buildPipeline( [], 'task' ) ),
+      processedchecklist.aggregate( buildPipeline( [ { checkListType: 'custom' } ], { isPlano: 1, planoId: 1, planoType: 1 } ) ),
+      processedTask.aggregate( buildPipeline( [], { isPlano: 1, planoId: 1, planoType: 1 } ) ),
     ] );
 
     const checklistData = checklistResult.status === 'fulfilled' ? checklistResult.value : [];
@@ -2388,7 +2481,7 @@ export async function checklistv1( req, res ) {
     const totalData = [ ...checklistData, ...taskData ];
 
     if ( !totalData.length ) {
-      return res.sendError( { error: 'No Data Found' }, 204 );
+      return res.sendSuccess( { count: 0, data: [] } );
     }
 
     const getSortingParams = ( status ) => {
@@ -2448,7 +2541,13 @@ export async function questionList( req, res ) {
           $cond: {
             if: { $eq: [ '$client_id', '11' ] },
             then: false,
-            else: { $ifNull: [ '$allowedStoreLocation', false ] },
+            else: {
+              '$cond': {
+                'if': { '$eq': [ '$coverage', 'user' ] },
+                'then': false,
+                'else': { '$ifNull': [ '$allowedStoreLocation', false ] },
+              },
+            },
           },
         },
         reinitiateStatus: { $ifNull: [ '$reinitiateStatus', '' ] },
@@ -2457,6 +2556,7 @@ export async function questionList( req, res ) {
         userEmail: { $ifNull: [ '$userEmail', '' ] },
         storeName: { $ifNull: [ '$storeName', '' ] },
         redoStatus: { $ifNull: [ '$redoStatus', false ] },
+        rawImageUpload: { $ifNull: [ '$rawImageUpload', false ] },
       },
     } );
 
@@ -2476,7 +2576,11 @@ export async function questionList( req, res ) {
             if ( question.answerType == 'multiplechoicemultiple' ) {
               let checkvalidation = null;
               if ( answer.validationAnswer && answer.validationAnswer !='' ) {
-                checkvalidation = await signedUrl( { file_path: decodeURIComponent( answer.validationAnswer ), Bucket: bucket.sop } );
+                if ( answer.validationType != 'Descriptive Answer' ) {
+                  checkvalidation = await signedUrl( { file_path: decodeURIComponent( answer.validationAnswer ), Bucket: bucket.sop } );
+                } else {
+                  checkvalidation = answer.validationAnswer;
+                }
               }
               Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation } );
               getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].index = ansIndex;
@@ -2753,7 +2857,13 @@ export async function taskQuestionList( req, res ) {
           $cond: {
             if: { $eq: [ '$client_id', '11' ] },
             then: false,
-            else: { $ifNull: [ '$allowedStoreLocation', false ] },
+            else: {
+              '$cond': {
+                'if': { '$eq': [ '$coverage', 'user' ] },
+                'then': false,
+                'else': { '$ifNull': [ '$allowedStoreLocation', false ] },
+              },
+            },
           },
         },
         reinitiateStatus: { $ifNull: [ '$reinitiateStatus', '' ] },
@@ -3070,7 +3180,7 @@ export async function login( req, res ) {
       return res.sendError( `User mail not Exists`, 401 );
     }
     if ( !result.isActive ) {
-      return res.sendError( 'The user has been unauthorized to login', 401 );
+      return res.sendError( 'Your account is currently inactive. Please contact your admin.', 401 );
     }
     if ( inputData.otp ) {
       const otpMatching = await findOTP( { email: result.email, type: 'login', otp: inputData.otp } );
@@ -3282,3 +3392,53 @@ export async function checkVersion( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+
+export async function clientConfig( req, res ) {
+  try {
+    let requestData = req.body;
+    if ( requestData.clientId && requestData.clientId !='' ) {
+      let getClientData = await clientService.findOne( { clientId: requestData.clientId }, { traxRAWImageUpload: 1, clientId: 1, clientName: 1, traxBlockMobileTimeUpdate: 1 } );
+      // console.log( ' getClientData=>', getClientData );
+      if ( getClientData ) {
+        return res.sendSuccess( getClientData );
+      } else {
+        return res.sendError( 'Invalid clientId', 400 );
+      }
+    } else {
+      return res.sendError( 'clientId is Required', 400 );
+    }
+  } catch ( e ) {
+    console.log( 'e =>', e );
+    logger.error( { error: e, function: 'clientConfig' } );
+    return res.sendError( e, 500 );
+  }
+}
+
+export async function updatePlanoStatus( req, res ) {
+  try {
+    if ( !req.body.id ) {
+      return res.sendError( 'Processed checklist id is required' );
+    }
+    if ( !req.body.status ) {
+      return res.sendError( 'status is required' );
+    }
+    let processCheckDetails = await processedchecklist.findOne( { _id: req.body.id } );
+    if ( !processCheckDetails ) {
+      return res.sendError( 'No data found', 204 );
+    }
+    let storeTimeZone = await storeService.findOne( { storeName: { $regex: processCheckDetails.storeName, $options: 'i' }, clientId: processCheckDetails.client_id }, { 'storeProfile.timeZone': 1 } );
+    let currentDateTime;
+    if ( storeTimeZone?.storeProfile?.timeZone ) {
+      currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+    } else {
+      currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
+    }
+    let submitTimeString = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
+    await processedchecklist.updateOne( { _id: req.body.id }, { checklistStatus: req.body.status, ...( req.body.status == 'inprogress' ) ? { startTime_string: submitTimeString } : { submitTime_string: submitTimeString } } );
+    return res.sendSuccess( 'Status updated Successfully' );
+  } catch ( e ) {
+    logger.error( { error: e, function: 'updatePlanoStatus' } );
+    return res.sendError( e, 500 );
+  }
+}
+