tango-app-api-trax 1.0.0-alpha.98 → 1.0.0-task.118

package/src/controllers/traxDashboard.controllers.js

@@ -276,19 +276,14 @@ export const checklistPerformance = async ( req, res ) => {
     let findQuery = [];
     let findAndQuery = [];
     findAndQuery.push(
+        { checkListType: { $eq: 'custom' } },
+        { date_iso: { $gte: fromDate, $lte: toDate } },
         { client_id: requestData.clientId },
         { store_id: { $in: requestData.storeId } },
-        { date_iso: { $gte: fromDate } },
-        { date_iso: { $lte: toDate } },
-        { checkListType: { $eq: 'custom' } },
     );
 
     findQuery.push( { $match: { $and: findAndQuery } } );
 
-    // if ( requestData.searchValue && requestData.searchValue != '' ) {
-    //   findQuery.push( { $match: { $or: [ { checkListName: { $regex: requestData.searchValue, $options: 'i' } } ] } } );
-    // }
-
     if ( requestData.searchValue && requestData.searchValue != '' ) {
       let checkListSearch = requestData.searchValue.split( ',' ).map( ( item ) => item.trim().toLowerCase() );
       let query;
@@ -301,21 +296,21 @@ export const checklistPerformance = async ( req, res ) => {
       findQuery.push( { $match: { $or: [ query ] } } );
     }
 
-    findQuery.push( {
-      $project: {
-        sourceCheckList_id: 1,
-        checkListId: 1,
-        checkListName: 1,
-        storeCount: 1,
-        createdBy: 1,
-        createdByName: 1,
-        checklistStatus: 1,
-        timeFlag: 1,
-        questionFlag: 1,
-        checkListType: 1,
-        scheduleRepeatedType: 1,
-      },
-    } );
+    // findQuery.push( {
+    //   $project: {
+    //     sourceCheckList_id: 1,
+    //     checkListId: 1,
+    //     checkListName: 1,
+    //     storeCount: 1,
+    //     createdBy: 1,
+    //     createdByName: 1,
+    //     checklistStatus: 1,
+    //     timeFlag: 1,
+    //     questionFlag: 1,
+    //     checkListType: 1,
+    //     scheduleRepeatedType: 1,
+    //   },
+    // } );
 
     findQuery.push( {
       $group: {
@@ -355,20 +350,33 @@ export const checklistPerformance = async ( req, res ) => {
       },
     } );
 
-    let getTotalCount = await processedchecklistService.aggregate( findQuery );
-    if ( !getTotalCount.length ) {
-      return res.sendError( { error: 'No Data Found' }, 204 );
-    }
-
     if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
       findQuery.push( { $sort: { [requestData.sortColumnName]: requestData.sortBy } } );
     } else {
       findQuery.push( { $sort: { ['submittedChecklist']: -1 } } );
     }
 
+    let limit = parseInt( requestData?.limit ) || 10;
+    let skip = limit * ( requestData?.offset ) || 0;
+
+    findQuery.push( {
+      $facet: {
+        data: [
+          { $skip: skip }, { $limit: limit },
+        ],
+        count: [
+          { $count: 'total' },
+        ],
+      },
+    } );
+    let getChecklistPerformanceData = await processedchecklistService.aggregate( findQuery );
+    if ( !getChecklistPerformanceData[0].data.length ) {
+      return res.sendError( 'no data found', 204 );
+    }
+
     if ( requestData.export ) {
       const exportdata = [];
-      getTotalCount.forEach( ( element ) => {
+      getChecklistPerformanceData[0].data.forEach( ( element ) => {
         exportdata.push( {
           'Checklist Name': element.checkListName,
           'Scheduled': element.scheduleRepeatedType,
@@ -380,13 +388,8 @@ export const checklistPerformance = async ( req, res ) => {
       return await download( exportdata, res );
     }
 
-    let limit = parseInt( requestData?.limit ) || 10;
-    let skip = limit * ( requestData?.offset ) || 0;
-    findQuery.push( { $skip: skip }, { $limit: limit } );
-    let getChecklistPerformanceData = await processedchecklistService.aggregate( findQuery );
-
-    result.totalCount = getTotalCount.length;
-    result.checklistPerformance = getChecklistPerformanceData;
+    result.totalCount = getChecklistPerformanceData[0].count[0].total;
+    result.checklistPerformance = getChecklistPerformanceData[0].data;
     return res.sendSuccess( result );
   } catch ( error ) {
     console.log( 'error =>', error );
@@ -467,8 +470,10 @@ export const storePerformance = async ( req, res ) => {
           },
         },
         checkListType: { $last: '$checkListType' },
-        questionFlag: { $sum: '$questionFlag' },
+        // questionFlag: { $sum: '$questionFlag' },
+        questionFlag: { $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, '$questionFlag', 0 ] } },
         questionCount: { $sum: '$questionCount' },
+        submitQuestionCount: { $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, '$questionCount', 0 ] } },
       },
     } );
 
@@ -487,7 +492,7 @@ export const storePerformance = async ( req, res ) => {
         completion: {
           $round: [ { $multiply: [ { $divide: [ '$submittedChecklist', '$totalChecklist' ] }, 100 ] }, 0 ],
         },
-        correctAnswers: { $subtract: [ '$questionCount', '$questionFlag' ] },
+        correctAnswers: { $subtract: [ '$submitQuestionCount', '$questionFlag' ] },
       },
     } );
 
