From c3e30b998d346d8e654a4a9cb9c28fc6ad66165c Mon Sep 17 00:00:00 2001
From: Nathan Cannon <nathan.cannon@edf-energy.com>
Date: Wed, 30 Sep 2020 13:23:25 +0100
Subject: [PATCH] Added filtering of empty text entries

---
 frontend/src/views/Observation.vue | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/Observation.vue b/frontend/src/views/Observation.vue
index 3828991..2c43d52 100644
--- a/frontend/src/views/Observation.vue
+++ b/frontend/src/views/Observation.vue
@@ -1,6 +1,10 @@
 <template>
   <b-container fluid>
-    <b-container v-if="type != null && whom != null && site != null && tutors != null" fluid style="padding-left: 130px;">
+    <b-container
+      v-if="type != null && whom != null && site != null && tutors != null"
+      fluid
+      style="padding-left: 130px;"
+    >
       <h3>
         <v-icon name="tag" scale="1.5" />
         {{ type }}&nbsp;/&nbsp;{{ whom }}
@@ -443,9 +447,11 @@ export default {
                 : notObservedValue,
             monitoringStrengths: monitoring
               .map((entry) => entry.strengths)
+              .filter((entry) => entry.length > 0)
               .join("; "),
             monitoringImprovements: monitoring
               .map((entry) => entry.AFIs)
+              .filter((entry) => entry.length > 0)
               .join("; "),
             controlProceduralRating:
               controlProcedural.length > 0
@@ -453,9 +459,11 @@ export default {
                 : notObservedValue,
             controlProceduralStrengths: controlProcedural
               .map((entry) => entry.strengths)
+              .filter((entry) => entry.length > 0)
               .join("; "),
             controlProceduralImprovements: controlProcedural
               .map((entry) => entry.AFIs)
+              .filter((entry) => entry.length > 0)
               .join("; "),
             controlRating:
               control.length > 0
@@ -463,17 +471,23 @@ export default {
                 : notObservedValue,
             controlStrengths: control
               .map((entry) => entry.strengths)
+              .filter((entry) => entry.length > 0)
+              .join("; "),
+            controlImprovements: control
+              .map((entry) => entry.AFIs)
+              .filter((entry) => entry.length > 0)
               .join("; "),
-            controlImprovements: control.map((entry) => entry.AFIs).join("; "),
             conservatismRating:
               conservatism.length > 0
                 ? Math.round(self.totals[3])
                 : notObservedValue,
             conservatismStrengths: conservatism
               .map((entry) => entry.strengths)
+              .filter((entry) => entry.length > 0)
               .join(";"),
             conservatismImprovements: conservatism
               .map((entry) => entry.strengths)
+              .filter((entry) => entry.length > 0)
               .join(";"),
             teamworkCommunicationsRating:
               teamworkCommunications.length > 0
@@ -481,9 +495,11 @@ export default {
                 : notObservedValue,
             teamworkCommunicationsStrengths: teamworkCommunications
               .map((entry) => entry.strengths)
+              .filter((entry) => entry.length > 0)
               .join(";"),
             teamworkCommunicationsImprovements: teamworkCommunications
               .map((entry) => entry.AFIs)
+              .filter((entry) => entry.length > 0)
               .join(";"),
             teamworkLeadershipRating:
               teamworkLeadership.length > 0
@@ -491,9 +507,11 @@ export default {
                 : notObservedValue,
             teamworkLeadershipStrengths: teamworkLeadership
               .map((entry) => entry.strengths)
+              .filter((entry) => entry.length > 0)
               .join(";"),
             teamworkLeadershipImprovements: teamworkLeadership
               .map((entry) => entry.AFIs)
+              .filter((entry) => entry.length > 0)
               .join(";"),
             teamworkWorkloadRating:
               teamworkWorkload.length > 0
@@ -501,9 +519,11 @@ export default {
                 : notObservedValue,
             teamworkWorkloadStrengths: teamworkWorkload
               .map((entry) => entry.strengths)
+              .filter((entry) => entry.length > 0)
               .join(";"),
             teamworkWorkloadImprovements: teamworkWorkload
               .map((entry) => entry.AFIs)
+              .filter((entry) => entry.length > 0)
               .join(";"),
             knowledgeRating:
               knowledge.length > 0
@@ -511,9 +531,11 @@ export default {
                 : notObservedValue,
             knowledgeStrengths: knowledge
               .map((entry) => entry.strengths)
+              .filter((entry) => entry.length > 0)
               .join(";"),
             knowledgeImprovements: knowledge
               .map((entry) => entry.AFIs)
+              .filter((entry) => entry.length > 0)
               .join(";"),
           });
         });