소스 검색

Full generation from linux

Vijayakrishnan 4 년 전
부모
커밋
207be0ec84

+ 14 - 14
resources/views/admin/bdt_devices/index.blade.php

@@ -13,38 +13,38 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
-<th>Deactivated At</th>
-<th>Deactivation Memo</th>
-<th>Is Active</th>
-<th>Reactivated At</th>
-<th>Reactivation Memo</th>
 <th>Category</th>
 <th>Imei</th>
 <th>Memo</th>
+<th>Created At</th>
 <th>Created By Session Id</th>
+<th>Type</th>
+<th>Is Active</th>
+<th>Deactivated At</th>
 <th>Deactivated By Session Id</th>
+<th>Deactivation Memo</th>
+<th>Reactivated At</th>
 <th>Reactivated By Session Id</th>
+<th>Reactivation Memo</th>
             </tr>
             </thead>
             <tbody>
             @foreach($records as $record)
                 <tr>
 <td><a href="/bdt_devices/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($record->created_at) ?></td>
-<td><?= $record->type ?></td>
-<td><?= friendly_date_time($record->deactivated_at) ?></td>
-<td><?= $record->deactivation_memo ?></td>
-<td><?= $record->is_active ?></td>
-<td><?= friendly_date_time($record->reactivated_at) ?></td>
-<td><?= $record->reactivation_memo ?></td>
 <td><?= $record->category ?></td>
 <td><?= $record->imei ?></td>
 <td><?= $record->memo ?></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
 <td><?= $record->created_by_session_id ?></td>
+<td><?= $record->type ?></td>
+<td><?= $record->is_active ?></td>
+<td><?= friendly_date_time($record->deactivated_at) ?></td>
 <td><?= $record->deactivated_by_session_id ?></td>
+<td><?= $record->deactivation_memo ?></td>
+<td><?= friendly_date_time($record->reactivated_at) ?></td>
 <td><?= $record->reactivated_by_session_id ?></td>
+<td><?= $record->reactivation_memo ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 28 - 28
resources/views/admin/bdt_measurements/index.blade.php

@@ -13,52 +13,52 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
-<th>Battery Voltage</th>
-<th>Device Category</th>
-<th>Device Id</th>
-<th>Diastolic Bp In Mm Hg</th>
 <th>Imei</th>
-<th>Rssi</th>
-<th>Signal Strength</th>
-<th>Systolic Bp In Mm Hg</th>
 <th>Ts</th>
-<th>Value Diastolic</th>
-<th>Value Irregular</th>
-<th>Value Pulse</th>
-<th>Value Systolic</th>
+<th>Battery Voltage</th>
+<th>Signal Strength</th>
 <th>Value Tare</th>
-<th>Value Unit</th>
 <th>Value Weight</th>
 <th>Weight In Pounds</th>
+<th>Value Systolic</th>
+<th>Value Diastolic</th>
+<th>Value Pulse</th>
+<th>Value Unit</th>
+<th>Value Irregular</th>
+<th>Rssi</th>
+<th>Device Id</th>
+<th>Device Category</th>
+<th>Created At</th>
 <th>Created By Session Id</th>
+<th>Type</th>
+<th>Diastolic Bp In Mm Hg</th>
+<th>Systolic Bp In Mm Hg</th>
             </tr>
             </thead>
             <tbody>
             @foreach($records as $record)
                 <tr>
 <td><a href="/bdt_measurements/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($record->created_at) ?></td>
-<td><?= $record->type ?></td>
-<td><?= $record->battery_voltage ?></td>
-<td><?= $record->device_category ?></td>
-<td><?= $record->device_id ?></td>
-<td><?= $record->diastolic_bp_in_mm_hg ?></td>
 <td><?= $record->imei ?></td>
-<td><?= $record->rssi ?></td>
-<td><?= $record->signal_strength ?></td>
-<td><?= $record->systolic_bp_in_mm_hg ?></td>
 <td><?= $record->ts ?></td>
-<td><?= $record->value_diastolic ?></td>
-<td><?= $record->value_irregular ?></td>
-<td><?= $record->value_pulse ?></td>
-<td><?= $record->value_systolic ?></td>
+<td><?= $record->battery_voltage ?></td>
+<td><?= $record->signal_strength ?></td>
 <td><?= $record->value_tare ?></td>
