live style changes

public/css/style.css

@@ -2470,4 +2470,33 @@ td.row-selection-highlight:after {
 }
 .icon-nutrition-rx-row-sm {
     max-height: 14px;
-}
+}
+
+.table td.fit, 
+.table th.fit {
+    white-space: nowrap;
+    width: 1%;
+}
+
+table.table-cage {
+    border: 0px;
+}
+
+table.table-cage tr:first-child td {
+	border-top: 0px;
+}
+
+table.table-cage tr:last-child td {
+	border-bottom: 0px;
+}
+
+table.table-cage tr td:first-child {
+	border-left: 0px;
+}
+
+table.table-cage tr td:last-child {
+	border-right: 0px;
+}
+table.table-xs tr td {
+	padding: 0.15rem;
+}

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

@@ -0,0 +1,185 @@
+<?php $iName = $segment->segmentTemplate->internal_name; ?>
+<div class="p-3 border-bottom note-section visit-segment {{$note->is_signed_by_hcp ? '' : 'edit-trigger'}} {{strpos($iName, 'lifestyle_') === 0 && $iName !== 'lifestyle_general' ? 'zero-height' : ''}}"
+     data-segment-uid="{{ $segment->uid }}"
+     data-segment-template-uid="{{ $segment->segmentTemplate->uid }}"
+     data-segment-template-name="{{ $segment->segmentTemplate->internal_name }}">
+
+    <?php $isLSSegment = strpos($iName, 'lifestyle_') === 0; ?>
+
+    <div class="d-flex align-items-baseline">
+
+        <!-- show hierarchy -->
+        {{--@if($segment->heading)
+            <span class="text-secondary">{{$segment->heading}}</span>
+            <i class="text-secondary text-sm fa fa-arrow-right mx-2"></i>
+        @endif
+        @if($segment->subheading)
+            <span class="text-secondary">{{$segment->subheading}}</span>
+            <i class="text-secondary text-sm fa fa-arrow-right mx-2"></i>
+        @endif--}}
+
+    <!-- title -->
+
+        @if($iName === 'medrisk_vigilence')
+            <div class="font-weight-bold text-center flex-grow-1">
+                <div class="on-hover-hide font-weight-normal text-info font-weight-bold text-center pt-2 font-size-11">MRV</div>
+                <span class="on-hover-only text-left">MedRisk Vigilence</span>
+            </div>
+        @else
+            <span class="font-weight-bold d-flex align-items-center {{$isLSSegment || $iName === 'medrisk_vigilence' ? '' : 'mb-2'}}">
+                @if($isLSSegment && $iName === 'lifestyle_general')
+                    Lifestyle
+                @else
+                    {{$segment->display_title}}
+                @endif
+
+                @if($segment->heading && $iName !== 'medrisk_vigilence')
+                    <span class="text-secondary ml-2 text-sm font-weight-normal">({{$segment->heading}})</span>
+                @endif
+            </span>
+        @endif
+
+        @if($isLSSegment)
+            @if($iName === 'lifestyle_general')
+                <a href="#" class="ls-segment-trigger ml-2" data-target="lifestyle_general">General</a>
+                <span class="mx-2 text-secondary text-sm">|</span>
+                <a href="#" class="ls-segment-trigger" data-target="lifestyle_nutrition">Nutrition</a>
+                <span class="mx-2 text-secondary text-sm">|</span>
+                <a href="#" class="ls-segment-trigger" data-target="lifestyle_physical_activity">Physical Act.</a>
+                <span class="mx-2 text-secondary text-sm">|</span>
+                <a href="#" class="ls-segment-trigger" data-target="lifestyle_sleep">Sleep</a>
+                <span class="mx-2 text-secondary text-sm">|</span>
+                <a href="#" class="ls-segment-trigger" data-target="lifestyle_social">Social Relns.</a>
+                <span class="mx-2 text-secondary text-sm">|</span>
+                <a href="#" class="ls-segment-trigger" data-target="lifestyle_substances">Subst. Use</a>
+                <span class="mx-2 text-secondary text-sm">|</span>
+                <a href="#" class="ls-segment-trigger" data-target="lifestyle_stress">Stress</a>
+            @else
+                <span class="text-info ml-auto font-weight-normal">(click to view)</span>
+            @endif
+        @endif
+
+        @if(!$note->is_signed_by_hcp && !$isLSSegment)
+            <a class="edit-trigger d-none if-edit c-pointer ml-3">
+                <i class="fas fa-caret-up font-size-16"></i>
+            </a>
+
+            <!-- refresh -->
+            <a class="ml-3 font-weight-normal refresh-segment c-pointer {{$iName === 'medrisk_vigilence' ? 'on-hover-only' : ''}}"
+               data-segment-uid="{{$segment->uid}}"
+               title="Update with latest patient data">
+                <i class="fa fa-sync"></i>
+            </a>
+
+            <!-- if intake - link to plan segment-->
+            <?php
+            $isIntake = strpos($iName, 'intake_') === 0;
+            ?>
+            @if($isIntake)
+                <?php
+                $targetSegment = 'plan_' . substr($iName, 7);
+                ?>
+                <a class="segment-trigger ml-3"
+                   href="#"
+                   data-target="{{$targetSegment}}">
+                    Changes During this Visit (Plan)
+                </a>
+            @endif
+
+            <!-- if plan - link to intake segment-->
+            <?php
+            $isPlan = strpos($iName, 'plan_') === 0 && $iName !== 'plan_free_text';
+            ?>
+            @if($isPlan)
+                <?php
+                $targetSegment = 'intake_' . substr($iName, 5);
+                ?>
+                <a class="segment-trigger ml-3"
+                   href="#"
+                   data-target="{{$targetSegment}}">
+                    Back to Intake (Subjective)
+                </a>
+            @endif
+
+            @include('app/patient/note/_templates-v2-index', ['sectionInternalName' => $segment->segmentTemplate->internal_name])
+
+        @endif
+
+    </div>
+
+    <?php if(!$isLSSegment): ?>
+
+    <div class="d-none if-not-edit inset-comment summary-container {{$iName === 'medrisk_vigilence' ? 'px-0' : ''}}">
+        {!! $segment->summary_html !!}
+    </div>
+
+    <?php
+    $wizardPowered = [
+        'intake_medications',
+        'plan_medications',
+        'intake_problems',
+        'plan_problems',
+        'intake_goals',
+        'plan_goals',
+        'intake_allergies',
+        'plan_allergies',
+        'intake_care_team',
+        'plan_care_team',
+        'intake_supplements',
+        'plan_supplements',
+    ];
+    if(!in_array($iName, $wizardPowered)) { ?>
+    <div class="d-none if-edit edit-container">
+        {!! $segment->edit_html !!}
+    </div>
+    <?php } ?>
+
+    <?php endif ?>
+
+    <!-- popup hack for LS segments -->
+    <?php if($isLSSegment): ?>
+    <div class="stag-popup stag-popup-md"
+         stag-popup-key="segment-popup-<?= $segment->segmentTemplate->internal_name ?>">
+        <div class="stag-popup-content">
+            <h3 class="stag-popup-title m-neg-3 px-3 mt-0 pb-3 border-bottom mb-3 pt-1">
+                <span class="d-inline-flex align-items-center">
+                    @if($segment->subheading)
+                        {{$segment->subheading}}
+                        <i class="text-secondary text-sm fa fa-arrow-right mx-2"></i>
+                    @endif
+                    {{$segment->display_title}}
+                </span>
+                <a href="#" class="ml-auto text-secondary" onclick="event.stopPropagation(); return closeStagPopup()">
+                    <i class="fa fa-times-circle"></i>
+                </a>
+            </h3>
+            <div class="ls-segment-edit-html">
+                {!! $segment->edit_html !!}
+            </div>
+        </div>
+    </div>
+    <?php endif ?>
+
+    {{-- popup trigger --}}
+    {{--
+    <div class="d-none">
+        <a native="" target="_blank"
+           class="c-pointer d-inline-flex align-items-center ml-3 text-decoration-none <?= $segment->segmentTemplate->internal_name ?>-trigger"
+           open-in-stag-popup="" update-parent=""
+           mc-initer="<?= $segment->segmentTemplate->internal_name ?>_{{$patient->id}}"
+           title="{{$segment->subheading ? $segment->subheading . ' / ' : ''}}{{$segment->display_title}}"
+           popup-style="wide overflow-visible"
+           href="/note-segment-view/{{$patient->uid}}/{{$note->uid}}/{{$segment->uid}}/<?= $segment->segmentTemplate->internal_name ?>/edit">
+            <i class="fa fa-bolt mr-1"></i>
+            <span>Manage</span>
+        </a>
+        <script>
+        addMCInitializer('<?= $segment->segmentTemplate->internal_name ?>_{{$patient->id}}', function() {
+            window.segmentInitializers['<?= $segment->segmentTemplate->internal_name ?>'].call(window);
+        }, '.<?= $segment->segmentTemplate->internal_name ?>-trigger');
+        </script>
+    </div>
+    --}}
+
+</div>
+

