Tickets v1 (wip)

public/css/style.css

@@ -1025,7 +1025,7 @@ body .node input[type="number"] {
 }
 
 .no-scroll {
-    /*overflow: hidden;*/
+    overflow: hidden;
 }
 .client-rs-contents p {
     margin-bottom: 0.25rem;

public/js/stag-popup.js

@@ -1,5 +1,6 @@
 function showStagPopup(_key, _noAutoFocus) {
-    $('html, body').addClass('no-scroll');
+    /*$('html, body').addClass('no-scroll');
+    $(window.top.document.body).find('#stag_mcp_lhs').addClass('no-scroll');*/
     let stagPopup = $('[stag-popup-key="' + _key + '"]');
     stagPopup.addClass('show');
     stagPopup.find('[moe][initialized]').removeAttr('initialized');
@@ -25,6 +26,7 @@ function submitStagPopup(_form) {
 function closeStagPopup() {
     $('.stag-popup').removeClass('show');
     $('html, body').removeClass('no-scroll');
+    $(window.top.document.body).find('#stag_mcp_lhs').removeClass('no-scroll');
     return false;
 }
 (function() {

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

@@ -105,7 +105,7 @@
                                     <span><span>Purpose:</span> @{{item.data.purpose}}</span>
                                 </span>
                                 -->
-                                <span class="text-nowrap ml-auto" v-html="pharmacy(item.data)"></span>
+                                <span class="text-nowrap ml-auto text-secondary" v-html="pharmacy(item.data)"></span>
                             </div>
                         </div>
                         <!--
@@ -139,25 +139,25 @@
                             <input required type="text" data-field="medication"
                                    v-model="erxPopupItem.data.medication" class="form-control form-control-sm">
                         </div>
-                        <div class="col-6">
+                        <div class="col-3 pl-0">
                             <label class="text-sm text-secondary mb-1">Strength</label>
                             <input type="text" data-field="strength"
-                                   v-model="erxPopupItem.data.strength" class="form-control form-control-sm">
+                                   v-model="erxPopupItem.data.strength" class="form-control form-control-sm min-width-unset">
                         </div>
-                    </div>
-                    <div class="row mb-2">
-                        <div class="col-6">
+                        <div class="col-3 pl-0">
                             <label class="text-sm text-secondary mb-1">Frequency</label>
-                            <input type="text" v-model="erxPopupItem.data.frequency" class="form-control form-control-sm"
+                            <input type="text" v-model="erxPopupItem.data.frequency" class="form-control form-control-sm min-width-unset"
                                    data-option-list="frequency-options">
                             <div id="frequency-options" class="data-option-list">
                                 <div>Once a day</div>
                                 <div>Twice a day</div>
                             </div>
                         </div>
+                    </div>
+                    <div class="row mb-2">
                         <div class="col-6">
                             <label class="text-sm text-secondary mb-1">Route</label>
-                            <input required type="text" v-model="erxPopupItem.data.route" class="form-control form-control-sm"
+                            <input required type="text" v-model="erxPopupItem.data.route" class="form-control form-control-sm min-width-unset"
                                    data-option-list="route-options">
                             <div id="route-options" class="data-option-list">
                                 <div>PO (by mouth)</div>
@@ -172,15 +172,13 @@
                                 <div>IP (intraperitoneal)</div>
                             </div>
                         </div>
-                    </div>
-                    <div class="row mb-2">
-                        <div class="col-6">
+                        <div class="col-3 pl-0">
                             <label class="text-sm text-secondary mb-1">Dispense Amount</label>
-                            <input required type="number" v-model="erxPopupItem.data.dispense" class="form-control form-control-sm">
+                            <input required type="number" v-model="erxPopupItem.data.dispense" class="form-control form-control-sm min-width-unset">
                         </div>
-                        <div class="col-6">
+                        <div class="col-3 pl-0">
                             <label class="text-sm text-secondary mb-1">Refills</label>
-                            <input type="number" v-model="erxPopupItem.data.refills" class="form-control form-control-sm">
+                            <input type="number" v-model="erxPopupItem.data.refills" class="form-control form-control-sm min-width-unset">
                         </div>
                     </div>
                     <div class="row mb-2">
@@ -189,11 +187,10 @@
                             <input required type="text" data-field="icd" v-model="erxPopupItem.data.purpose" class="form-control form-control-sm">
                         </div>
                     </div>
-                    <hr class="mt-3 mb-2">
 
                     <div class="row mb-2">
                         <div class="col-12">
-                            <label class="text-sm text-secondary mb-1 font-weight-bold">Preferred Pharmacy</label>
+                            <label class="text-secondary mt-2 mb-0 font-weight-bold font-size-13">Preferred Pharmacy</label>
                         </div>
                     </div>
                     <div class="row mb-2">
@@ -204,13 +201,21 @@
                         </div>
                     </div>
                     <div class="row mb-2">
-                        <div class="col-6">
+                        <div class="col-4">
                             <label class="text-sm text-secondary mb-1">City</label>
-                            <input type="text" v-model="erxPopupItem.data.pharmacyCity" class="form-control form-control-sm">
+                            <input type="text" v-model="erxPopupItem.data.pharmacyCity" class="form-control form-control-sm min-width-unset">
                         </div>
-                        <div class="col-6">
+                        <div class="col-2 pl-0">
                             <label class="text-sm text-secondary mb-1">State</label>
-                            <input type="text" v-model="erxPopupItem.data.pharmacyState" class="form-control form-control-sm">
+                            <input type="text" v-model="erxPopupItem.data.pharmacyState" class="form-control form-control-sm min-width-unset">
+                        </div>
+                        <div class="col-3 pl-0">
+                            <label class="text-sm text-secondary mb-1">Phone</label>
+                            <input type="text" v-model="erxPopupItem.data.pharmacyPhone" class="form-control form-control-sm min-width-unset">
+                        </div>
+                        <div class="col-3 pl-0">
+                            <label class="text-sm text-secondary mb-1">Fax</label>
+                            <input type="text" v-model="erxPopupItem.data.pharmacyFax" class="form-control form-control-sm min-width-unset">
                         </div>
                     </div>
                     <div class="row mb-2">
@@ -219,19 +224,9 @@
                             <input type="text" v-model="erxPopupItem.data.pharmacyAddressMemo" class="form-control form-control-sm">
                         </div>
                     </div>
-                    <div class="row mb-2">
-                        <div class="col-6">
-                            <label class="text-sm text-secondary mb-1">Phone</label>
-                            <input type="text" v-model="erxPopupItem.data.pharmacyPhone" class="form-control form-control-sm">
-                        </div>
-                        <div class="col-6">
-                            <label class="text-sm text-secondary mb-1">Fax</label>
-                            <input type="text" v-model="erxPopupItem.data.pharmacyFax" class="form-control form-control-sm">
-                        </div>
-                    </div>
 
                     <div class="d-flex align-items-center justify-content-center mt-3">
-                        <button type="button" class="btn btn-sm btn-primary mr-2" v-on:click.prevent="savePopupItem()">Submit</button>
+                        <button type="button" class="btn btn-sm btn-primary mr-2" v-on:click.prevent="saveErxPopupItem()">Submit</button>
                         <button type="button" class="btn btn-sm btn-default border" onclick="return closeStagPopup()">Cancel</button>
                     </div>
                 </form>
@@ -365,11 +360,11 @@
                                 payload.managerProUid = '{{ $pro->uid  }}';
                                 payload.orderingProUid = '{{ $pro->uid  }}';
                                 payload.initiatingProUid = '{{ $pro->uid  }}';
-                                payload.data = JSON.stringify(this.erxPopupItem);
+                                payload.data = JSON.stringify(this.erxPopupItem.data);
                             }
                             else {
                                 payload.uid = this.erxPopupItem.uid;
-                                payload.newData = JSON.stringify(this.erxPopupItem);
+                                payload.newData = JSON.stringify(this.erxPopupItem.data);
                             }
 
                             $.post(

resources/views/app/patient/tickets/pharmacy-suggest.blade.php

@@ -89,10 +89,10 @@ initPharmacySearch: function () {
     });
 },
 applySuggestion: function(_elem) {
-    this.popupItem.pharmacyName = $(_elem).attr('data-pharmacyName');
-    this.popupItem.pharmacyCity = $(_elem).attr('data-pharmacyCity');
-    this.popupItem.pharmacyState = $(_elem).attr('data-pharmacyState');
-    this.popupItem.pharmacyAddressMemo = $(_elem).attr('data-pharmacyAddressMemo');
-    this.popupItem.pharmacyPhone = $(_elem).attr('data-pharmacyPhone');
-    this.popupItem.pharmacyFax = $(_elem).attr('data-pharmacyFax');
+    this.erxPopupItem.data.pharmacyName = $(_elem).attr('data-pharmacyName');
+    this.erxPopupItem.data.pharmacyCity = $(_elem).attr('data-pharmacyCity');
+    this.erxPopupItem.data.pharmacyState = $(_elem).attr('data-pharmacyState');
+    this.erxPopupItem.data.pharmacyAddressMemo = $(_elem).attr('data-pharmacyAddressMemo');
+    this.erxPopupItem.data.pharmacyPhone = $(_elem).attr('data-pharmacyPhone');
+    this.erxPopupItem.data.pharmacyFax = $(_elem).attr('data-pharmacyFax');
 },