-<td><?= $record->value_unit ?></td>
 <td><?= $record->value_weight ?></td>
 <td><?= $record->weight_in_pounds ?></td>
+<td><?= $record->value_systolic ?></td>
+<td><?= $record->value_diastolic ?></td>
+<td><?= $record->value_pulse ?></td>
+<td><?= $record->value_unit ?></td>
+<td><?= $record->value_irregular ?></td>
+<td><?= $record->rssi ?></td>
+<td><?= $record->device_id ?></td>
+<td><?= $record->device_category ?></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
 <td><?= $record->created_by_session_id ?></td>
+<td><?= $record->type ?></td>
+<td><?= $record->diastolic_bp_in_mm_hg ?></td>
+<td><?= $record->systolic_bp_in_mm_hg ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 18 - 18
resources/views/admin/client_bdt_devices/index.blade.php

@@ -13,44 +13,44 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
-<th>Deactivated At</th>
-<th>Deactivation Memo</th>
-<th>Is Active</th>
-<th>Reactivated At</th>
-<th>Reactivation Memo</th>
+<th>Client Id</th>
+<th>Device Id</th>
 <th>Instructions</th>
 <th>Internal Memo</th>
 <th>Status</th>
 <th>Status Memo</th>
+<th>Created At</th>
 <th>Created By Session Id</th>
+<th>Type</th>
+<th>Is Active</th>
+<th>Deactivated At</th>
 <th>Deactivated By Session Id</th>
+<th>Deactivation Memo</th>
+<th>Reactivated At</th>
 <th>Reactivated By Session Id</th>
-<th>Client Id</th>
-<th>Device Id</th>
+<th>Reactivation Memo</th>
             </tr>
             </thead>
             <tbody>
             @foreach($records as $record)
                 <tr>
 <td><a href="/client_bdt_devices/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($record->created_at) ?></td>
-<td><?= $record->type ?></td>
-<td><?= friendly_date_time($record->deactivated_at) ?></td>
-<td><?= $record->deactivation_memo ?></td>
-<td><?= $record->is_active ?></td>
-<td><?= friendly_date_time($record->reactivated_at) ?></td>
-<td><?= $record->reactivation_memo ?></td>
+<td><?= $record->client_id ?></td>
+<td><?= $record->device_id ?></td>
 <td><?= $record->instructions ?></td>
 <td><?= $record->internal_memo ?></td>
 <td><?= $record->status ?></td>
 <td><?= $record->status_memo ?></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
 <td><?= $record->created_by_session_id ?></td>
+<td><?= $record->type ?></td>
+<td><?= $record->is_active ?></td>
+<td><?= friendly_date_time($record->deactivated_at) ?></td>
 <td><?= $record->deactivated_by_session_id ?></td>
+<td><?= $record->deactivation_memo ?></td>
+<td><?= friendly_date_time($record->reactivated_at) ?></td>
 <td><?= $record->reactivated_by_session_id ?></td>
-<td><?= $record->client_id ?></td>
-<td><?= $record->device_id ?></td>
+<td><?= $record->reactivation_memo ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 20 - 20
resources/views/admin/handouts/index.blade.php

@@ -13,44 +13,44 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
-<th>Deactivated At</th>
-<th>Deactivation Memo</th>
-<th>Is Active</th>
-<th>Reactivated At</th>
-<th>Reactivation Memo</th>
-<th>Content Text</th>
-<th>Display Name</th>
 <th>Internal Name</th>
+<th>Display Name</th>
+<th>Tags</th>
 <th>Pdf File Path</th>
 <th>Pdf File Size In Bytes</th>
-<th>Tags</th>
+<th>Content Text</th>
+<th>Created At</th>
 <th>Created By Session Id</th>
+<th>Type</th>
+<th>Is Active</th>
+<th>Deactivated At</th>
 <th>Deactivated By Session Id</th>
+<th>Deactivation Memo</th>
+<th>Reactivated At</th>
 <th>Reactivated By Session Id</th>
+<th>Reactivation Memo</th>
             </tr>
             </thead>
             <tbody>
             @foreach($records as $record)
                 <tr>
 <td><a href="/handouts/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($record->created_at) ?></td>
