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

public/css/style.css

@@ -270,6 +270,9 @@ body>nav.navbar {
 .mcp-theme-1 .width-50px {
     width: 50px !important;
 }
+.mcp-theme-1 .width-70px {
+    width: 70px !important;
+}
 .mcp-theme-1 .min-width-140px {
     min-width: 140px !important;
 }
@@ -1138,20 +1141,21 @@ table.table-edit-sheet .ql-editor[contenteditable] {
 .data-option-list {
     position: absolute;
     background: #fff;
-    border: 1px solid #ddd;
+    border: 2px solid #ddd;
     margin-top: -1px;
     width: 100%;
     z-index: 1;
     display: none;
-}
-input[data-option-list]:focus+.data-option-list {
-    display: block;
+    max-width: 250px;
+    box-shadow: 0 0 3px #ddd;
+    border-top: 0;
 }
 .data-option-list>div {
     cursor: pointer;
-    padding: 0.3rem 0.5rem;
+    padding: 0.2rem 0.5rem;
     border-bottom: 1px solid #ddd;
     color: #666;
+    font-size: 90%;
 }
 .data-option-list>div:last-child {
     border-bottom: 0;
@@ -1177,3 +1181,6 @@ button.note-templates-trigger-assessment {
     outline: none !important;
     box-shadow: none !important;
 }
+.appt-calendar-col.click-through .fc-timegrid-event-harness {
+    pointer-events: none !important;
+}

public/js/option-list.js

@@ -1,13 +1,38 @@
 (function() {
+    function showOptionsList(_input) {
+        let ol = $(_input).next('.data-option-list');
+        if(ol.length && !ol.is(':visible')) {
+            ol.show();
+        }
+    }
+    function hideOptionsList(_input) {
+        let ol = $(_input).next('.data-option-list');
+        if(ol.length && ol.is(':visible')) {
+            ol.hide();
+        }
+    }
     function init() {
         $(document)
             .off('mousedown.option-list', '.data-option-list>div')
             .on('mousedown.option-list', '.data-option-list>div', function() {
-                console.log(12);
                 $(this).parent().prev('input[data-option-list]').val('').focus();
                 document.execCommand('insertText', false, $(this).text());
+                $(this).closest('.data-option-list').hide();
                 return false;
             });
+        $(document)
+            .off('click.trigger-option-list', 'input[data-option-list]')
+            .on('click.trigger-option-list', 'input[data-option-list]', function() {
+                showOptionsList(this);
+            })
+            .off('focus.trigger-option-list', 'input[data-option-list]')
+            .on('focus.trigger-option-list', 'input[data-option-list]', function() {
+                showOptionsList(this);
+            })
+            .off('blur.trigger-option-list', 'input[data-option-list]')
+            .on('blur.trigger-option-list', 'input[data-option-list]', function() {
+                hideOptionsList(this);
+            });
     }
     addMCInitializer('option-list', init);
 })();

resources/views/app/patient/action-items-equipment-single.blade.php

@@ -27,8 +27,8 @@
                                 <span class="font-weight-bold">@{{ item.created_at }}</span>
                             </div>
                             <div class="d-flex align-items-start flex-nowrap mb-2">
-                                <span class="width-100px text-secondary text-sm">Items</span>
-                                <span class="font-weight-bold" v-html="item.items && Array.isArray(item.items) ? item.items.join(', ') : '-'"></span>
+                                <span class="width-100px text-secondary text-sm">Equipment</span>
+                                <span class="font-weight-bold" v-html="item.items && Array.isArray(item.items) ? item.items[0] : '-'"></span>
                             </div>
                             <div class="d-flex align-items-start flex-nowrap mb-2">
                                 <span class="width-100px text-secondary text-sm">Purpose</span>
@@ -64,11 +64,12 @@
                     </h3>
                     <div class="mb-2">
                         <div class="d-flex align-items-center mb-1">
-                            <label class="text-sm text-secondary mb-0">Items</label>
-                            <span class="text-sm mx-2 text-secondary">|</span>
-                            <a href="#" class="text-sm" v-on:click.prevent="popupItem.items.push('')">Add</a>
+                            <label class="text-sm text-secondary mb-0">Equipment</label>
+                            {{--<span class="text-sm mx-2 text-secondary">|</span>
+                            <a href="#" class="text-sm" v-on:click.prevent="popupItem.items.push('')">Add</a>--}}
                         </div>
-                        <div class="d-flex align-items-center mb-2" v-for="(item, itemIndex) in popupItem.items">
+                        {{--<div class="d-flex align-items-center mb-2" v-for="(item, itemIndex) in popupItem.items">--}}
+                        <div class="d-flex align-items-center mb-2" v-for="(item, itemIndex) in popupItem.items" v-if="itemIndex === 0">
                             <div class="position-relative flex-grow-1">
                                 <input required type="text" data-option-list v-model="popupItem.items[itemIndex]" class="form-control form-control-sm">
                                 <div class="data-option-list">
@@ -77,9 +78,9 @@
                                     <div>Temperature Gun</div>
                                 </div>
                             </div>
-                            <a v-if="popupItem.items.length > 1" class="ml-2 text-danger" href="#" v-on:click.prevent="popupItem.items.splice(itemIndex, 1)">
+                            {{--<a v-if="popupItem.items.length > 1" class="ml-2 text-danger" href="#" v-on:click.prevent="popupItem.items.splice(itemIndex, 1)">
                                 <i class="fa fa-trash-alt"></i>
-                            </a>
+                            </a>--}}
                         </div>
                     </div>
                     <div class="mb-2">

resources/views/app/patient/appointment-calendar.blade.php

@@ -68,6 +68,10 @@
             <h4 class="font-weight-bold m-0 font-size-16">
                 {{ $patient->displayName() }}'s Calendar
             </h4>
+            <button v-on:click.prevent="clickThruMode = !clickThruMode"
+                    class="ml-3 btn btn-sm outline-0" :class="clickThruMode ? 'btn-info font-weight-bold' : 'btn-outline-info'">
+                Click Through Mode
+            </button>
             <div class="ml-auto d-inline-flex align-items-center">
                 <label class="mr-2 my-0 text-secondary">Show</label>
                 <select id="eventTypes"
@@ -127,7 +131,7 @@
                 </select>
             </form>
             <hr class="my-2">
-            <div class="appt-calendar-col">
+            <div class="appt-calendar-col" :class="clickThruMode ? 'click-through' : ''">
                 <div class="stag-fc-container"></div>
             </div>
         </div>
@@ -414,6 +418,8 @@
 
                         inProgress: false,
                         editHonored: false,
+
+                        clickThruMode: false,
                     },
                     methods: {
                         // init

resources/views/app/patient/partials/equipment.blade.php

@@ -26,7 +26,7 @@
                     <div class="d-flex align-items-center flex-wrap">
                         <div>
                             <a :href="'/patients/view/{{$patient->uid}}/action-items-equipment/view/' + item.uid"
-                               v-html="item.items && Array.isArray(item.items) ? item.items.join(', ') : '-'"
+                               v-html="item.items && Array.isArray(item.items) ? item.items[0] : '-'"
                                class="font-weight-bold font-size-13"></a>
                         </div>
                         <span class="mx-2 text-secondary">•</span>
@@ -75,9 +75,9 @@
             </h3>
             <div class="mb-2">
                 <div class="d-flex align-items-center mb-1">
-                    <label class="text-sm text-secondary mb-0">Items</label>
-                    <span class="text-sm mx-2 text-secondary">|</span>
-                    <a href="#" class="text-sm" v-on:click.prevent="popupItem.items.push('')">Add</a>
+                    <label class="text-sm text-secondary mb-0">Equipment</label>
+                    {{--<span class="text-sm mx-2 text-secondary">|</span>
+                    <a href="#" class="text-sm" v-on:click.prevent="popupItem.items.push('')">Add</a>--}}
                 </div>
                 <div class="d-flex align-items-center mb-2" v-for="(item, itemIndex) in popupItem.items">
                     <div class="position-relative flex-grow-1">
@@ -88,9 +88,9 @@
                             <div>Temperature Gun</div>
                         </div>
                     </div>
-                    <a v-if="popupItem.items.length > 1" class="ml-2 text-danger" href="#" v-on:click.prevent="popupItem.items.splice(itemIndex, 1)">
+                    {{--<a v-if="popupItem.items.length > 1" class="ml-2 text-danger" href="#" v-on:click.prevent="popupItem.items.splice(itemIndex, 1)">
                         <i class="fa fa-trash-alt"></i>
-                    </a>
+                    </a>--}}
                 </div>
             </div>
             <div class="mb-2">

resources/views/app/patient/partials/ticket_vue_collab_card.blade.php

@@ -1,7 +1,7 @@
 <div class="card bg-light">
     <div class="card-body">
         <span class="d-flex align-items-center mb-2" v-if="item.assigned_pro_id">
-            <span class="text-secondary text-sm width-50px">Assigned:</span>
+            <span class="text-secondary text-sm width-70px">Assigned:</span>
             <b>@{{proNameFromId(item.assigned_pro_id)}}</b>
             <span class="d-inline-flex" v-if="item.manager_pro_id === {{$pro->id}}">
                 <span class="mx-2 opacity-60 text-secondary">•</span>
@@ -21,7 +21,7 @@
             </span>
         </span>
         <span class="d-flex align-items-center mb-2" v-if="item.manager_pro_id">
-            <span class="text-secondary text-sm width-50px">Manager:</span>
+            <span class="text-secondary text-sm width-70px">Manager:</span>
             <b>@{{proNameFromId(item.manager_pro_id)}}</b>
             <span class="d-inline-flex" v-if="item.manager_pro_id === {{$pro->id}}">
                 <span class="mx-2 opacity-60 text-secondary">•</span>
@@ -40,44 +40,44 @@
                    v-on:click.prevent="signAsManagerPro(item)">Sign</a>
             </span>
         </span>
-        <span class="d-flex align-items-center mb-2" v-if="item.initiating_pro_id">
-            <span class="text-secondary text-sm width-50px">Initiating:</span>
-            <b>@{{proNameFromId(item.initiating_pro_id)}}</b>
+        <span class="d-flex align-items-center mb-2" v-if="item.ordering_pro_id">
+            <span class="text-secondary text-sm width-70px">Ordering:</span>
+            <b>@{{proNameFromId(item.ordering_pro_id)}}</b>
             <span class="d-inline-flex" v-if="item.manager_pro_id === {{$pro->id}}">
                 <span class="mx-2 opacity-60 text-secondary">•</span>
-                <a class="on-hover-opaque c-pointer" v-on:click.prevent="showProUpdatePopup('other-popup', 'Initiating', item)">
+                <a class="on-hover-opaque c-pointer" v-on:click.prevent="showProUpdatePopup('other-popup', 'Ordering', item)">
                     <i class="fa fa-edit"></i>
                 </a>
             </span>
-            <span class="d-inline-flex" v-if="item.initiating_pro_id === {{$pro->id}}">
+            <span class="d-inline-flex" v-if="item.ordering_pro_id === {{$pro->id}}">
                 <span class="mx-2 opacity-60 text-secondary">•</span>
-                <span v-if="item.has_initiating_pro_signed" class="text-success">
+                <span v-if="item.has_ordering_pro_signed" class="text-success">
                     <i class="fa fa-check"></i>
                     Signed
-                    <a class="ml-2 c-pointer" v-on:click.prevent="undoSignAsInitiatingPro(item)">Undo</a>
+                    <a class="ml-2 c-pointer" v-on:click.prevent="undoSignAsOrderingPro(item)">Undo</a>
                 </span>
-                <a v-if="!item.has_initiating_pro_signed" class="c-pointer"
-                   v-on:click.prevent="signAsInitiatingPro(item)">Sign</a>
+                <a v-if="!item.has_ordering_pro_signed" class="c-pointer"
+                   v-on:click.prevent="signAsOrderingPro(item)">Sign</a>
             </span>
         </span>
-        <span class="d-flex align-items-center" v-if="item.ordering_pro_id">
-            <span class="text-secondary text-sm width-50px">Ordering:</span>
-            <b>@{{proNameFromId(item.ordering_pro_id)}}</b>
+        <span class="d-flex align-items-center" v-if="item.initiating_pro_id">
+            <span class="text-secondary text-sm width-70px">Initiating:</span>
+            <b>@{{proNameFromId(item.initiating_pro_id)}}</b>
             <span class="d-inline-flex" v-if="item.manager_pro_id === {{$pro->id}}">
                 <span class="mx-2 opacity-60 text-secondary">•</span>
-                <a class="on-hover-opaque c-pointer" v-on:click.prevent="showProUpdatePopup('other-popup', 'Ordering', item)">
+                <a class="on-hover-opaque c-pointer" v-on:click.prevent="showProUpdatePopup('other-popup', 'Initiating', item)">
                     <i class="fa fa-edit"></i>
                 </a>
             </span>
-            <span class="d-inline-flex" v-if="item.ordering_pro_id === {{$pro->id}}">
+            <span class="d-inline-flex" v-if="item.initiating_pro_id === {{$pro->id}}">
                 <span class="mx-2 opacity-60 text-secondary">•</span>
-                <span v-if="item.has_ordering_pro_signed" class="text-success">
+                <span v-if="item.has_initiating_pro_signed" class="text-success">
                     <i class="fa fa-check"></i>
                     Signed
-                    <a class="ml-2 c-pointer" v-on:click.prevent="undoSignAsOrderingPro(item)">Undo</a>
+                    <a class="ml-2 c-pointer" v-on:click.prevent="undoSignAsInitiatingPro(item)">Undo</a>
                 </span>
-                <a v-if="!item.has_ordering_pro_signed" class="c-pointer"
-                   v-on:click.prevent="signAsOrderingPro(item)">Sign</a>
+                <a v-if="!item.has_initiating_pro_signed" class="c-pointer"
+                   v-on:click.prevent="signAsInitiatingPro(item)">Sign</a>
             </span>
         </span>
     </div>

resources/views/app/patient/partials/ticket_vue_collab_column.blade.php

@@ -7,14 +7,6 @@
         </span>
     </span>
     <br>
-    <span class="d-inline-flex align-items-center" v-if="item.manager_pro_id">
-        <span class="text-nowrap">
-            <span class="text-secondary text-sm">Manager:</span>
-            <b>@{{proNameFromId(item.manager_pro_id)}}</b>
-            <span class="text-secondary text-sm" v-html="item.has_manager_pro_signed ? '(signed)' : ''"></span>
-        </span>
-    </span>
-    <br>
     <span class="d-inline-flex align-items-center" v-if="item.initiating_pro_id">
         <span class="text-nowrap">
             <span class="text-secondary text-sm">Initiating:</span>
@@ -23,6 +15,14 @@
         </span>
     </span>
     <br>
+    <span class="d-inline-flex align-items-center" v-if="item.manager_pro_id">
+        <span class="text-nowrap">
+            <span class="text-secondary text-sm">Manager:</span>
+            <b>@{{proNameFromId(item.manager_pro_id)}}</b>
+            <span class="text-secondary text-sm" v-html="item.has_manager_pro_signed ? '(signed)' : ''"></span>
+        </span>
+    </span>
+    <br>
     <span class="d-inline-flex align-items-center" v-if="item.ordering_pro_id">
         <span class="text-nowrap">
             <span class="text-secondary text-sm">Ordering:</span>

resources/views/app/video/call-agora-v2.blade.php

@@ -35,7 +35,7 @@
                     <span class="font-weight-bold">{{ $client->displayName() }}</span>
                 </a>
                 <span class="text-secondary ml-3">{{ $pro->displayName() }}</span>
-                <span class="text-secondary ml-3">{{ date('H:i:s') }}</span>
+                {{--<span class="text-secondary ml-3">{{ date('H:i:s') }}</span>--}}
             </div>
             @endif