Merge remote-tracking branch 'origin/cleanup-forms-fix' into cleanup-forms-fix

config/stag.php

@@ -81,6 +81,9 @@ return [
             'nutrition-center' => ['omega_subjective_system', 'omega_plan_system'],
             'exercise-center' => ['omega_subjective_system', 'omega_plan_system'],
             'behavior-center' => ['omega_subjective_system', 'omega_plan_system'],
+            'sleep_health_intake/edit' => ['omega_subjective_system', 'omega_plan_system'],
+            'lifestyle_social/edit' => ['omega_subjective_system', 'omega_plan_system'],
+            'lifestyle_nutrition/edit' => ['omega_subjective_system', 'omega_plan_system'],
         ],
     ]
 ];

resources/views/app/patient/module-specific-summary-renderers/allergy/subjective.blade.php

@@ -1,6 +1,6 @@
 @if($points && count($points))
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px "
+        <a class="mr-2 width-150px "
            open-in-stag-popup
            href="/allergies-center/{{$note->client->uid}}/{{$note->uid}}"
            mc-initer="allergies-center-{{$note->id}}"

resources/views/app/patient/module-specific-summary-renderers/behavior/subjective.blade.php

@@ -1,6 +1,6 @@
 @if($points && count($points))
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px hide-if-note-signed"
+        <a class="mr-2 width-150px hide-if-note-signed"
            open-in-stag-popup
            href="/behavior-center/{{$note->client->uid}}/{{$note->uid}}"
            mc-initer="behavior-center-{{$note->id}}"

resources/views/app/patient/module-specific-summary-renderers/care_team_member/subjective.blade.php

@@ -1,6 +1,6 @@
 @if($points && count($points))
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px "
+        <a class="mr-2 width-150px "
            open-in-stag-popup
            href="/careteam-center/{{$note->client->uid}}/{{$note->uid}}"
            mc-initer="careteam-center-{{$note->id}}"

resources/views/app/patient/module-specific-summary-renderers/data-dump.blade.php

@@ -2,14 +2,26 @@
 if ($point->lastChildReview && $point->lastChildReview->data) {
     $point->lastChildReview->data = json_decode($point->lastChildReview->data, true);
     $contentData = $point->lastChildReview->data;
+    $y = 1;
     foreach ($contentData as $k => $v) {
         if((!!$v) && (!@$keysToSkip || !in_array($k, $keysToSkip))) {
             ?>
-            <div class="d-flex align-items-baseline">
-                <span class="text-secondary mr-2">{{sanitize_state_name($k)}}:</span>
-                <span>{{is_array($v) ? implode(", ", $v) : $v}}</span>
-            </div>
+            <tr>
+                <td class="pr-2 pl-0 width-40px">
+                  {{$y}}.
+                </td>
+                <td class="px-2 grow-till-300px">
+                    {{sanitize_state_name($k)}}
+                </td>
+                <td class="width-300px">
+                    <div class="pl-2">
+                        {{is_array($v) ? implode(", ", $v) : $v}}
+                    </div>
+                </td>
+                <td></td>
+            </tr>
             <?php
+        $y++;
         }
     }
 }

resources/views/app/patient/module-specific-summary-renderers/exercise/subjective.blade.php

@@ -1,6 +1,6 @@
 @if($points && count($points))
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px hide-if-note-signed"
+        <a class="mr-2 width-150px hide-if-note-signed"
            open-in-stag-popup
            href="/exercise-center/{{$note->client->uid}}/{{$note->uid}}"
            mc-initer="exercise-center-{{$note->id}}"
@@ -46,4 +46,4 @@
 
         </div>
     </div>
-@endif
+@endif

resources/views/app/patient/module-specific-summary-renderers/goal/subjective.blade.php

@@ -1,6 +1,6 @@
 @if($points && count($points))
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px "
+        <a class="mr-2 width-150px "
            open-in-stag-popup
            href="/goals-center/{{$note->client->uid}}/{{$note->uid}}"
            mc-initer="goals-center-{{$note->id}}"

resources/views/app/patient/module-specific-summary-renderers/history_family/subjective.blade.php

@@ -13,7 +13,7 @@ use App\Models\Segment;
 @if($points && count($points))
 
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px "
+        <a class="mr-2 width-150px "
            open-in-stag-popup
            href="/note-segment-view-by-name/{{$note->uid}}/history_family/edit",
            mc-initer="edit-univ_history_family-container-{{$note->id}}"

resources/views/app/patient/module-specific-summary-renderers/history_social/subjective.blade.php

