= hai 1 mes
pai
achega
af07462c4d

+ 0 - 0
app/Helpers/grata.http


+ 69 - 59
resources/views/app/patient/care-month/partials/print/measurements.blade.php

@@ -1,33 +1,37 @@
-<h6 class="font-weight-bold">Measurements</h6>
-<table class="table table-striped table-sm table-bordered mt-2 mb-0">
+<h3 style="font-weight: bolder; font-size: 18px; line-height:18px; margin:0px;" class="mb-3"><b>Remote Monitoring:</b>
+</h3>
+<table class="table table-sm table-bordered mt-2 mb-0">
     <thead>
-        <tr>
-            <th class="px-1 text-secondary">Date & Time</th>
-            <th class="px-1 text-secondary w-25">Measurement</th>
-            <th class="px-1 text-secondary w-25">Type</th>
-            <th class="px-1 text-secondary w-25">Interaction</th>
-            <th class="px-4 text-secondary">Comments</th>
-        </tr>
+    <tr>
+        <th class="px-1 text-nowrap"><b>Date & Time</b></th>
+        <th class="px-1"><b>Measurement</b></th>
+        <th class="px-1"><b>Type</b></th>
+        <th class="px-1"><b>Interaction</b></th>
+        <th class="px-4 w-100"><b>Comments</b></th>
+    </tr>
     </thead>
     <tbody>
-        @php
-            $measurementsInCareMonth = $patient->measurementsInCareMonth($careMonth);
-            $plottableMeasurements = [];
-        @endphp
-        @foreach ($measurementsInCareMonth as $measurement)
-            @if($measurementType && stripos($measurement->label, $measurementType) === false ) @continue @endif
-            @if (!empty($measurement->label) && !in_array($measurement->label, ['SBP', 'DBP']) && !$measurement->is_cellular_zero)
-                <tr>
-                    <td class="px-2">
-                        @if ($measurement->ts)
+    @php
+        $measurementsInCareMonth = $patient->measurementsInCareMonth($careMonth);
+        $plottableMeasurements = [];
+    @endphp
+    @foreach ($measurementsInCareMonth as $measurement)
+        @if($measurementType && stripos($measurement->label, $measurementType) === false )
+            @continue
+        @endif
+        @if (!empty($measurement->label) && !in_array($measurement->label, ['SBP', 'DBP']) && !$measurement->is_cellular_zero)
+            <tr>
+                <td class="px-2 text-nowrap">
+                    @if ($measurement->ts)
                             <?php $timestampInSec = floor($measurement->ts / 1000); ?>
-                            {{ friendly_date_time_short_with_tz_from_timestamp($timestampInSec, 'EASTERN') }}
-                        @else
-                            {{ friendly_date_time_short_with_tz($measurement->effective_date, true, 'EASTERN') }}
-                        @endif
-                        EST
-                    </td>
-                    <td class="px-1">
+                        {{ friendly_date_time_short_with_tz_from_timestamp($timestampInSec, 'EASTERN') }}
+                    @else
+                        {{ friendly_date_time_short_with_tz($measurement->effective_date, true, 'EASTERN') }}
+                    @endif
+                    EST
+                </td>
+                <td class="px-1 ">
+                    <div class="text-nowrap">
                         @if ($measurement->is_cellular_zero)
                             <i class="font-size-11 fa fa-rss"></i>
                         @elseif($measurement->label === 'BP')
@@ -37,45 +41,51 @@
                         @else
                             {{ $measurement->value }}
                         @endif
-                    </td>
-                    <td class="px-1">{{ $measurement->label }}</td>
-                    <td>
-                        @if($careMonth->mcpInteractionNote)
-                            $careMonth->mcpInteractionNote->method
-                        @else
-
-                        @endif
-                    </td>
-{{--                    <td colspan="px-2">--}}
-{{--                        <?php--}}
-{{--                        $stamps = ['has_been_stamped_by_mcp', 'has_been_stamped_by_non_hcp', 'has_been_stamped_by_rme', 'has_been_stamped_by_rmm'];--}}
-{{--                        $isStamped = false;--}}
-{{--                        foreach ($stamps as $stamp) {--}}
-{{--                            if ($measurement->{$stamp}) {--}}
-{{--                                $isStamped = true;--}}
-{{--                            }--}}
-{{--                        }--}}
-{{--                        ?>--}}
-{{--                        @if ($isStamped)--}}
-{{--                            ✓--}}
-{{--                        @endif--}}
-{{--                    </td>--}}
-                    <td class="px-4">
+                    </div>
+                </td>
+                <td class="px-1">{{ $measurement->label }}</td>
+                <td>
+                    @if($careMonth->mcpInteractionNote)
+                        $careMonth->mcpInteractionNote->method
+                    @else
+                        Audio call
+                    @endif
+                </td>
+                {{--                    <td colspan="px-2">--}}
+                {{--                        <?php--}}
+                {{--                        $stamps = ['has_been_stamped_by_mcp', 'has_been_stamped_by_non_hcp', 'has_been_stamped_by_rme', 'has_been_stamped_by_rmm'];--}}
+                {{--                        $isStamped = false;--}}
+                {{--                        foreach ($stamps as $stamp) {--}}
+                {{--                            if ($measurement->{$stamp}) {--}}
+                {{--                                $isStamped = true;--}}
+                {{--                            }--}}
+                {{--                        }--}}
+                {{--                        ?>--}}
+                {{--                        @if ($isStamped)--}}
+                {{--                            ✓--}}
+                {{--                        @endif--}}
+                {{--                    </td>--}}
+                <td class="px-4">
+                    <div class="">
                         @foreach($careMonth->entries as $entry)
                             @if($entry->achieved_mcp_time_in_seconds > 0 && $entry->is_removed != true )
