فهرست منبع

Merge branch 'master' of rav.triplestart.com:jmudaka/stagfe2

= 3 سال پیش
والد
کامیت
6f43b152a6
23فایلهای تغییر یافته به همراه97 افزوده شده و 83 حذف شده
  1. 9 9
      resources/views/app/patient/segment-templates/_child_plan/behavior/SELF_MONITORING/edit-plan.php
  2. 1 1
      resources/views/app/patient/segment-templates/_child_plan/behavior/SLEEP_HABITS/edit-plan.php
  3. 5 5
      resources/views/app/patient/segment-templates/_child_review/behavior/CRAVINGS/edit-review.php
  4. 5 5
      resources/views/app/patient/segment-templates/_child_review/behavior/FOOD_TRIGGERS/edit-review.php
  5. 9 9
      resources/views/app/patient/segment-templates/_child_review/behavior/SELF_MONITORING/edit-review.php
  6. 2 2
      resources/views/app/patient/segment-templates/_child_review/behavior/SLEEP_HABITS/edit-review.php
  7. 2 2
      resources/views/app/patient/segment-templates/_common_actions/toggle-relevance.blade.php
  8. 3 3
      resources/views/app/patient/segment-templates/_custom_items/edit.blade.php
  9. 1 1
      resources/views/app/patient/segment-templates/covid_intake/edit.blade.php
  10. 27 15
      resources/views/app/patient/segment-templates/history_family/edit.blade.php
  11. 2 2
      resources/views/app/patient/segment-templates/history_family/summary.blade.php
  12. 3 3
      resources/views/app/patient/segment-templates/history_social/edit.blade.php
  13. 2 2
      resources/views/app/patient/segment-templates/history_social/summary.blade.php
  14. 3 3
      resources/views/app/patient/segment-templates/history_surgical/edit.blade.php
  15. 1 1
      resources/views/app/patient/segment-templates/history_surgical/summary.blade.php
  16. 1 1
      resources/views/app/patient/segment-templates/omega_history_surgical/summary-dashboard.blade.php
  17. 1 1
      resources/views/app/patient/segment-templates/omega_history_surgical/summary.blade.php
  18. 1 1
      resources/views/app/patient/segment-templates/omega_ros/edit.blade.php
  19. 1 1
      resources/views/app/patient/segment-templates/omega_ros/summary.blade.php
  20. 13 11
      resources/views/app/patient/segment-templates/omega_subjective_system/summary.blade.php
  21. 3 3
      resources/views/app/patient/segment-templates/past_medical_history/edit.blade.php
  22. 1 1
      resources/views/app/patient/segment-templates/past_medical_history/summary.blade.php
  23. 1 1
      resources/views/app/patient/segment-templates/sigma_history_surgical/summary.blade.php

+ 9 - 9
resources/views/app/patient/segment-templates/_child_plan/behavior/SELF_MONITORING/edit-plan.php

@@ -1,6 +1,6 @@
-<p class="mb-2"><b>Self Monitoring</b></p>
+<p class="mb-2"><b>Change Goal</b></p>
 
-<div class="mb-2 d-flex align-items-center">
+<div class="mb-2 d-block d-md-flex align-items-center">
     <label class="my-0 mr-2">Number of weigh-ins per week:</label>
     <input type="text" data-name="weighInsPerWeek" class="form-control form-control-sm min-width-unset width-100px" value="<?= @($currentValue->weighInsPerWeek) ?>">
 </div>
@@ -8,19 +8,19 @@
 <div class="mb-2">
     <label class="mb-2 font-weight-bold text-secondary">Track the following:</label>
     <div class="row mb-1">
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="tracking->calorieIntake" <?= @($currentValue->tracking->calorieIntake) ? 'checked' : ''?>>
                 <span class="ml-2">Calorie Intake</span>
             </label>
         </div>
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="tracking->dailyCarbIntake" <?= @($currentValue->tracking->dailyCarbIntake) ? 'checked' : ''?>>
                 <span class="ml-2">Daily Carb Intake</span>
             </label>
         </div>
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="tracking->portionSize" <?= @($currentValue->tracking->portionSize) ? 'checked' : ''?>>
                 <span class="ml-2">Portion Size</span>
