Merge remote-tracking branch 'origin/dev-vj' into dev-vj

generatecv/tree.txt

@@ -355,6 +355,7 @@ PRO
 # :: need remove
             cm_time_entries
                 id=care_month_entry.care_month_id,cm_or_rm='CM'
+                !inc:content_text,content_detail,time_in_seconds
                 add_new:care_month_entry:createForCm
                     careMonthUid:hidden=uid
                     proUid:record:pro:uid,name_display

resources/views/pro/care_months_SINGLE/SUB_cm_time_entries.blade.php

@@ -15,58 +15,18 @@
                 <thead>
                 <tr>
                     <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
-<th>Is Removed</th>
-<th>Removal Memo</th>
-<th>Removed At</th>
-<th>Achieved Cm Pro Time In Seconds</th>
-<th>Achieved Mcp Time In Seconds</th>
-<th>Achieved Rme Pro Time In Seconds</th>
-<th>Achieved Rmm Pro Time In Seconds</th>
-<th>Achieved Total Time In Seconds</th>
-<th>Cm Or Rm</th>
-<th>Content Detail</th>
 <th>Content Text</th>
-<th>Effective Date</th>
-<th>Ending Time</th>
-<th>Is Time Specific</th>
-<th>Starting Time</th>
+<th>Content Detail</th>
 <th>Time In Seconds</th>
-<th>Created By Session Id</th>
-<th>Removed By Session Id</th>
-<th>Care Month Id</th>
-<th>Client Id</th>
-<th>Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
                 @foreach($subRecords as $subRecord)
                     <tr>
                         <td><a href=""><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($record->created_at) ?></td>
-<td><?= $subRecord->type ?></td>
-<td><?= $subRecord->is_removed ?></td>
-<td><?= $subRecord->removal_memo ?></td>
-<td><?= friendly_date_time($record->removed_at) ?></td>
-<td><?= $subRecord->achieved_cm_pro_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_mcp_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_rme_pro_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_rmm_pro_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_total_time_in_seconds ?></td>
-<td><?= $subRecord->cm_or_rm ?></td>
-<td><?= $subRecord->content_detail ?></td>
 <td><?= $subRecord->content_text ?></td>
-<td><?= $subRecord->effective_date ?></td>
-<td><?= $subRecord->ending_time ?></td>
-<td><?= $subRecord->is_time_specific ?></td>
-<td><?= $subRecord->starting_time ?></td>
+<td><?= $subRecord->content_detail ?></td>
 <td><?= $subRecord->time_in_seconds ?></td>
-<td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->removed_by_session_id ?></td>
-<td><?= $subRecord->care_month_id ?></td>
-<td><?= $subRecord->client_id ?></td>
-<td><?= $subRecord->pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>