Merge branch 'dev' into dev-vj

resources/views/app/dashboard.blade.php

@@ -11,7 +11,6 @@
                 <div class="card mb-4">
                     <div class="card-header pl-2">
                         <strong>
-                            <i class="fas fa-chart-bar"></i>
                             Key Numbers
                         </strong>
                     </div>
@@ -53,7 +52,6 @@
                 <div class="card mb-4">
                     <div class="card-header pl-2">
                         <strong>
-                            <i class="fas fa-money-bill"></i>
                             Reimbursement
                         </strong>
                     </div>
@@ -90,7 +88,6 @@
                 <div class="card mb-4">
                     <div class="card-header pl-2">
                         <strong>
-                            <i class="fa fa-receipt"></i>
                             Bills &amp; Claims
                         </strong>
                     </div>

resources/views/app/new-patient.blade.php

@@ -76,7 +76,7 @@
                             <label class='my-0 mr-3 control-label'>Insurance </label>
                             <div class="d-inline-flex align-items-center">
                                 <label class="my-0 mr-3 d-inline-flex align-items-center">
-                                    <input class='insurance' type='radio' name='insurance' value="medicare">
+                                    <input class='insurance' type='radio' name='insurance' value="medicare" checked>
                                     <span class="ml-1">Medicare</span>
                                 </label>
                                 <label class="my-0 mr-3 d-inline-flex align-items-center">
@@ -85,7 +85,7 @@
                                 </label>
                             </div>
                         </div>
-                        <div data-insurance="medicare" class="d-none">
+                        <div data-insurance="medicare">
                             <div class='form-group mb-3'>
                                 <label class='control-label'>Medicare Number</label>
                                 <input class='form-control' type='text' name='medicareNumber'>
@@ -103,7 +103,7 @@
                             </div>
                             <div class='form-group mb-3'>
                                 <label class='control-label'>Member ID</label>
-                                <input class='form-control' type='text' name='mbPayerMemberId' required>
+                                <input class='form-control' type='text' name='mbPayerMemberId'>
                             </div>
                         </div>
                         <hr class="m-neg-4">
@@ -160,6 +160,8 @@
                         $('[data-insurance]').addClass('d-none');
                         $('[data-insurance="' + $(this).val() + '"]').removeClass('d-none');
                         $(this).closest('form').attr('url', '/api/client/' + ($(this).val() === 'medicare' ? 'create' : 'createNonMcn'))
+                        $(this).closest('[moe]').removeAttr('initialized');
+                        initMoes();
                         return false;
                     });
                 $('.select2').select2({

resources/views/app/patient/note/dashboard.blade.php

@@ -180,11 +180,8 @@
                                 <input type="hidden" name="uid" value="{{$note->uid}}">
                                 <div class="mb-2">
                                     <select name="method" class="form-control form-control-sm" required>
-                                        <option value="">-- select --</option>
-                                        <option value="VIDEO" {{ $note->method === "VIDEO" ? "selected" : "" }}>Video</option>
-                                        @if($note->new_or_fu_or_na !== 'NEW')
                                         <option value="AUDIO" {{ $note->method === "AUDIO" ? "selected" : "" }}>Audio</option>
-                                        @endif
+                                        <option value="VIDEO" {{ $note->method === "VIDEO" ? "selected" : "" }}>Video</option>
                                         <option value="IN_CLINIC" {{ $note->method === "IN_CLINIC" ? "selected" : "" }}>In-Clinic</option>
                                         <option value="HOUSE_CALL" {{ $note->method === "HOUSE_CALL" ? "selected" : "" }}>House Call</option>
                                     </select>

resources/views/app/patients.blade.php

@@ -108,7 +108,12 @@
                                 @if($patient->mcn)
                                     <div>Invalid MCN</div>
                                 @else
-                                    <div>No Info Provided</div>
+                                    @if($patient->is_coverage_manually_verified)
+                                        {{$patient->coverage_manual_verification_memo}} <span style="color:green"><i class="fa fa-check-circle">
+                                    @else
+                                        <div>No Info Provided</div>
+                                    @endif
+
                                 @endif
                             @endif
                         </td>

resources/views/layouts/patient.blade.php

@@ -295,8 +295,8 @@
                                                             @if($patient->mcn)
                                                                 {{$patient->mcn}} Invalid MCN <i
                                                                     class="fa fa-times"></i>
-                                                            @elseif($patient->payer)
-                                                                {{$patient->payer->name()}}
+                                                            @elseif($patient->is_coverage_manually_verified)
+                                                                {{$patient->coverage_manual_verification_memo}} <span style="color:green"><i class="fa fa-check-circle"></i>
                                                             @else
                                                                 No Info Provided
                                                             @endif
@@ -338,6 +338,36 @@
                                                         </form>
                                                     </div>
                                                 @endif
+                                                @if(!$patient->was_medicare_validation_successful)
+                                                    @if(!$patient->is_coverage_manually_verified)
+                                                    <div moe relative>
+                                                        <a start show class="font-weight-bold">Manually verify coverage</a>
+                                                        <form url="/api/client/markCoverageAsManuallyVerified" class="mcp-theme-1" right>
+                                                            <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                                            <div class="form-group">
+                                                                <textarea name="memo"  class="fom-control"></textarea>
+                                                            </div>
+                                                            <div>
+                                                                <button submit class="btn btn-sm btn-success mr-1">Yes</button>
+                                                                <button cancel class="btn btn-sm btn-default border">No</button>
+                                                            </div>
+                                                        </form>
+                                                    </div>
+                                                    @endif
+                                                    @if($patient->is_coverage_manually_verified)
+                                                        <div moe relative>
+                                                            <a start show class="font-weight-bold">Undo coverage verification</a>
+                                                            <form url="/api/client/undoMarkCoverageAsManuallyVerified" class="mcp-theme-1" right>
+                                                                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                                                <p>Undo coverage verification</p>
+                                                                <div>
+                                                                    <button submit class="btn btn-sm btn-success mr-1">Yes</button>
+                                                                    <button cancel class="btn btn-sm btn-default border">No</button>
+                                                                </div>
+                                                            </form>
+                                                        </div>
+                                                    @endif
+                                                @endif
                                             </div>
                                         </div>
                                         <div class=separators>