@@ -28,13 +28,13 @@
         </div>
     </div>
     <div class="row">
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="tracking->eatingSpeed" <?= @($currentValue->tracking->eatingSpeed) ? 'checked' : ''?>>
                 <span class="ml-2">Eating Speed</span>
             </label>
         </div>
-        <div class="col-8">
+        <div class="col-md-8">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="tracking->other" <?= @($currentValue->tracking->other) ? 'checked' : ''?>>
                 <span class="ml-2">Other</span>
@@ -47,14 +47,14 @@
 <div class="mb-2">
     <label class="mb-2 font-weight-bold text-secondary">Food monitoring:</label>
     <div class="row">
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="foodMonitoring->phoneTracker" <?= @($currentValue->foodMonitoring->phoneTracker) ? 'checked' : ''?>>
                 <img src="/img/behavior-rx/phone-tracker.png" class="icon-nutrition-rx-md mx-2">
                 <span class="">Phone Tracker</span>
             </label>
         </div>
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="foodMonitoring->dailyFoodLog" <?= @($currentValue->foodMonitoring->dailyFoodLog) ? 'checked' : ''?>>
                 <img src="/img/behavior-rx/food-log.png" class="icon-nutrition-rx-md mx-2">

+ 1 - 1
resources/views/app/patient/segment-templates/_child_plan/behavior/SLEEP_HABITS/edit-plan.php

@@ -1,4 +1,4 @@
-<p class="mb-2"><b>Sleep Habits</b></p>
+<p class="mb-2"><b>Change Goal</b></p>
 
 <div class="mb-2 d-flex align-items-center">
     <label class="my-0 mr-2">Hours of sleep:</label>

+ 5 - 5
resources/views/app/patient/segment-templates/_child_review/behavior/CRAVINGS/edit-review.php

@@ -2,19 +2,19 @@
 
 <div class="mb-2">
     <div class="row mb-1">
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="sugar" <?= @($currentValue->sugar) ? 'checked' : ''?>>
                 <span class="mx-2">Sugar</span>
             </label>
         </div>
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="starches" <?= @($currentValue->starches) ? 'checked' : ''?>>
                 <span class="mx-2">Starches</span>
             </label>
         </div>
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="friedFood" <?= @($currentValue->friedFood) ? 'checked' : ''?>>
                 <span class="mx-2">Fried Food</span>
@@ -22,13 +22,13 @@
         </div>
     </div>
     <div class="row">
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="sweetDrinks" <?= @($currentValue->sweetDrinks) ? 'checked' : ''?>>
                 <span class="mx-2">Sweet Drinks</span>
             </label>
         </div>
-        <div class="col-8">
+        <div class="col-md-8">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="other" <?= @($currentValue->other) ? 'checked' : ''?>>
                 <span class="ml-2">Other</span>

+ 5 - 5
resources/views/app/patient/segment-templates/_child_review/behavior/FOOD_TRIGGERS/edit-review.php

@@ -2,21 +2,21 @@
 
 <div class="mb-2">
     <div class="row mb-1">
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="stress" <?= @($currentValue->stress) ? 'checked' : ''?>>
                 <span class="mx-2">Stress</span>
                 <img src="/img/behavior-rx/stress.png" class="icon-nutrition-rx-row">
             </label>
         </div>
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="work" <?= @($currentValue->work) ? 'checked' : ''?>>
                 <span class="mx-2">Work</span>
                 <img src="/img/behavior-rx/work.png" class="icon-nutrition-rx-row">
             </label>
         </div>
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="social" <?= @($currentValue->social) ? 'checked' : ''?>>
                 <span class="mx-2">Social</span>