-                            <p>{{$entry->achieved_mcp_time_in_seconds/60}}m: {!!  $entry->content_text  !!}</p>
+                                <div class="d-flex align-items-start">
+                                    <span class="mr-2">{{$entry->achieved_mcp_time_in_seconds/60}}m: </span>
+                                    <div>{!!  $entry->content_text  !!}</div>
+                                </div>
                             @endif
                         @endforeach
-                    </td>
-                </tr>
-            @endif
-        @endforeach
-        @if (!$patient->measurements || !count($patient->measurements) === 0)
-            <tr>
-                <td class="text-secondary p-0 border-0">
-                    No items to show
+                    </div>
                 </td>
             </tr>
         @endif
+    @endforeach
+    @if (!$patient->measurements || !count($patient->measurements) === 0)
+        <tr>
+            <td class="text-secondary p-0 border-0">
+                No items to show
+            </td>
+        </tr>
+    @endif
     </tbody>
 </table>

+ 6 - 10
resources/views/app/patient/care-month/partials/print/rm-reasons.blade.php

@@ -1,11 +1,7 @@
 <h6 class="font-weight-bold">Diagnosis</h6>
-<table class="table table-striped table-sm table-bordered mt-2 mb-0">
-    <tr>
-        <td>
-            @include('app.patient.partials.rm-reasons-print-display', [
-                'recordType' => 'CARE_MONTH',
-                'record' => $careMonth,
-            ])
-        </td>
-    </tr>
-</table>
+
+@include('app.patient.partials.rm-reasons-print-display', [
+    'recordType' => 'CARE_MONTH',
+    'record' => $careMonth,
+])
+

+ 17 - 10
resources/views/app/patient/care-month/print.blade.php

@@ -1,13 +1,14 @@
-@extends('layouts.print2')
+@extends('layouts.print')
 
 @section('content')
     <style>
         html,
         body {
             height: max-content;
-            display:flex;
+            display: flex;
             margin: auto;
         }
+
         #printableScreen {
             width: 11in;
         }
@@ -37,7 +38,8 @@
         <div
             style="width: 100%  !important; background-color: black !important; color: snow  !important">
             <div class="p-3 text-right">
-                <h3 style="font-weight: bolder; font-size: 18px; line-height:18px; margin:0px;">Remote Patient Monitoring</h3>
+                <h3 style="font-weight: bolder; font-size: 18px; line-height:18px; margin:0px;">Remote Patient
+                    Monitoring</h3>
             </div>
         </div>
         <div>
@@ -80,7 +82,8 @@
         </div>
 
         <div>
-            <h3>Remote Monitoring Measurements:</h3>
+            <h3 style="font-weight: bolder; font-size: 18px; line-height:18px; margin:0px;" class="mt-4 mb-3"><b>Remote
+                    Monitoring Measurements:</b>
             @include('app.patient.care-month._vitals_graph_unified')
         </div>
 
@@ -93,21 +96,25 @@
         </div>
 
         <div>
-            <h3>Devices</h3>
-            <ul>
+            <h3 style="font-weight: bolder; font-size: 18px; line-height:18px; margin:0px;" class="mb-2"><b>Devices:</b>
+            </h3>
+            <ol>
                 @foreach($careMonth->client->devices as $device)
                     @if($device->device->category == 'BP')
-                        <ol>Cellular BP Cuff: IMEI# {{$device->device->imei}}</ol>
+                        <li>Cellular BP Cuff: IMEI# {{$device->device->imei}}</li>
                     @endif
                     @if($device->device->category == 'WEIGHT')
-                        <ol>Cellular Weight Scale: IMEI# {{$device->device->imei}}</ol>
+                        <li>Cellular Weight Scale: IMEI# {{$device->device->imei}}</li>
                     @endif
                 @endforeach
-            </ul>
+            </ol>
         </div>
 
         <div>
-            <h3>Signature: </h3>
+            <h3 style="font-weight: bolder; font-size: 18px; line-height:18px; margin:0px;" class="mb-3">
+                <b>Signature:</b>
+            </h3>
+
             <table>
                 <tr>
                     <td>Date of Service</td>

+ 16 - 18
resources/views/app/patient/partials/rm-reasons-print-display.blade.php

@@ -58,25 +58,23 @@ if($recordType === 'NOTE'){
 }
 ?>
 <div>
-	<div class="d-flex">
+	<div>
 		<?php $emptyICDs = true; ?>
-		<ol class="pl-3 mb-2">
-			@foreach($displayData as $rmKey=>$rmData)
-				<?php
-				$emptyICD = true;
-				if (!empty($rmData['reason']) || !empty($rmData['description'])) {
-					$emptyICDs = false;
-					$emptyICD = false;
-				}
-				?>
-				@if(!$emptyICD)
-					<li  style="margin-bottom: 10px;">
-					{{$rmData['reason']}} 
-					@if(!empty($rmData['description']))({{ $rmData['description'] }})@endif
-					</li>
-				@endif
-			@endforeach
-		</ol>
+        @foreach($displayData as $rmKey=>$rmData)
+                <?php
+                $emptyICD = true;
+                if (!empty($rmData['reason']) || !empty($rmData['description'])) {
+                    $emptyICDs = false;
+                    $emptyICD = false;
+                }
+                ?>
+            @if(!$emptyICD)
+                <div>
+                    {{$rmData['reason']}}
+                    @if(!empty($rmData['description']))({{ $rmData['description'] }})@endif
+                </div>
+            @endif
+        @endforeach
 		@if($emptyICDs)
 			Relevant RM reason(s) not specified.
 		@endif