tango-app-api-trax 3.9.56 → 3.9.58

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.9.56",
+    "version": "3.9.58",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/internalTrax.controller.js

@@ -2834,6 +2834,14 @@ export async function countUpdateRunAI( req, res ) {
             const scores = ( question.userAnswer || [] ).map( ( ua ) => ua.complianceScore ?? 0 );
             score = scores.length ? Math.max( ...scores ) : 0;
           }
+          // Single-choice questions answered 'NA' / 'N/A' (case-insensitive) contribute 0;
+          // don't count the selected answer's compliance score for that question.
+          if ( question.answerType === 'multiplechoicesingle' ) {
+            const naAnswer = ( question.userAnswer?.[0]?.answer || '' ).toString().trim().toLowerCase();
+            if ( naAnswer === 'na' || naAnswer === 'n/a' ) {
+              score = 0;
+            }
+          }
           userComplianceTotal += score;
         }
       } );

package/src/controllers/mobileTrax.controller.js

@@ -2141,6 +2141,22 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
 
     if ( requestData.submittype == 'submit' ) {
       requestData.userComplianceCount = 0;
+
+      // Pull every "Matched/Not Matched" verdict out of a runAIData array, tolerating both shapes:
+      //   1) [ { answerImage, results: [ { featureName, value } ] } ]  (verdict nested under results)
+      //   2) [ { featureName, value } ]                                (flat verdict)
+      const extractMatchValues = ( runAIData ) => {
+        if ( !Array.isArray( runAIData ) ) return [];
+        const values = [];
+        runAIData.forEach( ( entry ) => {
+          const results = Array.isArray( entry?.results ) ? entry.results : [ entry ];
+          results.forEach( ( r ) => {
+            if ( r?.featureName === 'Matched/Not Matched' ) values.push( r?.value );
+          } );
+        } );
+        return values;
+      };
+
       for ( let section of sectionFormat ) {
         for ( let question of section.questions ) {
           let mustValidate = !question.linkType || ( question.linkType && question.linkquestionenabled );
@@ -2148,8 +2164,40 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
             return res.sendError( 'Please Fill All Fields', 400 );
           }
           if ( question.compliance ) {
-            const scores = ( question.userAnswer || [] ).map( ( ua ) => ua?.complianceScore ?? 0 );
-            let score = scores.length ? Math.max( ...scores ) : 0;
+            let score = 0;
+
+            // image / image/video: when runAI verdicts are already present on the userAnswer,
+            // derive compliance from them (every "Matched/Not Matched" must be True to count as
+            // matched, else not matched), mirroring countUpdateRunAI.
+            const aiAnswers = question.answerType === 'image/video' ?
+              ( question.userAnswer || [] ).filter( ( ua ) => ua?.answerType === 'image' ) :
+              ( question.userAnswer || [] );
+            const hasRunAIData = [ 'image', 'image/video' ].includes( question.answerType ) &&
+              aiAnswers.some( ( ua ) => Array.isArray( ua?.runAIData ) && ua.runAIData.length );
+
+            if ( hasRunAIData ) {
+              const matchValues = aiAnswers.flatMap( ( ua ) => extractMatchValues( ua?.runAIData ) );
+              const allMatched = matchValues.length > 0 && matchValues.every( ( v ) => v === 'True' || v === true );
+              score = allMatched ?
+                ( question.answers?.[0]?.matchedCount ?? 0 ) :
+                ( question.answers?.[0]?.notMatchedCount ?? 0 );
+              // Persist the derived score onto each userAnswer so PDF/dashboard reads stay consistent.
+              ( question.userAnswer || [] ).forEach( ( ua ) => {
+                ua.complianceScore = score;
+              } );
+            } else {
+              const scores = ( question.userAnswer || [] ).map( ( ua ) => ua?.complianceScore ?? 0 );
+              score = scores.length ? Math.max( ...scores ) : 0;
+            }
+
+            // Single-choice questions answered 'NA' / 'N/A' (case-insensitive) contribute 0;
+            // don't count the selected answer's compliance score for that question.
+            if ( question.answerType === 'multiplechoicesingle' ) {
+              const naAnswer = ( question.userAnswer?.[0]?.answer || '' ).toString().trim().toLowerCase();
+              if ( naAnswer === 'na' || naAnswer === 'n/a' ) {
+                score = 0;
+              }
+            }
             requestData.userComplianceCount += score;
           }
         }