-<td><?= $record->type ?></td>
-<td><?= friendly_date_time($record->deactivated_at) ?></td>
-<td><?= $record->deactivation_memo ?></td>
-<td><?= $record->is_active ?></td>
-<td><?= friendly_date_time($record->reactivated_at) ?></td>
-<td><?= $record->reactivation_memo ?></td>
-<td><?= $record->content_text ?></td>
-<td><?= $record->display_name ?></td>
 <td><?= $record->internal_name ?></td>
+<td><?= $record->display_name ?></td>
+<td><?= $record->tags ?></td>
 <td><?= $record->pdf_file_path ?></td>
 <td><?= $record->pdf_file_size_in_bytes ?></td>
-<td><?= $record->tags ?></td>
+<td><?= $record->content_text ?></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
 <td><?= $record->created_by_session_id ?></td>
+<td><?= $record->type ?></td>
+<td><?= $record->is_active ?></td>
+<td><?= friendly_date_time($record->deactivated_at) ?></td>
 <td><?= $record->deactivated_by_session_id ?></td>
+<td><?= $record->deactivation_memo ?></td>
+<td><?= friendly_date_time($record->reactivated_at) ?></td>
 <td><?= $record->reactivated_by_session_id ?></td>
+<td><?= $record->reactivation_memo ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 14 - 14
resources/views/admin/stag_app_pro_access/index.blade.php

@@ -13,38 +13,38 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
+<th>Pro Id</th>
+<th>Stag App Id</th>
+<th>Memo</th>
 <th>Created At</th>
+<th>Created By Session Id</th>
 <th>Type</th>
+<th>Is Active</th>
 <th>Deactivated At</th>
+<th>Deactivated By Session Id</th>
 <th>Deactivation Memo</th>
-<th>Is Active</th>
 <th>Reactivated At</th>
-<th>Reactivation Memo</th>
-<th>Memo</th>
-<th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
 <th>Reactivated By Session Id</th>
-<th>Pro Id</th>
-<th>Stag App Id</th>
+<th>Reactivation Memo</th>
             </tr>
             </thead>
             <tbody>
             @foreach($records as $record)
                 <tr>
 <td><a href="/stag_app_pro_access/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
+<td><?= $record->pro_id ?></td>
+<td><?= $record->stag_app_id ?></td>
+<td><?= $record->memo ?></td>
 <td><?= friendly_date_time($record->created_at) ?></td>
+<td><?= $record->created_by_session_id ?></td>
 <td><?= $record->type ?></td>
+<td><?= $record->is_active ?></td>
 <td><?= friendly_date_time($record->deactivated_at) ?></td>
+<td><?= $record->deactivated_by_session_id ?></td>
 <td><?= $record->deactivation_memo ?></td>
-<td><?= $record->is_active ?></td>
 <td><?= friendly_date_time($record->reactivated_at) ?></td>
-<td><?= $record->reactivation_memo ?></td>
-<td><?= $record->memo ?></td>
-<td><?= $record->created_by_session_id ?></td>
-<td><?= $record->deactivated_by_session_id ?></td>
 <td><?= $record->reactivated_by_session_id ?></td>
-<td><?= $record->pro_id ?></td>
-<td><?= $record->stag_app_id ?></td>
+<td><?= $record->reactivation_memo ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 16 - 16
resources/views/admin/stag_apps/index.blade.php

@@ -13,42 +13,42 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
+<th>Name</th>
+<th>Url</th>
+<th>Description</th>
+<th>Position Index</th>
 <th>Created At</th>
+<th>Created By Session Id</th>
 <th>Type</th>
+<th>Is Active</th>
 <th>Deactivated At</th>
+<th>Deactivated By Session Id</th>
 <th>Deactivation Memo</th>
-<th>Is Active</th>
 <th>Reactivated At</th>
+<th>Reactivated By Session Id</th>
 <th>Reactivation Memo</th>
-<th>Description</th>
-<th>Name</th>
-<th>Position Index</th>
 <th>Requires Admin</th>
-<th>Url</th>
-<th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
-<th>Reactivated By Session Id</th>
             </tr>
             </thead>
             <tbody>
             @foreach($records as $record)
                 <tr>
 <td><a href="/stag_apps/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
+<td><?= $record->name ?></td>
+<td><?= $record->url ?></td>
+<td><?= $record->description ?></td>
+<td><?= $record->position_index ?></td>
 <td><?= friendly_date_time($record->created_at) ?></td>