@@ -511,7 +516,6 @@ export const storePerformance = async ( req, res ) => {
             then: 0,
             else: {
               $round: [ { $multiply: [ { $divide: [ '$correctAnswers', '$questionCount' ] }, 100 ] }, 0 ],
-              // $multiply: [ { $divide: [ '$correctAnswers', '$questionCount' ] }, 100 ],
             },
           },
         },
@@ -535,14 +539,13 @@ export const storePerformance = async ( req, res ) => {
         completion: 1,
         compliance: 1,
         performance: { $round: [ { $divide: [ { $add: [ '$completion', '$compliance' ] }, 2 ] }, 0 ] },
-        // performance: { $divide: [ { $add: [ '$completion', '$compliance' ] }, 2 ] },
       },
     } );
 
-    let getTotalCount = await processedchecklistService.aggregate( findQuery );
-    if ( !getTotalCount.length ) {
-      return res.sendError( { error: 'No Data Found' }, 204 );
-    }
+    // let getTotalCount = await processedchecklistService.aggregate( findQuery );
+    // if ( !getTotalCount.length ) {
+    //   return res.sendError( { error: 'No Data Found' }, 204 );
+    // }
 
     if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
       if ( requestData.sortColumnName == 'storeName' ) {
@@ -554,9 +557,29 @@ export const storePerformance = async ( req, res ) => {
       findQuery.push( { $sort: { ['submittedChecklist']: -1 } } );
     }
 
+    let limit = parseInt( requestData?.limit ) || 10;
+    let skip = limit * ( requestData?.offset ) || 0;
+    findQuery.push( {
+      $facet: {
+        data: [
+          { $skip: skip }, { $limit: limit },
+        ],
+        count: [
+          { $count: 'total' },
+        ],
+      },
+    },
+    );
+
+    let getStorePerformanceData = await processedchecklistService.aggregate( findQuery );
+    if ( !getStorePerformanceData[0].data.length ) {
+      return res.sendError( { error: 'No Data Found' }, 204 );
+    }
+
+
     if ( requestData.export ) {
       const exportdata = [];
-      getTotalCount.forEach( ( element ) => {
+      getStorePerformanceData[0].data.forEach( ( element ) => {
         exportdata.push( {
           'Store Name': element.storeName,
           'Store Spoc': element.userEmail,
@@ -570,13 +593,8 @@ export const storePerformance = async ( req, res ) => {
       return await download( exportdata, res );
     }
 
-    let limit = parseInt( requestData?.limit ) || 10;
-    let skip = limit * ( requestData?.offset ) || 0;
-    findQuery.push( { $skip: skip }, { $limit: limit } );
-    let getStorePerformanceData = await processedchecklistService.aggregate( findQuery );
-
-    result.totalCount = getTotalCount.length;
-    result.storePerformance = getStorePerformanceData;
+    result.totalCount = getStorePerformanceData[0].count[0].total;
+    result.storePerformance = getStorePerformanceData[0].data;
     return res.sendSuccess( result );
   } catch ( error ) {
     console.log( 'error =>', error );
@@ -598,11 +616,10 @@ export const userPerformance = async ( req, res ) => {
     let findQuery = [];
     let findAndQuery = [];
     findAndQuery.push(
+        { date_iso: { $gte: fromDate, $lte: toDate } },
+        { checkListType: { $eq: 'custom' } },
         { client_id: requestData.clientId },
         { store_id: { $in: requestData.storeId } },
-        { date_iso: { $gte: fromDate } },
-        { date_iso: { $lte: toDate } },
-        { checkListType: { $eq: 'custom' } },
     );
 
     findQuery.push( { $match: { $and: findAndQuery } } );
@@ -643,6 +660,7 @@ export const userPerformance = async ( req, res ) => {
         storeName: 1,
         userEmail: 1,
         userName: 1,
+        questionCount: 1,
       },
     } );
 
@@ -659,8 +677,10 @@ export const userPerformance = async ( req, res ) => {
           },
         },
         checkListType: { $last: '$checkListType' },
-        questionFlag: { $sum: '$questionFlag' },
+        // questionFlag: { $sum: '$questionFlag' },
+        questionFlag: { $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, '$questionFlag', 0 ] } },
         questionCount: { $sum: '$questionCount' },
+        submittedChecklistQuestionCount: { $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, '$questionCount', 0 ] } },
       },
     } );
 
