tango-app-api-trax 3.7.68 → 3.7.70

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.7.68",
+    "version": "3.7.70",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -29,7 +29,7 @@
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
         "puppeteer": "^24.39.1",
-        "tango-api-schema": "^2.5.63",
+        "tango-api-schema": "^2.5.64",
         "tango-app-api-middleware": "^3.5.2",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/mobileTrax.controller.js

@@ -1444,9 +1444,26 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                   };
                   if ( qaAnswers[j].answerType == 'date' ) {
                     ansstructure.dateRangeType = requestSection[i].dateRangeType || false;
+                    if ( qaAnswers[j].compliance ) {
+                      // if( requestSection[i].answer > )
+                    }
                   }
                   if ( qaAnswers[j].answerType == 'linearscale' ) {
+                    let linearAnswer = requestSection[i].answer.split( 'to' );
+                    if ( qaAnswers[j].compliance ) {
+                      if ( parseInt( linearAnswer?.[0] ) >= qaAnswers[j]?.answers[0]?.minValue && parseInt( linearAnswer?.[1] ) <= qaAnswers[j]?.answers[0]?.maxValue ) {
+                        ansstructure.complianceScore = qaAnswers[j]?.answers[0]?.matchedCount;
+                      } else {
+                        ansstructure.complianceScore = qaAnswers[j]?.answers[0]?.notMatchedCount;
+                      }
+                    }
                     ansstructure.linearType = qaAnswers[j]?.answers[0]?.linearType;
+                    ansstructure.matchedCount = qaAnswers[j]?.answers[0]?.matchedCount;
+                    ansstructure.notMatchedCount = qaAnswers[j]?.answers[0]?.notMatchedCount;
+                  }
+                  if ( qaAnswers[j].answerType == 'image' ) {
+                    ansstructure.matchedCount = qaAnswers[j]?.answers[0]?.matchedCount;
+                    ansstructure.notMatchedCount = qaAnswers[j]?.answers[0]?.notMatchedCount;
                   }
                   des.push( ansstructure );
                 }
@@ -2013,7 +2030,6 @@ export async function submitChecklist( req, res ) {
             logDetails: {},
             userType: req.user.userType,
           };
-          console.log( 'inserttraxlogs =>', inserttraxlogs );
           insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
           if ( updateData.questionFlag ) {
             let checklistDetails = await checklistService.findOne( { _id: getchecklist[0].sourceCheckList_id }, { notifyFlags: 1, approver: 1 } );
@@ -2023,7 +2039,7 @@ export async function submitChecklist( req, res ) {
               let data = {
                 storeName: getchecklist[0].storeName,
                 flagCount: updateData.questionFlag,
-                checklistName: getchecklist[0].checkListName?.trim(),
+                checklistName: getchecklist[0].checkListName,
                 submittedBy: getchecklist[0].userName,
                 time: updateData.submitMobileTime,
                 domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags`,
@@ -3705,10 +3721,14 @@ export async function taskQuestionList( req, res ) {
               }
             }
 
-            if ( question.answerType == 'multiplechoicemultiple' ) {
+            if ( question.answerType == 'multiplechoicemultiple' || ( question.answerType == 'dropdown' && question.allowMultiple ) ) {
               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;
@@ -3729,7 +3749,7 @@ export async function taskQuestionList( req, res ) {
                   Bucket: bucket.sop,
                 } );
               }
-              if ( [ 'image', 'descriptiveImage', 'video' ].includes( question.answerType ) && userAns.answer != '' ) {
+              if ( [ 'image', 'descriptiveImage', 'video', 'image/video' ].includes( question.answerType ) && userAns.answer != '' ) {
                 getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].answer = await signedUrl( {
                   file_path: decodeURIComponent( userAns.answer ),
                   Bucket: bucket.sop,
@@ -3741,23 +3761,23 @@ export async function taskQuestionList( req, res ) {
                   Bucket: bucket.sop,
                 } );
               }
-              if ( question.answerType == 'multiplechoicemultiple' ) {
+              if ( question.answerType == 'multiplechoicemultiple' || ( question.answerType == 'dropdown' && question.allowMultiple ) ) {
                 let ansIndex = Multianswer.findIndex( ( item ) => item.answer == userAns.answer );
-                if ( ansIndex ) {
+                if ( ansIndex >= 0 ) {
                   Multianswer[ansIndex].validationAnswer = userAns.validationAnswer;
                 }
               }
-              if ( question.answerType == 'multipleImage' ) {
+              if ( question.answerType == 'multipleImage' || question.answerType == 'image/video' ) {
                 if ( userAns && userAns.answer && userAns.answer != '' ) {
                   let manswer = await signedUrl( { file_path: decodeURIComponent( userAns.answer ), Bucket: bucket.sop } );
-                  Multianswer.push( { 'answer': manswer, 'no': userAnsIndex, 'validationAnswer': '' } );
+                  Multianswer.push( { 'answer': manswer, 'no': userAnsIndex, 'validationAnswer': '', ...( question.answerType == 'image/video' && { answerType: userAns?.answerType } ) } );
                 } else {
 
                 }
               }
             }
           }
-          if ( question.answerType == 'multiplechoicemultiple' ) {
+          if ( question.answerType == 'multiplechoicemultiple' || ( question.answerType == 'dropdown' && question.allowMultiple ) ) {
             Multianswer.forEach( ( item ) => {
               if ( item.validationAnswer == null ) {
                 item.answer = null;
@@ -3769,11 +3789,11 @@ export async function taskQuestionList( req, res ) {
               question.Multianswer = Multianswer;
             }
           }
-          if ( question.answerType == 'multipleImage' ) {
+          if ( question.answerType == 'multipleImage' || question.answerType == 'image/video' ) {
             if ( Multianswer.length ) {
               question.Multianswer = Multianswer;
             } else {
-              Multianswer.push( { 'answer': null, 'no': 0, 'validationAnswer': null } );
+              Multianswer.push( { 'answer': null, 'no': 0, 'validationAnswer': null, ...( question.answerType == 'image/video' && { answerType: null } ) } );
               question.Multianswer = Multianswer;
             }
           }

package/src/controllers/traxDashboard.controllers.js

@@ -446,7 +446,6 @@ export const checklistPerformance = async ( req, res ) => {
       },
     } );
     let getChecklistPerformanceData = await processedchecklistService.aggregate( findQuery );
-    console.log( getChecklistPerformanceData );
     if ( !getChecklistPerformanceData[0].data.length ) {
       return res.sendError( 'no data found', 204 );
     }