@@ -13,7 +13,7 @@ use App\Models\Segment;
 @if($points && count($points))
 
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px "
+        <a class="mr-2 width-150px "
            open-in-stag-popup
            href="/note-segment-view-by-name/{{$note->uid}}/history_social/edit",
            mc-initer="edit-univ_history_social-container-{{$note->id}}"

resources/views/app/patient/module-specific-summary-renderers/history_surgical/subjective.blade.php

@@ -13,7 +13,7 @@ use App\Models\Segment;
 @if($points && count($points))
 
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px hide-if-note-signed"
+        <a class="mr-2 width-150px hide-if-note-signed"
            open-in-stag-popup
            href="/note-segment-view-by-name/{{$note->uid}}/history_surgical/edit",
            mc-initer="edit-univ_history_surgical-container-{{$note->id}}"

resources/views/app/patient/module-specific-summary-renderers/lifestyle_general/subjective.blade.php

@@ -2,7 +2,7 @@
 @if($points && count($points))
 
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px "
+        <a class="mr-2 width-150px "
            open-in-stag-popup
            href="/module-view/{{$note->uid}}/lifestyle_general/edit"
            mc-initer="edit-univ_sub_lifestyle_general-container-{{$note->id}}"
@@ -11,14 +11,10 @@
             Lifestyle General
         </a>
         <div class="flex-grow-1">
-            <table class="table table-bordered table-xs mb-0">
+            <table class="table table-bordered table-xs table-cage mb-0">
                 <?php for( $j = 0; $j < count($points); $j++): ?>
                     <?php $point = $points[$j]; ?>
-                    <tr>
-                        <td>
-                           @include('app.patient.module-specific-summary-renderers.data-dump', compact('point'))
-                        </td>
-                    </tr>
+                    @include('app.patient.module-specific-summary-renderers.data-dump', compact('point'))
                 <?php endfor; ?>
             </table>
         </div>

resources/views/app/patient/module-specific-summary-renderers/lifestyle_nutrition/subjective.blade.php

@@ -1,6 +1,6 @@
 @if($points && count($points))
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px "
+        <a class="mr-2 width-150px "
            open-in-stag-popup
            href="/module-view/{{$note->uid}}/lifestyle_nutrition/edit"
            mc-initer="edit-univ_sub_nutrition_assessment-container-{{$note->id}}"
@@ -9,7 +9,7 @@
             Lifestyle Nutrition
         </a>
         <div class="flex-grow-1">
-            <table class="table table-bordered table-xs mb-0">
+            <table class="table table-bordered table-xs table-cage mb-0">
                 <?php $j = 0; foreach ($points as $point): $j++; ?>
                     <tr>
                         <td>

resources/views/app/patient/module-specific-summary-renderers/lifestyle_physical_activity/subjective.blade.php

@@ -1,6 +1,6 @@
 @if($points && count($points))
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px hide-if-note-signed"
+        <a class="mr-2 width-150px hide-if-note-signed"
            open-in-stag-popup
            href="/module-view/{{$note->uid}}/lifestyle_physical_activity/edit"
            mc-initer="edit-univ_sub_physical_activity_assessment-container-{{$note->id}}"
@@ -12,7 +12,7 @@
             Lifestyle Physical Activity
         </span>
         <div class="flex-grow-1">
-            <table class="table table-bordered table-xs  mb-0">
+            <table class="table table-bordered table-xs table-cage mb-0">
                 <?php $j = 0; foreach ($points as $point): $j++; ?>
                     <tr>
                         <td>

resources/views/app/patient/module-specific-summary-renderers/lifestyle_sleep/subjective.blade.php

@@ -1,6 +1,6 @@
 @if($points && count($points))
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px hide-if-note-signed"
+        <a class="mr-2 width-150px hide-if-note-signed"
            open-in-stag-popup
            href="/module-view/{{$note->uid}}/lifestyle_sleep/edit"
            mc-initer="edit-univ_sub_sleep_assessment-container-{{$note->id}}"
@@ -12,7 +12,7 @@
             Lifestyle Sleep
         </span>
         <div class="flex-grow-1">
-            <table class="table table-bordered table-xs  mb-0">
+            <table class="table table-bordered table-xs table-cage mb-0">
                 <?php $j = 0; foreach ($points as $point): $j++; ?>
                     <tr>
                         <td>

resources/views/app/patient/module-specific-summary-renderers/lifestyle_social_relationships/subjective.blade.php

@@ -1,6 +1,6 @@
 @if($points && count($points))
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px hide-if-note-signed"
+        <a class="mr-2 width-150px hide-if-note-signed"
            open-in-stag-popup
            href="/module-view/{{$note->uid}}/lifestyle_social/edit"
            mc-initer="edit-univ_sub_social_relationships_assessment-container-{{$note->id}}"