@@ -25,14 +25,14 @@
         </div>
     </div>
     <div class="row">
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="reward" <?= @($currentValue->reward) ? 'checked' : ''?>>
                 <span class="mx-2">Reward</span>
                 <img src="/img/behavior-rx/reward.png" class="icon-nutrition-rx-row">
             </label>
         </div>
-        <div class="col-8">
+        <div class="col-md-8">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="relaxation" <?= @($currentValue->relaxation) ? 'checked' : ''?>>
                 <span class="mx-2">Relaxation</span>

+ 9 - 9
resources/views/app/patient/segment-templates/_child_review/behavior/SELF_MONITORING/edit-review.php

@@ -1,6 +1,6 @@
-<p class="mb-2"><b>Self Monitoring</b></p>
+<p class="mb-2"><b>Current</b></p>
 
-<div class="mb-2 d-flex align-items-center">
+<div class="mb-2 d-block d-md-flex align-items-center">
     <label class="my-0 mr-2">Current number of weigh-ins per week:</label>
     <input type="text" data-name="weighInsPerWeek" class="form-control form-control-sm min-width-unset width-100px" value="<?= @($currentValue->weighInsPerWeek) ?>">
 </div>
@@ -8,19 +8,19 @@
 <div class="mb-2">
     <label class="mb-2 font-weight-bold text-secondary">Currently tracking:</label>
     <div class="row mb-1">
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="tracking->calorieIntake" <?= @($currentValue->tracking->calorieIntake) ? 'checked' : ''?>>
                 <span class="ml-2">Calorie Intake</span>
             </label>
         </div>
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="tracking->dailyCarbIntake" <?= @($currentValue->tracking->dailyCarbIntake) ? 'checked' : ''?>>
                 <span class="ml-2">Daily Carb Intake</span>
             </label>
         </div>
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="tracking->portionSize" <?= @($currentValue->tracking->portionSize) ? 'checked' : ''?>>
                 <span class="ml-2">Portion Size</span>
@@ -28,13 +28,13 @@
         </div>
     </div>
     <div class="row">
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="tracking->eatingSpeed" <?= @($currentValue->tracking->eatingSpeed) ? 'checked' : ''?>>
                 <span class="ml-2">Eating Speed</span>
             </label>
         </div>
-        <div class="col-8">
+        <div class="col-md-8">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="tracking->other" <?= @($currentValue->tracking->other) ? 'checked' : ''?>>
                 <span class="ml-2">Other</span>
@@ -47,14 +47,14 @@
 <div class="mb-2">
     <label class="mb-2 font-weight-bold text-secondary">Current food monitoring:</label>
     <div class="row">
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="foodMonitoring->phoneTracker" <?= @($currentValue->foodMonitoring->phoneTracker) ? 'checked' : ''?>>
                 <img src="/img/behavior-rx/phone-tracker.png" class="icon-nutrition-rx-md mx-2">
                 <span class="">Phone Tracker</span>
             </label>
         </div>
-        <div class="col-4">
+        <div class="col-md-4">
             <label class="d-flex align-items-center mb-1">
                 <input type="checkbox" data-name="foodMonitoring->dailyFoodLog" <?= @($currentValue->foodMonitoring->dailyFoodLog) ? 'checked' : ''?>>
                 <img src="/img/behavior-rx/food-log.png" class="icon-nutrition-rx-md mx-2">

+ 2 - 2
resources/views/app/patient/segment-templates/_child_review/behavior/SLEEP_HABITS/edit-review.php

@@ -1,6 +1,6 @@
-<p class="mb-2"><b>Sleep Habits</b></p>
+<p class="mb-2"><b>Current</b></p>
 
-<div class="mb-2 d-flex align-items-center">
+<div class="mb-2 d-block d-md-flex align-items-center">
     <label class="my-0 mr-2">Current hours of sleep:</label>
     <input type="text" data-name="hoursOfSleep" class="form-control form-control-sm min-width-unset width-100px" value="<?= @($currentValue->hoursOfSleep) ?>">
 </div>

