Explorar o código

Use "Month YYYY" format for care month start_date

Vijayakrishnan Krishnan %!s(int64=5) %!d(string=hai) anos
pai
achega
212dadb0c4

+ 14 - 0
app/Helpers/helpers.php

@@ -28,6 +28,20 @@ if(!function_exists('friendly_date_time')) {
     }
 }
 
+if(!function_exists('friendly_month')) {
+    function friendly_month($value) {
+        if(!$value || empty($value)) return "-";
+        try {
+            $result = strtotime($value);
+            $result = date("M o", $result);
+            return $result;
+        }
+        catch (Exception $e) {
+            return $value;
+        }
+    }
+}
+
 if(!function_exists('time_in_minsec')) {
     function time_in_minsec($value, $default = '0s') {
         if(!$value || empty($value)) return $default;

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

@@ -10,7 +10,7 @@
                 <a href="/patients/view/{{ $patient->uid }}/care-months" class="small text-decoration-none mr-3">
                     <i class="fa fa-chevron-left"></i>
                 </a>
-                <span class="text-dark font-weight-bold">Care Month</span>&nbsp;starting&nbsp;<span class="text-dark font-weight-bold">{{ friendly_date_time($careMonth->start_date, false) }}</span>
+                <span class="text-dark font-weight-bold">Care Month</span>&nbsp;for&nbsp;<span class="text-dark font-weight-bold">{{friendly_month($careMonth->start_date)}}</span>
                 <span class="d-inline-flex align-items-center ml-auto">
                     <span class="mr-3">
                         CM <span class="font-weight-bold text-dark">{{time_in_minsec($careMonth->cm_total_time_in_seconds_by_cm_pro, '0s')}}</span>

+ 3 - 1
resources/views/app/patient/care-months.blade.php

@@ -63,7 +63,9 @@
             @foreach($careMonths as $careMonth)
                 <tr>
                     <td class="px-2">
-                        <a href="/patients/view/{{ $patient->uid }}/care-months/view/{{ $careMonth->uid }}">{{friendly_date_time($careMonth->start_date, false)}}</a>
+                        <a href="/patients/view/{{ $patient->uid }}/care-months/view/{{ $careMonth->uid }}">
+                            {{friendly_month($careMonth->start_date)}}
+                        </a>
                     </td>
                     <td class="px-2">{{$careMonth->cm_total_time_in_seconds}} seconds</td>
                     <td class="px-2">{{$careMonth->mcp ? $careMonth->mcp->name_display : '-'}}</td>