tango-app-api-trax 3.7.62 → 3.7.64

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.7.62",
+    "version": "3.7.64",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -28,7 +28,8 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.5.61",
+        "puppeteer": "^24.39.1",
+        "tango-api-schema": "^2.5.63",
         "tango-app-api-middleware": "^3.5.2",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/internalTrax.controller.js

@@ -595,6 +595,7 @@ export async function PCLconfigCreation( req, res ) {
                         element4.remainder = getCLconfig?.remainder || [];
                         element4.country = element4?.store?.[0]?.country || '';
                         element4.state = element4?.store?.[0]?.state || '';
+                        element4.complianceCount = getCLconfig?.complianceCount || 0;
 
                         // if ( getCLconfig?.isPlano ) {
                         //   let planoDetails = await planoService.findOne( { storeId: element4.store_id, clientId: getCLconfig.client_id }, { _id: 1 } );
@@ -2715,8 +2716,13 @@ export async function updateChecklistConfig( req, res ) {
 
 export async function submittedList( req, res ) {
   try {
+    let fromDate = new Date( dayjs().format( 'YYYY-MM-DD' ) );
+    let toDate = new Date( dayjs().format( 'YYYY-MM-DD' ) );
+    let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    toDate.setUTCHours( 23, 59, 59, 59 );
     let getSubmitChecklist = await processedchecklist.find( { checklistStatus: 'submit', date_iso: new Date( dayjs().format( 'YYYY-MM-DD' ) ) }, { _id: 1 } );
-    let getSubmitTask = await processedTaskService.find( { checklistStatus: 'submit', date_iso: new Date( dayjs().format( 'YYYY-MM-DD' ) ), isPlano: { $exists: false } }, { _id: 1 } );
+    let getSubmitTask = await processedTaskService.find( { checklistStatus: 'submit', $or: [ { date_iso: new Date( dayjs().format( 'YYYY-MM-DD' ) ) }, { scheduleEndTime_iso: { $gte: fromDate, $lte: toDate } } ], isPlano: { $exists: false } }, { _id: 1 } );
 
     let result = [ ...getSubmitChecklist?.map( ( ele ) => ele?._id ), ...getSubmitTask?.map( ( ele ) => ele?._id ) ];
     return res.sendSuccess( result );

package/src/controllers/mobileTrax.controller.js

@@ -27,7 +27,7 @@ dayjs.extend( timeZone );
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore.js';
 import * as cameraService from '../services/camera.service.js';
 dayjs.extend( isSameOrBefore );
-import * as pdf from 'html-pdf';
+import puppeteer from 'puppeteer';
 import handlebars from './handlebar-helper.js';
 import fs from 'fs';
 import path from 'path';
@@ -664,7 +664,7 @@ export async function sopMobilechecklistQuestionValidatorv1( req, res, next ) {
             // question.answers.forEach( ( answer ) => {
             let sectionQuestion = requestSection.filter( ( secQuestion ) => secQuestion.qname == question.oldQname || secQuestion.qname == question.qname );
             if ( sectionQuestion.length ) {
-              if ( question.answerType == 'multiplechoicemultiple' || ( question.answerType =='dropdown' && question.allowMultiple ) && ( sectionQuestion[0].Multianswer == null || sectionQuestion[0].Multianswer == '' || !sectionQuestion[0].Multianswer.length ) ) {
+              if ( ( question.answerType == 'multiplechoicemultiple' || ( question.answerType =='dropdown' && question.allowMultiple ) ) && ( sectionQuestion[0].Multianswer == null || sectionQuestion[0].Multianswer == '' || !sectionQuestion[0].Multianswer.length ) ) {
                 validationCount++;
               } else {
                 if ( ![ 'multiplechoicemultiple', 'multipleImage' ].includes( question.answerType ) && ( question.answerType =='dropdown' && !question.allowMultiple ) && ( ( !sectionQuestion[0].linkType && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) || ( sectionQuestion[0].linkType && sectionQuestion[0].linkquestionenabled && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) ) ) {
@@ -1444,6 +1444,9 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                   if ( qaAnswers[j].answerType == 'date' ) {
                     ansstructure.dateRangeType = requestSection[i].dateRangeType || false;
                   }
+                  if ( qaAnswers[j].answerType == 'linearscale' ) {
+                    ansstructure.linearType = qaAnswers[j]?.answers[0]?.linearType;
+                  }
                   des.push( ansstructure );
                 }
                 let structure = {};
@@ -4577,7 +4580,6 @@ export async function downloadChecklist( req, res ) {
         file_path: `${bucketpath}/${clientDetails?.profileDetails?.logo}`,
       };
       let brandImage = await signedUrl( params );
-      // let brandImage = await convertUrltoBase64( url );
       if ( brandImage ) {
         checklistDetails['brandLogo'] = brandImage;
       }
@@ -4605,18 +4607,55 @@ export async function downloadChecklist( req, res ) {
     const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/template.hbs', 'utf8' );
     const template = handlebars.compile( templateHtml );
     const html = template( { data: checklistDetails } );
-    pdf.create( html ).toStream( ( err, stream ) => {
-      if ( err ) {
-        return res.status( 500 ).send( 'Error generating PDF' );
-      }
 
-      res.setHeader( 'Content-Type', 'application/pdf' );
-      res.setHeader( 'Content-Disposition', 'attachment; filename=checkListDetails.pdf' );
+    // Generate PDF using puppeteer instead of deprecated html-pdf
+    const browser = await puppeteer.launch( {
+      headless: 'new',
+      args: [ '--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage' ],
+    } );
+
+    const page = await browser.newPage();
+
+    await page.setContent( html, {
+      waitUntil: 'domcontentloaded',
+    } );
+
+    /* -------- WAIT FOR ALL IMAGES TO LOAD -------- */
+
+    await page.evaluate( async () => {
+      const images = Array.from( document.images );
+
+      await Promise.all(
+          images.map( ( img ) => {
+            if ( img.complete ) return;
+
+            return new Promise( ( resolve ) => {
+              img.onload = img.onerror = resolve;
+            } );
+          } ),
+      );
+    } );
+
+    /* ---------------- GENERATE PDF ---------------- */
 
-      stream.pipe( res );
+    const pdfBuffer = await page.pdf( {
+      format: 'A4',
+      printBackground: true,
     } );
+
+    await browser.close();
+
+    /* ---------------- RESPONSE ---------------- */
+
+    res.setHeader( 'Content-Type', 'application/pdf' );
+    res.setHeader(
+        'Content-Disposition',
+        'attachment; filename=checkListDetails.pdf',
+    );
+
+    return res.end( pdfBuffer );
   } catch ( e ) {
-    console.log( 'getChecklistQuestionAnswers =>', e );
-    return false;
+    logger.error( { functionName: 'getChecklistQuestionAnswers', error: e } );
+    return e;
   }
 }

package/src/controllers/trax.controller.js

@@ -184,7 +184,7 @@ export const create = async ( req, res ) => {
     checkNumber = result.length > 0 ? result[0].maxCheckListNumber + 1 : 0;
 
     let runAIQuestionCount = 0;
-
+    let complianceCount = 0;
     inputBody.sections.forEach( async ( element ) => {
       if ( !element?.questions?.length && inputBody.submitType == 'configure' ) {
         return res.sendError( { message: 'Question is Required' }, 400 );
@@ -192,6 +192,9 @@ export const create = async ( req, res ) => {
       if ( element?.questions?.length ) {
         questionCount = questionCount + element?.questions?.length;
       }
+      element.questions.forEach( ( question ) => {
+        complianceCount += Math.max( ...question.answers.map( ( o ) => o?.complianceScore ?? Math.max( o?.matchedCount ?? 0, o?.notMatched ?? 0 ) ) );
+      } );
       let runAiQuestions = element?.questions.filter( ( qn ) => qn.runAI );
       runAIQuestionCount += runAiQuestions.length;
     } );
@@ -207,6 +210,7 @@ export const create = async ( req, res ) => {
       client_id: req.body?.clientId,
       owner: req.user.userType == 'client' ? [ { name: req.user.userName, value: req.user.email } ] : [],
       runAIQuestionCount: runAIQuestionCount,
+      complianceCount: complianceCount,
       // configStartDate:new Date(),
       // configEndDate:new Date(),
     };
@@ -983,6 +987,7 @@ export const update = async ( req, res ) => {
 
     let getExistQuestions = await questionService.findSort( { checkListId: req.params.checklistId, client_id: req.body.clientId }, {}, { sectionNumber: 1 } );
     let runAIQuestionCount = 0;
+    let complianceCount = 0;
     inputBody.sections.forEach( async ( element ) => {
       if ( !element.questions.length && inputBody.submitType == 'configure' ) {
         return res.sendError( { message: 'Question is Required' }, 400 );
@@ -991,6 +996,9 @@ export const update = async ( req, res ) => {
       if ( element.questions.length ) {
         questionCount = questionCount + element.questions.length;
       }
+      element.questions.forEach( ( question ) => {
+        complianceCount += Math.max( ...question.answers.map( ( o ) => o?.complianceScore ?? Math.max( o?.matchedCount ?? 0, o?.notMatched ?? 0 ) ) );
+      } );
       let runAiQuestions = element?.questions.filter( ( qn ) => qn.runAI );
       runAIQuestionCount += runAiQuestions.length;
     } );
@@ -1001,6 +1009,7 @@ export const update = async ( req, res ) => {
       checkListDescription: inputBody.checklistDescription,
       questionCount: questionCount,
       runAIQuestionCount: runAIQuestionCount,
+      complianceCount: complianceCount,
     };
 
     await checklistService.updateOne( { _id: req.params.checklistId }, params );
@@ -3931,6 +3940,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
         element4.rawImageUpload = getCLconfig?.rawImageUpload || false;
         element4.rawVideoUpload = getCLconfig?.rawVideoUpload || false;
         element4.videoUploadTimeLimit = getCLconfig?.videoUploadTimeLimit || 0;
+        element4.complianceCount = getCLconfig?.complianceCount || 0;
         assignUserList.push( { ...element4 } );
       }
     } ) );

package/src/controllers/traxDashboard.controllers.js

@@ -276,6 +276,28 @@ export const checklistPerformance = async ( req, res ) => {
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
     toDate.setUTCHours( 23, 59, 59, 59 );
     let result = {};
+    let checklistIdList = [];
+
+    let limit = parseInt( requestData?.limit ) || 10;
+    let skip = limit * ( requestData?.offset ) || 0;
+
+    const detectionPayload = {
+      'fromDate': requestData.fromDate,
+      'toDate': requestData.toDate,
+      'clientId': requestData.clientId,
+      'sortColumnName': requestData.sortColumnName,
+      'sortBy': requestData.sortBy,
+      'storeId': requestData.storeId,
+    };
+
+
+    let complianceURL = 'https://h5gwudrwylz65s4vb6h2evwxeq0kkjog.lambda-url.ap-south-1.on.aws/';
+    const complianceData = await LamdaServiceCall( complianceURL, detectionPayload );
+    if ( complianceData ) {
+      const end = skip + requestData?.limit;
+      checklistIdList = complianceData.slice( start, end )?.map( ( ele ) => ele?.checklistId );
+    }
+
 
     // Get User Based Checklist //
     // let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
@@ -290,8 +312,13 @@ export const checklistPerformance = async ( req, res ) => {
         { client_id: requestData.clientId },
         // { store_id: { $in: requestData.storeId } },
         { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
+
     );
 
+    if ( requestData?.sortColumnName == 'questionCompliance' ) {
+      findAndQuery.push( { sourceCheckList_id: { $in: checklistIdList } } );
+    }
+
     findQuery.push( { $match: { $and: findAndQuery } } );
 
     if ( requestData.searchValue && requestData.searchValue != '' ) {
@@ -409,9 +436,6 @@ export const checklistPerformance = async ( req, res ) => {
       findQuery.push( { $sort: { ['submittedChecklist']: -1 } } );
     }
 
-    let limit = parseInt( requestData?.limit ) || 10;
-    let skip = limit * ( requestData?.offset ) || 0;
-
     findQuery.push( {
       $facet: {
         data: [
@@ -427,6 +451,11 @@ export const checklistPerformance = async ( req, res ) => {
       return res.sendError( 'no data found', 204 );
     }
 
+    getChecklistPerformanceData.forEach( ( ele ) => {
+      let findCompliance = complianceData?.find( ( data ) => data.checklistId == ele?.sourceCheckList_id );
+      ele['questionComplianceRate'] = findCompliance?.compliance ?? 0;
+    } );
+
     if ( requestData.export ) {
       const exportdata = [];
       getChecklistPerformanceData[0].data.forEach( ( element ) => {
@@ -4303,3 +4332,27 @@ function escapeRegex( text ) {
 //     return [ ];
 //   }
 // }
+
+async function LamdaServiceCall( url, data ) {
+  try {
+    const requestOptions = {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify( data ),
+    };
+    console.log( data );
+    const response = await fetch( url, requestOptions );
+    if ( !response.ok ) {
+      throw new Error( `Response status: ${response.status}` );
+      return false;
+    }
+    const json = await response.json();
+    return json;
+  } catch ( error ) {
+    console.log( error );
+    logger.error( { error: error, message: data, function: 'LamdaServiceCall' } );
+    return false;
+  }
+}