@@ -12,7 +12,7 @@
             Lifestyle Social
         </span>
         <div class="flex-grow-1">
-            <table class="table table-bordered table-xs  mb-0">
+            <table class="table table-bordered table-xs table-cage mb-0">
                 <?php $j = 0; foreach ($points as $point): $j++; ?>
                     <tr>
                         <td>

resources/views/app/patient/module-specific-summary-renderers/lifestyle_stress/subjective.blade.php

@@ -1,6 +1,6 @@
 @if($points && count($points))
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px hide-if-note-signed"
+        <a class="mr-2 width-150px hide-if-note-signed"
            open-in-stag-popup
            href="/module-view/{{$note->uid}}/lifestyle_stress/edit"
            mc-initer="edit-univ_sub_stress_assessment-container-{{$note->id}}"
@@ -12,7 +12,7 @@
             Lifestyle Stress
         </span>
         <div class="flex-grow-1">
-            <table class="table table-bordered table-xs  mb-0">
+            <table class="table table-bordered table-xs table-cage mb-0">
                 <?php $j = 0; foreach ($points as $point): $j++; ?>
                     <tr>
                         <td>

resources/views/app/patient/module-specific-summary-renderers/lifestyle_substance_use/subjective.blade.php

@@ -1,6 +1,6 @@
 @if($points && count($points))
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px hide-if-note-signed"
+        <a class="mr-2 width-150px hide-if-note-signed"
            open-in-stag-popup
            href="/module-view/{{$note->uid}}/lifestyle_substances/edit"
            mc-initer="edit-univ_sub_substance_use_assessment-container-{{$note->id}}"
@@ -12,7 +12,7 @@
             Lifestyle Substances
         </span>
         <div class="flex-grow-1">
-            <table class="table table-bordered table-xs  mb-0">
+            <table class="table table-bordered table-xs table-cage mb-0">
                 <?php $j = 0; foreach ($points as $point): $j++; ?>
                     <tr>
                         <td>

resources/views/app/patient/module-specific-summary-renderers/medication/subjective.blade.php

@@ -1,6 +1,6 @@
 @if($points && count($points))
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px "
+        <a class="mr-2 width-150px "
            open-in-stag-popup
            href="/medications-center/{{$note->client->uid}}/{{$note->uid}}"
            mc-initer="medications-center-{{$note->id}}"

resources/views/app/patient/module-specific-summary-renderers/nutrition/subjective.blade.php

@@ -1,6 +1,6 @@
 @if($points && count($points))
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px hide-if-note-signed"
+        <a class="mr-2 width-150px hide-if-note-signed"
            open-in-stag-popup
            href="/nutrition-center/{{$note->client->uid}}/{{$note->uid}}"
            mc-initer="nutrition-center-{{$note->id}}"

resources/views/app/patient/module-specific-summary-renderers/past_medical_history/subjective.blade.php

@@ -13,7 +13,7 @@ use App\Models\Segment;
 @if($points && count($points))
 
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px hide-if-note-signed"
+        <a class="mr-2 width-150px hide-if-note-signed"
            open-in-stag-popup
            href="/note-segment-view-by-name/{{$note->uid}}/past_medical_history/edit",
            mc-initer="edit-univ_history_past_medical-container-{{$note->id}}"

resources/views/app/patient/module-specific-summary-renderers/problem/plan.blade.php

@@ -1,6 +1,6 @@
 @if($points && count($points))
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px hide-if-note-signed"
+        <a class="mr-2 width-150px hide-if-note-signed"
            open-in-stag-popup
            href="/problems-center/{{$note->client->uid}}/{{$note->uid}}"
            mc-initer="problems-center-{{$note->id}}"

resources/views/app/patient/module-specific-summary-renderers/problem/subjective.blade.php

@@ -1,6 +1,6 @@
 @if($points && count($points))
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px "
+        <a class="mr-2 width-150px "
            open-in-stag-popup
            href="/problems-center/{{$note->client->uid}}/{{$note->uid}}"
            mc-initer="problems-center-{{$note->id}}"

resources/views/app/patient/module-specific-summary-renderers/ros/subjective.blade.php

@@ -13,7 +13,7 @@ use App\Models\Segment;
 @if($points && count($points))
 
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px hide-if-note-signed"
+        <a class="mr-2 width-150px hide-if-note-signed"
            open-in-stag-popup
            href="/note-segment-view-by-name/{{$note->uid}}/omega_ros/edit",
            mc-initer="init-ros-{{$note->id}}"

resources/views/app/patient/module-specific-summary-renderers/sleep_health_intake/subjective.blade.php

@@ -25,7 +25,7 @@
     ?>
 @if($output && !!trim(strip_tags($output)))
 <div class="d-flex border-bottom">
