Add-form logic - apply to edit form

public/css/style.css

@@ -257,7 +257,7 @@ body>nav.navbar {
 .mcp-theme-1 [large] .form-control.form-control-sm {
     min-width: unset;
 }
-[wide] .form-control.form-control-sm {
+[wide] .form-control.form-control-sm:not(.min-width-unset) {
     min-width: 480px;
 }
 [moe][center] [url]:not([show]) {

resources/views/app/patient/medications-center.blade.php

@@ -95,6 +95,11 @@ $medications = $points;
                                 <input type="hidden" data-name="routedDosageFormMedId" value="{{@$medication->data->routedDosageFormMedId}}">
                                 <input type="hidden" data-name="gcnSeqno" value="{{@$medication->data->gcnSeqno}}">
 
+                                <input type="hidden" name="additionReasonCategory" value="{{@$medication->addition_reason_category}}">
+                                <input type="hidden" name="isRemoved" value="{{@$medication->is_removed}}">
+                                <input type="hidden" name="removalReasonCategory" value="{{@$medication->removal_reason_category}}">
+                                <input type="hidden" name="isRemovedDueToEntryError" value="{{@$medication->is_removed_due_to_entry_error}}">
+
                                 <div class="mb-2">
                                     <label class="text-sm text-secondary mb-1">Drug</label>
                                     <input type="text" class="form-control form-control-sm min-width-unset prescription-medication"
@@ -117,14 +122,52 @@ $medications = $points;
                                 </div>
 
                                 <div class="mb-2">
-                                    <label class="text-sm text-secondary mb-1">Existing / New</label>
-                                    <select class="form-control form-control-sm" name="additionReasonCategory" required>
+                                    <label class="text-sm text-secondary mb-0">Historic / Preexisting / New</label>
+                                    <select class="form-control form-control-sm additionReasonCategory_ui" name="additionReasonCategory_ui" required>
                                         <option value="">-- select --</option>
-                                        <option value="ON_INTAKE" {{$medication->addition_reason_category === 'ON_INTAKE' ? 'selected' : ''}}>Existing (Patient was already on this)</option>
-                                        <option value="DURING_VISIT" {{$medication->addition_reason_category === 'DURING_VISIT' ? 'selected' : ''}}>New (Prescribed during this visit)</option>
+                                        <option value="HISTORIC" {{$medication->addition_reason_category === 'ON_INTAKE' && $medication->is_removed ? 'selected' : ''}}>Historic</option>
+                                        <option value="PRE_EXISTING" {{$medication->addition_reason_category === 'ON_INTAKE' && !$medication->is_removed ? 'selected' : ''}}>Preexisting</option>
+                                        <option value="NEW" {{$medication->addition_reason_category === 'DURING_VISIT' ? 'selected' : ''}}>New (Prescribed during this visit)</option>
                                     </select>
                                 </div>
 
+                                <div class="d-flex align-items-start">
+                                    <div class="w-50 mb-2">
+                                        <div class="start_date_ui" style="display: none">
+                                            <label class="text-sm text-secondary mb-0">Start Date</label>
+                                            <input type="date"
+                                                   data-name="start_date"
+                                                   class="form-control form-control-sm min-width-unset">
+                                        </div>
+                                    </div>
+                                    <div class="w-50 pl-2 mb-2">
+                                        <div class="prescriber_ui" style="display: none">
+                                            <label class="text-sm text-secondary mb-0">Prescribed By</label>
+                                            <input type="text"
+                                                   data-name="prescriber"
+                                                   class="form-control form-control-sm min-width-unset">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="d-flex align-items-start">
+                                    <div class="w-50 mb-2">
+                                        <div class="removalEffectiveDate_ui" style="display: none">
+                                            <label class="text-sm text-secondary mb-0">End Date</label>
+                                            <input type="date"
+                                                   name="removalEffectiveDate"
+                                                   class="form-control form-control-sm min-width-unset">
+                                        </div>
+                                    </div>
+                                    <div class="w-50 pl-2 mb-2">
+                                        <div class="removalReasonMemo_ui" style="display: none">
+                                            <label class="text-sm text-secondary mb-0">Removal By/Memo</label>
+                                            <input type="text"
+                                                   name="removalReasonMemo"
+                                                   class="form-control form-control-sm min-width-unset">
+                                        </div>
+                                    </div>
+                                </div>
+
                                 <div class="mb-2">
                                     <label class="text-sm text-secondary mb-1">Description</label>
                                     <textarea rows="1" data-name="description" class="form-control form-control-sm">{{@$medication->data->description}}</textarea>
@@ -288,12 +331,6 @@ $medications = $points;
                                     </div>
                                 </div>
                             </div>
-                            <!--<div class="row mb-2">
-                                <div class="col-12">
-                                    <label class="text-sm text-secondary mb-0">Description</label>
-                                    <textarea rows="1" data-name="description" class="form-control form-control-sm"></textarea>
-                                </div>
-                            </div>-->
                             <div class="row mb-2">
                                 <div class="col-12">
                                     <label class="text-sm text-secondary mb-0">Historic / Preexisting / New</label>