Эх сурвалжийг харах

Generated sources (from windows)

Vijayakrishnan Krishnan 5 жил өмнө
parent
commit
844744c5b5
20 өөрчлөгдсөн 198 нэмэгдсэн , 90 устгасан
  1. 6 0
      app/Console/Commands/GenerateTreeCommand.php
  2. 11 4
      generatecv/tree-templates/dashboard.template.blade.php
  3. 11 4
      resources/views/admin/facilities_SINGLE/SUB_dashboard.blade.php
  4. 11 4
      resources/views/admin/lobbies_SINGLE/SUB_dashboard.blade.php
  5. 11 4
      resources/views/admin/meeting_invitations_SINGLE/SUB_dashboard.blade.php
  6. 11 4
      resources/views/admin/meeting_knocks_SINGLE/SUB_dashboard.blade.php
  7. 11 4
      resources/views/admin/meeting_messages_SINGLE/SUB_dashboard.blade.php
  8. 11 4
      resources/views/admin/meeting_participants_SINGLE/SUB_dashboard.blade.php
  9. 11 4
      resources/views/admin/meeting_rings_SINGLE/SUB_dashboard.blade.php
  10. 11 4
      resources/views/admin/meetings_SINGLE/SUB_dashboard.blade.php
  11. 11 4
      resources/views/admin/pro_rates_SINGLE/SUB_dashboard.blade.php
  12. 11 4
      resources/views/admin/pros_SINGLE/SUB_dashboard.blade.php
  13. 11 4
      resources/views/pro/action_items_SINGLE/SUB_dashboard.blade.php
  14. 11 4
      resources/views/pro/bills_SINGLE/SUB_dashboard.blade.php
  15. 11 4
      resources/views/pro/care_month_entries_SINGLE/SUB_dashboard.blade.php
  16. 1 3
      resources/views/pro/care_months_SINGLE/SUB_dashboard.blade.php
  17. 11 4
      resources/views/pro/erx_SINGLE/SUB_dashboard.blade.php
  18. 8 14
      resources/views/pro/my_clients_SINGLE/SUB_notes.blade.php
  19. 11 4
      resources/views/pro/notes_SINGLE/SUB_dashboard.blade.php
  20. 7 9
      resources/views/pro/pro_access_SINGLE/SUB_dashboard.blade.php

+ 6 - 0
app/Console/Commands/GenerateTreeCommand.php