+ 2 - 2
resources/views/app/patient/segment-templates/_common_actions/toggle-relevance.blade.php

@@ -3,7 +3,7 @@ if(parentPopup.length) {
     <?php $rel = $point->relevanceToNote($note); ?>
     parentPopup.find('.toggle-relevance-ui').remove();
     let relUI = $('<div/>')
-        .addClass('toggle-relevance-ui border p-2 ml-4 mr-auto {{ !!$rel ? 'bg-aliceblue' : 'bg-light' }}')
+        .addClass('toggle-relevance-ui border p-2 mb-3 mr-3 mr-md-auto {{ !!$rel ? 'bg-aliceblue border-info' : 'bg-light' }}')
         .html('Relevant to visit: <b>{{ !!$rel ? 'Yes' : 'No' }}</b>');
     let toggleBtn = $('<a/>')
         .attr('href', '#')
@@ -41,5 +41,5 @@ if(parentPopup.length) {
             return false;
         })
         .appendTo(relUI);
-    relUI.insertAfter($('{{$container}}').closest('.stag-popup').find('.stag-popup-title>span').first());
+    relUI.prependTo($('{{$container}}').closest('.stag-popup').find('[visit-moe]').first());
 }

+ 3 - 3
resources/views/app/patient/segment-templates/_custom_items/edit.blade.php

@@ -21,12 +21,12 @@
             </div>
         </div>
         <div class="row custom-items-container">
-            <div class="col-4" v-for="(item, itemIndex) in customFields" v-if="!item.other">
+            <div class="col-12 col-sm-6 col-lg-4" v-for="(item, itemIndex) in customFields" v-if="!item.other">
                 <label class="d-flex align-items-start mb-1">
                     <input type="checkbox" class="mx-0 mt-1"
                            v-model="item.value">
-                    <div class="ml-2 pr-3">
-                        <div>
+                    <div class="ml-2 pr-3 d-inline-flex">
+                        <div class="d-flex">
                             <span class="mr-1 custom-item">@{{ item.label }}</span>
                             <div moe relative no-mask v-show="item.value" >
                                 <a href="#" start show>

+ 1 - 1
resources/views/app/patient/segment-templates/covid_intake/edit.blade.php

