not showing for phoneme nor fonema

yeatmanlab · May 24, 2024 · 037e661 · 037e661
1 parent eb6f071
commit 037e661
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 30 deletions.
diff --git a/src/components/reports/TableScoreTag.vue b/src/components/reports/TableScoreTag.vue
@@ -70,7 +70,9 @@ function handleToolTip(_taskId, _toolTip, _colData) {
   // Get the support level and flags, if they exist
   if (_colData.scores?.[_taskId]?.supportLevel) {
     _toolTip += _colData.scores?.[_taskId]?.supportLevel + '\n' + '\n';
-    _toolTip += getFlags(_colData, _taskId);
+    if (!_taskId.includes('pa')) {
+      _toolTip += getFlags(_colData, _taskId);
+    }
   }
 
   // If the task does not have a raw score, then display no scores

diff --git a/src/pages/ScoreReport.vue b/src/pages/ScoreReport.vue
@@ -528,20 +528,23 @@ const {
 // Return a faded color if assessment is not reliable
 function returnColorByReliability(assessment, rawScore, support_level, tag_color) {
   if (assessment.reliable !== undefined && !assessment.reliable && assessment.engagementFlags !== undefined) {
-    if (assessment.taskId.includes('es')) {
-    }
-    if (support_level === 'Optional') {
-      return '#a1d8e3';
-    } else if (support_level === 'Needs Extra Support') {
-      return '#d6b8c7';
-    } else if (support_level === 'Developing Skill') {
-      return '#e8dbb5';
-    } else if (support_level === 'Achieved Skill') {
-      return '#c0d9bd';
-    } else if (rawOnlyTasks.includes(assessment.taskId) && rawScore) {
+    if (assessment.taskId.includes('pa-es')) {
       return 'white';
-    } else {
-      return '#d3d3d3';
+    }
+    if (assessment.taskId !== 'pa') {
+      if (support_level === 'Optional') {
+        return '#a1d8e3';
+      } else if (support_level === 'Needs Extra Support') {
+        return '#d6b8c7';
+      } else if (support_level === 'Developing Skill') {
+        return '#e8dbb5';
+      } else if (support_level === 'Achieved Skill') {
+        return '#c0d9bd';
+      } else if (rawOnlyTasks.includes(assessment.taskId) && rawScore) {
+        return 'white';
+      } else {
+        return '#d3d3d3';
+      }
     }
   }
   return tag_color;
@@ -871,16 +874,18 @@ const exportSelected = (selectedRows) => {
         tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Raw`] = score.rawScore;
         tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Support Level`] = score.supportLevel;
       }
-      if (score.reliable !== undefined && !score.reliable && score.engagementFlags !== undefined) {
-        const engagementFlags = Object.keys(score.engagementFlags);
-        if (engagementFlags.length > 0) {
-          const engagementFlagString = 'Unreliable: ' + engagementFlags.map((key) => _lowerCase(key)).join(', ');
-          tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = engagementFlagString;
+      if (!taskId.includes('pa')) {
+        if (score.reliable !== undefined && !score.reliable && score.engagementFlags !== undefined) {
+          const engagementFlags = Object.keys(score.engagementFlags);
+          if (engagementFlags.length > 0) {
+            const engagementFlagString = 'Unreliable: ' + engagementFlags.map((key) => _lowerCase(key)).join(', ');
+            tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = engagementFlagString;
+          } else {
+            tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = 'Assessment Incomplete';
+          }
         } else {
-          tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = 'Assessment Incomplete';
+          tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = 'Reliable';
         }
-      } else {
-        tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = 'Reliable';
       }
     }
     return tableRow;
@@ -919,16 +924,18 @@ const exportAll = async () => {
         tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Raw`] = score.rawScore;
         tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Support Level`] = score.supportLevel;
       }
-      if (score.reliable !== undefined && !score.reliable && score.engagementFlags !== undefined) {
-        const engagementFlags = Object.keys(score.engagementFlags);
-        if (engagementFlags.length > 0) {
-          const engagementFlagString = 'Unreliable: ' + engagementFlags.map((key) => _lowerCase(key)).join(', ');
-          tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = engagementFlagString;
+      if (!taskId.includes('pa')) {
+        if (score.reliable !== undefined && !score.reliable && score.engagementFlags !== undefined) {
+          const engagementFlags = Object.keys(score.engagementFlags);
+          if (engagementFlags.length > 0) {
+            const engagementFlagString = 'Unreliable: ' + engagementFlags.map((key) => _lowerCase(key)).join(', ');
+            tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = engagementFlagString;
+          } else {
+            tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = 'Assessment Incomplete';
+          }
         } else {
-          tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = 'Assessment Incomplete';
+          tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = 'Reliable';
         }
-      } else {
-        tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = 'Reliable';
       }
     }
     return tableRow;