+<td><?= $record->created_by_session_id ?></td>
 <td><?= $record->type ?></td>
+<td><?= $record->is_active ?></td>
 <td><?= friendly_date_time($record->deactivated_at) ?></td>
+<td><?= $record->deactivated_by_session_id ?></td>
 <td><?= $record->deactivation_memo ?></td>
-<td><?= $record->is_active ?></td>
 <td><?= friendly_date_time($record->reactivated_at) ?></td>
+<td><?= $record->reactivated_by_session_id ?></td>
 <td><?= $record->reactivation_memo ?></td>
-<td><?= $record->description ?></td>
-<td><?= $record->name ?></td>
-<td><?= $record->position_index ?></td>
 <td><?= $record->requires_admin ?></td>
-<td><?= $record->url ?></td>
-<td><?= $record->created_by_session_id ?></td>
-<td><?= $record->deactivated_by_session_id ?></td>
-<td><?= $record->reactivated_by_session_id ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 4 - 4
resources/views/pro/action_items/index.blade.php

@@ -18,8 +18,6 @@
 <th>Action Item Category</th>
 <th>Content Detail</th>
 <th>Content Text</th>
-<th>Dose</th>
-<th>Facility Memo</th>
 <th>Is Signed By Ally</th>
 <th>Is Signed By Prescriber</th>
 <th>Signed By Ally At</th>
@@ -35,6 +33,8 @@
 <th>Signed By Ally Session Id</th>
 <th>Signed By Prescriber Session Id</th>
 <th>To Facility Id</th>
+<th>Facility Memo</th>
+<th>Dose</th>
             </tr>
             </thead>
             <tbody>
@@ -46,8 +46,6 @@
 <td><?= $record->action_item_category ?></td>
 <td><?= $record->content_detail ?></td>
 <td><?= $record->content_text ?></td>
-<td><?= $record->dose ?></td>
-<td><?= $record->facility_memo ?></td>
 <td><?= $record->is_signed_by_ally ?></td>
 <td><?= $record->is_signed_by_prescriber ?></td>
 <td><?= friendly_date_time($record->signed_by_ally_at) ?></td>
@@ -63,6 +61,8 @@
 <td><?= $record->signed_by_ally_session_id ?></td>
 <td><?= $record->signed_by_prescriber_session_id ?></td>
 <td><?= $record->to_facility_id ?></td>
+<td><?= $record->facility_memo ?></td>
+<td><?= $record->dose ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 2 - 2
resources/views/pro/bills_SINGLE/SUB_transactions.blade.php

@@ -26,8 +26,8 @@
 <th>Created By Session Id</th>
 <th>Bill Id</th>
 <th>Client Id</th>
-<th>Client Program Month Entry Id</th>
 <th>Pro Id</th>
+<th>Client Program Month Entry Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -45,8 +45,8 @@
 <td><?= $subRecord->created_by_session_id ?></td>
 <td><?= $subRecord->bill_id ?></td>
 <td><?= $subRecord->client_id ?></td>
-<td><?= $subRecord->client_program_month_entry_id ?></td>
 <td><?= $subRecord->pro_id ?></td>
+<td><?= $subRecord->client_program_month_entry_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 2 - 0
resources/views/pro/care_months_SINGLE/SUB_bills.blade.php

@@ -78,6 +78,7 @@
 <th>Signed By Hcp Session Id</th>
 <th>Signed By Rme Session Id</th>
 <th>Signed By Rmm Session Id</th>
+<th>Claim Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -147,6 +148,7 @@
 <td><?= $subRecord->signed_by_hcp_session_id ?></td>
 <td><?= $subRecord->signed_by_rme_session_id ?></td>
 <td><?= $subRecord->signed_by_rmm_session_id ?></td>
+<td><?= $subRecord->claim_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 4 - 4
resources/views/pro/clients_SINGLE/SUB_action_items.blade.php

@@ -20,8 +20,6 @@
 <th>Action Item Category</th>
 <th>Content Detail</th>
 <th>Content Text</th>
-<th>Dose</th>
-<th>Facility Memo</th>
 <th>Is Signed By Ally</th>
 <th>Is Signed By Prescriber</th>
 <th>Signed By Ally At</th>
@@ -37,6 +35,8 @@
 <th>Signed By Ally Session Id</th>
 <th>Signed By Prescriber Session Id</th>
 <th>To Facility Id</th>