@@ -853,12 +853,18 @@ class GenController {
                     $fields = [];
                     foreach ($group["fields"] as $field) {
 
+                        if($field === 'id' || $field === 'uid') continue;
+
                         $columnTitle = $this->snakeToTitleCase($field);
                         $columnValue = "<?= \$record->$field ?>";
                         $hasLink = false;
                         $linkTarget = null;
                         $actions = [];
 
+                        if(substr($field, -3) === '_at') {
+                            $columnValue = "<?= friendly_date_time(\$record->$field) ?>";
+                        }
+
                         // check if this column has column spec
                         if(isset($method->columns[$field])) {
                             $columnTitle = $method->columns[$field]["label"];

+ 11 - 4
generatecv/tree-templates/dashboard.template.blade.php

@@ -9,12 +9,19 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($record as $k => $v)
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
                     <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
                     </tr>
-                @endforeach
+                <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

+ 11 - 4
resources/views/admin/facilities_SINGLE/SUB_dashboard.blade.php

@@ -12,12 +12,19 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($record as $k => $v)
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
                     <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
                     </tr>
-                @endforeach
+                <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

+ 11 - 4
resources/views/admin/lobbies_SINGLE/SUB_dashboard.blade.php

@@ -12,12 +12,19 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($record as $k => $v)
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
                     <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
                     </tr>
-                @endforeach
+                <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

+ 11 - 4
resources/views/admin/meeting_invitations_SINGLE/SUB_dashboard.blade.php

@@ -12,12 +12,19 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($record as $k => $v)
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
                     <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
                     </tr>
-                @endforeach
+                <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

+ 11 - 4
resources/views/admin/meeting_knocks_SINGLE/SUB_dashboard.blade.php

@@ -12,12 +12,19 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($record as $k => $v)
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
                     <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
                     </tr>
-                @endforeach
+                <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

+ 11 - 4
resources/views/admin/meeting_messages_SINGLE/SUB_dashboard.blade.php

@@ -12,12 +12,19 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($record as $k => $v)
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
                     <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
                     </tr>
-                @endforeach
+                <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

+ 11 - 4
resources/views/admin/meeting_participants_SINGLE/SUB_dashboard.blade.php

@@ -12,12 +12,19 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($record as $k => $v)
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
                     <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
                     </tr>
-                @endforeach
+                <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

+ 11 - 4
resources/views/admin/meeting_rings_SINGLE/SUB_dashboard.blade.php

@@ -12,12 +12,19 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($record as $k => $v)
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
                     <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
                     </tr>
-                @endforeach
+                <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

+ 11 - 4
resources/views/admin/meetings_SINGLE/SUB_dashboard.blade.php

@@ -12,12 +12,19 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($record as $k => $v)
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
                     <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
                     </tr>
-                @endforeach
+                <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

+ 11 - 4
resources/views/admin/pro_rates_SINGLE/SUB_dashboard.blade.php

@@ -12,12 +12,19 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($record as $k => $v)
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
                     <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
                     </tr>
-                @endforeach
+                <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

+ 11 - 4
resources/views/admin/pros_SINGLE/SUB_dashboard.blade.php

@@ -12,12 +12,19 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($record as $k => $v)
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
                     <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
                     </tr>
-                @endforeach
+                <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

+ 11 - 4
resources/views/pro/action_items_SINGLE/SUB_dashboard.blade.php

@@ -12,12 +12,19 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($record as $k => $v)
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
                     <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
                     </tr>
-                @endforeach
+                <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

+ 11 - 4
resources/views/pro/bills_SINGLE/SUB_dashboard.blade.php

@@ -12,12 +12,19 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($record as $k => $v)
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
                     <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
                     </tr>
-                @endforeach
+                <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

+ 11 - 4
resources/views/pro/care_month_entries_SINGLE/SUB_dashboard.blade.php

@@ -12,12 +12,19 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($record as $k => $v)
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
                     <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
                     </tr>
-                @endforeach
+                <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

+ 1 - 3
resources/views/pro/care_months_SINGLE/SUB_dashboard.blade.php

@@ -14,10 +14,8 @@
         </tr>
         </thead>
         <tbody>
-            <tr><td class="w-25 px-2 text-secondary border-right">Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->id ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Created At</td><td class="w-75 px-2 font-weight-bold"><?= $record->created_at ?></td></tr>
+            <tr><td class="w-25 px-2 text-secondary border-right">Created At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->created_at) ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Type</td><td class="w-75 px-2 font-weight-bold"><?= $record->type ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Uid</td><td class="w-75 px-2 font-weight-bold"><?= $record->uid ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Cm Reason1</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_reason1 ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Cm Reason2</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_reason2 ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Cm Total Time In Seconds</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_total_time_in_seconds ?></td></tr>

+ 11 - 4
resources/views/pro/erx_SINGLE/SUB_dashboard.blade.php

@@ -12,12 +12,19 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($record as $k => $v)
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
                     <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
                     </tr>
-                @endforeach
+                <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

+ 8 - 14
resources/views/pro/my_clients_SINGLE/SUB_notes.blade.php

@@ -20,11 +20,10 @@
 <th>Cancellation Memo</th>
 <th>Cancelled At</th>
 <th>Is Cancelled</th>
-<th>Category</th>
-<th>Content Detail</th>
-<th>Content Text</th>
+<th>Content Html</th>
 <th>Effective Dateest</th>
 <th>Effective Time</th>
+<th>Free Text Html</th>
 <th>Is Signed By Ally</th>
 <th>Is Signed By Hcp</th>
 <th>Reason1</th>
@@ -34,17 +33,15 @@
 <th>Service Location</th>
 <th>Signed By Ally At</th>
 <th>Signed By Hcp At</th>
+<th>Title</th>
 <th>Created By Session Id</th>
 <th>Cancelled By Session Id</th>
 <th>Ally Pro Id</th>
 <th>Client Id</th>
 <th>Hcp Pro Id</th>
+<th>Note Template Id</th>
 <th>Signed By Ally Session Id</th>
 <th>Signed By Hcp Session Id</th>
-<th>Content Html</th>
-<th>Free Text Html</th>
-<th>Title</th>
-<th>Note Template Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -56,11 +53,10 @@
 <td><?= $subRecord->cancellation_memo ?></td>
 <td><?= friendly_date_time($record->cancelled_at) ?></td>
 <td><?= $subRecord->is_cancelled ?></td>
-<td><?= $subRecord->category ?></td>
-<td><?= $subRecord->content_detail ?></td>
-<td><?= $subRecord->content_text ?></td>
+<td><?= $subRecord->content_html ?></td>
 <td><?= $subRecord->effective_dateest ?></td>
 <td><?= $subRecord->effective_time ?></td>
+<td><?= $subRecord->free_text_html ?></td>
 <td><?= $subRecord->is_signed_by_ally ?></td>
 <td><?= $subRecord->is_signed_by_hcp ?></td>
 <td><?= $subRecord->reason1 ?></td>
@@ -70,17 +66,15 @@
 <td><?= $subRecord->service_location ?></td>
 <td><?= friendly_date_time($record->signed_by_ally_at) ?></td>
 <td><?= friendly_date_time($record->signed_by_hcp_at) ?></td>
+<td><?= $subRecord->title ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
 <td><?= $subRecord->cancelled_by_session_id ?></td>
 <td><?= $subRecord->ally_pro_id ?></td>
 <td><?= $subRecord->client_id ?></td>
 <td><?= $subRecord->hcp_pro_id ?></td>
+<td><?= $subRecord->note_template_id ?></td>
 <td><?= $subRecord->signed_by_ally_session_id ?></td>
 <td><?= $subRecord->signed_by_hcp_session_id ?></td>
-<td><?= $subRecord->content_html ?></td>
-<td><?= $subRecord->free_text_html ?></td>
-<td><?= $subRecord->title ?></td>
-<td><?= $subRecord->note_template_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 11 - 4
resources/views/pro/notes_SINGLE/SUB_dashboard.blade.php

@@ -12,12 +12,19 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($record as $k => $v)
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
                     <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
                     </tr>
-                @endforeach
+                <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

+ 7 - 9
resources/views/pro/pro_access_SINGLE/SUB_dashboard.blade.php

@@ -14,10 +14,8 @@
         </tr>
         </thead>
         <tbody>
-            <tr><td class="w-25 px-2 text-secondary border-right">Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->id ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Created At</td><td class="w-75 px-2 font-weight-bold"><?= $record->created_at ?></td></tr>
+            <tr><td class="w-25 px-2 text-secondary border-right">Created At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->created_at) ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Type</td><td class="w-75 px-2 font-weight-bold"><?= $record->type ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Uid</td><td class="w-75 px-2 font-weight-bold"><?= $record->uid ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Bill Service Type</td><td class="w-75 px-2 font-weight-bold"><?= $record->bill_service_type ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Cm Expected Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_expected_payment_amount ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Cm Or Rm</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_or_rm ?></td></tr>
@@ -37,8 +35,8 @@
 <tr><td class="w-25 px-2 text-secondary border-right">Is Signed By Rme</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_signed_by_rme ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Is Signed By Rmm</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_signed_by_rmm ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Is Submitted</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_submitted ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Marked Cancelled At</td><td class="w-75 px-2 font-weight-bold"><?= $record->marked_cancelled_at ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Marked Submitted At</td><td class="w-75 px-2 font-weight-bold"><?= $record->marked_submitted_at ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Marked Cancelled At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->marked_cancelled_at) ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Marked Submitted At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->marked_submitted_at) ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Modifier</td><td class="w-75 px-2 font-weight-bold"><?= $record->modifier ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Number Of Units</td><td class="w-75 px-2 font-weight-bold"><?= $record->number_of_units ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Reason1</td><td class="w-75 px-2 font-weight-bold"><?= $record->reason1 ?></td></tr>
@@ -50,10 +48,10 @@
 <tr><td class="w-25 px-2 text-secondary border-right">Rmm Expected Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->rmm_expected_payment_amount ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Rmm Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->rmm_payment_amount ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Service Location</td><td class="w-75 px-2 font-weight-bold"><?= $record->service_location ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Signed By Cm At</td><td class="w-75 px-2 font-weight-bold"><?= $record->signed_by_cm_at ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Signed By Hcp At</td><td class="w-75 px-2 font-weight-bold"><?= $record->signed_by_hcp_at ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Signed By Rme At</td><td class="w-75 px-2 font-weight-bold"><?= $record->signed_by_rme_at ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Signed By Rmm At</td><td class="w-75 px-2 font-weight-bold"><?= $record->signed_by_rmm_at ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Signed By Cm At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->signed_by_cm_at) ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Signed By Hcp At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->signed_by_hcp_at) ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Signed By Rme At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->signed_by_rme_at) ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Signed By Rmm At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->signed_by_rmm_at) ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Created By Session Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->created_by_session_id ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Care Month Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->care_month_id ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Client Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->client_id ?></td></tr>