瀏覽代碼

FU appt section JS fixes

Vijayakrishnan 3 年之前
父節點
當前提交
21cd59dbe2

+ 8 - 2
resources/views/app/patient/note/dashboard_script.blade.php

@@ -47,8 +47,14 @@
                 $(document)
                 $(document)
                     .off('click.update-fu-appt-status', '.fu-appt-container .update-fu-appt-status')
                     .off('click.update-fu-appt-status', '.fu-appt-container .update-fu-appt-status')
                     .on('click.update-fu-appt-status', '.fu-appt-container .update-fu-appt-status', function() {
                     .on('click.update-fu-appt-status', '.fu-appt-container .update-fu-appt-status', function() {
-                        let parent = $(this).closest('.fu-appt-container');
-                        parent.find('.fu-appt-choices').removeClass('d-none').addClass('d-flex');
+                        let parent = $(this).closest('.fu-appt-container'),
+                            choices = parent.find('.fu-appt-choices');
+                        if(choices.is('.d-none')) {
+                            choices.removeClass('d-none').addClass('d-block');
+                        }
+                        else {
+                            choices.removeClass('d-block').addClass('d-none');
+                        }
                         return false;
                         return false;
                     });
                     });
 
 

+ 27 - 25
resources/views/app/patient/note/follow-up-appointment.blade.php

@@ -22,32 +22,34 @@
         </div>
         </div>
     @endif
     @endif
 
 
-    <div class="align-items-center mb-3 fu-appt-choices {{!is_null($note->is_follow_up_needed) ? 'd-none' : 'd-flex'}}">
-        <p class="font-weight-bold text-secondary my-0 mr-3">Would you like to book a follow-up appointment?</p>
-        <label class="d-inline-flex align-items-center mr-3 my-0">
-            <input type="radio" name="is_follow_up_needed" value="1">
-            <span class="ml-1">Yes</span>
-        </label>
-        <label class="d-inline-flex align-items-center mr-3 my-0">
-            <input type="radio" name="is_follow_up_needed" value="0">
-            <span class="ml-1 mr-3">No</span>
-        </label>
-    </div>
+    <div class="fu-appt-choices {{!is_null($note->is_follow_up_needed) ? 'd-none' : 'd-block'}}">
+        <div class="d-flex align-items-center mb-3">
+            <p class="font-weight-bold text-secondary my-0 mr-3">Would you like to book a follow-up appointment?</p>
+            <label class="d-inline-flex align-items-center mr-3 my-0">
+                <input type="radio" name="is_follow_up_needed" value="1">
+                <span class="ml-1">Yes</span>
+            </label>
+            <label class="d-inline-flex align-items-center mr-3 my-0">
+                <input type="radio" name="is_follow_up_needed" value="0">
+                <span class="ml-1 mr-3">No</span>
+            </label>
+        </div>
 
 
-    <div moe class="no-fu-memo-form mb-3 d-none">
-        <form show url="/api/note/updateFollowUpStatus">
-            <input type="hidden" name="uid" value="{{$note->uid}}">
-            <input type="hidden" name="isFollowUpNeeded" value="0">
-            <div class="d-flex align-items-start mb-3">
-                <span class="text-nowrap mr-2">Please indicate why follow-up<br>appointment is not needed:</span>
-                <textarea class="form-control form-control-sm width-300px no-fu-memo"
-                         rows="2" name="followUpNotNeededMemo" required>{{$note->follow_up_not_needed_memo}}</textarea>
-            </div>
-            <div class="mb-0">
-                <button class="btn btn-primary btn-sm mr-1" submit>Submit</button>
-                <button class="btn btn-default bg-white border btn-sm mr-1 cancel-fu-appt-form">Cancel</button>
-            </div>
-        </form>
+        <div moe class="no-fu-memo-form mb-3 d-none">
+            <form show url="/api/note/updateFollowUpStatus">
+                <input type="hidden" name="uid" value="{{$note->uid}}">
+                <input type="hidden" name="isFollowUpNeeded" value="0">
+                <div class="d-flex align-items-start mb-3">
+                    <span class="text-nowrap mr-2">Please indicate why follow-up<br>appointment is not needed:</span>
+                    <textarea class="form-control form-control-sm width-300px no-fu-memo"
+                             rows="2" name="followUpNotNeededMemo" required>{{$note->follow_up_not_needed_memo}}</textarea>
+                </div>
+                <div class="mb-0">
+                    <button class="btn btn-primary btn-sm mr-1" submit>Submit</button>
+                    <button class="btn btn-default bg-white border btn-sm mr-1 cancel-fu-appt-form">Cancel</button>
+                </div>
+            </form>
+        </div>
     </div>
     </div>
 
 
 </div>
 </div>