tango-app-api-trax 3.9.54 → 3.9.56

package/package.json

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

package/src/controllers/mobileTrax.controller.js

@@ -2150,14 +2150,6 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
           if ( question.compliance ) {
             const scores = ( question.userAnswer || [] ).map( ( ua ) => ua?.complianceScore ?? 0 );
             let score = scores.length ? Math.max( ...scores ) : 0;
-            // Single-choice questions answered 'NA' / 'N/A' (case-insensitive) score 0,
-            // matching the visit-checklist PDF and dashboard compliance calculation.
-            if ( question.answerType === 'multiplechoicesingle' ) {
-              const naAnswer = ( question.userAnswer?.[0]?.answer || '' ).toString().trim().toLowerCase();
-              if ( naAnswer === 'na' || naAnswer === 'n/a' ) {
-                score = 0;
-              }
-            }
             requestData.userComplianceCount += score;
           }
         }

package/src/controllers/traxDashboard.controllers.js

@@ -326,83 +326,6 @@ export const checklistPerformance = async ( req, res ) => {
     //   },
     // } );
 
-    // Recompute compliance per submission straight from questionAnswers so the
-    // dashboard % matches the visit-checklist PDF: a 'multiplechoicesingle'
-    // question answered 'NA'/'N/A' (case-insensitive) is excluded from BOTH the
-    // score (numerator) and the max (denominator). Non-compliance questions and
-    // non-NA questions keep the existing max/score formula.
-    findQuery.push( {
-      $addFields: {
-        naAwareCompliance: {
-          $reduce: {
-            input: { $ifNull: [ '$questionAnswers', [] ] },
-            initialValue: { score: 0, max: 0 },
-            in: {
-              $reduce: {
-                input: { $ifNull: [ '$$this.questions', [] ] },
-                initialValue: '$$value',
-                in: {
-                  $let: {
-                    vars: {
-                      // Count this question's score/max unless it is a single-choice
-                      // question answered NA/N/A, or a non-compliance question.
-                      countIt: {
-                        $and: [
-                          { $toBool: { $ifNull: [ '$$this.compliance', false ] } },
-                          { $not: [ {
-                            $and: [
-                              { $eq: [ '$$this.answerType', 'multiplechoicesingle' ] },
-                              { $in: [
-                                { $toLower: { $trim: { input: { $convert: {
-                                  input: { $arrayElemAt: [ { $ifNull: [ '$$this.userAnswer.answer', [] ] }, 0 ] },
-                                  to: 'string', onError: '', onNull: '',
-                                } } } } },
-                                [ 'na', 'n/a' ],
-                              ] },
-                            ],
-                          } ] },
-                        ],
-                      },
-                    },
-                    in: {
-                      score: {
-                        $add: [
-                          '$$value.score',
-                          { $cond: [
-                            '$$countIt',
-                            { $ifNull: [ { $max: { $map: {
-                              input: { $ifNull: [ '$$this.userAnswer', [] ] },
-                              as: 'u',
-                              in: { $ifNull: [ '$$u.complianceScore', 0 ] },
-                            } } }, 0 ] },
-                            0,
-                          ] },
-                        ],
-                      },
-                      max: {
-                        $add: [
-                          '$$value.max',
-                          { $cond: [
-                            '$$countIt',
-                            { $ifNull: [ { $max: { $map: {
-                              input: { $ifNull: [ '$$this.answers', [] ] },
-                              as: 'o',
-                              in: { $ifNull: [ '$$o.complianceScore', { $max: [ { $ifNull: [ '$$o.matchedCount', 0 ] }, { $ifNull: [ '$$o.notMatchedCount', 0 ] } ] } ] },
-                            } } }, 0 ] },
-                            0,
-                          ] },
-                        ],
-                      },
-                    },
-                  },
-                },
-              },
-            },
-          },
-        },
-      },
-    } );
-
     findQuery.push( {
       $group: {
         _id: '$sourceCheckList_id',
@@ -421,24 +344,16 @@ export const checklistPerformance = async ( req, res ) => {
         timeFlag: { $sum: '$timeFlag' },
         questionFlagCount: { $sum: '$questionFlag' },
         runAIFlagCount: { $sum: '$runAIFlag' },
-        userComplianceScoreTotal: {
+        userComplianceCountTotal: {
           $sum: {
             $cond: [
               { $eq: [ '$checklistStatus', 'submit' ] },
-              { $ifNull: [ '$naAwareCompliance.score', 0 ] },
-              0,
-            ],
-          },
-        },
-        complianceMaxTotal: {
-          $sum: {
-            $cond: [
-              { $eq: [ '$checklistStatus', 'submit' ] },
-              { $ifNull: [ '$naAwareCompliance.max', 0 ] },
+              { $ifNull: [ '$userComplianceCount', 0 ] },
               0,
             ],
           },
         },
+        complianceCount: { $first: '$complianceCount' },
         checkListType: { $last: '$checkListType' },
         redo: { $sum: { $cond: [ { $eq: [ '$redoStatus', true ] }, 1, 0 ] } },
         task: {
@@ -499,26 +414,34 @@ export const checklistPerformance = async ( req, res ) => {
         redo: 1,
         task: 1,
         questionCompliance: {
-          $cond: [
-            { $gt: [ '$complianceMaxTotal', 0 ] },
-            {
-              $max: [
-                0,
+          $let: {
+            vars: {
+              divisor: {
+                $cond: [
+                  { $gt: [ '$submittedChecklist', 1 ] },
+                  { $multiply: [ { $ifNull: [ '$complianceCount', 0 ] }, '$submittedChecklist' ] },
+                  { $ifNull: [ '$complianceCount', 0 ] },
+                ],
+              },
+            },
+            in: {
+              $cond: [
+                { $gt: [ '$$divisor', 0 ] },
                 {
                   $round: [
                     {
                       $multiply: [
-                        { $divide: [ '$userComplianceScoreTotal', '$complianceMaxTotal' ] },
+                        { $divide: [ '$userComplianceCountTotal', '$$divisor' ] },
                         100,
                       ],
                     },
                     0,
                   ],
                 },
+                0,
               ],
             },
-            0,
-          ],
+          },
         },
       },
     } );
@@ -540,7 +463,7 @@ export const checklistPerformance = async ( req, res ) => {
       },
     } );
     let getChecklistPerformanceData = await processedchecklistService.aggregate( findQuery );
-    if ( !getChecklistPerformanceData?.[0]?.data?.length ) {
+    if ( !getChecklistPerformanceData[0].data.length ) {
       return res.sendError( 'no data found', 204 );
     }