fixed caremonth report

app/Helpers/helpers.php

@@ -525,6 +525,21 @@ if(!function_exists('date_short_with_tz_from_timestamp_divide1000')) {
     }
 }
 
+if(!function_exists('get_end_of_month')) {
+    function get_end_of_month($value) {
+
+        if(!$value || empty($value)) return $default;
+        try {
+            $date = new DateTime($value);
+            $date->modify('last day of this month');
+            return $date->format("m/d/Y");
+        }
+        catch (Exception $e) {
+            return $e->getMessage();
+        }
+    }
+}
+
 if(!function_exists('friendly_date')) {
     function friendly_date($value) {
         if(!$value || empty($value)) return '';
@@ -1215,4 +1230,4 @@ if(!function_exists('determineTier')) {
 function getLogo(){
     if(config('app.internalName')) return asset('/img/'.config('app.internalName').'/logo_white.svg');
     return asset('/img/logo_white.svg');
-}
+}

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

@@ -49,8 +49,12 @@
                         @php $found = false; @endphp
                         @foreach($careMonth->entries as $entry)
                             @if(friendly_date($entry->effective_date) == friendly_date($measurement->effective_date) && $entry->did_pro_interact_with_client_about_rm && !$found)
-                                Text/Audio call
                                 @php $found = true; @endphp
+                                @if(str_contains($entry->content_text, 'text'))
+                                    Text
+                                @else
+                                    Audio call
+                                @endif
                             @endif
                         @endforeach
                     </div>
@@ -83,6 +87,20 @@
                                     <span class="mr-2">{{$entry->time_in_seconds/60}}m: </span>
                                     <div>{!!  $entry->content_text  !!}</div>
                                 </div>
+                                <div class="d-flex justify-content-end ">
+                                    <div class="mr-1">
+                                        <b>
+                                        @if($entry->pro)
+                                            @if($entry->pro->is_hcp)
+                                                {{$entry->pro->displayName()}}
+                                            @else
+                                                Medical Staff
+                                            @endif
+                                        @endif
+                                        </b>
+                                    </div>
+                                    <div>{{friendly_date_time($entry->created_at)}}</div>
+                                </div>
                             @endif
                         @endforeach
                     </div>

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

@@ -58,12 +58,16 @@
                 </tr>
                 <tr>
                     <td><b>Gender:</b> {{$careMonth->client->sex}}</td>
-                    <td><b>Measurement Period:</b> {{friendly_month($careMonth->start_date)}}</td>
+                    <td><b>Care Month:</b> {{friendly_month($careMonth->start_date)}}</td>
                 </tr>
                 <tr>
-                    <td><b>Date of Enrollment:</b> {{friendly_month($careMonth->client->enrolled_in_rm_at)}}</td>
+                    <td><b>Date of Enrollment:</b> {{friendly_date($careMonth->client->enrolled_in_rm_at? $careMonth->client->enrolled_in_rm_at : $careMonth->client->created_at)}}</td>
                     <td><b>Consent Received:</b> Yes</td>
                 </tr>
+                <tr>
+                    <td><b>Days with Measurements:</b> {{$careMonth->number_of_days_with_remote_measurements}}</td>
+                    <td><b>Measurement Period:</b> {{friendly_date($careMonth->start_date)}} - {{get_end_of_month($careMonth->start_date)}}</td>
+                </tr>
             </table>
         </div>