+<th>Facility Memo</th>
+<th>Dose</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -48,8 +48,6 @@
 <td><?= $subRecord->action_item_category ?></td>
 <td><?= $subRecord->content_detail ?></td>
 <td><?= $subRecord->content_text ?></td>
-<td><?= $subRecord->dose ?></td>
-<td><?= $subRecord->facility_memo ?></td>
 <td><?= $subRecord->is_signed_by_ally ?></td>
 <td><?= $subRecord->is_signed_by_prescriber ?></td>
 <td><?= friendly_date_time($subRecord->signed_by_ally_at) ?></td>
@@ -65,6 +63,8 @@
 <td><?= $subRecord->signed_by_ally_session_id ?></td>
 <td><?= $subRecord->signed_by_prescriber_session_id ?></td>
 <td><?= $subRecord->to_facility_id ?></td>
+<td><?= $subRecord->facility_memo ?></td>
+<td><?= $subRecord->dose ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 18 - 18
resources/views/pro/clients_SINGLE/SUB_bdt_devices.blade.php

@@ -15,44 +15,44 @@
                 <thead>
                 <tr>
                     <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
-<th>Deactivated At</th>
-<th>Deactivation Memo</th>
-<th>Is Active</th>
-<th>Reactivated At</th>
-<th>Reactivation Memo</th>
+<th>Client Id</th>
+<th>Device Id</th>
 <th>Instructions</th>
 <th>Internal Memo</th>
 <th>Status</th>
 <th>Status Memo</th>
+<th>Created At</th>
 <th>Created By Session Id</th>
+<th>Type</th>
+<th>Is Active</th>
+<th>Deactivated At</th>
 <th>Deactivated By Session Id</th>
+<th>Deactivation Memo</th>
+<th>Reactivated At</th>
 <th>Reactivated By Session Id</th>
-<th>Client Id</th>
-<th>Device Id</th>
+<th>Reactivation Memo</th>
                 </tr>
                 </thead>
                 <tbody>
                 @foreach($subRecords as $subRecord)
                     <tr>
                         <td><a href="/client_bdt_devices/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($subRecord->created_at) ?></td>
-<td><?= $subRecord->type ?></td>
-<td><?= friendly_date_time($subRecord->deactivated_at) ?></td>
-<td><?= $subRecord->deactivation_memo ?></td>
-<td><?= $subRecord->is_active ?></td>
-<td><?= friendly_date_time($subRecord->reactivated_at) ?></td>
-<td><?= $subRecord->reactivation_memo ?></td>
+<td><?= $subRecord->client_id ?></td>
+<td><?= $subRecord->device_id ?></td>
 <td><?= $subRecord->instructions ?></td>
 <td><?= $subRecord->internal_memo ?></td>
 <td><?= $subRecord->status ?></td>
 <td><?= $subRecord->status_memo ?></td>
+<td><?= friendly_date_time($subRecord->created_at) ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
+<td><?= $subRecord->type ?></td>
+<td><?= $subRecord->is_active ?></td>
+<td><?= friendly_date_time($subRecord->deactivated_at) ?></td>
 <td><?= $subRecord->deactivated_by_session_id ?></td>
+<td><?= $subRecord->deactivation_memo ?></td>
+<td><?= friendly_date_time($subRecord->reactivated_at) ?></td>
 <td><?= $subRecord->reactivated_by_session_id ?></td>
-<td><?= $subRecord->client_id ?></td>
-<td><?= $subRecord->device_id ?></td>
+<td><?= $subRecord->reactivation_memo ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 2 - 0
resources/views/pro/clients_SINGLE/SUB_bills.blade.php

@@ -78,6 +78,7 @@
 <th>Signed By Hcp Session Id</th>
 <th>Signed By Rme Session Id</th>
 <th>Signed By Rmm Session Id</th>
+<th>Claim Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -147,6 +148,7 @@
 <td><?= $subRecord->signed_by_hcp_session_id ?></td>
 <td><?= $subRecord->signed_by_rme_session_id ?></td>
 <td><?= $subRecord->signed_by_rmm_session_id ?></td>
+<td><?= $subRecord->claim_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 8 - 8
resources/views/pro/clients_SINGLE/SUB_device_measurements.blade.php