resources/views/app/patient/note/_PREVIOUS_note-segment-list.blade.php

@@ -0,0 +1,45 @@
+<div class="segments-list" id="note-segments-list">
+
+    <?php
+    $previousHeading = null;
+    $previousSubHeading = null;
+    ?>
+    @foreach($note->segments as $segment)
+        <?php
+//        if ($segment->subheading !== $previousSubHeading) {
+//            if (!empty($previousSubHeading)) {
+//                echo '</div></div>'; // <!-- end the previous parent section -->
+//            }
+//            if (!empty($segment->subheading)) {
+//                echo '<div class="note-content-node note-content-heading">' .
+//                    '<a class="c-pointer">' . $segment->subheading . '</a>' .
+//                    '<div class="note-content-children">'; // <!-- open new node -->
+//            }
+//            $previousSubHeading = $segment->subheading;
+//        }
+        if ($segment->heading !== $previousHeading) {
+            if (!empty($previousHeading)) {
+                echo '</div></div>'; // <!-- end the previous parent section -->
+            }
+            if (!empty($segment->heading)) {
+                echo '<div class="note-content-node note-content-heading">' .
+                    '<div class="py-2 px-3 border-bottom font-size-16 font-weight-bold bg-light text-secondary ' . ($previousHeading ? 'mt-4 border-top' : '') . '">' . $segment->heading . '</div>' .
+                    '<div class="note-content-children ml-5 border-left">'; // <!-- open new node -->
+            }
+            $previousHeading = $segment->heading;
+        }
+        ?>
+        <div class="{{$segment->segmentTemplate->internal_name === 'medrisk_vigilence' ? 'd-none' : ''}}">
+            @include('app.patient.note.segment')
+        </div>
+    @endforeach
+    <?php
+//    if (!empty($previousSubHeading)) {
+//        echo '</div></div>'; // <!-- close any open parent section -->
+//    }
+    if (!empty($previousHeading)) {
+        echo '</div></div>'; // <!-- close any open parent section -->
+    }
+    ?>
+</div>
+@include('app.patient.note.segment_script')