@@ -838,7 +838,7 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
 <script>
     (function() {
         function init() {
-            runMCInitializer('hide-moes');
+            $('div[moe] form:not([show])').hide();
             // if in popup (omega template), add provision to toggle relevance
             @include('app.patient.segment-templates._common_actions.toggle-relevance', ['container' => '#edit-module-covid-intake'])
         }

+ 27 - 15
resources/views/app/patient/segment-templates/history_family/edit.blade.php

@@ -82,7 +82,7 @@ if(!$contentData) {
                 <div v-if="!unknown" v-for="(item, index) in items" class="note-section-item-row">
                     <hr v-if="index > 0" class="row">
                     <div class="row mb-3">
-                        <div class="col-md-3">
+                        <div class="col-12 col-sm-6 col-md-3">
                             <label class="text-secondary text-sm mb-1 d-block">Relationship</label>
                             <select class="form-control form-control-sm min-width-unset" v-model="item.relationship" required>
                                 <option value="">-- select --</option>
@@ -122,7 +122,7 @@ if(!$contentData) {
                                 <option value="Grandson">Grandson</option>
                             </select>
                         </div>
-                        <div class="col-md-6">
+                        <div class="col-12 col-sm-6 mt-2 mt-sm-0">
                             <label class="text-secondary text-sm mb-1 d-block">Health Status</label>
                             <label class="my-0 mr-3 d-inline-flex align-items-center">
                                 <input type="radio" :name="'item_' + index + '_status'" v-model="item.status" value="Alive" class="mr-1">
@@ -137,10 +137,10 @@ if(!$contentData) {
                                 Unknown
                             </label>
                         </div>
-                        <div class="col-md-2">
-                            <label class="text-secondary text-sm mb-1 d-block">&nbsp;</label>
+                        <div class="col-md-2 mt-2 mt-md-0">
+                            <label class="text-secondary text-sm mb-1 d-none d-md-block">&nbsp;</label>
                             <div moe relative v-if="items.length > 1">
-                                <a href="#" start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
+                                <a href="#" start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i> <span class="d-inline d-md-none">Delete</span></a>
                                 <div url="/nop" right>
                                     <p>Are you sure?</p>
                                     <div class="">
@@ -151,30 +151,34 @@ if(!$contentData) {
                             </div>
                         </div>
                     </div>
-                    <div class="row mb-1 font-weight-bold">
+                    {{--<div class="row mb-1 font-weight-bold">
                         <div class="col-8">
                             General
                         </div>
                         <div class="col-4">
                             Cancer
                         </div>
-                    </div>
-                    <div class="row mb-1 font-weight-bold">
-                        <div class="col-4">
+                    </div>--}}
+                    {{--<div class="row mb-1 font-weight-bold">
+                        <div class="col-6 col-md-4">
                             <div class="rspace">+</div>
                             <div class="rspace">-</div>
                         </div>
-                        <div class="col-4">
+                        <div class="col-6 col-md-4">
                             <div class="rspace">+</div>
                             <div class="rspace">-</div>
                         </div>
-                        <div class="col-4">
+                        <div class="col-6 col-md-4">
                             <div class="rspace">+</div>
                             <div class="rspace">-</div>
                         </div>
-                    </div>
+                    </div>--}}
                     <div class="row mb-3">
-                        <div class="col-4">
+                        <div class="col-12 col-sm-6 col-md-4">
+                            <div class="d-flex">
+                                <div class="rspace">+</div>
+                                <div class="rspace">-</div>
+                            </div>
                             <div class="d-flex align-items-center">
                                 <div class="rspace"><input type="radio" value="yes" :name="'item_' + index + '_general_no_health_concern'" v-model="item.general_no_health_concern"></div>
                                 <div class="rspace"><input type="radio" value="no" :name="'item_' + index + '_general_no_health_concern'" v-model="item.general_no_health_concern"></div>
@@ -218,7 +222,11 @@ if(!$contentData) {
                                 <a href="#" v-show="item.general_diabetes" v-on:click.prevent="clearValue(item, 'general_diabetes')"><i class="text-danger on-hover-opaque fa fa-trash-alt ml-1"></i></a>
                             </div>
                         </div>
-                        <div class="col-4">
+                        <div class="col-12 col-sm-6 col-md-4">
+                            <div class="d-none d-sm-flex">
+                                <div class="rspace">+</div>
+                                <div class="rspace">-</div>
+                            </div>
                             <div class="d-flex align-items-center">
                                 <div class="rspace"><input type="radio" value="yes" :name="'item_' + index + '_general_heart_attack'" v-model="item.general_heart_attack"></div>
                                 <div class="rspace"><input type="radio" value="no" :name="'item_' + index + '_general_heart_attack'" v-model="item.general_heart_attack"></div>
@@ -262,7 +270,11 @@ if(!$contentData) {
                                 <a href="#" v-show="item.general_stroke" v-on:click.prevent="clearValue(item, 'general_stroke')"><i class="text-danger on-hover-opaque fa fa-trash-alt ml-1"></i></a>
                             </div>
                         </div>
-                        <div class="col-4">
+                        <div class="col-12 col-sm-6 col-md-4">
+                            <div class="d-none d-sm-flex">
+                                <div class="rspace">+</div>
+                                <div class="rspace">-</div>
+                            </div>
                             <div class="d-flex align-items-center">
                                 <div class="rspace"><input type="radio" value="yes" :name="'item_' + index + '_cancer_breast_ca'" v-model="item.cancer_breast_ca"></div>
                                 <div class="rspace"><input type="radio" value="no" :name="'item_' + index + '_cancer_breast_ca'" v-model="item.cancer_breast_ca"></div>

+ 2 - 2
resources/views/app/patient/segment-templates/history_family/summary.blade.php

@@ -70,10 +70,10 @@ if($contentData && !$contentData['unknown'] && !!$contentData['count']) {
         }
         ?>
         @if(count($positives))
-            <div class="pt-1"><b>Positive for</b>: {!!  implode(', ', $positives) !!}</div>
+            <div class="pt-1"><span>Positive for</span>: {!!  implode(', ', $positives) !!}</div>
         @endif
         @if(count($negatives))
-            <div class="pt-1"><b>Negative for</b>: {!!  implode(', ', $negatives) !!}</div>
+            <div class="pt-1"><span>Negative for</span>: {!!  implode(', ', $negatives) !!}</div>
         @endif
     </div>
     <?php if(isset($contentData['items'][$i]['comments']) && !empty($contentData['items'][$i]['comments'])): ?>

+ 3 - 3
resources/views/app/patient/segment-templates/history_social/edit.blade.php

@@ -79,9 +79,9 @@ for ($i = 0; $i < count($fields); $i++) {
             <input type="hidden" name="data">
 
             <div id="edit-univ_history_social-container">
-                <div class="d-flex align-items-start flex-wrap custom-items-container">
+                <div class="d-flex align-items-start flex-wrap custom-items-container row">
                     @for ($i = 0; $i < count($fields); $i++)
-                        <div class="w-25">
+                        <div class="col-12 col-sm-6 col-md-4 col-lg-3">
                             @foreach($fields[$i] as $head => $values)
                                 <div class="font-weight-bold mb-2">{{ $head }}</div>
                                 <div class="mb-3">
@@ -91,7 +91,7 @@ for ($i = 0; $i < count($fields); $i++) {
                                             <input type="checkbox" name="{{ $fName }}" class="mx-0 mt-1"
                                                    v-model="common['{{$fName}}']">
                                             <div class="ml-2">
-                                                <div>
+                                                <div class="d-flex">
                                                     <span class="mr-2 common-item">{{ $values[$k] }}</span>
                                                     <div moe relative no-mask v-show="common['{{$fName}}']" >
                                                         <a href="#" start show>

+ 2 - 2
resources/views/app/patient/segment-templates/history_social/summary.blade.php

@@ -48,7 +48,7 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
                     <div>
                         <?= ucwords($head) ?>
                         <i class="fa fa-arrow-right text-sm text-secondary"></i>
-                        <span class="font-weight-bold"><?= $values[$k] ?></span>
+                        <span class="font-weight-normal"><?= $values[$k] ?></span>
                         <?php if(@$contentData['common'][$fName . '__comments']): ?>
                             <span class="text-sm ml-1 text-secondary">(<?= $contentData['common'][$fName . '__comments'] ?>)</span>
                         <?php endif; ?>
@@ -69,7 +69,7 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
                 <div>
                     Custom
                     <i class="fa fa-arrow-right text-sm text-secondary"></i>
-                    <span class="font-weight-bold"><?= $item['label'] ?></span>
+                    <span class="font-weight-normal"><?= $item['label'] ?></span>
                     <?php if($item['comments']): ?>
                         <span class="text-sm ml-1 text-secondary">(<?= $item['comments'] ?>)</span>
                     <?php endif; ?>

+ 3 - 3
resources/views/app/patient/segment-templates/history_surgical/edit.blade.php

@@ -80,9 +80,9 @@ for ($i = 0; $i < count($fields); $i++) {
                 <div class="d-flex align-items-center mb-2">
                     <span class="font-weight-bold">Common Surgeries</span>
                 </div>
-                <div class="d-flex align-items-start flex-wrap custom-items-container">
+                <div class="d-flex align-items-start flex-wrap custom-items-container row">
                     @for ($i = 0; $i < count($fields); $i++)
-                        <div class="w-25">
+                        <div class="col-12 col-sm-6 col-md-4 col-lg-3">
                             @foreach($fields[$i] as $head => $values)
                                 <div class="font-weight-bold mb-2">{{ $head }}</div>
                                 <div class="mb-3">
@@ -92,7 +92,7 @@ for ($i = 0; $i < count($fields); $i++) {
                                             <input type="checkbox" name="{{ $fName }}" class="mx-0 mt-1"
                                                    v-model="common['{{$fName}}']">
                                             <div class="ml-2">
-                                                <div>
+                                                <div class="d-flex">
                                                     <span class="mr-2 common-item">{{ $values[$k] }}</span>
                                                     <div moe relative no-mask v-show="common['{{$fName}}']" >
                                                         <a href="#" start show>

+ 1 - 1
resources/views/app/patient/segment-templates/history_surgical/summary.blade.php

@@ -45,7 +45,7 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
                     <div>
                         <!--Common
                         <i class="fa fa-arrow-right text-sm text-secondary"></i>-->
-                        <span class="font-weight-bold"><?= $values[$k] ?></span>
+                        <span class="font-weight-normal"><?= $values[$k] ?></span>
                         <?php if(@$contentData['common'][$fName . '__comments']): ?>
                             <span class="text-sm ml-1 text-secondary">(<?= $contentData['common'][$fName . '__comments'] ?>)</span>
                         <?php endif; ?>

+ 1 - 1
resources/views/app/patient/segment-templates/omega_history_surgical/summary-dashboard.blade.php

@@ -47,7 +47,7 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
                     <div>
                         <!--Common
                         <i class="fa fa-arrow-right text-sm text-secondary"></i>-->
-                        <span class="font-weight-bold"><?= $values[$k] ?></span>
+                        <span class="font-weight-normal"><?= $values[$k] ?></span>
                         <?php if(@$contentData['common'][$fName . '__comments']): ?>
                             <span class="text-sm ml-1 text-secondary">(<?= $contentData['common'][$fName . '__comments'] ?>)</span>
                         <?php endif; ?>

+ 1 - 1
resources/views/app/patient/segment-templates/omega_history_surgical/summary.blade.php

@@ -47,7 +47,7 @@ if ($point->lastChildReview && $point->lastChildReview->data && ($rel || $point-
                     <div>
                         <!--Common
                         <i class="fa fa-arrow-right text-sm text-secondary"></i>-->
-                        <span class="font-weight-bold"><?= $values[$k] ?></span>
+                        <span class="font-weight-normal"><?= $values[$k] ?></span>
                         <?php if(@$contentData['common'][$fName . '__comments']): ?>
                             <span class="text-sm ml-1 text-secondary">(<?= $contentData['common'][$fName . '__comments'] ?>)</span>
                         <?php endif; ?>

+ 1 - 1
resources/views/app/patient/segment-templates/omega_ros/edit.blade.php

@@ -265,7 +265,7 @@ for ($i = 0; $i < count($fields); $i++) {
                                                 </span>
                                             </div>
                                             <div class="ml-2">
-                                                <div>
+                                                <div class="d-flex">
                                                     <span class="mr-2 common-item">{{ $values[$k] }}</span>
                                                     <div moe relative no-mask v-show="common['{{$fName}}']" >
                                                         <a href="#" start show>

+ 1 - 1
resources/views/app/patient/segment-templates/omega_ros/summary.blade.php

@@ -243,7 +243,7 @@ if ($point->lastChildReview && $point->lastChildReview->data && ($rel || $point-
     }
     ?>
     @if(isset($contentData['comments']) && !empty(trim($contentData['comments'])))
-        <div class="mt-2">
+        <div class="mt-1">
             <b>Comments: </b><?= $contentData['comments'] ?>
         </div>
     @endif

+ 13 - 11
resources/views/app/patient/segment-templates/omega_subjective_system/summary.blade.php

@@ -28,17 +28,19 @@ $wizardLinks = [
 
 ?>
 
-<div class="my-1 hide-if-note-signed">
-    @foreach($wizardLinks as $link)
-        @if(@$link['name'])
-            <a href="{{$link['href']}}"
-               open-in-stag-popup
-               popup-style="overflow-visible {{@$link['style']}}"
-               title="{!! @$link['title'] ?: $link['name'] !!}"
-               mc-initer="{{ @$link['initer']  }}"
-               class="mr-2 d-inline-block text-nowrap font-underline">{!! $link['name'] !!}</a>
-        @endif
-    @endforeach
+<div class="hide-if-note-signed">
+    <div class="d-none d-md-block my-1">
+        @foreach($wizardLinks as $link)
+            @if(@$link['name'])
+                <a href="{{$link['href']}}"
+                   open-in-stag-popup
+                   popup-style="overflow-visible {{@$link['style']}}"
+                   title="{!! @$link['title'] ?: $link['name'] !!}"
+                   mc-initer="{{ @$link['initer']  }}"
+                   class="mr-2 d-inline-block text-nowrap font-underline">{!! $link['name'] !!}</a>
+            @endif
+        @endforeach
+    </div>
 </div>
 
 <div class="system_segment">

+ 3 - 3
resources/views/app/patient/segment-templates/past_medical_history/edit.blade.php

@@ -110,9 +110,9 @@ for ($i = 0; $i < count($fields); $i++) {
                         </select>
                     </div>
                 </div>
-                <div class="d-flex align-items-start flex-wrap custom-items-container">
+                <div class="row custom-items-container">
                     @for ($i = 0; $i < count($fields); $i++)
-                        <div class="w-25">
+                        <div class="col-12 col-sm-6 col-md-4 col-lg-3">
                             @foreach($fields[$i] as $head => $values)
                                 <div class="font-weight-bold mb-2">{{ $head }}</div>
                                 <div class="mb-3">
@@ -122,7 +122,7 @@ for ($i = 0; $i < count($fields); $i++) {
                                             <input type="checkbox" name="{{ $fName }}" class="mx-0 mt-1"
                                                    v-model="common['{{$fName}}']">
                                             <div class="ml-2">
-                                                <div>
+                                                <div class="d-flex">
                                                     <span class="mr-2 common-item">{{ $values[$k] }}</span>
                                                     <div moe relative no-mask v-show="common['{{$fName}}']" >
                                                         <a href="#" start show>

+ 1 - 1
resources/views/app/patient/segment-templates/past_medical_history/summary.blade.php

@@ -83,7 +83,7 @@ if ($contentData) {
                     <div>
                         <?= ucwords($head) ?>
                         <i class="fa fa-arrow-right text-sm text-secondary"></i>
-                        <span class="font-weight-bold"><?= $values[$k] ?></span>
+                        <span class="font-weight-normal"><?= $values[$k] ?></span>
                         <?php if(@$contentData['common'][$fName . '__comments']): ?>
                             <span class="text-sm ml-1 text-secondary">(<?= $contentData['common'][$fName . '__comments'] ?>)</span>
                         <?php endif; ?>

+ 1 - 1
resources/views/app/patient/segment-templates/sigma_history_surgical/summary.blade.php

@@ -47,7 +47,7 @@ if ($point->lastChildReview && $point->lastChildReview->data && ($rel || $point-
                     <div>
                         <!--Common
                         <i class="fa fa-arrow-right text-sm text-secondary"></i>-->
-                        <span class="font-weight-bold"><?= $values[$k] ?></span>
+                        <span class="font-weight-normal"><?= $values[$k] ?></span>
                         <?php if(@$contentData['common'][$fName . '__comments']): ?>
                             <span class="text-sm ml-1 text-secondary">(<?= $contentData['common'][$fName . '__comments'] ?>)</span>
                         <?php endif; ?>