@@ -15,13 +15,13 @@
                 <thead>
                 <tr>
                     <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
+<th>Client Id</th>
+<th>Bdt Measurement Id</th>
 <th>Status</th>
 <th>Status Memo</th>
+<th>Created At</th>
 <th>Created By Session Id</th>
-<th>Bdt Measurement Id</th>
-<th>Client Id</th>
+<th>Type</th>
 <th>Measurement Id</th>
                 </tr>
                 </thead>
@@ -29,13 +29,13 @@
                 @foreach($subRecords as $subRecord)
                     <tr>
                         <td><a href=""><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($subRecord->created_at) ?></td>
-<td><?= $subRecord->type ?></td>
+<td><?= $subRecord->client_id ?></td>
+<td><?= $subRecord->bdt_measurement_id ?></td>
 <td><?= $subRecord->status ?></td>
 <td><?= $subRecord->status_memo ?></td>
+<td><?= friendly_date_time($subRecord->created_at) ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->bdt_measurement_id ?></td>
-<td><?= $subRecord->client_id ?></td>
+<td><?= $subRecord->type ?></td>
 <td><?= $subRecord->measurement_id ?></td>
                     </tr>
                 @endforeach

+ 4 - 4
resources/views/pro/clients_SINGLE/SUB_erx.blade.php

@@ -20,8 +20,6 @@
 <th>Action Item Category</th>
 <th>Content Detail</th>
 <th>Content Text</th>
-<th>Dose</th>
-<th>Facility Memo</th>
 <th>Is Signed By Ally</th>
 <th>Is Signed By Prescriber</th>
 <th>Signed By Ally At</th>
@@ -37,6 +35,8 @@
 <th>Signed By Ally Session Id</th>
 <th>Signed By Prescriber Session Id</th>
 <th>To Facility Id</th>
+<th>Facility Memo</th>
+<th>Dose</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -48,8 +48,6 @@
 <td><?= $subRecord->action_item_category ?></td>
 <td><?= $subRecord->content_detail ?></td>
 <td><?= $subRecord->content_text ?></td>
-<td><?= $subRecord->dose ?></td>
-<td><?= $subRecord->facility_memo ?></td>
 <td><?= $subRecord->is_signed_by_ally ?></td>
 <td><?= $subRecord->is_signed_by_prescriber ?></td>
 <td><?= friendly_date_time($subRecord->signed_by_ally_at) ?></td>
@@ -65,6 +63,8 @@
 <td><?= $subRecord->signed_by_ally_session_id ?></td>
 <td><?= $subRecord->signed_by_prescriber_session_id ?></td>
 <td><?= $subRecord->to_facility_id ?></td>
+<td><?= $subRecord->facility_memo ?></td>
+<td><?= $subRecord->dose ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 2 - 2
resources/views/pro/clients_SINGLE/SUB_related_transactions.blade.php

@@ -26,8 +26,8 @@
 <th>Created By Session Id</th>
 <th>Bill Id</th>
 <th>Client Id</th>
-<th>Client Program Month Entry Id</th>
 <th>Pro Id</th>
+<th>Client Program Month Entry Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -45,8 +45,8 @@
 <td><?= $subRecord->created_by_session_id ?></td>
 <td><?= $subRecord->bill_id ?></td>
 <td><?= $subRecord->client_id ?></td>
-<td><?= $subRecord->client_program_month_entry_id ?></td>
 <td><?= $subRecord->pro_id ?></td>
+<td><?= $subRecord->client_program_month_entry_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 4 - 4
resources/views/pro/erx/index.blade.php

@@ -18,8 +18,6 @@
 <th>Action Item Category</th>
 <th>Content Detail</th>
 <th>Content Text</th>
-<th>Dose</th>
-<th>Facility Memo</th>
 <th>Is Signed By Ally</th>
 <th>Is Signed By Prescriber</th>
 <th>Signed By Ally At</th>
@@ -35,6 +33,8 @@
 <th>Signed By Ally Session Id</th>
 <th>Signed By Prescriber Session Id</th>
 <th>To Facility Id</th>
+<th>Facility Memo</th>
+<th>Dose</th>
             </tr>
             </thead>
             <tbody>
@@ -46,8 +46,6 @@
 <td><?= $record->action_item_category ?></td>
 <td><?= $record->content_detail ?></td>
 <td><?= $record->content_text ?></td>