resources/views/app/patient/note/note-segment-list.blade.php

@@ -1,31 +1,25 @@
 <div class="segments-list" id="note-segments-list">
-
     <?php
     $previousHeading = null;
     $previousSubHeading = null;
     ?>
     @foreach($note->segments as $segment)
         <?php
-//        if ($segment->subheading !== $previousSubHeading) {
-//            if (!empty($previousSubHeading)) {
-//                echo '</div></div>'; // <!-- end the previous parent section -->
-//            }
-//            if (!empty($segment->subheading)) {
-//                echo '<div class="note-content-node note-content-heading">' .
-//                    '<a class="c-pointer">' . $segment->subheading . '</a>' .
-//                    '<div class="note-content-children">'; // <!-- open new node -->
-//            }
-//            $previousSubHeading = $segment->subheading;
-//        }
         if ($segment->heading !== $previousHeading) {
             if (!empty($previousHeading)) {
                 echo '</div></div>'; // <!-- end the previous parent section -->
             }
             if (!empty($segment->heading)) {
-                echo '<div class="note-content-node note-content-heading">' .
-                    '<div class="py-2 px-3 border-bottom font-size-16 font-weight-bold bg-light text-secondary ' . ($previousHeading ? 'mt-4 border-top' : '') . '">' . $segment->heading . '</div>' .
-                    '<div class="note-content-children ml-5 border-left">'; // <!-- open new node -->
-            }
+
+	?>
+	<div class="note-content-node note-content-heading">
+		<div class="py-2 px-3 border-bottom font-size-16 font-weight-bold bg-light text-secondary {{ $previousHeading ? 'mt-4 border-top' : '' }}">
+			{{ $segment->heading }}
+		</div>
+		<div class="note-content-children ml-5 border-left">
+			<!-- open new node -->
+        <?php
+	    }
             $previousHeading = $segment->heading;
         }
         ?>
@@ -34,12 +28,9 @@
         </div>
     @endforeach
     <?php
-//    if (!empty($previousSubHeading)) {
-//        echo '</div></div>'; // <!-- close any open parent section -->
-//    }
     if (!empty($previousHeading)) {
         echo '</div></div>'; // <!-- close any open parent section -->
     }
     ?>
 </div>
