Merge branch 'master' of rav.triplestart.com:jmudaka/stagfe2

public/css/style.css

@@ -182,4 +182,7 @@ body>nav.navbar {
     white-space: nowrap;
     display: block;
 }
+.mcp-theme-1 .cancelled-item {
+    opacity: 0.5;
+}
 

public/js/mc.js

@@ -163,9 +163,7 @@ function initFastLoad(_parent = false) {
         $(_a)
             .off('click.fast-load')
             .on('click.fast-load', function () {
-                console.log('ALIX: got click!');
                 showMask();
-                console.log('ALIX: showed mask');
                 fastLoad(this.href, true, true);
                 $('.dropdown-menu[aria-labelledby="practice-management"]')
                     .removeClass('show')
@@ -176,13 +174,13 @@ function initFastLoad(_parent = false) {
     }
 
     // fast cache
-    allAs = $('a[href]:not([onclick]):not([href="#"])');
-    allAs.each(function () {
-        var a = this;
-        $.get(a.href, function (_data) {
-            fastCache[a.href] = _data;
-        });
-    });
+    // allAs = $('a[href]:not([onclick]):not([href="#"])');
+    // allAs.each(function () {
+    //     var a = this;
+    //     $.get(a.href, function (_data) {
+    //         fastCache[a.href] = _data;
+    //     });
+    // });
 
 }
 

resources/views/app/patient/care-month/dashboard.blade.php

@@ -570,7 +570,6 @@
                                     </form>
                                 </div>
                                 @endif
-                                @if($pro->pro_type === 'ADMIN')
                                 <span class="mx-2 text-secondary">|</span>
                                 <div moe>
                                     <a start show class="py-0 mb-3 text-danger">Cancel</a>
@@ -586,7 +585,6 @@
                                         </div>
                                     </form>
                                 </div>
-                                @endif
                             @endif
                         </div>
                         @if($activeCMBill !== false)
@@ -757,7 +755,6 @@
                                 </form>
                             </div>
                             @endif
-                            @if($pro->pro_type === 'ADMIN')
                             <span class="mx-2 text-secondary">|</span>
                             <div moe relative>
                                 <a start show class="py-0 mb-3 text-danger">Cancel</a>
@@ -773,7 +770,6 @@
                                     </div>
                                 </form>
                             </div>
-                            @endif
                         @endif
                     </div>
                     @if($activeRMBill !== false)

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

@@ -11,12 +11,14 @@
                 <i class="fa fa-chevron-left"></i>
             </a>
             <div>
-                <span class="text-dark font-weight-bold">{{$note->title}}</span>
+                <span class="text-dark font-weight-bold">{{$note->title}}
+                    <span class="text-secondary font-weight-normal">{{ $note->is_cancelled ? '(CANCELLED)' : '' }}</span>
+                </span>
             </div>
         </h6>
     </div>
 
-    <div class="card mb-0">
+    <div class="card mb-0 {{ $note->is_cancelled ? 'cancelled-item' : '' }}">
         <div class="card-header d-flex align-items-start px-3">
             <div class="pr-2">
                 {{$note->title}}
@@ -163,37 +165,61 @@
                         @endif
                     </div>
                 </div>
-                <div moe relatve class="pl-2">
-                    <a class="" href="" show start>Create Bill</a>
-                    <form url="/api/bill/createForNote" right>
-                        <input type="hidden" name="noteUid" value="{{$note->uid}}">
-                        <div class="mb-2">
-                            <label for="" class="text-secondary text-sm">Effective Date</label>
-                            <input type="date" name="effectiveDate" class="form-control form-control-sm" required>
-                        </div>
-                        <div class="mb-2">
-                            <input type="text" name="code" placeholder="Code" class="form-control form-control-sm" required>
-                        </div>
-                        <div class="mb-2">
-                            <input type="text" name="reason1" placeholder="Reason 1" class="form-control form-control-sm">
+                <div class="pl-2">
+                    <div class="d-flex justify-content-end">
+                        <div moe relatve class="">
+                            <a class="" href="" show start>Create Bill</a>
+                            <form url="/api/bill/createForNote" right>
+                                <input type="hidden" name="noteUid" value="{{$note->uid}}">
+                                <div class="mb-2">
+                                    <label for="" class="text-secondary text-sm">Effective Date</label>
+                                    <input type="date" name="effectiveDate" class="form-control form-control-sm" required>
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" name="code" placeholder="Code" class="form-control form-control-sm" required>
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" name="reason1" placeholder="Reason 1" class="form-control form-control-sm">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" name="reason2" placeholder="Reason 2" class="form-control form-control-sm">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" name="serviceLocation" placeholder="Service Location" class="form-control form-control-sm">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" name="modifier" placeholder="Modifier" class="form-control form-control-sm">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="number" name="numberOfUnits" placeholder="Number of Units" class="form-control form-control-sm">
+                                </div>
+                                <div class="">
+                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                </div>
+                            </form>
                         </div>
-                        <div class="mb-2">
-                            <input type="text" name="reason2" placeholder="Reason 2" class="form-control form-control-sm">
-                        </div>
-                        <div class="mb-2">
-                            <input type="text" name="serviceLocation" placeholder="Service Location" class="form-control form-control-sm">
-                        </div>
-                        <div class="mb-2">
-                            <input type="text" name="modifier" placeholder="Modifier" class="form-control form-control-sm">
-                        </div>
-                        <div class="mb-2">
-                            <input type="number" name="numberOfUnits" placeholder="Number of Units" class="form-control form-control-sm">
-                        </div>
-                        <div class="">
-                            <button class="btn btn-primary btn-sm" submit>Submit</button>
-                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                    </div>
+                    <div class="d-flex justify-content-end">
+                        @if(!$note->is_cancelled)
+                        <div moe relatve class="">
+                            <a class="text-danger" href="" show start>Cancel Note</a>
+                            <form url="/api/note/cancel" right>
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <p class="small mb-2">Are you sure you want to cancel this note?</p>
+                                <div class="mb-2">
+                                    <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="memo-textarea form-control form-control-sm"></textarea>
+                                </div>
+                                <div class="d-flex align-items-center">
+                                    <button class="btn btn-sm btn-danger mr-2" submit>Yes</button>
+                                    <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
+                                </div>
+                            </form>
                         </div>
-                    </form>
+                        @else
+                            <span class="text-secondary font-weight-bold">CANCELLED</span>
+                        @endif
+                    </div>
                 </div>
             </div>
         </div>

resources/views/app/patient/notes.blade.php

@@ -120,7 +120,7 @@
             </thead>
             <tbody>
             @foreach ($patient->notes as $note)
-                <tr>
+                <tr class="{{ $note->is_cancelled ? 'cancelled-item' : '' }}">
                     <td class="px-2">
                         {{ friendly_date_time($note->created_at, true) }}
                     </td>