changes in fonema/phoneme

yeatmanlab · May 25, 2024 · a9f180a · a9f180a
1 parent cc9fc38
commit a9f180a
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 35 deletions.
diff --git a/src/components/reports/TableScoreTag.vue b/src/components/reports/TableScoreTag.vue
@@ -70,9 +70,7 @@ 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';
-    if (!_taskId.includes('pa')) {
-      _toolTip += getFlags(_colData, _taskId);
-    }
+    _toolTip += getFlags(_colData, _taskId);
   }
 
   // If the task does not have a raw score, then display no scores
@@ -113,11 +111,15 @@ function getFlags(colData, taskId) {
 
   // If there are flags and the assessment is not reliable, return the flags
   if (flags && !colData.scores[taskId].reliable) {
-    const reliabilityFlags = Object.keys(flags).map((flag) => {
-      return flagMessages[flag] || _lowerCase(flag);
-    });
+    if (!taskId.includes('pa')) {
+      const reliabilityFlags = Object.keys(flags).map((flag) => {
+        return flagMessages[flag] || _lowerCase(flag);
+      });
+      return 'Engagement Flags: ' + reliabilityFlags.join('\n') + '\n\n';
+    } else {
+      return 'Unreliable \n\n';
+    }
     // Join the returned flags with a newline character, then add two newlines for spacing
-    return 'Engagement Flags: ' + reliabilityFlags.join('\n') + '\n\n';
   } else {
     return '';
   }

diff --git a/src/pages/ScoreReport.vue b/src/pages/ScoreReport.vue
@@ -528,23 +528,18 @@ 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('pa-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) {
       return 'white';
-    }
-    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';
-      }
+    } else {
+      return '#d3d3d3';
     }
   }
   return tag_color;
@@ -874,18 +869,20 @@ const exportSelected = (selectedRows) => {
         tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Raw`] = score.rawScore;
         tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Support Level`] = score.supportLevel;
       }
-      if (!taskId.includes('pa')) {
-        if (score.reliable !== undefined && !score.reliable && score.engagementFlags !== undefined) {
-          const engagementFlags = Object.keys(score.engagementFlags);
-          if (engagementFlags.length > 0) {
+      if (score.reliable !== undefined && !score.reliable && score.engagementFlags !== undefined) {
+        const engagementFlags = Object.keys(score.engagementFlags);
+        if (engagementFlags.length > 0) {
+          if (!taskId.includes('pa')) {
             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';
+            tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = 'Unreliable';
           }
         } else {
-          tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = 'Reliable';
+          tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = 'Assessment Incomplete';
         }
+      } else {
+        tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = 'Reliable';
       }
     }
     return tableRow;
@@ -924,18 +921,21 @@ const exportAll = async () => {
         tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Raw`] = score.rawScore;
         tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Support Level`] = score.supportLevel;
       }
-      if (!taskId.includes('pa')) {
-        if (score.reliable !== undefined && !score.reliable && score.engagementFlags !== undefined) {
-          const engagementFlags = Object.keys(score.engagementFlags);
-          if (engagementFlags.length > 0) {
+
+      if (score.reliable !== undefined && !score.reliable && score.engagementFlags !== undefined) {
+        const engagementFlags = Object.keys(score.engagementFlags);
+        if (engagementFlags.length > 0) {
+          if (!taskId.includes('pa')) {
             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';
+            tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = 'Unreliable';
           }
         } else {
-          tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = 'Reliable';
+          tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = 'Assessment Incomplete';
         }
+      } else {
+        tableRow[`${taskDisplayNames[taskId]?.name ?? taskId} - Reliability`] = 'Reliable';
       }
     }
     return tableRow;