-@include('app.patient.note.segment_script')
+@include('app.patient.note.segment_script')

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

@@ -1,22 +1,12 @@
 <?php $iName = $segment->segmentTemplate->internal_name; ?>
-<div class="p-3 border-bottom note-section visit-segment {{$note->is_signed_by_hcp ? '' : 'edit-trigger'}} {{strpos($iName, 'lifestyle_') === 0 && $iName !== 'lifestyle_general' ? 'zero-height' : ''}}"
+<?php $isLSSegment = strpos($iName, 'lifestyle_') === 0; ?>
+
+<div class="border-bottom note-section visit-segment {{$note->is_signed_by_hcp ? '' : 'edit-trigger'}} {{strpos($iName, 'lifestyle_') === 0 && $iName !== 'lifestyle_general' ? 'zero-height' : ''}}"
      data-segment-uid="{{ $segment->uid }}"
      data-segment-template-uid="{{ $segment->segmentTemplate->uid }}"
      data-segment-template-name="{{ $segment->segmentTemplate->internal_name }}">
 
-    <?php $isLSSegment = strpos($iName, 'lifestyle_') === 0; ?>
-
-    <div class="d-flex align-items-baseline">
-
-        <!-- show hierarchy -->
-        {{--@if($segment->heading)
-            <span class="text-secondary">{{$segment->heading}}</span>
-            <i class="text-secondary text-sm fa fa-arrow-right mx-2"></i>
-        @endif
-        @if($segment->subheading)
-            <span class="text-secondary">{{$segment->subheading}}</span>
-            <i class="text-secondary text-sm fa fa-arrow-right mx-2"></i>
-        @endif--}}
+    <div class="d-flex align-items-baseline bg-light text-secondary p-2" style="border-bottom: 1px solid #dee2e6;">
 
     <!-- title -->
 
@@ -26,7 +16,7 @@
                 <span class="on-hover-only text-left">MedRisk Vigilence</span>
             </div>
         @else
-            <span class="font-weight-bold d-flex align-items-center {{$isLSSegment || $iName === 'medrisk_vigilence' ? '' : 'mb-2'}}">
+            <span class="font-weight-bold d-flex align-items-center {{$isLSSegment || $iName === 'medrisk_vigilence' ? '' : 'xxxmb-2'}}" style="font-size: 14px;">
                 @if($isLSSegment && $iName === 'lifestyle_general')
                     Lifestyle
                 @else
@@ -109,7 +99,7 @@
 
     <?php if(!$isLSSegment): ?>
 
-    <div class="d-none if-not-edit inset-comment summary-container {{$iName === 'medrisk_vigilence' ? 'px-0' : ''}}">
+    <div class="d-none if-not-edit inset-comment summary-container {{$iName === 'medrisk_vigilence' ? 'px-0' : 'p-2 pl-4'}}">
         {!! $segment->summary_html !!}
     </div>
 

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

@@ -33,7 +33,11 @@ $points = [
     <div class="point-table-container">
 
         <table class="table table-sm table-bordered mb-0 bg-white mb-2 point-table">
-
+		<tr class="point-row">
+			<td></td>
+			<td>Subjective</td>
+			<td>Plan</td>
+		</tr>
             @foreach($points as $p)
                 <?php $point = $p['point']; ?>
                 <tr class="point-row" data-uid="{{$point ? $point->uid : ''}}">
@@ -123,4 +127,4 @@ $points = [
         }
         addMCInitializer('nutrition-center-{{$note->id}}', init, '#nutrition-center-{{$note->id}}');
     }).call(window);
-</script>
+</script>

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

@@ -21,20 +21,27 @@ $plural = 'Allergies';
 <?php if (!count($points)): ?>
     <div class="text-secondary">-</div>
 <?php else: ?>
+<table class="table table-bordered table-xs table-cage mb-0">
     <?php foreach ($points as $point): ?>
