Jelajahi Sumber

Supply orders - show all columns even when one is open

Vijayakrishnan 4 tahun lalu
induk
melakukan
81d07b10a0
1 mengubah file dengan 26 tambahan dan 30 penghapusan
  1. 26 30
      resources/views/app/patient/supply-orders.blade.php

+ 26 - 30
resources/views/app/patient/supply-orders.blade.php

@@ -35,18 +35,16 @@
         </div>
         <div class="d-flex align-items-start h-100">
             <div class="flex-grow-1">
-                <table class="table table-sm table-bordered mb-0">
+                <table class="table table-sm table-bordered mb-0" style="table-layout: fixed">
                     @if($patient->supplyOrders && count($patient->supplyOrders))
                         <thead>
                         <tr class="bg-light">
-                            <th class="px-2 text-nowrap text-secondary border-bottom-0">Title</th>
-                            <th class="px-2 text-nowrap text-secondary border-bottom-0">Reason</th>
-                            @if(!$supplyOrder)
-                                <th class="px-2 text-nowrap text-secondary border-bottom-0">Created At</th>
-                                <th class="px-2 text-nowrap text-secondary border-bottom-0">Pro Signed?</th>
-                                <th class="px-2 text-nowrap text-secondary border-bottom-0">Cancelled?</th>
-                                <th class="px-2 text-nowrap text-secondary border-bottom-0">Shipment</th>
-                            @endif
+                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Title</div></th>
+                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Reason</div></th>
+                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Created At</div></th>
+                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Pro Signed?</div></th>
+                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Cancelled?</div></th>
+                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Shipment</div></th>
                         </tr>
                         </thead>
                         <tbody>
@@ -58,27 +56,25 @@
                                     </a>
                                 </td>
                                 <td class="px-2">{{ $iSupplyOrder->reason }}</td>
-                                @if(!$supplyOrder)
-                                    <td class="px-2">{{ friendlier_date_time($iSupplyOrder->created_at) }}</td>
-                                    <td class="px-2">{{ $iSupplyOrder->is_signed_by_pro ? $iSupplyOrder->signedPro->displayName() : '-' }}</td>
-                                    <td class="px-2">{{ $iSupplyOrder->is_cancelled ? 'Yes' : 'No' }}</td>
-                                    <td class="px-2 text-nowrap">
-                                        @if($iSupplyOrder->shipment_id)
-                                            <i class="fa fa-building"></i>
-                                            {{$iSupplyOrder->shipment->status ? $iSupplyOrder->shipment->status : 'CREATED'}}
-                                        @elseif($iSupplyOrder->is_cleared_for_shipment)
-                                            <span class="text-info">
-                                                <i class="fa fa-user-nurse"></i>
-                                                Cleared for shipment
-                                            </span>
-                                        @else
-                                            <span class="text-warning-mellow">
-                                                <i class="fa fa-user-nurse"></i>
-                                                Not cleared for shipment
-                                            </span>
-                                        @endif
-                                    </td>
-                                @endif
+                                <td class="px-2">{{ friendlier_date_time($iSupplyOrder->created_at) }}</td>
+                                <td class="px-2">{{ $iSupplyOrder->is_signed_by_pro ? $iSupplyOrder->signedPro->displayName() : '-' }}</td>
+                                <td class="px-2">{{ $iSupplyOrder->is_cancelled ? 'Yes' : 'No' }}</td>
+                                <td class="px-2">
+                                    @if($iSupplyOrder->shipment_id)
+                                        <i class="fa fa-building"></i>
+                                        {{$iSupplyOrder->shipment->status ? $iSupplyOrder->shipment->status : 'CREATED'}}
+                                    @elseif($iSupplyOrder->is_cleared_for_shipment)
+                                        <span class="text-info">
+                                            <i class="fa fa-user-nurse"></i>
+                                            Cleared for shipment
+                                        </span>
+                                    @else
+                                        <span class="text-warning-mellow">
+                                            <i class="fa fa-user-nurse"></i>
+                                            Not cleared for shipment
+                                        </span>
+                                    @endif
+                                </td>
                             </tr>
                         @endforeach
                         </tbody>