always show project

fixes #103
david-loe · Oct 5, 2024 · a823657 · a823657
1 parent 4497be4
commit a823657
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/frontend/src/components/elements/CardElement.vue b/frontend/src/components/elements/CardElement.vue
@@ -26,8 +26,8 @@
         </div>
       </div>
 
-      <span v-if="showOwner && request.owner" class="card-subtitle mb-1 fs-6 fw-medium text-muted">
-        {{ request.owner.name.givenName + ' ' + request.owner.name.familyName + ' - ' + request.project.identifier }}
+      <span class="card-subtitle mb-1 fs-6 fw-medium text-muted">
+        {{ (showOwner ? request.owner.name.givenName + ' ' + request.owner.name.familyName + ' - ' : '') + request.project.identifier }}
       </span>
       <div class="row mb-2">
         <slot name="details"></slot>

diff --git a/frontend/src/components/expenseReport/ExpenseReportPage.vue b/frontend/src/components/expenseReport/ExpenseReportPage.vue
@@ -93,8 +93,12 @@
             </div>
           </div>
         </div>
-        <div v-if="endpointPrefix === 'examine/'" class="text-secondary">
-          {{ expenseReport.owner.name.givenName + ' ' + expenseReport.owner.name.familyName + ' - ' + expenseReport.project.identifier }}
+        <div class="text-secondary">
+          {{
+            (endpointPrefix === 'examine/' ? expenseReport.owner.name.givenName + ' ' + expenseReport.owner.name.familyName + ' - ' : '') +
+            expenseReport.project.identifier +
+            (expenseReport.project.name ? ' ' + expenseReport.project.name : '')
+          }}
         </div>
       </div>
 

diff --git a/frontend/src/components/healthCareCost/HealthCareCostPage.vue b/frontend/src/components/healthCareCost/HealthCareCostPage.vue
@@ -103,8 +103,14 @@
             </div>
           </div>
         </div>
-        <div v-if="endpointPrefix !== ''" class="text-secondary">
-          {{ healthCareCost.owner.name.givenName + ' ' + healthCareCost.owner.name.familyName + ' - ' + healthCareCost.project.identifier }}
+        <div class="text-secondary">
+          {{
+            (endpointPrefix === 'examine/'
+              ? healthCareCost.owner.name.givenName + ' ' + healthCareCost.owner.name.familyName + ' - '
+              : '') +
+            healthCareCost.project.identifier +
+            (healthCareCost.project.name ? ' ' + healthCareCost.project.name : '')
+          }}
         </div>
       </div>
 

diff --git a/frontend/src/components/travel/TravelPage.vue b/frontend/src/components/travel/TravelPage.vue
@@ -131,8 +131,12 @@
             </div>
           </div>
         </div>
-        <div v-if="endpointPrefix === 'examine/'" class="text-secondary">
-          {{ travel.owner.name.givenName + ' ' + travel.owner.name.familyName + ' - ' + travel.project.identifier }}
+        <div class="text-secondary">
+          {{
+            (endpointPrefix === 'examine/' ? travel.owner.name.givenName + ' ' + travel.owner.name.familyName + ' - ' : '') +
+            travel.project.identifier +
+            (travel.project.name ? ' ' + travel.project.name : '')
+          }}
         </div>
       </div>