Merge branch 'main' into feat-INVT-CPC-994-ability-to-fix-the-styling…

…-of-the-product-details-form
cgerard321 · Oct 23, 2023 · 9002749 · 9002749
2 parents 49675cc + 0f591d8
commit 9002749
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/api-gateway/src/main/resources/static/scripts/visit-list/visit-list.template.html b/api-gateway/src/main/resources/static/scripts/visit-list/visit-list.template.html
@@ -109,8 +109,8 @@ <h3 style="margin: 0; display: inline-block;">Upcoming Visits</h3>
         <td class="border">{{v.visitDate | date:'yyyy-MM-ddTHH:mm:ss'}}</td>
         <td class="border" style="white-space: pre-line">{{v.description}}</td>
         <!--        <td style="white-space: pre-line">{{$ctrl.getPractitionerName(v.practitionerId)}}</td>-->
-        <td class="border" style="white-space: pre-line">{{v.practitionerId}}</td>
-        <td class="border" style="white-space: pre-line">{{v.petId}}</td>
+        <td class="border" style="white-space: pre-line">{{v.vetFirstName}} {{v.vetLastName}}</td>
+        <td class="border" style="white-space: pre-line">{{v.petName}}</td>
         <td class="status-text" style="white-space: pre-line"></td>
         <td class="status-text border" style="white-space: pre-line">{{v.status}}</td>
         <td class="border">
@@ -170,8 +170,8 @@ <h3 style="margin: 0; display: inline-block;">Confirmed Visits</h3>
         <td class="border">{{v.visitDate | date:'yyyy-MM-ddTHH:mm:ss'}}</td>
         <td class="border" style="white-space: pre-line">{{v.description}}</td>
         <!--        <td style="white-space: pre-line">{{$ctrl.getPractitionerName(v.practitionerId)}}</td>-->
-        <td class="border" style="white-space: pre-line">{{v.practitionerId}}</td>
-        <td class="border" style="white-space: pre-line">{{v.petId}}</td>
+        <td class="border" style="white-space: pre-line">{{v.vetFirstName}} {{v.vetLastName}}</td>
+        <td class="border" style="white-space: pre-line">{{v.petName}}</td>
         <td class="status-text" style="white-space: pre-line"></td>
         <td class="status-text border" style="white-space: pre-line">{{v.status}}</td>
         <td class="border">
@@ -232,8 +232,8 @@ <h3 style="margin: 0; display: inline-block;">Cancelled Visits</h3>
         <td class="border">{{v.visitDate | date:'yyyy-MM-ddTHH:mm:ss'}}</td>
         <td class="border" style="white-space: pre-line">{{v.description}}</td>
         <!--        <td style="white-space: pre-line">{{$ctrl.getPractitionerName(v.practitionerId)}}</td>-->
-        <td class="border" style="white-space: pre-line">{{v.practitionerId}}</td>
-        <td class="border" style="white-space: pre-line">{{v.petId}}</td>
+        <td class="border" style="white-space: pre-line">{{v.vetFirstName}} {{v.vetLastName}}</td>
+        <td class="border" style="white-space: pre-line">{{v.petName}}</td>
         <td class="status-text" style="white-space: pre-line"></td>
         <td class="status-text border" style="white-space: pre-line">{{v.status}}</td>
         <td class="border">
@@ -293,8 +293,8 @@ <h3 style="margin: 0; display: inline-block;">Completed Visits</h3>
         <td class="border">{{v.visitDate | date:'yyyy-MM-ddTHH:mm:ss'}}</td>
         <td class="border" style="white-space: pre-line">{{v.description}}</td>
         <!--        <td style="white-space: pre-line">{{$ctrl.getPractitionerName(v.practitionerId)}}</td>-->
-        <td class="border" style="white-space: pre-line">{{v.practitionerId}}</td>
-        <td class="border" style="white-space: pre-line">{{v.petId}}</td>
+        <td class="border" style="white-space: pre-line">{{v.vetFirstName}} {{v.vetLastName}}</td>
+        <td class="border" style="white-space: pre-line">{{v.petName}}</td>
         <td class="status-text" style="white-space: pre-line"></td>
         <td class="status-text border" style="white-space: pre-line">{{v.status}}</td>
         <td class="border">
@@ -318,4 +318,4 @@ <h3 style="margin: 0; display: inline-block;">Completed Visits</h3>
         <td class="border"><a class="btn btn-danger" href="javascript:void(0)" ng-click="deleteVisit(v.visitId)">Delete Visit</a></td>
     </tr>
     </tbody>
-</table>
+</table>