Forráskód Böngészése

Incoming reports UI (wip)

Vijayakrishnan 4 éve
szülő
commit
e0d52f4c6b

+ 4 - 0
app/Models/IncomingReport.php

@@ -7,4 +7,8 @@ namespace App\Models;
 class IncomingReport extends Model
 {
     protected $table = 'incoming_report';
+
+    public function hcp() {
+        return $this->hasOne(Pro::class, 'id', 'hcp_pro_id');
+    }
 }

+ 7 - 7
public/js/pro-suggest.js

@@ -125,14 +125,14 @@
                 .on('keypress.pro-suggest', function (e) {
                     suggestionsOuter = $(this).next('.pro-suggestions-container').find('>.suggestions-outer');
                     return handleKeypress($(this), e);
-                })
-                .off('blur.pro-suggest')
-                .on('blur.pro-suggest', function (e) {
-                    window.setTimeout(() => {
-                        $(this).next('.pro-suggestions-container').find('>.suggestions-outer').addClass('d-none');
-                        $(this).val($(this).data('original'));
-                    }, 50);
                 });
+                // .off('blur.pro-suggest')
+                // .on('blur.pro-suggest', function (e) {
+                //     window.setTimeout(() => {
+                //         $(this).next('.pro-suggestions-container').find('>.suggestions-outer').addClass('d-none');
+                //         $(this).val($(this).data('original'));
+                //     }, 50);
+                // });
 
         });
 

+ 38 - 18
resources/views/app/patient/incoming-reports.blade.php

@@ -36,13 +36,19 @@
                         <input type="file" class="form-control form-control-sm" name="pdf"
                                value="" placeholder="File" required>
                     </div>
+                    <div class="mb-2">
+                        <label for="" class="text-sm text-secondary mb-1">HCP Pro</label>
+                        <select name="hcpProUid" provider-search data-pro-uid="{{$pro->uid}}" data-pro-name="{{$pro->displayName()}}"
+                                class="form-control form-control-sm">
+                        </select>
+                    </div>
                     <div class="mb-2">
                         <label for="" class="text-sm text-secondary mb-1">Memo</label>
                         <input type="text" class="form-control form-control-sm" name="memo"
                                value="" placeholder="Memo">
                     </div>
                     <div class="d-flex align-items-center">
-                        <button class="btn btn-sm btn-primary mr-2" type="submit">Send</button>
+                        <button class="btn btn-sm btn-primary mr-2" type="submit">Save</button>
                         <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                     </div>
                 </form>
@@ -70,28 +76,34 @@
                                href="/api/incomingReport/download/{{ $document->uid }}"
                                title="View">View</a>
                             @if($document->is_entry_error)
-                                <span class="ml-auto text-danger on-hover-opaque" title="Entry Error"><i class="fa fa-exclamation-triangle"></i></span>
+                                <span class="ml-auto text-danger on-hover-opaque" title="Entry Error">
+                                    <i class="fa fa-exclamation-triangle"></i>
+                                </span>
                             @endif
                         </div>
                     </td>
                     <td class="px-2">
                         @if(!$document->has_hcp_pro_signed)
-                            <div moe relative class="mr-2">
-                                <a start show class="">Sign</a>
-                                <form url="/api/incomingReport/signAsHcp" right>
-                                    <input type="hidden" name="uid" value="{{ $document->uid }}">
-                                    <p class="small">Are you sure you want to sign this report as HCP?</p>
-                                    <div class="d-flex align-items-center">
-                                        <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
-                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                    </div>
-                                </form>
-                            </div>
+                            @if($document->hcp_pro_id === $pro->id)
+                                <div moe relative class="mr-2">
+                                    <a start show class="">Sign</a>
+                                    <form url="/api/incomingReport/signAsHcp" right>
+                                        <input type="hidden" name="uid" value="{{ $document->uid }}">
+                                        <p class="small">Are you sure you want to sign this report as HCP?</p>
+                                        <div class="d-flex align-items-center">
+                                            <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            @else
+                                -
+                            @endif
                         @else
                             <span class="text-secondary">
-                                    <i class="fa fa-check"></i>
-                                    Signed
-                                </span>
+                                <i class="fa fa-check"></i>
+                                Signed
+                            </span>
                         @endif
                     </td>
                     <td class="px-2">{{ $document->title }}</td>
@@ -106,6 +118,7 @@
                                 <div moe relative class="mr-3">
                                     <a href="#" start show class="on-hover-opaque" title="Edit"><i class="fa fa-edit text-primary"></i></a>
                                     <form url="dummy" action="/api/incomingReport/updateBasic"
+                                          right
                                           method="post"
                                           onsubmit="return submitIncomingReport(this)"
                                           enctype="multipart/form-data">
@@ -137,6 +150,13 @@
                                                    value="" placeholder="File">
                                             <span class="text-sm text-secondary">Leave blank if not changing</span>
                                         </div>
+                                        <div class="mb-2">
+                                            <label for="" class="text-sm text-secondary mb-1">HCP Pro</label>
+                                            <select name="hcpProUid" provider-search
+                                                    data-pro-name="{{$document->hcp ? $document->hcp->displayName() : ''}}"
+                                                    class="form-control form-control-sm">
+                                            </select>
+                                        </div>
                                         <div class="mb-2">
                                             <label for="" class="text-sm text-secondary mb-1">Memo</label>
                                             <input type="text" class="form-control form-control-sm" name="memo"
@@ -144,14 +164,14 @@
                                         </div>
 
                                         <div class="d-flex align-items-center">
-                                            <button class="btn btn-sm btn-primary mr-2" submit>Submit</button>
+                                            <button class="btn btn-sm btn-primary mr-2" type="submit">Save</button>
                                             <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                         </div>
                                     </form>
                                 </div>
                                 @if(!$document->is_entry_error)
                                     <div moe relative class="mr-3">
-                                        <a start show class="on-hover-opaque" title="Mark as entry-error"><i class="fa fa-trash-alt text-danger"></i></a>
+                                        <a start show class="on-hover-opaque" title="Mark as entry-error"><i class="fa fa-ban text-danger"></i></a>
                                         <form url="/api/incomingReport/setIsEntryErrorToTrue" right>
                                             <input type="hidden" name="uid" value="{{ $document->uid }}">
                                             <p class="small">Are you sure you want to set this report as entry error?</p>