update

resources/views/app/patient/modules/sleep_health_intake/edit.blade.php

@@ -36,10 +36,6 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
     .textarea .select2-selection{
       height: 100px !important;
     }
-    .modal-backdrop {
-      z-index: 90 !important;
-      background: #ccc;
-    }
     .select2-results__message {
       display: none !important;
     }
@@ -151,7 +147,7 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
 								self.autoSaveForm();
 							}).val(loadedData);
 
-							$(arr[i]).val(loadedData).trigger('change'); //load preselected
+							$(arr[i]).trigger('change'); //load preselected
 
 						};
 					},
@@ -215,10 +211,6 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
 					},
 				},
 				mounted: function() {
-					if (!this.data.dropdownOptions) {
-						this.data.dropdownOptions = this.defaultDropdownOptions;
-						this.$forceUpdate();
-					}
 					this.initSelect2();
 					this.initOnSelectChange();
 					this.initOmegaCC();

resources/views/app/patient/modules/sleep_health_intake/partials/epworth_sleepiness_study.blade.php

@@ -55,25 +55,70 @@
         <div class="form-group">
             <label class="m-0">Symptoms</label>
             <div class="d-flex align-items-end">
-                <select name="HPI_symptoms" multiple="multiple" class="select2" v-model="data.HPI_symptoms"></select>
+                <select name="HPI_symptoms" multiple="multiple" class="select2" v-model="data.HPI_symptoms">
+                  <option value=""></option>
+                  <option>change in bowels</option>
+                  <option>chronic or persistent cough</option>
+                  <option>clumsiness</option>
+                  <option>edema of lower extremities</option>
+                  <option>episodes of chest tightness</option>
+                  <option>episodes of wheezing</option>
+                  <option>excessive phlegm</option>
+                  <option>excessively dry skin</option>
+                  <option>High blood pressure</option>
+                  <option>impotency</option>
+                  <option>loss of muscle strength</option>
+                  <option>loss of sensation</option>
+                  <option>occasional sleep disturbance</option>
+                  <option>persistent joint pain</option>
+                  <option>problems breathing through nose</option>
+                  <option>shortness of breath with exercise</option>
+                  <option>urinary discomfort</option>
+                  <option>weight gain</option>
+                  <option>weight loss</option>
+                </select>
             </div>
         </div>
         <div class="form-group">
             <label class="m-0">Severity</label>
             <div class="d-flex align-items-end">
-                <select name="HPI_severity" multiple="multiple" class="select2" v-model="data.HPI_severity"></select>
+                <select name="HPI_severity" multiple="multiple" class="select2" v-model="data.HPI_severity">
+                  <option value=""></option>
+                  <option>Mild</option>
+                  <option>Moderate</option>
+                  <option>Severe</option>
+                </select>
             </div>
         </div>
         <div class="form-group">
             <label class="m-0">Duration</label>
             <div class="d-flex align-items-end">
-                <select name="HPI_duration" multiple="multiple" class="select2" v-model="data.HPI_duration"></select>
+                <select name="HPI_duration" multiple="multiple" class="select2" v-model="data.HPI_duration">
+                  <option value=""></option>
+                  <option>Less than 1 week</option>
+                  <option>1 week</option>
+                  <option>2 weeks</option>
+                  <option>3 weeks</option>
+                  <option>1 month</option>
+                  <option>2 months</option>
+                  <option>3 months</option>
+                  <option>4 months</option>
+                  <option>5 months</option>
+                  <option>6 months</option>
+                  <option>1 year</option>
+                  <option>Unknown</option>
+                  <option>2-3 years</option>
+                </select>
             </div>
         </div>
         <div class="form-group">
             <label class="m-0">Timing</label>
             <div class="d-flex align-items-end">
-                <select name="HPI_timing" multiple="multiple" class="select2" v-model="data.HPI_timing"></select>
+                <select name="HPI_timing" multiple="multiple" class="select2" v-model="data.HPI_timing">
+                  <option value=""></option>
+                  <option>constant</option>
+                  <option>intermittent</option>
+                </select>
             </div>
         </div>
         <div class="form-group">
@@ -85,31 +130,83 @@
         <div class="form-group">
             <label class="m-0">Aggravating Factors:</label>
             <div class="d-flex align-items-end">
-                <select name="HPI_aggravating_factors" multiple="multiple" class="select2" v-model="data.HPI_aggravating_factors"></select>
+                <select name="HPI_aggravating_factors" multiple="multiple" class="select2" v-model="data.HPI_aggravating_factors">
+                  <option value=""></option>
+                  <option>exercise</option>
+                  <option>exertion</option>
+                  <option>rest</option>
+                  <option>stress</option>
+                </select>
             </div>
         </div>
         <div class="form-group">
             <label class="m-0">Alleviating Factors:</label>
             <div class="d-flex align-items-end">
-                <select name="HPI_alleviating_factors" multiple="multiple" class="select2" v-model="data.HPI_alleviating_factors"></select>
+                <select name="HPI_alleviating_factors" multiple="multiple" class="select2" v-model="data.HPI_alleviating_factors">
+                  <option value=""></option>
+                  <option>cold</option>
+                  <option>heat</option>
+                  <option>rest</option>
+                </select>
             </div>
         </div>
         <div class="form-group textarea">
             <label class="m-0">Sleep Summary:</label>
             <div class="d-flex align-items-end">
-                <select data-name="sleep_exam_sleep_summary" name="sleep_exam_sleep_summary" multiple="multiple" class="select2" v-model="data.sleep_exam_sleep_summary"></select>
+                <select data-name="sleep_exam_sleep_summary" name="sleep_exam_sleep_summary" multiple="multiple" class="select2" v-model="data.sleep_exam_sleep_summary">
+                  <option value=""></option>
+                  <option>awakens due to extremity jerks</option>
+                  <option>awakens due to snoring</option>
+                  <option>awakens with chest pain or palpitations</option>
+                  <option>awakens with dry throat</option>
+                  <option>delayed sleep due to pain</option>
+                  <option>disturbed sleep</option>
+                  <option>fatigued from lack of sleep</option>
+                  <option>leg restlessness with aching or twitching</option>
+                  <option>sleep walks</option>
+                  <option>sleeps primarily on back</option>
+                  <option>sleeps primarily on side</option>
+                  <option>sleeps primarily on stomach</option>
+                  <option>takes over 45 mintues to fall asleep</option>
+                  <option>talks in sleep</option>
+                  <option>wakes gasping</option>
+                </select>
             </div>
         </div>
         <div class="form-group textarea">
             <label class="m-0">Previous Treatments:</label>
             <div class="d-flex align-items-end">
-                <select data-name="PH_previous_treatment" name="PH_previous_treatment" multiple="multiple" class="select2" v-model="data.PH_previous_treatment"></select>
+                <select data-name="PH_previous_treatment" name="PH_previous_treatment" multiple="multiple" class="select2" v-model="data.PH_previous_treatment">
+                  <option value=""></option>
+                  <option>BiPAP</option>
+                  <option>CPAP</option>
+                  <option>elevating head of bed</option>
+                  <option>oxygen therapy</option>
+                  <option>sleep aids</option>
+                  <option>soft pallet injection</option>
+                  <option>stimulants for daytime sleepiness</option>
+                  <option>tonsils and adeniod surgery</option>
+                  <option>Uvulopalatopharyngoplasty</option>
+                  <option>weight loss</option>
+                </select>
             </div>
         </div>
         <div class="form-group textarea">
             <label class="m-0">Current Treatments:</label>
             <div class="d-flex align-items-end">
-                <select data-name="PH_current_treatment" name="PH_current_treatment" multiple="multiple" class="select2" v-model="data.PH_current_treatment"></select>
+                <select data-name="PH_current_treatment" name="PH_current_treatment" multiple="multiple" class="select2" v-model="data.PH_current_treatment">
+                  <option value=""></option>
+                  <option>BiPAP</option>
+                  <option>CPAP</option>
+                  <option>elevating head of bed</option>
+                  <option>oxygen therapy</option>
+                  <option>sleep aids</option>
+                  <option>soft pallet injection</option>
+                  <option>stimulants for daytime sleepiness</option>
+                  <option>tonsils and adeniod surgery</option>
+                  <option>Uvulopalatopharyngoplasty</option>
+                  <option>weight loss</option>
+                </select>
             </div>
         </div>
     </div>

resources/views/app/patient/segment-templates/omega_pe/edit.blade.php

@@ -20,7 +20,7 @@ $contentData = [
   "PE_Resp_Normal" => "Clear to auscultation, no wheezes, rales, or rhonchi.",
   "PE_Cardio_Normal" => "Regular rate and rhythm, no murmurs, ectopy, or rubs. No jugular venous distention.",
   "PE_Skin_Normal" => "Tone, turgor, texture, and temperature within normal limits. Hair growth within normal limits.",
-  "PE_Extrimities_Normal" => "Inspection and palpation of digits and nails reveal no clubbing, cyanosis, or edema. Muscle strength 5 / 5.",
+  "PE_Extremities_Normal" => "Inspection and palpation of digits and nails reveal no clubbing, cyanosis, or edema. Muscle strength 5 / 5.",
   "PE_Neuro_Normal" => "Cranial nerves I - XII are grossly intact. Bilateral reflexes are 2+ throughout. Intact sensations of fine touch, pain, and temperature.",
   "PE_Psych_Normal" => "Oriented to time, place, and person. Appropriate mood and affect."
 ];
@@ -48,10 +48,24 @@ $containerID = 'edit-omega-pe-' . time();
 
       <div id="{{ $containerID }}">
         <div class="form-group">
-          <label class="m-0">General:</label>
-          <div class="d-flex align-items-end">
-            <input @change.prevent="onInputChange" name="PE_general" v-model="data.PE_general" class="form-control form-control-sm" />
-          </div>
+            <label class="m-0">General:</label>
+            <div class="d-flex align-items-end">
+                <select data-name="PE_general" name="PE_general" multiple="multiple" class="select2PE" v-model="data.PE_general">
+                  <option value=""></option>
+                  <option>Patient well nourished and well groomed</option>
+                  <option>No deformities or obvious deficiencies</option>
+                  <option>acutely ill</option>
+                  <option>cachectic</option>
+                  <option>chronically ill</option>
+                  <option>frail and elderly</option>
+                  <option>healthy and in no apparent distress</option>
+                  <option>lethargic</option>
+                  <option>overweight</option>
+                  <option>overweight and in no apparent distress</option>
+                  <option>restless</option>
+                  <option>malnourished</option>
+                </select>
+            </div>
         </div>
         <div class="form-group d-flex align-items-start">
           <label class="mb-0 mr-3">
@@ -283,25 +297,25 @@ $containerID = 'edit-omega-pe-' . time();
         </div>
         <div class="form-group">
           <label class="mb-0">
-            <b>Extrimities</b>
+            <b>Extremities</b>
           </label>
           <div class="bg-light p-1">
             <div>
               <label class="mb-0 mr-3">
-                <input @change.prevent="onInputChange" type="radio" data-name="PE_Extrimities" value="Normal" v-model="data.PE_Extrimities" />
+                <input @change.prevent="onInputChange" type="radio" data-name="PE_Extremities" value="Normal" v-model="data.PE_Extremities" />
                 <span>Normal</span>
               </label>
               <label class="mb-0 mr-3">
-                <input @change.prevent="onInputChange" type="radio" data-name="PE_Extrimities" value="Abnormal" v-model="data.PE_Extrimities" />
+                <input @change.prevent="onInputChange" type="radio" data-name="PE_Extremities" value="Abnormal" v-model="data.PE_Extremities" />
                 <span>Abnormal</span>
               </label>
               <label class="mb-0 mr-3">
-                <input @change.prevent="onInputChange" type="radio" data-name="PE_Extrimities" value="" v-model="data.PE_Extrimities" />
+                <input @change.prevent="onInputChange" type="radio" data-name="PE_Extremities" value="" v-model="data.PE_Extremities" />
                 <span>--</span>
               </label>
             </div>
-            <input @change.prevent="onInputChange" v-if="data.PE_Extrimities == 'Normal'" data-name="PE_Extrimities_Normal" v-model="data.PE_Extrimities_Normal" class="form-control form-control-sm" />
-            <input @change.prevent="onInputChange" v-if="data.PE_Extrimities == 'Abnormal'" data-name="PE_Extrimities_Abnormal" v-model="data.PE_Extrimities_Abnormal" class="form-control form-control-sm" />
+            <input @change.prevent="onInputChange" v-if="data.PE_Extremities == 'Normal'" data-name="PE_Extremities_Normal" v-model="data.PE_Extremities_Normal" class="form-control form-control-sm" />
+            <input @change.prevent="onInputChange" v-if="data.PE_Extremities == 'Abnormal'" data-name="PE_Extremities_Abnormal" v-model="data.PE_Extremities_Abnormal" class="form-control form-control-sm" />
           </div>
         </div>
         <div class="form-group">
@@ -389,10 +403,31 @@ $containerID = 'edit-omega-pe-' . time();
           }
         },
         mounted: function() {
+          this.initSelect2();
           $('#' + containerID + ' [moe][initialized]').removeAttr('initialized');
           initMoes();
         },
         methods: {
+          initSelect2: function() {
+            var self = this;
+						var arr = $('.select2PE');
+						for (var i = 0; i < arr.length; i++) {
+							var loadedData = self.data[arr[i].name] || [];
+
+							$(arr[i]).select2({
+								data: loadedData,
+								tags: true,
+								allowClear: true,
+								placeholder: 'Press "Enter" to create a new entry',
+							}).on('change', function(e) {
+								var name = $(e.target)[0].name;
+								var value = $(e.target).val();
+								self.data[name] = value;
+                self.autoSaveForm();
+							}).val(loadedData);
+
+						};
+          },
           onInputChange: function(evt) {
             var self = this;
             var input = evt.target;
@@ -407,6 +442,7 @@ $containerID = 'edit-omega-pe-' . time();
             self.autoSaveForm();
           },
           autoSaveForm: function() {
+
             var self = this;
             var url = form.attr('url');
             form.find('input[name=data]').val(JSON.stringify(self.data));
@@ -436,4 +472,4 @@ $containerID = 'edit-omega-pe-' . time();
     addMCInitializer('init-pe-{{$note->id}}', initPE, '#' + containerID);
 
   }).call(window);
-</script>
+</script>

resources/views/app/patient/segment-templates/omega_pe/summary.blade.php

@@ -44,10 +44,14 @@ $labels = [
 if($contentData && !@$contentData['unknown']) {
     foreach ($labels as $k => $v) {
 ?>
-@if(isset($contentData[$k]) && $contentData[$k] !== '')
-  @if($k == 'PE_general' || $k == 'PE_General_Depression')
+@if(isset($contentData[$k]))
+  @if($k == 'PE_general')
     <div class="mb-1">
-      <b>{{$v}}:</b> <span>{{$contentData[$k]}}</span>
+      <b>{{$v}}:</b> <span><?= implode(", ", $contentData[$k]) ?></span>
+    </div>
+  @elseif($k == 'PE_General_Depression')
+    <div class="mb-1">
+      <b>{{$v}}:</b> <span>{{ $contentData[$k] }}</span>
     </div>
   @else
     <div class="mb-2">