-        <?php $rel = $point->relevanceToNote($note); ?>
-        <div class="mb-2">
-            <div class="d-flex align-items-baseline">
-                @if($rel)
-                    <span class="text-info mr-1">
-                        <i class="fa fa-star"></i>
-                    </span>
-                    <?php $numRelevant++; ?>
-                @endif
-                <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
-                    <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
-                </div>
-                <?php if ($point->is_removed): ?>
+	<?php $rel = $point->relevanceToNote($note); ?>
+        <tr>
+		<td class="fit px-2">
+			<div class="font-weight-bold <?= $point->is_removed ? 'strike-through' : '' ?>">
+                	    <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
+                	</div>
+		</td>
+		<td class="fit px-2">
+        <div class="">
+            <?php $review = $point->childReviewAddedInNote($note); ?>
+            <?php if(!!$review): ?>
+                    <span>{!! $review->data->value !!}</span>
+            <?php elseif($rel): ?>
+                <div class="relevant-without-review text-warning-mellow mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
+            <?php endif; ?>
+        </div>		
+		</td>
+		<td class="fit px-2">
+			<?php if ($point->is_removed): ?>
                     @if($point->removal_reason_category === 'DURING_VISIT')
                         <span class="ml-2 text-sm text-secondary">Removed during visit</span>
                     @elseif($point->removal_reason_category === 'ON_INTAKE')
@@ -47,18 +54,18 @@ $plural = 'Allergies';
                         <span class="ml-2 text-sm text-info">* Added on intake</span>
                     <?php endif;?>
                 <?php endif; ?>
-            </div>
-            <?php $review = $point->childReviewAddedInNote($note); ?>
-            <?php if(!!$review): ?>
-                <div class="pl-3 mt-1 d-flex align-items-baseline">
-                    <span class="text-secondary font-weight-bold mr-2">Subjective:</span>
-                    <span>{!! $review->data->value !!}</span>
-                </div>
-            <?php elseif($rel): ?>
-                <div class="relevant-without-review text-warning-mellow mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
-            <?php endif; ?>
-        </div>
+		</td>
+		<td class="px-2">
+			@if($rel)
+                            <span class="text-info mr-1">
+                                <i class="fa fa-star"></i>
+                            </span>
+                            <?php $numRelevant++; ?>
+                        @endif
+		</td>
+        </tr>
     <?php endforeach; ?>
+</table>
     @if($numRelevant)
         <div class="d-flex align-items-baseline text-info mr-1 mt-3">
             <span class="text-sm mr-1"><i class="fa fa-star text-sm"></i></span>

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

@@ -14,52 +14,59 @@ $plural = 'Medications';
     <div class="text-secondary"><span>No Known Medications</span></div>
 <?php endif; ?>
 <?php if(!$tracker || !@($tracker->data->no_known_medications)): ?>
-<?php if (!count($points)): ?>
+<?php if (!count($points)): ?>i
     <div class="text-secondary">-</div>
 <?php else: ?>
+	<table class="table table-bordered table-xs table-cage mb-0">
     <?php foreach ($points as $point): ?>
         <?php $rel = $point->relevanceToNote($note); ?>
-        <div class="mb-2">
-            <div class="d-flex align-items-baseline">
-                @if($rel)
-                    <span class="text-info mr-1">
-                        <i class="fa fa-star"></i>
-                    </span>
-                    <?php $numRelevant++; ?>
-                @endif
-                <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
-                    <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
-                </div>
-                <?php if ($point->is_removed): ?>
-                    @if($point->removal_reason_category === 'DURING_VISIT')
-                        <span class="ml-2 text-sm text-secondary">Removed during visit</span>
-                    @elseif($point->removal_reason_category === 'ON_INTAKE')
-                        <span class="ml-2 text-sm text-secondary">Removed on intake</span>
-                    @endif
-                <?php elseif ($point->added_in_note_id === $note->id): ?>
-                    <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
-                        <span class="ml-2 text-sm text-success">* Prescribed during visit</span>
-                    <?php else: ?>
-                        <span class="ml-2 text-sm text-info">* Added on intake</span>
-                    <?php endif;?>
-                <?php endif; ?>
-            </div>
+	<tr>
+		<td class="fit px-2">
+                	<div class="font-weight-bold <?= $point->is_removed ? 'strike-through' : '' ?>">
+                	    <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
+                	</div>
+		</td>
+		<td class="fit px-2">
+        <div class="">
             <?php $review = $point->childReviewAddedInNote($note); ?>
             <?php if(!!$review): ?>
-                <div class="pl-3 mt-1 d-flex align-items-baseline">
-                    <span class="text-secondary font-weight-bold mr-2">Subjective:</span>
+                <div class="d-flex align-items-baseline">
                     <span>{!! $review->data->value !!}</span>
                 </div>
-            <?php elseif($rel): ?>
+            <?php elseif(false && $rel): ?>
                 <div class="relevant-without-review text-warning-mellow mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
             <?php endif; ?>
         </div>
