Samson Mutunga пре 3 година
родитељ
комит
57336417cc

+ 9 - 0
resources/views/app/dna/dashboard/reports_pending_ack.blade.php

@@ -12,6 +12,7 @@
                         <th class="border-0">Category</th>
                         <th class="border-0">Report Date</th>
                         <th class="border-0">Sign</th>
+                        <th class="border-0"></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -41,6 +42,14 @@
                             @endif
                             @endif
                         </td>
+                        <td>
+                            <div moe relative class="ml-auto">
+                                <form show url="/api/incomingReport/signAsNa">
+                                    <input type="hidden" name="uid" value="{{ $report->uid }}">
+                                    <button submit class="bg-transparent border-0 p-0 text-primary">Ack.</button>
+                                </form>
+                            </div>
+                        </td>
                     </tr>
                     @endforeach
 

+ 14 - 5
resources/views/app/dna/dashboard/supply_orders_pending_my_ack.blade.php

@@ -1,5 +1,5 @@
-@php 
-    $supplyOrdersPendingMyAck = $performer->pro->supplyOrdersPendingMyAckRecordsAsDna();
+@php
+$supplyOrdersPendingMyAck = $performer->pro->supplyOrdersPendingMyAckRecordsAsDna();
 @endphp
 <div class="p-3" id="patients-list">
     <div class="card">
@@ -13,6 +13,7 @@
                         <th class="border-0">Reason</th>
                         <th class="border-0">Is Cancelled</th>
                         <th class="border-0">Shipment</th>
+                        <th class="border-0"></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -39,6 +40,14 @@
                             </span>
                             @endif
                         </td>
+                        <td>
+                            <div moe relative class="ml-auto">
+                                <form show url="/api/supplyOrder/signAsNa">
+                                    <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
+                                    <button submit class="bg-transparent border-0 p-0 text-primary">Ack.</button>
+                                </form>
+                            </div>
+                        </td>
                     </tr>
                     @endforeach
 
@@ -51,9 +60,9 @@
 
             </table>
             @if($supplyOrdersPendingMyAck->hasPages())
-                <div class="ml-2 mt-2">
-                    {{ $supplyOrdersPendingMyAck->appends(request()->input())->links() }}
-                </div>
+            <div class="ml-2 mt-2">
+                {{ $supplyOrdersPendingMyAck->appends(request()->input())->links() }}
+            </div>
             @endif
         </div>
     </div>

+ 2 - 2
resources/views/app/patient/prescriptions/list.blade.php

@@ -657,10 +657,10 @@ GROUP BY erx_category");
                                         erx_category: _type,
                                         hcpProDisplayName: "{{$pro->displayName()}}",
                                         hcpProUid: "{{$pro->uid}}",
-                                        hcp_pro_id: {{$pro->id}},
+                                        hcp_pro_id: "{{$pro->id}}",
                                         hcp_pro_signed_at: null,
                                         hcp_pro_signed_by_session_id: null,
-                                        note_id: {{@$note ? $note->id : $patient->coreNote->id}},
+                                        note_id: "{{@$note ? $note->id : @$patient->coreNote->id}}",
                                         uid: _data.data,
                                         version_number: 1,
                                     });