@@ -679,7 +699,7 @@ export const userPerformance = async ( req, res ) => {
           $round: [ { $multiply: [ { $divide: [ '$submittedChecklist', '$totalChecklist' ] }, 100 ] }, 0 ],
           // $multiply: [ { $divide: [ '$submittedChecklist', '$totalChecklist' ] }, 100 ],
         },
-        correctAnswers: { $subtract: [ '$questionCount', '$questionFlag' ] },
+        correctAnswers: { $subtract: [ '$submittedChecklistQuestionCount', '$questionFlag' ] },
       },
     } );
 
@@ -729,10 +749,10 @@ export const userPerformance = async ( req, res ) => {
       },
     } );
 
-    let getTotalCount = await processedchecklistService.aggregate( findQuery );
-    if ( !getTotalCount.length ) {
-      return res.sendError( { error: 'No Data Found' }, 204 );
-    }
+    // let getTotalCount = await processedchecklistService.aggregate( findQuery );
+    // if ( !getTotalCount.length ) {
+    //   return res.sendError( { error: 'No Data Found' }, 204 );
+    // }
 
     if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
       if ( requestData.sortColumnName == 'userName' ) {
@@ -746,11 +766,26 @@ export const userPerformance = async ( req, res ) => {
 
     let limit = parseInt( requestData?.limit ) || 10;
     let skip = limit * ( requestData?.offset ) || 0;
-    findQuery.push( { $skip: skip }, { $limit: limit } );
+    findQuery.push( {
+      $facet: {
+        data: [
+          { $skip: skip }, { $limit: limit },
+        ],
+        count: [
+          { $count: 'total' },
+        ],
+      },
+    },
+    );
+
     let getUserPerformanceData = await processedchecklistService.aggregate( findQuery );
 
-    result.totalCount = getTotalCount.length;
-    result.userPerformance = getUserPerformanceData;
+    if ( !getUserPerformanceData[0].data.length ) {
+      return res.sendError( { error: 'No Data Found' }, 204 );
+    }
+
+    result.totalCount = getUserPerformanceData[0].count[0].total;
+    result.userPerformance = getUserPerformanceData[0].data;
     return res.sendSuccess( result );
   } catch ( error ) {
     console.log( 'error =>', error );
@@ -2067,25 +2102,24 @@ export const overallCardsV1 = async ( req, res ) => {
     let findUniqueQuery = [];
     let findAndQuery = [];
     findAndQuery.push(
+        { checkListType: { $eq: 'custom' } },
+        { date_iso: { $gte: fromDate, $lte: toDate } },
         { client_id: requestData.clientId },
         { store_id: { $in: requestData.storeId } },
-        { date_iso: { $gte: fromDate } },
-        { date_iso: { $lte: toDate } },
-        { checkListType: { $eq: 'custom' } },
     );
 
     findQuery.push( { $match: { $and: findAndQuery } } );
 
-    findQuery.push( {
-      $project: {
-        sourceCheckList_id: 1,
-        checkListId: 1,
-        checklistStatus: 1,
-        timeFlag: 1,
-        questionFlag: 1,
-        questionCount: 1,
-      },
-    } );
+    // findQuery.push( {
+    //   $project: {
+    //     sourceCheckList_id: 1,
+    //     checkListId: 1,
+    //     checklistStatus: 1,
+    //     timeFlag: 1,
+    //     questionFlag: 1,
+    //     questionCount: 1,
+    //   },
+    // } );
 
     findQuery.push( {
       $group: {
@@ -2104,6 +2138,12 @@ export const overallCardsV1 = async ( req, res ) => {
         statusCounts: {
           $push: { k: '$_id', v: '$count' },
         },
+        submiitedQuestionCount: {
+          $push: { k: '$_id', v: '$totalQuestionCount' },
+        },
+        flaggedQuestionCount: {
+          $push: { k: '$_id', v: '$totalQuestionFlagCount' },
+        },
         questionCountSum: { $sum: '$totalQuestionCount' },
         questionFlagCountSum: { $sum: '$totalQuestionFlagCount' },
         timeFlagSum: { $sum: '$totalTimeFlag' },
@@ -2112,6 +2152,8 @@ export const overallCardsV1 = async ( req, res ) => {
     findQuery.push( {
       $addFields: {
         statusCounts: { $arrayToObject: '$statusCounts' },
+        submittedChecklistQuestionCount: { $arrayToObject: '$submiitedQuestionCount' },
+        submittedChecklistFlagQuestionCount: { $arrayToObject: '$flaggedQuestionCount' },
       },
     } );
     findQuery.push( {
@@ -2121,6 +2163,8 @@ export const overallCardsV1 = async ( req, res ) => {
         questionFlagCountSum: 1,
         timeFlagSum: 1,
         statusCounts: 1,
+        submittedChecklistQuestionCount: 1,
+        submittedChecklistFlagQuestionCount: 1,
       },
     } );
     findQuery.push( {
@@ -2135,7 +2179,7 @@ export const overallCardsV1 = async ( req, res ) => {
         // completionScore: { $multiply: [ { $divide: [ '$statusCounts.submit', '$totalChecklist' ] }, 100 ] },
         questionFlagCount: '$questionFlagCountSum',
         questionCount: '$questionCountSum',
-        correctAnswers: { $subtract: [ '$questionCountSum', '$questionFlagCountSum' ] },
+        correctAnswers: { $subtract: [ '$submittedChecklistQuestionCount.submit', '$submittedChecklistFlagQuestionCount.submit' ] },
       },
     } );
     findQuery.push( {
@@ -2162,11 +2206,6 @@ export const overallCardsV1 = async ( req, res ) => {
       },
     } );
     console.log( 'overallCardsV1 Query Hit 1=>' );
-    let getOverallChecklistData = await processedchecklistService.aggregate( findQuery );
-    console.log( 'overallCardsV1 Query Output 1=>', getOverallChecklistData );
-    if ( !getOverallChecklistData.length ) {
-      return res.sendError( { error: 'No Data Found' }, 204 );
-    }
     findUniqueQuery.push( { $match: { $and: findAndQuery } } );
     findUniqueQuery.push( {
       $project: {
@@ -2181,12 +2220,12 @@ export const overallCardsV1 = async ( req, res ) => {
     findUniqueQuery.push( {
       $count: 'totalUniqueChecklist',
     } );
-    console.log( 'overallCardsV1 unique checklist Query Hit 2 =>' );
-    let getUniqueChecklistData = await processedchecklistService.aggregate( findUniqueQuery );
-    console.log( 'overallCardsV1 unique checklist output 2 =>', getUniqueChecklistData );
-    if ( !getUniqueChecklistData.length && !getOverallChecklistData.length ) {
-      return res.sendError( { error: 'No Data Found' }, 204 );
-    }
+
+    const [ getOverallChecklistData, getUniqueChecklistData ] = await Promise.all( [
+      processedchecklistService.aggregate( findQuery ),
+      processedchecklistService.aggregate( findUniqueQuery ),
+    ] );
+
 
     if ( getUniqueChecklistData.length && getUniqueChecklistData.length>0 ) {
       if ( getUniqueChecklistData[0].totalUniqueChecklist ) {
@@ -2325,25 +2364,24 @@ export const overallComparisonCardsV1 = async ( req, res ) => {
     let rangeOneFindQuery = [];
     let rangeOneFindAndQuery = [];
     rangeOneFindAndQuery.push(
+        { checkListType: { $eq: 'custom' } },
+        { date_iso: { $gte: rangeOneFromDate, $lte: rangeOneToDate } },
         { client_id: requestData.clientId },
         { store_id: { $in: requestData.storeId } },
-        { date_iso: { $gte: rangeOneFromDate } },
-        { date_iso: { $lte: rangeOneToDate } },
-        { checkListType: { $eq: 'custom' } },
     );
 
     rangeOneFindQuery.push( { $match: { $and: rangeOneFindAndQuery } } );
-    rangeOneFindQuery.push( {
-      $project: {
-        sourceCheckList_id: 1,
-        checkListId: 1,
-        checklistStatus: 1,
-        timeFlag: 1,
-        questionFlag: 1,
-        questionCount: 1,
-        checkListType: 1,
-      },
-    } );
+    // rangeOneFindQuery.push( {
+    //   $project: {
+    //     sourceCheckList_id: 1,
+    //     checkListId: 1,
+    //     checklistStatus: 1,
+    //     timeFlag: 1,
+    //     questionFlag: 1,
+    //     questionCount: 1,
+    //     checkListType: 1,
+    //   },
+    // } );
     rangeOneFindQuery.push( {
       $group: {
         _id: '',
@@ -2388,31 +2426,28 @@ export const overallComparisonCardsV1 = async ( req, res ) => {
         },
       },
     } );
-    let rangeOneData = await processedchecklistService.aggregate( rangeOneFindQuery );
-    console.log( 'rangeOneData =>', rangeOneData );
 
     let rangeTwoFindQuery = [];
     let rangeTwoFindAndQuery = [];
     rangeTwoFindAndQuery.push(
+        { checkListType: { $eq: 'custom' } },
+        { date_iso: { $gte: rangeTwoFromDate, $lte: rangeTwoToDate } },
         { client_id: requestData.clientId },
         { store_id: { $in: requestData.storeId } },
-        { date_iso: { $gte: rangeTwoFromDate } },
-        { date_iso: { $lte: rangeTwoToDate } },
-        { checkListType: { $eq: 'custom' } },
     );
 
     rangeTwoFindQuery.push( { $match: { $and: rangeTwoFindAndQuery } } );
-    rangeTwoFindQuery.push( {
-      $project: {
-        sourceCheckList_id: 1,
-        checkListId: 1,
-        checklistStatus: 1,
-        timeFlag: 1,
-        questionFlag: 1,
-        questionCount: 1,
-        checkListType: 1,
-      },
-    } );
+    // rangeTwoFindQuery.push( {
+    //   $project: {
+    //     sourceCheckList_id: 1,
+    //     checkListId: 1,
+    //     checklistStatus: 1,
+    //     timeFlag: 1,
+    //     questionFlag: 1,
+    //     questionCount: 1,
+    //     checkListType: 1,
+    //   },
+    // } );
     rangeTwoFindQuery.push( {
       $group: {
         _id: '',
@@ -2457,23 +2492,28 @@ export const overallComparisonCardsV1 = async ( req, res ) => {
         },
       },
     } );
-    let rangeTwoData = await processedchecklistService.aggregate( rangeTwoFindQuery );
+    const [ rangeOneData, rangeTwoData ] = await Promise.all( [
+      processedchecklistService.aggregate( rangeOneFindQuery ),
+      processedchecklistService.aggregate( rangeTwoFindQuery ),
+    ] );
     console.log( 'rangeTwoData =>', rangeTwoData );
+    console.log( 'rangeOneData =>', rangeOneData );
+
 
     if ( rangeOneData.length >0 && rangeTwoData.length >0 ) {
-      overallComparisonCards.flags.comparisonData = Math.round( ( ( ( rangeOneData[0].flaggedChecklist - rangeTwoData[0].flaggedChecklist )/rangeOneData[0].flaggedChecklist )*100 ) ); // .toFixed( 2 )
+      overallComparisonCards.flags.comparisonData = Math.round( ( ( ( rangeOneData[0].flaggedChecklist - rangeTwoData[0].flaggedChecklist )/rangeTwoData[0].flaggedChecklist )*100 ) ); // .toFixed( 2 )
       if ( overallComparisonCards.flags.comparisonData > 0 ) {
         overallComparisonCards.flags.ComparisonFlag = true;
       } else {
         overallComparisonCards.flags.ComparisonFlag = false;
       }
-      overallComparisonCards.completionScore.comparisonData = Math.round( ( ( ( rangeOneData[0].completionScore - rangeTwoData[0].completionScore )/rangeOneData[0].completionScore )*100 ) ); // .toFixed( 2 )
+      overallComparisonCards.completionScore.comparisonData = Math.round( ( ( ( rangeOneData[0].completionScore - rangeTwoData[0].completionScore )/rangeTwoData[0].completionScore )*100 ) ); // .toFixed( 2 )
       if ( overallComparisonCards.completionScore.comparisonData > 0 ) {
         overallComparisonCards.completionScore.ComparisonFlag = true;
       } else {
         overallComparisonCards.completionScore.ComparisonFlag = false;
       }
-      overallComparisonCards.complianceRate.comparisonData = Math.round( ( ( ( rangeOneData[0].questionCompletionScore - rangeTwoData[0].questionCompletionScore )/rangeOneData[0].questionCompletionScore )*100 ) ); // .toFixed( 2 )
+      overallComparisonCards.complianceRate.comparisonData = Math.round( ( ( ( rangeOneData[0].questionCompletionScore - rangeTwoData[0].questionCompletionScore )/rangeTwoData[0].questionCompletionScore )*100 ) ); // .toFixed( 2 )
       if ( overallComparisonCards.complianceRate.comparisonData > 0 ) {
         overallComparisonCards.complianceRate.ComparisonFlag = true;
       } else {
@@ -2666,6 +2706,15 @@ export const infoCardsV1 = async ( req, res ) => {
         timeFlag: { $sum: '$timeFlag' },
         questionFlagCount: { $sum: '$questionFlag' },
         questionCount: { $sum: '$questionCount' },
+        submittedQuestionCount: {
+          $sum: {
+            $cond: [
+              { $eq: [ '$checklistStatus', 'submit' ] },
+              '$questionCount', // Sum this field if status is 'submit'
+              0, // Otherwise, add 0
+            ],
+          },
+        },
       },
     } );
     findQuery.push( {
@@ -2681,7 +2730,8 @@ export const infoCardsV1 = async ( req, res ) => {
         questionFlagCount: 1,
         questionCount: 1,
         timeFlag: 1,
-        correctAnswers: { $subtract: [ '$questionCount', '$questionFlagCount' ] },
+        submittedQuestionCount: 1,
+        correctAnswers: { $subtract: [ '$submittedQuestionCount', '$questionFlagCount' ] },
       },
     } );
     findQuery.push( {
@@ -2697,6 +2747,7 @@ export const infoCardsV1 = async ( req, res ) => {
         questionCount: 1,
         timeFlag: 1,
         correctAnswers: 1,
+        submittedQuestionCount: 1,
         questionCompletionScore: {
           $cond: {
             if: { $eq: [ '$questionCount', 0 ] },
@@ -3089,31 +3140,31 @@ export const infoComparisonCardsV1 = async ( req, res ) => {
     }
 
     if ( rangeOneData.length >0 && rangeTwoData.length >0 ) {
-      infoComparisonCards.totalInstances.comparisonData = Math.round( ( ( ( rangeOneData[0].totalChecklist - rangeTwoData[0].totalChecklist )/rangeOneData[0].totalChecklist )*100 ) ); // .toFixed( 2 )
+      infoComparisonCards.totalInstances.comparisonData = Math.round( ( ( ( rangeOneData[0].totalChecklist - rangeTwoData[0].totalChecklist )/rangeTwoData[0].totalChecklist )*100 ) ); // .toFixed( 2 )
       if ( infoComparisonCards.totalInstances.comparisonData > 0 ) {
         infoComparisonCards.totalInstances.ComparisonFlag = true;
       } else {
         infoComparisonCards.totalInstances.ComparisonFlag = false;
       }
-      infoComparisonCards.completedInstances.comparisonData = Math.round( ( ( ( rangeOneData[0].submittedChecklist - rangeTwoData[0].submittedChecklist )/rangeOneData[0].submittedChecklist )*100 ) ); // .toFixed( 2 )
+      infoComparisonCards.completedInstances.comparisonData = Math.round( ( ( ( rangeOneData[0].submittedChecklist - rangeTwoData[0].submittedChecklist )/rangeTwoData[0].submittedChecklist )*100 ) ); // .toFixed( 2 )
       if ( infoComparisonCards.completedInstances.comparisonData > 0 ) {
         infoComparisonCards.completedInstances.ComparisonFlag = true;
       } else {
         infoComparisonCards.completedInstances.ComparisonFlag = false;
       }
-      infoComparisonCards.flags.comparisonData = Math.round( ( ( ( rangeOneData[0].flaggedChecklist - rangeTwoData[0].flaggedChecklist )/rangeOneData[0].flaggedChecklist )*100 ) ); // .toFixed( 2 )
+      infoComparisonCards.flags.comparisonData = Math.round( ( ( ( rangeOneData[0].flaggedChecklist - rangeTwoData[0].flaggedChecklist )/rangeTwoData[0].flaggedChecklist )*100 ) ); // .toFixed( 2 )
       if ( infoComparisonCards.flags.comparisonData > 0 ) {
         infoComparisonCards.flags.ComparisonFlag = true;
       } else {
         infoComparisonCards.flags.ComparisonFlag = false;
       }
-      infoComparisonCards.completionScore.comparisonData = Math.round( ( ( ( rangeOneData[0].questionCompletionScore - rangeTwoData[0].questionCompletionScore )/rangeOneData[0].questionCompletionScore )*100 ) ); // .toFixed( 2 )
+      infoComparisonCards.completionScore.comparisonData = Math.round( ( ( ( rangeOneData[0].questionCompletionScore - rangeTwoData[0].questionCompletionScore )/rangeTwoData[0].questionCompletionScore )*100 ) ); // .toFixed( 2 )
       if ( infoComparisonCards.completionScore.comparisonData > 0 ) {
         infoComparisonCards.completionScore.ComparisonFlag = true;
       } else {
         infoComparisonCards.completionScore.ComparisonFlag = false;
       }
-      infoComparisonCards.complianceRate.comparisonData = Math.round( ( ( ( rangeOneData[0].completionScore - rangeTwoData[0].completionScore )/rangeOneData[0].completionScore )*100 ) ); // .toFixed( 2 )
+      infoComparisonCards.complianceRate.comparisonData = Math.round( ( ( ( rangeOneData[0].completionScore - rangeTwoData[0].completionScore )/rangeTwoData[0].completionScore )*100 ) ); // .toFixed( 2 )
       if ( infoComparisonCards.complianceRate.comparisonData > 0 ) {
         infoComparisonCards.complianceRate.ComparisonFlag = true;
       } else {
@@ -3444,7 +3495,6 @@ export const checklistDropdown = async ( req, res ) => {
     findAndQuery.push(
         { client_id: requestData.clientId },
         { checkListType: 'custom' },
-        { isdeleted: false },
     );
     findQuery.push( { $match: { $and: findAndQuery } } );
     findQuery.push( {

package/src/dtos/downloadValidation.dtos.js

@@ -18,6 +18,8 @@ export const validateDownloadInsertSchema = joi.object( {
   viewFlag: joi.boolean().optional().allow( '' ),
   downloadInsertFrom: joi.string().optional().allow( '' ),
   userId: joi.string().optional().allow( '' ),
+  answerType: joi.string().optional().allow( '' ),
+  searchValue: joi.string().optional().allow( '' ),
 } );
 
 export const validateDownloadInsertParams = {
@@ -25,7 +27,9 @@ export const validateDownloadInsertParams = {
 };
 
 export const validateDownloadListSchema = joi.object( {
-  ...baseSchema,
+  clientId: joi.string().required(),
+  fromDate: joi.string().optional().allow( '' ),
+  toDate: joi.string().optional().allow( '' ),
   createdBy: joi.string().optional().allow( '' ),
   searchValue: joi.string().optional().allow( '' ),
   sortBy: joi.number().optional().allow( '' ),

package/src/routes/mobileTrax.routes.js

@@ -7,11 +7,17 @@ export const mobileRouter = express.Router();
 
 mobileRouter
     .get( '/storeList', isAllowedSessionHandler, mobileController.storeList )
+    .get( '/storeListv1', isAllowedSessionHandler, mobileController.storeListv1 )
     .post( '/startCheckList', isAllowedSessionHandler, validate( startValidation ), mobileController.startChecklist )
+    .post( '/startTask', isAllowedSessionHandler, validate( startValidation ), mobileController.startTask )
     .post( '/submitCheckList', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobilechecklistQuestionValidator, mobileController.sopMobilechecklistMultiSectionFormatter, mobileController.submitChecklist )
+    .post( '/submitTask', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobileTaskQuestionValidator, mobileController.sopMobileTaskMultiSectionFormatter, mobileController.submitTask )
     .get( '/dashboard', isAllowedSessionHandler, validate( dashboardValidation ), mobileController.dashboard )
+    .get( '/dashboardv1', isAllowedSessionHandler, validate( dashboardValidation ), mobileController.dashboardv1 )
     .get( '/checklist', isAllowedSessionHandler, validate( mobileChecklistValidation ), mobileController.checklist )
+    .get( '/checklistv1', isAllowedSessionHandler, validate( mobileChecklistValidation ), mobileController.checklistv1 )
     .get( '/checklistQuestionList', isAllowedSessionHandler, mobileController.questionList )
+    .get( '/taskQuestionList', isAllowedSessionHandler, mobileController.taskQuestionList )
     .post( '/uploadAnswerImage', isAllowedSessionHandler, mobileController.uploadAnswerImage )
     .get( '/appVersion', mobileController.appVersion )
     .post( '/appVersion', mobileController.updateappVersion )