Browse Source

Tickets - ability to specify assigned_pro during add

Vijayakrishnan 3 years ago
parent
commit
0729f528db

+ 3 - 2
resources/views/app/patient/tickets.blade.php

@@ -541,7 +541,7 @@
                             if(this.otherPopupMode === 'add') {
                                 payload.clientUid = '{{ $patient->uid  }}';
                                 payload.category = 'other';
-                                payload.assignedProUid = '{{ $pro->uid  }}';
+                                payload.assignedProUid = this.otherPopupItem.assigned_pro_uid ? this.otherPopupItem.assigned_pro_uid : '{{ $pro->uid  }}';
                                 payload.managerProUid = '{{ $pro->uid  }}';
                                 payload.orderingProUid = '{{ $pro->uid  }}';
                                 payload.initiatingProUid = '{{ $pro->uid  }}';
@@ -909,6 +909,7 @@
                             $(document).on('pro-changed', '#ticketsApp select[provider-search]', function() {
                                 console.log('ALIX pro-changed', $(this).attr('data-field'), $(this).val());
                                 if(!!$(this).val()) {
+                                    if(!self.currentCategory) self.currentCategory = 'other';
                                     self[self.currentCategory + 'PopupItem'][$(this).attr('data-field')] = $(this).val();
 
                                     // save
@@ -921,7 +922,7 @@
                                             proType = 'Ordering';
                                             break;
                                     }
-                                    if (proType) {
+                                    if (proType && self[self.currentCategory + 'PopupMode'] !== 'add') {
                                         $.post('/api/ticket/update' + proType + 'Pro', {
                                             uid: self[self.currentCategory + 'PopupItem'].uid,
                                             newProUid: $(this).val()

+ 23 - 21
resources/views/app/patient/tickets/common-fields.blade.php

@@ -1,29 +1,31 @@
 <div class="p-3 border-bottom">
 
-    <div v-if="<?=$category?>PopupMode === 'edit'">
-        <div class="row mb-2">
-            <div class="col-3 d-inline-flex align-items-center">
-                <label class="text-secondary m-0">Assigned Pro</label>
-            </div>
-            <div class="col-9">
-                <div class="d-flex align-items-center">
-                    <div class="pro-initials text-uppercase"
-                         :title="allProsFlat['pro_' + <?=$category?>PopupItem.assigned_pro_id].displayedName"
-                         :style="'background-color: ' + allProsFlat['pro_' + <?=$category?>PopupItem.assigned_pro_id].colors.bc + '; color: ' + allProsFlat['pro_' + <?=$category?>PopupItem.assigned_pro_id].colors.fc + ';'"
-                         v-html="allProsFlat['pro_' + <?=$category?>PopupItem.assigned_pro_id].displayedInitials">
-                    </div>
-                    <div class="flex-grow-1 ml-2">
-                        <select provider-search
-                                data-field="assigned_pro_uid"
-                                v-model="<?=$category?>PopupItem.assigned_pro_uid"
-                                :data-pro-name="[<?=$category?>PopupItem.assigned_pro.name_last, <?=$category?>PopupItem.assigned_pro.name_first].filter(Boolean).join(', ')"
-                                class="form-control form-control-sm">
-                            <option value=""> --select--</option>
-                        </select>
-                    </div>
+    <div class="row mb-2">
+        <div class="col-3 d-inline-flex align-items-center">
+            <label class="text-secondary m-0">Assigned Pro</label>
+        </div>
+        <div class="col-9">
+            <div class="d-flex align-items-center">
+                <div class="pro-initials text-uppercase"
+                     v-if="<?=$category?>PopupItem.assigned_pro_id"
+                     :title="allProsFlat['pro_' + <?=$category?>PopupItem.assigned_pro_id].displayedName"
+                     :style="'background-color: ' + allProsFlat['pro_' + <?=$category?>PopupItem.assigned_pro_id].colors.bc + '; color: ' + allProsFlat['pro_' + <?=$category?>PopupItem.assigned_pro_id].colors.fc + ';'"
+                     v-html="allProsFlat['pro_' + <?=$category?>PopupItem.assigned_pro_id].displayedInitials">
+                </div>
+                <div class="flex-grow-1 ml-2">
+                    <select provider-search
+                            data-field="assigned_pro_uid"
+                            v-model="<?=$category?>PopupItem.assigned_pro_uid"
+                            :data-pro-name="<?=$category?>PopupItem.assigned_pro_id ? [<?=$category?>PopupItem.assigned_pro.name_last, <?=$category?>PopupItem.assigned_pro.name_first].filter(Boolean).join(', ') : ''"
+                            class="form-control form-control-sm">
+                        <option value=""> --select--</option>
+                    </select>
                 </div>
             </div>
         </div>
+    </div>
+
+    <div v-if="<?=$category?>PopupMode === 'edit'">
         <div class="row mb-2">
             <div class="col-3 d-inline-flex align-items-center">
                 <label class="text-secondary m-0">Ordering Pro</label>