Sfoglia il codice sorgente

Rx wizard - make add form the same as edit form

Vijayakrishnan 3 anni fa
parent
commit
3a83f7b1ff
1 ha cambiato i file con 76 aggiunte e 54 eliminazioni
  1. 76 54
      resources/views/app/patient/medications-center.blade.php

+ 76 - 54
resources/views/app/patient/medications-center.blade.php

@@ -323,79 +323,101 @@ $medications = $points;
                     <input type="hidden" data-name="routedDosageFormMedId">
                     <input type="hidden" data-name="gcnSeqno">
 
-                    <input type="hidden" name="additionReasonCategory">
-                    <input type="hidden" name="isRemoved">
-                    <input type="hidden" name="removalReasonCategory">
-                    <input type="hidden" name="isRemovedDueToEntryError">
-
                     <p class="mb-2"><b>Add Medication</b></p>
 
                     <div class="row">
                         <div class="col-7">
+                            <div class="mb-2">
+                                <label class="text-sm text-secondary mb-0">Name</label>
+                                <input type="text"
+                                       data-name="name"
+                                       class="form-control form-control-sm"
+                                       stag-suggest
+                                       stag-suggest-bottom-left
+                                       stag-suggest-ep="/fdb-med-suggest-v2/json"
+                                       required>
+                            </div>
                             <div class="row mb-2">
-                                <div class="col-8 pr-0">
-                                    <label class="text-sm text-secondary mb-0">Name</label>
-                                    <input type="text"
-                                           data-name="name"
-                                           class="form-control form-control-sm"
-                                           stag-suggest
-                                           stag-suggest-bottom-left
-                                           stag-suggest-ep="/fdb-med-suggest-v2/json"
-                                           required>
-                                </div>
-                                <div class="col-4">
-                                    <label class="text-sm text-secondary mb-0">Frequency</label>
-                                    <input type="text" class="form-control form-control-sm" data-name="frequency"
-                                           data-option-list="frequency-options" autocomplete="off">
+                                <div class="col-4 pr-0">
+                                    <label class="text-sm mb-1">Frequency</label>
+                                    <input type="text" class="form-control form-control-sm min-width-unset"
+                                           data-option-list="frequency-options" data-field="frequency"
+                                           data-name="frequency">
                                     <div id="frequency-options" class="data-option-list">
                                         <div>Once a day</div>
                                         <div>Twice a day</div>
                                     </div>
                                 </div>
+                                <div class="col-4 pr-0">
+                                    <label class="text-sm mb-0">Start Date</label>
+                                    <input type="date"
+                                           data-name="start_date"
+                                           class="form-control form-control-sm min-width-unset">
+                                </div>
+                                <div class="col-4">
+                                    <label class="text-sm mb-0">Prescribed By</label>
+                                    <input type="text"
+                                           data-name="prescriber"
+                                           class="form-control form-control-sm min-width-unset">
+                                </div>
                             </div>
+                            <div class="mb-2">
+                                <label class="text-sm mb-1">Description</label>
+                                <textarea rows="1" data-name="description" class="form-control form-control-sm"></textarea>
+                            </div>
+
+                            <hr class="my-3">
+
                             <div class="row mb-2">
-                                <div class="col-12">
-                                    <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>
+                                <div class="col-4 pr-0">
+                                    <label class="text-sm mb-0">When Added</label>
+                                    <select class="form-control form-control-sm min-width-unset" name="additionReasonCategory" required>
                                         <option value="">-- select --</option>
-                                        <option value="HISTORIC">Historic</option>
-                                        <option value="PRE_EXISTING">Preexisting</option>
-                                        <option value="NEW">New (Prescribed during this visit)</option>
+                                        <option value="ON_INTAKE">On Intake</option>
+                                        <option value="DURING_VISIT">During Visit</option>
                                     </select>
                                 </div>
+                                <div class="col-8">
+                                    <label class="text-sm mb-0 min-width-unset">Addition Memo</label>
+                                    <input type="text"
+                                           name="additionReasonMemo"
+                                           class="form-control form-control-sm min-width-unset">
+                                </div>
                             </div>
-                            <div class="d-flex align-items-start mb-2">
-                                <div class="w-25">
-                                    <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>
+
+                            <hr class="my-3">
+
+                            <div class="row mb-2">
+                                <div class="col-6 pr-0">
+                                    <label class="text-sm mb-0 min-width-unset">Is medication active?</label>
+                                    <select class="form-control form-control-sm min-width-unset" name="isRemoved" required>
+                                        <option value="0" selected>Yes</option>
+                                        <option value="1">No</option>
+                                    </select>
                                 </div>
-                                <div class="w-25 pl-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>
+                                <input type="hidden" name="isRemovedDueToEntryError" value="0">
+                            </div>
+
+                            <div class="row mb-2 is_removed_ui_2" style="display: none">
+                                <div class="col-4 pr-0">
+                                    <label class="text-sm mb-0 min-width-unset">When Removed</label>
+                                    <select class="form-control form-control-sm min-width-unset" name="removalReasonCategory">
+                                        <option value="">-- select --</option>
+                                        <option value="ON_INTAKE">On Intake</option>
+                                        <option value="DURING_VISIT">During Visit</option>
+                                    </select>
                                 </div>
-                                <div class="w-25 pl-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 class="col-4 pr-0">
+                                    <label class="text-sm mb-0 min-width-unset">End Date</label>
+                                    <input type="date"
+                                           name="removalEffectiveDate"
+                                           class="form-control form-control-sm min-width-unset">
                                 </div>
-                                <div class="w-25 pl-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 class="col-4">
+                                    <label class="text-sm mb-0 min-width-unset">Removal By/Memo</label>
+                                    <input type="text"
+                                           name="removalReasonMemo"
+                                           class="form-control form-control-sm min-width-unset">
                                 </div>
                             </div>
                         </div>