Show friendly time in hh mm ss format in all places

app/Helpers/helpers.php

@@ -42,13 +42,28 @@ if(!function_exists('friendly_month')) {
     }
 }
 
-if(!function_exists('time_in_minsec')) {
-    function time_in_minsec($value, $default = '0s') {
+if(!function_exists('time_in_hrminsec')) {
+    function time_in_hrminsec($value, $default = '-') {
         if(!$value || empty($value)) return $default;
         $value = intval($value);
         $minutes = intval($value / 60);
         $seconds = $value % 60;
-        return "{$minutes}m, {$seconds}s";
+        $hours = 0;
+        if($minutes >= 60) {
+            $hours = intval($minutes / 60);
+            $minutes = $minutes % 60;
+        }
+        $output = [];
+        if($hours > 0) {
+            $output[] = "{$hours}h";
+        }
+        if($minutes > 0) {
+            $output[] = "{$minutes}m";
+        }
+        if($seconds > 0) {
+            $output[] = "{$seconds}s";
+        }
+        return implode(" ", $output);
     }
 }
 

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

@@ -18,19 +18,19 @@
                         <div class="mr-3 text-sm-incl-children">
                             <span class="d-inline-block minutes-label">CM</span>
                             <span class="font-weight-bold text-dark text-nowrap">
-                                {{time_in_minsec($careMonth->cm_total_time_in_seconds_by_cm_pro, '0s')}}
+                                {{time_in_hrminsec($careMonth->cm_total_time_in_seconds_by_cm_pro)}}
                             </span>
                         </div>
                         <div class="mr-3 text-sm-incl-children">
                             <span class="d-inline-block minutes-label">MCP</span>
                             <span class="font-weight-bold text-dark text-nowrap">
-                                {{time_in_minsec($careMonth->cm_total_time_in_seconds_by_mcp, '0s')}}
+                                {{time_in_hrminsec($careMonth->cm_total_time_in_seconds_by_mcp)}}
                             </span>
                         </div>
                     </div>
                     <div class="ml-3 text-sm-incl-children">
                         <div class="">CM Total</div>
-                        <div class="font-weight-bold text-dark text-nowrap">{{time_in_minsec($careMonth->cm_total_time_in_seconds, '0s')}}</div>
+                        <div class="font-weight-bold text-dark text-nowrap">{{time_in_hrminsec($careMonth->cm_total_time_in_seconds)}}</div>
                     </div>
                 </div>
                 <div class="d-inline-flex align-items-start border-left pl-3 ml-3">
@@ -38,25 +38,25 @@
                         <div class="mr-3 text-sm-incl-children">
                             <span class="d-inline-block minutes-label">RMM</span>
                             <span class="font-weight-bold text-dark text-nowrap">
-                                {{time_in_minsec($careMonth->rm_total_time_in_seconds_by_rmm_pro, '0s')}}
+                                {{time_in_hrminsec($careMonth->rm_total_time_in_seconds_by_rmm_pro)}}
                             </span>
                         </div>
                         <div class="mr-3 text-sm-incl-children">
                             <span class="d-inline-block minutes-label">RME</span>
                             <span class="font-weight-bold text-dark text-nowrap">
-                                {{time_in_minsec($careMonth->rm_total_time_in_seconds_by_rme_pro, '0s')}}
+                                {{time_in_hrminsec($careMonth->rm_total_time_in_seconds_by_rme_pro)}}
                             </span>
                         </div>
                         <div class="mr-3 text-sm-incl-children">
                             <span class="d-inline-block minutes-label">MCP</span>
                             <span class="font-weight-bold text-dark text-nowrap">
-                                {{time_in_minsec($careMonth->rm_total_time_in_seconds_by_mcp, '0s')}}
+                                {{time_in_hrminsec($careMonth->rm_total_time_in_seconds_by_mcp)}}
                             </span>
                         </div>
                     </div>
                     <div class="ml-3 text-sm-incl-children">
                         <div class="">RM Total</div>
-                        <div class="font-weight-bold text-dark text-nowrap">{{time_in_minsec($careMonth->rm_total_time_in_seconds, '0s')}}</div>
+                        <div class="font-weight-bold text-dark text-nowrap">{{time_in_hrminsec($careMonth->rm_total_time_in_seconds)}}</div>
                     </div>
                 </div>
             </div>
@@ -138,7 +138,7 @@
                                 <div class="small text-secondary">Created: {{friendly_date_time($entry->effective_date)}}</div>
                             </td>
                             <td class="px-2">
-                                {{time_in_minsec($entry->time_in_seconds)}}
+                                {{time_in_hrminsec($entry->time_in_seconds)}}
                             </td>
                             <td class="px-2">
                                 <div>{{$entry->content_text}}</div>
@@ -232,7 +232,7 @@
                                     <div class="small text-secondary">Created: {{friendly_date_time($entry->effective_date)}}</div>
                                 </td>
                                 <td class="px-2">
-                                    {{time_in_minsec($entry->time_in_seconds)}}
+                                    {{time_in_hrminsec($entry->time_in_seconds)}}
                                 </td>
                                 <td class="px-2">
                                     <div>{{$entry->content_text}}</div>

resources/views/app/patient/care-months.blade.php

@@ -66,7 +66,7 @@
                             {{friendly_month($careMonth->start_date)}}
                         </a>
                     </td>
-                    <td class="px-2">{{$careMonth->cm_total_time_in_seconds}} seconds</td>
+                    <td class="px-2">{{time_in_hrminsec($careMonth->cm_total_time_in_seconds)}}</td>
                     <td class="px-2">{{$careMonth->mcp ? $careMonth->mcp->name_display : '-'}}</td>
                     <td class="px-2">{{friendly_date_time($careMonth->created_at)}}</td>
                 </tr>