+		</td>
+		<td class="fit px-2">
+            		<div class="d-flex align-items-baseline">
+                		<?php if ($point->is_removed): ?>
+                    		@if($point->removal_reason_category === 'DURING_VISIT')
+                    		    <span class="ml-2 text-sm text-secondary">Removed during visit</span>
+                    		@elseif($point->removal_reason_category === 'ON_INTAKE')
+                    		    <span class="ml-2 text-sm text-secondary">Removed on intake</span>
+                    		@endif
+                		<?php elseif ($point->added_in_note_id === $note->id): ?>
+                    		<?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+                    		    <span class="ml-2 text-sm text-success">* Prescribed during visit</span>
+                    		<?php else: ?>
+                    		    <span class="ml-2 text-sm text-info">* Added on intake</span>
+                    		<?php endif;?>
+                		<?php endif; ?>
+            		</div>
+		</td>
+		<td class="fit px-2" style="border-right: 0px">
+                	@if($rel)
+                	    <span class="text-info mr-1">
+                	        <i class="fa fa-star"></i>
+                	    </span>
+                	    <?php $numRelevant++; ?>
+                	@endif
+		</td>
+		<td class="end" style="border: 0px">
+		</td>
+	</tr>
     <?php endforeach; ?>
-    @if($numRelevant)
-        <div class="d-flex align-items-baseline text-info mr-1 mt-3">
-            <span class="text-sm mr-1"><i class="fa fa-star text-sm"></i></span>
-            <span class="text-sm">{{$plural}} relevant to this note</span>
-        </div>
-    @endif
+	</table>
 <?php endif; ?>
 <?php endif; ?>

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

@@ -25,31 +25,34 @@ $points = [
 ];
 ?>
 
+<table class="table table-bordered table-sm mb-0">
 <?php foreach ($points as $p): ?>
 <?php $point = $p['point']; ?>
 <?php if(!!$point): ?>
 <?php $review = $point->lastChildReview; ?>
 <?php if ($review && @($review->data)) $review->data = json_decode($review->data); ?>
-<div class="mb-2">
-    <div class="d-flex align-items-baseline">
-        <b><?= $p['name'] ?></b>
-    </div>
-    <?php if(!!$review): ?>
-    <div class="pl-3 mt-1 d-flex align-items-baseline">
-        <span class="text-secondary font-weight-bold mr-2">Subjective:</span>
+<tr>
+<td>
+	<?= $p['name'] ?>
+</td>
+<td>
+<?php if(!!$review): ?>
+    <div class="pl-3 d-flex align-items-baseline">
         <div>
             <?php if($p['category'] === 'FAST_FOOD'): ?>
-                <div class="mb-1"><span class="text-sm">Meals per week:</span> <?= @$review->data->mealsPerWeek ? strip_tags($review->data->mealsPerWeek) : '' ?></div>
-                <div class="mb-1"><span class="text-sm">Self-prepared meals per week:</span> <?= @$review->data->selfPrepMealsPerWeek ? strip_tags($review->data->selfPrepMealsPerWeek) : '' ?></div>
+                <div class=""><span class="text-sm">Meals per week:</span> <?= @$review->data->mealsPerWeek ? strip_tags($review->data->mealsPerWeek) : '' ?></div>
+                <div class=""><span class="text-sm">Self-prepared meals per week:</span> <?= @$review->data->selfPrepMealsPerWeek ? strip_tags($review->data->selfPrepMealsPerWeek) : '' ?></div>
             <?php elseif ($p['category'] === 'SNACKS'): ?>
-                <div class="mb-1"><span class="text-sm">Unhealthy snacks:</span> <?= @$review->data->unhealthySnacks ? strip_tags($review->data->unhealthySnacks) : '' ?></div>
-                <div class="mb-1"><span class="text-sm">Healthy snacks:</span> <?= @$review->data->healthySnacks ? strip_tags($review->data->healthySnacks) : '' ?></div>
+                <div class=""><span class="text-sm">Unhealthy snacks:</span> <?= @$review->data->unhealthySnacks ? strip_tags($review->data->unhealthySnacks) : '' ?></div>
+                <div class=""><span class="text-sm">Healthy snacks:</span> <?= @$review->data->healthySnacks ? strip_tags($review->data->healthySnacks) : '' ?></div>
             <?php else: ?>
                 <span>{!! $review->data->value ? strip_tags($review->data->value) : '-' !!}</span>
             <?php endif; ?>
         </div>
     </div>
-    <?php endif; ?>
-</div>
+<?php endif; ?>
+</td>
+</tr>
 <?php endif; ?>
 <?php endforeach; ?>
+</table>