rx wiz add/edit: logic updates

resources/views/app/patient/wizard-partials/common-fields.blade.php

@@ -30,25 +30,6 @@
         </div>
     </div>
 
-    <div if-addition-on-intake-or-during-visit class="d-none">
-        <div class="row mb-2">
-            <div class="col-6 pr-0">
-                <label class="text-sm mb-0">Start Date</label>
-                <input type="date"
-                       data-name="start_date"
-                       value="{{@$point->data ? @$point->data->start_date : ''}}"
-                       class="form-control form-control-sm min-width-unset">
-            </div>
-            <div class="col-6">
-                <label class="text-sm mb-0">Added By</label>
-                <input type="text"
-                       data-name="prescriber"
-                       value="{{@$point->data ? @$point->data->prescriber : ''}}"
-                       class="form-control form-control-sm min-width-unset">
-            </div>
-        </div>
-    </div>
-
 </div>
 
 <div if-not-active class="d-none">
@@ -87,27 +68,49 @@
             </div>
         </div>
 
-        <div if-removal-on-intake-or-during-visit class="d-none">
-            <div class="row mb-2">
-                <div class="col-6 pr-0">
-                    <label class="text-sm mb-0">End Date</label>
-                    <input type="date"
-                           name="removalEffectiveDate"
-                           value="{{@$point->removal_effective_date}}"
-                           class="form-control form-control-sm min-width-unset">
-                </div>
-                <div class="col-6">
-                    <label class="text-sm mb-0">Removal By/Memo</label>
-                    <input type="text"
-                           name="removalReasonMemo"
-                           value="{{@$point->removal_reason_memo}}"
-                           class="form-control form-control-sm min-width-unset">
+    </div>
+
+</div>
+
+<div {{@$point ? 'if-not-entry-error class="d-none"' : ''}}>
+    <div if-addition-or-removal-on-intake-or-during-visit class="d-none">
+        <div class="row mb-2">
+            <div class="col-6 pr-0">
+                <label class="text-sm mb-0">Start Date</label>
+                <input type="date"
+                       data-name="start_date"
+                       value="{{@$point->data ? @$point->data->start_date : ''}}"
+                       class="form-control form-control-sm min-width-unset">
+            </div>
+            <div class="col-6">
+                <label class="text-sm mb-0">Added By</label>
+                <input type="text"
+                       data-name="prescriber"
+                       value="{{@$point->data ? @$point->data->prescriber : ''}}"
+                       class="form-control form-control-sm min-width-unset">
+            </div>
+        </div>
+        <div if-not-active class="d-none">
+            <div if-removal-on-intake-or-during-visit class="d-none">
+                <div class="row mb-2">
+                    <div class="col-6 pr-0">
+                        <label class="text-sm mb-0">End Date</label>
+                        <input type="date"
+                               name="removalEffectiveDate"
+                               value="{{@$point->removal_effective_date}}"
+                               class="form-control form-control-sm min-width-unset">
+                    </div>
+                    <div class="col-6">
+                        <label class="text-sm mb-0">Removal By/Memo</label>
+                        <input type="text"
+                               name="removalReasonMemo"
+                               value="{{@$point->removal_reason_memo}}"
+                               class="form-control form-control-sm min-width-unset">
+                    </div>
                 </div>
             </div>
         </div>
-
     </div>
-
 </div>
 
 <div {{@$point ? 'if-not-entry-error class="d-none"' : ''}}>

resources/views/app/patient/wizard-partials/common-script.blade.php

@@ -20,6 +20,10 @@ parentSegment.find('[name="additionReasonCategory"]')
         let form = $(this).closest('form');
         form.find('[if-addition-on-intake-or-during-visit], [if-addition-on-intake], [if-addition-during-visit]').addClass('d-none');
         if(form.find('[name="additionReasonCategory"]:checked').length) form.find('[if-addition-on-intake-or-during-visit]').removeClass('d-none');
+        form.find('[if-addition-or-removal-on-intake-or-during-visit]').addClass('d-none');
+        if(form.find('[name="additionReasonCategory"]:checked').length || form.find('[name="removalReasonCategory"]:checked').length) {
+            form.find('[if-addition-or-removal-on-intake-or-during-visit]').removeClass('d-none');
+        }
         if(form.find('[name="additionReasonCategory"]:checked').val() === 'ON_INTAKE') {
             form.find('[if-addition-on-intake]').removeClass('d-none');
             form.find('[data-name="start_date"]').val('');
@@ -40,6 +44,10 @@ parentSegment.find('[name="removalReasonCategory"]')
         let form = $(this).closest('form');
         form.find('[if-removal-on-intake-or-during-visit], [if-removal-on-intake], [if-removal-during-visit]').addClass('d-none');
         if(form.find('[name="removalReasonCategory"]:checked').length) form.find('[if-removal-on-intake-or-during-visit]').removeClass('d-none');
+        form.find('[if-addition-or-removal-on-intake-or-during-visit]').addClass('d-none');
+        if(form.find('[name="additionReasonCategory"]:checked').length || form.find('[name="removalReasonCategory"]:checked').length) {
+            form.find('[if-addition-or-removal-on-intake-or-during-visit]').removeClass('d-none');
+        }
         if(form.find('[name="removalReasonCategory"]:checked').val() === 'ON_INTAKE') {
             form.find('[if-removal-on-intake]').removeClass('d-none');
             form.find('[name="removalEffectiveDate"]').val('');