Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2

resources/views/app/dna/appointments.blade.php

@@ -64,7 +64,7 @@
                         <td>{{ $appointment->pro->displayName() }}</td>
                         <td>
                             <a href="/patients/view/{{$appointment->client->uid}}/calendar/{{$appointment->uid}}" class="text-nowrap">
-                                {{friendlier_date_time($appointment->raw_date . ' ' . $appointment->raw_start_time)}}
+                                {{friendly_date($appointment->raw_date) . ' ' . friendly_time($appointment->raw_start_time)}}
                             </a>
                         </td>
                         <td class="px-2">

resources/views/app/mcp/appointments.blade.php

@@ -31,7 +31,7 @@
                     <tr>
                         <td>
                             <a href="/patients/view/{{$appointment->client->uid}}/calendar/{{$appointment->uid}}">
-                                {{friendlier_date_time($appointment->raw_date . ' ' . $appointment->raw_start_time)}}
+                                {{friendly_date($appointment->raw_date) . ' ' . friendly_time($appointment->raw_start_time)}}                            
                             </a>
                         </td>
                         <td>{{ $appointment->client->displayName() }}</pre>