-<td><?= $record->dose ?></td>
-<td><?= $record->facility_memo ?></td>
 <td><?= $record->is_signed_by_ally ?></td>
 <td><?= $record->is_signed_by_prescriber ?></td>
 <td><?= friendly_date_time($record->signed_by_ally_at) ?></td>
@@ -63,6 +61,8 @@
 <td><?= $record->signed_by_ally_session_id ?></td>
 <td><?= $record->signed_by_prescriber_session_id ?></td>
 <td><?= $record->to_facility_id ?></td>
+<td><?= $record->facility_memo ?></td>
+<td><?= $record->dose ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 24 - 24
resources/views/pro/leads/index.blade.php

@@ -13,44 +13,44 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
-<th>Address</th>
+<th>Program</th>
+<th>Name First</th>
+<th>Name Last</th>
 <th>Dob</th>
-<th>Email</th>
-<th>Full Eligible Api Response</th>
-<th>Full Lead Form Data</th>
+<th>Mcn</th>
 <th>Is Mcn Valid</th>
+<th>Client Id</th>
+<th>Full Lead Form Data</th>
+<th>Full Eligible Api Response</th>
+<th>Created At</th>
+<th>Created By Session Id</th>
+<th>Type</th>
 <th>Lead Data</th>
-<th>Mcn</th>
-<th>Name First</th>
-<th>Name Last</th>
 <th>Phone</th>
-<th>Program</th>
-<th>Created By Session Id</th>
-<th>Client Id</th>
+<th>Email</th>
+<th>Address</th>
             </tr>
             </thead>
             <tbody>
             @foreach($records as $record)
                 <tr>
 <td><a href="/leads/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($record->created_at) ?></td>
-<td><?= $record->type ?></td>
-<td><?= $record->address ?></td>
+<td><?= $record->program ?></td>
+<td><?= $record->name_first ?></td>
+<td><?= $record->name_last ?></td>
 <td><?= $record->dob ?></td>
-<td><?= $record->email ?></td>
-<td><?= $record->full_eligible_api_response ?></td>
-<td><?= $record->full_lead_form_data ?></td>
+<td><?= $record->mcn ?></td>
 <td><?= $record->is_mcn_valid ?></td>
+<td><?= $record->client_id ?></td>
+<td><?= $record->full_lead_form_data ?></td>
+<td><?= $record->full_eligible_api_response ?></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
+<td><?= $record->created_by_session_id ?></td>
+<td><?= $record->type ?></td>
 <td><?= $record->lead_data ?></td>
-<td><?= $record->mcn ?></td>
-<td><?= $record->name_first ?></td>
-<td><?= $record->name_last ?></td>
 <td><?= $record->phone ?></td>
-<td><?= $record->program ?></td>
-<td><?= $record->created_by_session_id ?></td>
-<td><?= $record->client_id ?></td>
+<td><?= $record->email ?></td>
+<td><?= $record->address ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 2 - 0
resources/views/pro/notes_SINGLE/SUB_bills.blade.php

@@ -78,6 +78,7 @@
 <th>Signed By Hcp Session Id</th>
 <th>Signed By Rme Session Id</th>
 <th>Signed By Rmm Session Id</th>
+<th>Claim Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -147,6 +148,7 @@
 <td><?= $subRecord->signed_by_hcp_session_id ?></td>
 <td><?= $subRecord->signed_by_rme_session_id ?></td>
 <td><?= $subRecord->signed_by_rmm_session_id ?></td>
+<td><?= $subRecord->claim_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 2 - 2
resources/views/pro/transactions/index.blade.php

@@ -24,8 +24,8 @@
 <th>Created By Session Id</th>
 <th>Bill Id</th>
 <th>Client Id</th>
-<th>Client Program Month Entry Id</th>
 <th>Pro Id</th>
+<th>Client Program Month Entry Id</th>
             </tr>
             </thead>
             <tbody>
@@ -43,8 +43,8 @@
 <td><?= $record->created_by_session_id ?></td>
 <td><?= $record->bill_id ?></td>
 <td><?= $record->client_id ?></td>
-<td><?= $record->client_program_month_entry_id ?></td>
 <td><?= $record->pro_id ?></td>
+<td><?= $record->client_program_month_entry_id ?></td>
                 </tr>
             @endforeach
             </tbody>