-    <a class="mr-2 min-width-110px hide-if-note-signed"
+    <a class="mr-2 width-150px hide-if-note-signed"
       open-in-stag-popup
       href="/module-view/{{$note->uid}}/sleep_health_intake/edit"
       mc-initer="edit-sleep_health_intake-container-{{$note->id}}"

resources/views/app/patient/module-specific-summary-renderers/weight_loss_intake/plan.blade.php

@@ -98,7 +98,7 @@
     ?>
     @if($output && !!trim(strip_tags($output)))
     <div class="d-flex border-bottom">
-        <a class="mr-2 min-width-110px hide-if-note-signed"
+        <a class="mr-2 width-150px hide-if-note-signed"
             open-in-stag-popup
            href="/module-view/{{$note->uid}}/weight_loss_intake/edit"
            mc-initer="edit-weight_loss_intake-container-{{$note->id}}"

resources/views/app/patient/module-specific-summary-renderers/weight_loss_intake/subjective.blade.php

@@ -22,7 +22,7 @@
     ?>
     @if($output && !!trim(strip_tags($output)))
         <div class="d-flex border-bottom">
-            <a class="mr-2 min-width-110px hide-if-note-signed"
+            <a class="mr-2 width-150px hide-if-note-signed"
                open-in-stag-popup
                href="/module-view/{{$note->uid}}/weight_loss_intake/edit"
                mc-initer="edit-weight_loss_intake-container-{{$note->id}}"

resources/views/app/patient/note/dashboard.blade.php

@@ -492,19 +492,19 @@ use App\Models\Handout;
                     "initer" => "behavior-center-{$note->id}"
                 ],
                 [], // for separator
-                [
-                    "name" => 'COVID-19 Intake',
-                    "title" => 'COVID-19 Intake',
-                    "href" => "/note-segment-view-by-name/{$note->uid}/covid_intake/edit",
-                    "initer" => "edit-module-covid-intake-{$note->id}"
-                ],
-                [
-                    "name" => 'COVID-19 Follow-up',
-                    "title" => 'COVID-19 Follow-up',
-                    "href" => "/note-segment-view-by-name/{$note->uid}/covid_follow-up/edit",
-                    "initer" => "covid-follow-up-{$note->id}"
-                ],
-                [], // for separator
+                // [
+                //     "name" => 'COVID-19 Intake',
+                //     "title" => 'COVID-19 Intake',
+                //     "href" => "/note-segment-view-by-name/{$note->uid}/covid_intake/edit",
+                //     "initer" => "edit-module-covid-intake-{$note->id}"
+                // ],
+                // [
+                //     "name" => 'COVID-19 Follow-up',
+                //     "title" => 'COVID-19 Follow-up',
+                //     "href" => "/note-segment-view-by-name/{$note->uid}/covid_follow-up/edit",
+                //     "initer" => "covid-follow-up-{$note->id}"
+                // ],
+                //[], // for separator
                 [
                     "name" => 'Lifestyle General',
                     "title" => 'Lifestyle General',

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

@@ -29,7 +29,7 @@ foreach ($points as $point) {
 
 {{--@if($allergies && count($allergies))
     <div class="d-flex mb-1">
-        <a class="mr-2 min-width-110px "
+        <a class="mr-2 width-150px "
            open-in-stag-popup
            href="/allergies-center/{{$note->client->uid}}/{{$note->uid}}"
            mc-initer="allergies-center-{{$note->id}}"
@@ -45,7 +45,7 @@ foreach ($points as $point) {
 
 @if($problems && count($problems))
     <div class="d-flex mb-1">
-        <a class="mr-2 min-width-110px "
+        <a class="mr-2 width-150px "
            open-in-stag-popup
            href="/problems-center/{{$note->client->uid}}/{{$note->uid}}"
            mc-initer="problems-center-{{$note->id}}"

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

@@ -28,7 +28,7 @@ foreach ($points as $point) {
 
 {{--@if($allergies && count($allergies))
     <div class="d-flex mb-1">
-        <a class="mr-2 min-width-110px "
+        <a class="mr-2 width-150px "
            open-in-stag-popup
            href="/allergies-center/{{$note->client->uid}}/{{$note->uid}}"
            mc-initer="allergies-center-{{$note->id}}"
@@ -44,7 +44,7 @@ foreach ($points as $point) {
 
 @if($problems && count($problems))
     <div class="d-flex mb-1">
-        <a class="mr-2 min-width-110px "
+        <a class="mr-2 width-150px "
            open-in-stag-popup
            href="/problems-center/{{$note->client->uid}}/{{$note->uid}}"
            mc-initer="problems-center-{{$note->id}}"