Merge pull request #1662 from bcgov/feature/EDX-2590

fixes issue with table display for isAdult and isGraduated
bcgov · Jun 25, 2024 · 0dfbf5a · 0dfbf5a
2 parents c6b7421 + 468d0b3
commit 0dfbf5a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/frontend/src/components/common/CustomTable.vue b/frontend/src/components/common/CustomTable.vue
@@ -108,7 +108,8 @@
               </span>
 
               <div v-else-if="column.key === 'isAdult'">
-                <span v-if="props.item['isAdult'] !== null || props.item['isAdult' !== undefined]">{{ props.item['isAdult'] === "true" ? 'Yes' : 'No' }}</span>
+                <span v-if="props.item['isAdult'] !== null && props.item['isAdult'] !== undefined">{{ props.item['isAdult'] === "true" ? 'Yes' : 'No' }}</span>
+                <span v-else>-</span>
               </div>
 
               <div v-else-if="column.key === 'fte'">
@@ -149,7 +150,8 @@
                   <span v-else>-</span>
                 </div>
                 <div v-else-if="column.subHeader.key === 'isGraduated'">
-                  <span v-if="props.item['isGraduated'] !== null || props.item['isGraduated'] !== undefined">{{ props.item['isGraduated'] === "true" ? 'Yes' :'No' }}</span>
+                  <span v-if="props.item['isGraduated'] !== null && props.item['isGraduated'] !== undefined">{{ props.item['isGraduated'] === "true" ? 'Yes' :'No' }}</span>
+                  <span v-else>-</span>
                 </div>
                 <span v-else-if="props.item[column.subHeader.key]">{{ props.item[column.subHeader.key] }}</span>
                 <span v-else>-</span>