Browse Source

Show creator in supply-orders matrix

Vijayakrishnan 4 years ago
parent
commit
fccd7ccd4b

+ 5 - 0
app/Models/SupplyOrder.php

@@ -34,4 +34,9 @@ class SupplyOrder extends Model
     public function clearedForShipmentPro() {
         return $this->hasOne(Pro::class, 'id', 'cleared_for_shipment_by_pro_id');
     }
+
+    public function createdSession()
+    {
+        return $this->hasOne(AppSession::class, 'id', 'created_by_session_id');
+    }
 }

+ 11 - 6
resources/views/app/practice-management/supply-orders.blade.php

@@ -39,7 +39,7 @@
                         <td>
                             @if($supplyOrder->is_signed_by_pro)
                                 <b>Signed</b>
-                                <div class="text-secondary text-sm">
+                                <div class="text-secondary text-sm mt-1">
                                     By {{$supplyOrder->signedPro->displayName()}}<br>
                                     {{friendlier_date_time($supplyOrder->pro_signed_at)}}
                                 </div>
@@ -50,13 +50,13 @@
                         <td>
                             @if($supplyOrder->is_signed_by_client)
                                 <b>Signed</b>
-                                <div class="text-secondary text-sm">
+                                <div class="text-secondary text-sm mt-1">
                                     By {{$patient->displayName()}}<br>
                                     On {{friendlier_date_time($supplyOrder->client_signed_at)}}
                                 </div>
                             @elseif($supplyOrder->is_client_signature_waived)
                                 <b>Waived</b>
-                                <div class="text-secondary text-sm">
+                                <div class="text-secondary text-sm mt-1">
                                     By {{$supplyOrder->waiverPro->displayName()}}<br>
                                     on {{friendlier_date_time($supplyOrder->client_signature_waived_at)}}
                                 </div>
@@ -69,14 +69,14 @@
                                 <i class="fa fa-building"></i>
                                 {{$supplyOrder->shipment->status ? $supplyOrder->shipment->status : 'CREATED'}}
                                 @if($supplyOrder->shipment && $supplyOrder->shipment->status === 'DELIVERED' && $supplyOrder->shipment->delivered_date)
-                                    <div class="text-secondary text-sm">
+                                    <div class="text-secondary text-sm mt-1">
                                     on {{friendlier_date_time($supplyOrder->shipment->delivered_date)}}
                                     </div>
                                 @endif
                             @elseif($supplyOrder->is_cleared_for_shipment)
                                 <i class="fa fa-user-nurse"></i>
                                 Cleared for shipment
-                                <div class="text-secondary text-sm">
+                                <div class="text-secondary text-sm mt-1">
                                     By {{$supplyOrder->clearedForShipmentPro->displayName()}}<br>
                                     on {{friendlier_date_time($supplyOrder->cleared_for_shipment_at)}}
                                 </div>
@@ -87,7 +87,12 @@
                         </td>
                         <td>{{$supplyOrder->lot_number}}</td>
                         <td>{{$supplyOrder->imei}}</td>
-                        <td>{{friendlier_date_time($supplyOrder->created_at)}}</td>
+                        <td>
+                            {{friendlier_date_time($supplyOrder->created_at)}}
+                            <div class="text-secondary text-sm mt-1">
+                                By {{$supplyOrder->createdSession->pro->displayName()}}
+                            </div>
+                        </td>
                         <td>{{$supplyOrder->is_cancelled ? 'Yes' : 'No'}}</td>
                     </tr>
                 @endforeach