Procházet zdrojové kódy

RM to the left & CM to the right

Vijayakrishnan Krishnan před 4 roky
rodič
revize
2e5b4e03a2
1 změnil soubory, kde provedl 362 přidání a 362 odebrání
  1. 362 362
      resources/views/app/patient/care-month/dashboard.blade.php

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

@@ -95,47 +95,47 @@
                 <div class="d-inline-flex align-items-start">
                     <div>
                         <div class="mr-3 text-sm-incl-children">
-                            <span class="d-inline-block minutes-label">CM</span>
+                            <span class="d-inline-block minutes-label">RMM</span>
                             <span class="font-weight-bold text-dark text-nowrap">
-                                {{time_in_hrminsec($careMonth->cm_total_time_in_seconds_by_cm_pro)}}
+                                {{time_in_hrminsec($careMonth->rm_total_time_in_seconds_by_rmm_pro)}}
+                            </span>
+                        </div>
+                        <div class="mr-3 text-sm-incl-children">
+                            <span class="d-inline-block minutes-label">RME</span>
+                            <span class="font-weight-bold text-dark text-nowrap">
+                                {{time_in_hrminsec($careMonth->rm_total_time_in_seconds_by_rme_pro)}}
                             </span>
                         </div>
                         <div class="mr-3 text-sm-incl-children">
                             <span class="d-inline-block minutes-label">MCP</span>
                             <span class="font-weight-bold text-dark text-nowrap">
-                                {{time_in_hrminsec($careMonth->cm_total_time_in_seconds_by_mcp)}}
+                                {{time_in_hrminsec($careMonth->rm_total_time_in_seconds_by_mcp)}}
                             </span>
                         </div>
                     </div>
                     <div class="ml-3 text-sm-incl-children">
-                        <div class="">CM Total</div>
-                        <div class="font-weight-bold text-dark text-nowrap">{{time_in_hrminsec($careMonth->cm_total_time_in_seconds)}}</div>
+                        <div class="">RM Total</div>
+                        <div class="font-weight-bold text-dark text-nowrap">{{time_in_hrminsec($careMonth->rm_total_time_in_seconds)}}</div>
                     </div>
                 </div>
                 <div class="d-inline-flex align-items-start border-left pl-3 ml-3">
                     <div>
                         <div class="mr-3 text-sm-incl-children">
-                            <span class="d-inline-block minutes-label">RMM</span>
-                            <span class="font-weight-bold text-dark text-nowrap">
-                                {{time_in_hrminsec($careMonth->rm_total_time_in_seconds_by_rmm_pro)}}
-                            </span>
-                        </div>
-                        <div class="mr-3 text-sm-incl-children">
-                            <span class="d-inline-block minutes-label">RME</span>
+                            <span class="d-inline-block minutes-label">CM</span>
                             <span class="font-weight-bold text-dark text-nowrap">
-                                {{time_in_hrminsec($careMonth->rm_total_time_in_seconds_by_rme_pro)}}
+                                {{time_in_hrminsec($careMonth->cm_total_time_in_seconds_by_cm_pro)}}
                             </span>
                         </div>
                         <div class="mr-3 text-sm-incl-children">
                             <span class="d-inline-block minutes-label">MCP</span>
                             <span class="font-weight-bold text-dark text-nowrap">
-                                {{time_in_hrminsec($careMonth->rm_total_time_in_seconds_by_mcp)}}
+                                {{time_in_hrminsec($careMonth->cm_total_time_in_seconds_by_mcp)}}
                             </span>
                         </div>
                     </div>
                     <div class="ml-3 text-sm-incl-children">
-                        <div class="">RM Total</div>
-                        <div class="font-weight-bold text-dark text-nowrap">{{time_in_hrminsec($careMonth->rm_total_time_in_seconds)}}</div>
+                        <div class="">CM Total</div>
+                        <div class="font-weight-bold text-dark text-nowrap">{{time_in_hrminsec($careMonth->cm_total_time_in_seconds)}}</div>
                     </div>
                 </div>
             </div>
@@ -148,10 +148,6 @@
                 <span class="text-secondary">MCP:</span>
                 <span class="text-nowrap">{{ $careMonth->mcp ? $careMonth->mcp->displayName() : '-' }}</span>
             </div>
-            <div class="col-3">
-                <span class="text-secondary">CM:</span>
-                <span class="text-nowrap">{{ $careMonth->cmPro ? $careMonth->cmPro->displayName() : '-' }}</span>
-            </div>
             <div class="col-3">
                 <span class="text-secondary">RMM:</span>
                 <span class="text-nowrap">{{ $careMonth->rmmPro ? $careMonth->rmmPro->displayName() : '-' }}</span>
@@ -160,6 +156,10 @@
                 <span class="text-secondary">RME:</span>
                 <span class="text-nowrap">{{ $careMonth->rmePro ? $careMonth->rmePro->displayName() : '-' }}</span>
             </div>
+            <div class="col-3">
+                <span class="text-secondary">CM:</span>
+                <span class="text-nowrap">{{ $careMonth->cmPro ? $careMonth->cmPro->displayName() : '-' }}</span>
+            </div>
         </div>
 
         <hr class="m-negator mt-0">
@@ -193,6 +193,153 @@
         ?>
 
         <div class="row">
+            @if($patient->is_enrolled_in_rm === 'YES')
+                <div class="col-6">
+                    <div class="d-flex align-items-center">
+                        <h6 class="my-0 text-secondary font-weight-bold text-dark lh-24px">RM Time Entries</h6>
+                        <span class="mx-2 text-secondary">|</span>
+                        @if(!$activeRMBill)
+                            <div moe large>
+                                <a start show class="py-0 mb-3">Add</a>
+                                <form url="/api/careMonthEntry/createForRm">
+                                    <input type="hidden" name="careMonthUid" value="{{ $careMonth->uid }}">
+                                    <div class="mb-2">
+                                        <div class="row">
+                                            <div class="col-4 pr-0">
+                                                <select class="form-control form-control-sm w-100" name="proUid">
+                                                    <option value="">-- Select Pro --</option>
+                                                    @foreach($pros as $iPro)
+                                                        <option {{ $iPro->uid === $pro->uid ? 'selected' : '' }}
+                                                                value="{{ $iPro->uid }}">{{ $iPro->displayName() }}</option>
+                                                    @endforeach
+                                                </select>
+                                            </div>
+                                            <div class="col-4 pr-0">
+                                                <?php
+                                                $sD = strtotime($careMonth->start_date);
+                                                $y = date('Y', $sD);
+                                                $m = date('m', $sD);
+                                                $d = date('t', $sD);
+                                                $yCurrent = date('Y');
+                                                $mCurrent = date('m');
+                                                if($y === $yCurrent && $m === $mCurrent) {
+                                                    $d = date('d');
+                                                }
+                                                ?>
+                                                <input autofocus type="date" min="{{ date($y . '-' . $m . '-01') }}" max="{{ date($y . '-' . $m . '-' . $d) }}"
+                                                       class="form-control form-control-sm w-100" name="effectiveDate"
+                                                       placeholder="Effective Date">
+                                            </div>
+                                            <div class="col-4">
+                                                <input type="number" min="0" max="5400" class="form-control form-control-sm w-100 cm-time-value" name="timeInSeconds"
+                                                       value="" placeholder="Time in Seconds">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="mb-2">
+                                        <div class="row">
+                                            <div class="col-4 pr-0 d-flex align-items-center">
+                                                <div class="d-flex align-items-center">
+                                                    <span>Time Specific:</span>
+                                                    <input type="checkbox" name="isTimeSpecific" class="ml-1"
+                                                           onchange="enableTimeSpecificFields(this.checked, 'rm-time-value', 'rm-time-range')">
+                                                </div>
+                                            </div>
+                                            <div class="col-4 pr-0">
+                                                <input type="time" class="form-control form-control-sm rm-time-range" name="startingTime"
+                                                       value="" placeholder="Starting Time" disabled>
+                                            </div>
+                                            <div class="col-4">
+                                                <input type="time" class="form-control form-control-sm rm-time-range" name="endingTime"
+                                                       value="" placeholder="Ending Time" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    @include('app/entry-templates/rm/default')
+                                    <div class="d-flex align-items-center">
+                                        <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                    </div>
+                                </form>
+                            </div>
+                        @else
+                            <span class="text-secondary">Can't modify since a bill exists</span>
+                        @endif
+                    </div>
+                    <table class="table table-striped table-sm table-bordered mt-2 mb-0">
+                        <thead>
+                        <tr>
+                            <th class="px-2 text-secondary border-bottom-0">Effective Date</th>
+                            <th class="px-2 text-secondary border-bottom-0">Time</th>
+                            <th class="px-2 text-secondary border-bottom-0 w-50">Details</th>
+                            <th class="px-2 text-secondary border-bottom-0 delete-column">&nbsp;</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        @foreach($entries as $entry)
+                            @if(!$entry->is_removed && $entry->cm_or_rm === "RM")
+                                <tr>
+                                    <td class="px-2">
+                                        <div class="font-weight-bold">{{friendly_date_time($entry->effective_date, false)}}</div>
+                                        <div class="small text-secondary">Created: {{friendly_date_time($entry->created_at)}}</div>
+                                    </td>
+                                    <td class="px-2">
+                                        {{time_in_hrminsec($entry->time_in_seconds)}}
+                                    </td>
+                                    <td class="px-2">
+                                        <div class="text-secondary text-s">{!! $entry->content_text !!}</div>
+                                        {{--<div class="text-secondary text-sm">{{$entry->content_detail}}</div>--}}
+                                    </td>
+                                    <td class="px-2 text-center delete-column">
+                                        @if(!$activeRMBill)
+                                            <div moe relative>
+                                                <a start show><i class="on-hover-opaque fa fa-trash-alt text-danger"></i></a>
+                                                <form url="/api/careMonthEntry/remove" right>
+                                                    <input type="hidden" name="uid" value="{{ $entry->uid }}">
+                                                    <p class="small">Are you sure you want to delete this RM entry?</p>
+                                                    <div class="d-flex align-items-center">
+                                                        <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                        @else
+                                            <a href="#" class="text-secondary" title="Can't modify since a bill exists"><i class="on-hover-opaque fa fa-trash-alt"></i></a>
+                                        @endif
+                                    </td>
+                                </tr>
+                            @endif
+                        @endforeach
+                        </tbody>
+                    </table>
+                </div>
+            @else
+                <div class="col-6">
+                    <h6 class="mb-3 text-secondary font-weight-bold text-dark">RM Time Entries</h6>
+                    <div class="alert alert-secondary mb-0">
+                        <b>{{ $patient->displayName() }}</b> is currently not enrolled in <b>RM</b>.
+                        <span moe class="">
+                        <a start show class="font-weight-bold">Enroll Now</a>
+                        <form url="/api/client/setIsEnrolledInRmToTrue">
+                            <input type="hidden" name="uid" value="{{ $patient->uid }}">
+                            <div class="mb-2">
+                                <input type="text" class="form-control form-control-sm" name="rmReason1"
+                                       value="" placeholder="RM Reason 1">
+                            </div>
+                            <div class="mb-2">
+                                <input type="text" class="form-control form-control-sm" name="rmReason2"
+                                       value="" placeholder="RM Reason 2">
+                            </div>
+                            <div class="d-flex align-items-center">
+                                <button class="btn btn-sm btn-success mr-2" submit>Enroll</button>
+                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                            </div>
+                        </form>
+                    </span>
+                    </div>
+                </div>
+            @endif
+
             @if($careMonth->is_tm_this_month)
                 <div class="col-6">
                     <div class="d-flex align-items-center">
@@ -220,9 +367,9 @@
                             <h6 class="my-0 text-secondary font-weight-bold text-dark lh-24px">CM Time Entries</h6>
                             <span class="mx-2 text-secondary">|</span>
                             @if(!$activeCMBill)
-                                <div moe large>
+                                <span moe large relative>
                                     <a start show class="py-0 mb-3">Add</a>
-                                    <form url="/api/careMonthEntry/createForCm">
+                                    <form url="/api/careMonthEntry/createForCm" right>
                                         <input type="hidden" name="careMonthUid" value="{{ $careMonth->uid }}">
                                         <div class="mb-2">
                                             <div class="row">
@@ -282,7 +429,7 @@
                                             <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                         </div>
                                     </form>
-                                </div>
+                                </span>
                             @else
                                 <span class="text-secondary">Can't modify since a bill exists</span>
                             @endif
@@ -369,153 +516,6 @@
                     </div>
                 @endif
             @endif
-
-            @if($patient->is_enrolled_in_rm === 'YES')
-                <div class="col-6">
-                <div class="d-flex align-items-center">
-                    <h6 class="my-0 text-secondary font-weight-bold text-dark lh-24px">RM Time Entries</h6>
-                    <span class="mx-2 text-secondary">|</span>
-                    @if(!$activeRMBill)
-                        <div moe large>
-                            <a start show class="py-0 mb-3">Add</a>
-                            <form url="/api/careMonthEntry/createForRm">
-                                <input type="hidden" name="careMonthUid" value="{{ $careMonth->uid }}">
-                                <div class="mb-2">
-                                    <div class="row">
-                                        <div class="col-4 pr-0">
-                                            <select class="form-control form-control-sm w-100" name="proUid">
-                                                <option value="">-- Select Pro --</option>
-                                                @foreach($pros as $iPro)
-                                                    <option {{ $iPro->uid === $pro->uid ? 'selected' : '' }}
-                                                            value="{{ $iPro->uid }}">{{ $iPro->displayName() }}</option>
-                                                @endforeach
-                                            </select>
-                                        </div>
-                                        <div class="col-4 pr-0">
-                                            <?php
-                                            $sD = strtotime($careMonth->start_date);
-                                            $y = date('Y', $sD);
-                                            $m = date('m', $sD);
-                                            $d = date('t', $sD);
-                                            $yCurrent = date('Y');
-                                            $mCurrent = date('m');
-                                            if($y === $yCurrent && $m === $mCurrent) {
-                                                $d = date('d');
-                                            }
-                                            ?>
-                                            <input autofocus type="date" min="{{ date($y . '-' . $m . '-01') }}" max="{{ date($y . '-' . $m . '-' . $d) }}"
-                                                   class="form-control form-control-sm w-100" name="effectiveDate"
-                                                   placeholder="Effective Date">
-                                        </div>
-                                        <div class="col-4">
-                                            <input type="number" min="0" max="5400" class="form-control form-control-sm w-100 cm-time-value" name="timeInSeconds"
-                                                   value="" placeholder="Time in Seconds">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="mb-2">
-                                    <div class="row">
-                                        <div class="col-4 pr-0 d-flex align-items-center">
-                                            <div class="d-flex align-items-center">
-                                                <span>Time Specific:</span>
-                                                <input type="checkbox" name="isTimeSpecific" class="ml-1"
-                                                       onchange="enableTimeSpecificFields(this.checked, 'rm-time-value', 'rm-time-range')">
-                                            </div>
-                                        </div>
-                                        <div class="col-4 pr-0">
-                                            <input type="time" class="form-control form-control-sm rm-time-range" name="startingTime"
-                                                   value="" placeholder="Starting Time" disabled>
-                                        </div>
-                                        <div class="col-4">
-                                            <input type="time" class="form-control form-control-sm rm-time-range" name="endingTime"
-                                                   value="" placeholder="Ending Time" disabled>
-                                        </div>
-                                    </div>
-                                </div>
-                                @include('app/entry-templates/rm/default')
-                                <div class="d-flex align-items-center">
-                                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                    @else
-                        <span class="text-secondary">Can't modify since a bill exists</span>
-                    @endif
-                </div>
-                <table class="table table-striped table-sm table-bordered mt-2 mb-0">
-                    <thead>
-                    <tr>
-                        <th class="px-2 text-secondary border-bottom-0">Effective Date</th>
-                        <th class="px-2 text-secondary border-bottom-0">Time</th>
-                        <th class="px-2 text-secondary border-bottom-0 w-50">Details</th>
-                        <th class="px-2 text-secondary border-bottom-0 delete-column">&nbsp;</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    @foreach($entries as $entry)
-                        @if(!$entry->is_removed && $entry->cm_or_rm === "RM")
-                            <tr>
-                                <td class="px-2">
-                                    <div class="font-weight-bold">{{friendly_date_time($entry->effective_date, false)}}</div>
-                                    <div class="small text-secondary">Created: {{friendly_date_time($entry->created_at)}}</div>
-                                </td>
-                                <td class="px-2">
-                                    {{time_in_hrminsec($entry->time_in_seconds)}}
-                                </td>
-                                <td class="px-2">
-                                    <div class="text-secondary text-s">{!! $entry->content_text !!}</div>
-                                    {{--<div class="text-secondary text-sm">{{$entry->content_detail}}</div>--}}
-                                </td>
-                                <td class="px-2 text-center delete-column">
-                                    @if(!$activeRMBill)
-                                        <div moe relative>
-                                            <a start show><i class="on-hover-opaque fa fa-trash-alt text-danger"></i></a>
-                                            <form url="/api/careMonthEntry/remove" right>
-                                                <input type="hidden" name="uid" value="{{ $entry->uid }}">
-                                                <p class="small">Are you sure you want to delete this RM entry?</p>
-                                                <div class="d-flex align-items-center">
-                                                    <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
-                                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                </div>
-                                            </form>
-                                        </div>
-                                    @else
-                                        <a href="#" class="text-secondary" title="Can't modify since a bill exists"><i class="on-hover-opaque fa fa-trash-alt"></i></a>
-                                    @endif
-                                </td>
-                            </tr>
-                        @endif
-                    @endforeach
-                    </tbody>
-                </table>
-            </div>
-            @else
-                <div class="col-6">
-                    <h6 class="mb-3 text-secondary font-weight-bold text-dark">RM Time Entries</h6>
-                    <div class="alert alert-secondary mb-0">
-                        <b>{{ $patient->displayName() }}</b> is currently not enrolled in <b>RM</b>.
-                        <span moe class="">
-                        <a start show class="font-weight-bold">Enroll Now</a>
-                        <form url="/api/client/setIsEnrolledInRmToTrue">
-                            <input type="hidden" name="uid" value="{{ $patient->uid }}">
-                            <div class="mb-2">
-                                <input type="text" class="form-control form-control-sm" name="rmReason1"
-                                       value="" placeholder="RM Reason 1">
-                            </div>
-                            <div class="mb-2">
-                                <input type="text" class="form-control form-control-sm" name="rmReason2"
-                                       value="" placeholder="RM Reason 2">
-                            </div>
-                            <div class="d-flex align-items-center">
-                                <button class="btn btn-sm btn-success mr-2" submit>Enroll</button>
-                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                            </div>
-                        </form>
-                    </span>
-                    </div>
-                </div>
-            @endif
         </div>
 
         @if((!$careMonth->is_tm_this_month && $patient->is_enrolled_in_cm === 'YES') || $patient->is_enrolled_in_rm === 'YES')
@@ -524,198 +524,6 @@
 
         <div class="row">
 
-            {{-- cm bills --}}
-            @if($careMonth->is_tm_this_month)
-                <div class="col-6">
-                    {{-- no cm bills in tm month --}}
-                </div>
-            @else
-                <div class="col-6">
-                    @if($patient->is_enrolled_in_cm === 'YES')
-                        <div class="d-flex align-items-center">
-                            <h6 class="my-0 text-secondary font-weight-bold text-dark">CM Bill
-                                @if($activeCMBill && !$activeCMBill->is_signed_by_hcp)
-                                    <span class="small ml-1 text-secondary">(HCP Sign Pending)</span>
-                                @else
-                                    @if($activeCMBill)
-                                        <span class="small ml-1 text-secondary">(Signed by HCP)</span>
-                                    @endif
-                                @endif
-                            </h6>
-                            @if($activeCMBill === false)
-                                <span class="mx-2 text-secondary">|</span>
-                                <div moe>
-                                <a start show class="py-0 mb-3">Generate</a>
-                                <form url="/api/careMonth/generateBillForCm">
-                                    <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
-                                    <div class="mb-2">
-                                        <select class="form-control" name="cmCode">
-                                            <option value="">-- Select CM Code --</option>
-                                            <?php $cmRates = $pro->cmRates(); ?>
-                                            @if($cmRates && count($cmRates))
-                                                @foreach($cmRates as $cmRate)
-                                                    <option value="{{ $cmRate->code }}">{{ $cmRate->code }}</option>
-                                                @endforeach
-                                            @endif
-                                        </select>
-                                    </div>
-                                    <div class="mb-2">
-                                        <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="form-control form-control-sm"></textarea>
-                                    </div>
-                                    <div class="d-flex align-items-center">
-                                        <button class="btn btn-sm btn-primary mr-2" submit>Generate</button>
-                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                    </div>
-                                </form>
-                            </div>
-                            @else
-                                @if(!$activeCMBill->is_signed_by_hcp && $activeCMBill->hcp_pro_id === $pro->id)
-                                <span class="mx-2 text-secondary">|</span>
-                                <div moe>
-                                    <a start show class="py-0 mb-3 text-success">Sign as HCP</a>
-                                    <form url="/api/bill/signAsHcp">
-                                        <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
-                                        <p class="small">Sign this CM bill as HCP?</p>
-                                        <div class="d-flex align-items-center">
-                                            <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
-                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                        </div>
-                                    </form>
-                                </div>
-                                @endif
-                                <span class="mx-2 text-secondary">|</span>
-                                <div moe>
-                                    <a start show class="py-0 mb-3 text-danger">Cancel</a>
-                                    <form url="/api/bill/markCancelled">
-                                        <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
-                                        <p class="small mb-2">Are you sure you want to cancel this CM bill?</p>
-                                        <div class="mb-2">
-                                            <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="memo-textarea form-control form-control-sm"></textarea>
-                                        </div>
-                                        <div class="d-flex align-items-center">
-                                            <button class="btn btn-sm btn-danger mr-2" submit>Yes</button>
-                                            <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
-                                        </div>
-                                    </form>
-                                </div>
-                            @endif
-                        </div>
-                        @if($activeCMBill !== false)
-                            <div class="border bg-white p-2 mt-2">
-                                <div class="">
-                                    Code: <span class="font-weight-bold text-dark">{{ $activeCMBill->code }}</span>
-                                    <div class="small text-secondary">Memo: {{$activeCMBill->memo}}</div>
-                                    <div class="small text-secondary">Created: {{friendly_date_time($activeCMBill->created_at)}}</div>
-                                </div>
-                                <div class="font-weight-bold text-dark mt-2 mb-1"></div>
-                                @if($activeCMBill->hcp_pro_id === $pro->id)
-                                <div class="d-flex align-items-center">
-                                    @if($activeCMBill->has_hcp_been_paid)
-                                        <span class="text-dark">Received HCP Amount: </span>
-                                        <span class="font-weight-bold text-success ml-2">${{ $activeCMBill->hcp_payment_amount }}</span>
-                                    @else
-                                        <span class="text-dark">Expected HCP Amount: </span>
-                                        <span class="font-weight-bold text-dark ml-2">{{ $activeCMBill->hcp_expected_payment_amount ? '$' . $activeCMBill->hcp_expected_payment_amount : '-' }}</span>
-                                        <span class="ml-auto">
-                                            @if($activeCMBill->is_signed_by_hcp)
-                                                <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
-                                            @else
-                                                <div class="text-primary ml-3">
-                                                    <div moe class="text-dark">
-                                                        <a start show class="py-0 mb-3 text-primary text-sm">
-                                                            <i class="fa fa-exclamation-triangle"></i> Sign Pending
-                                                        </a>
-                                                        <form url="/api/bill/signAsHcp">
-                                                            <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
-                                                            <p class="small">Sign this RM bill as HCP?</p>
-                                                            <div class="d-flex align-items-center">
-                                                                <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
-                                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                            </div>
-                                                        </form>
-                                                    </div>
-                                                </div>
-                                            @endif
-                                        </span>
-                                    @endif
-                                </div>
-                                @endif
-                                @if($activeCMBill->cm_pro_id === $pro->id)
-                                <div class="d-flex align-items-center">
-                                    @if($activeCMBill->has_cm_been_paid)
-                                        <span class="text-dark">Received CM Pro Amount: </span>
-                                        <span class="font-weight-bold text-success ml-2">${{ $activeCMBill->cm_payment_amount }}</span>
-                                    @else
-                                        <span class="text-dark">Expected CM Pro Amount: </span>
-                                        <span class="font-weight-bold text-dark ml-2">{{ $activeCMBill->cm_expected_payment_amount ? '$' . $activeCMBill->cm_expected_payment_amount : '-' }}</span>
-                                        <span class="ml-auto">
-                                            @if($activeCMBill->is_signed_by_cm)
-                                                <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
-                                            @else
-                                                <div class="text-primary ml-3">
-                                                    <div moe class="text-dark">
-                                                        <a start show class="py-0 mb-3 text-primary text-sm">
-                                                            <i class="fa fa-exclamation-triangle"></i> Sign Pending
-                                                        </a>
-                                                        <form url="/api/bill/signAsCm">
-                                                            <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
-                                                            <p class="small">Sign this RM bill as CM Pro?</p>
-                                                            <div class="d-flex align-items-center">
-                                                                <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
-                                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                            </div>
-                                                        </form>
-                                                    </div>
-                                                </div>
-                                            @endif
-                                        </span>
-                                    @endif
-                                </div>
-                                @endif
-                            </div>
-                        @endif
-                        {{-- cancelled cm bills --}}
-                        @if(count($cancelledCMBills))
-                            @foreach($cancelledCMBills as $cancelledBill)
-                                <div class="border bg-light p-2 mt-2 on-hover-opaque mb-3">
-                                    <div class="d-flex">
-                                        <div class="">
-                                            Code: <span class="font-weight-bold text-dark">{{ $cancelledBill->code }}</span>
-                                            <div class="small text-secondary">Memo: {{$cancelledBill->memo}}</div>
-                                            <div class="small text-secondary">Created: {{friendly_date_time($cancelledBill->created_at)}}</div>
-                                        </div>
-                                        <div class="ml-auto text-secondary font-weight-bold">CANCELLED BILL</div>
-                                    </div>
-                                    <div class="font-weight-bold text-dark mt-2 mb-1"></div>
-                                    @if($cancelledBill->hcp_pro_id === $pro->id)
-                                        <div class="d-flex align-items-center">
-                                            @if($cancelledBill->has_hcp_been_paid)
-                                                <span class="text-dark">Received HCP Amount: </span>
-                                                <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->hcp_payment_amount }}</span>
-                                            @else
-                                                <span class="text-dark">Expected HCP Amount: </span>
-                                                <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->hcp_expected_payment_amount ? '$' . $cancelledBill->hcp_expected_payment_amount : '-' }}</span>
-                                            @endif
-                                        </div>
-                                    @endif
-                                    @if($cancelledBill->cm_pro_id === $pro->id)
-                                        <div class="d-flex align-items-center">
-                                            @if($cancelledBill->has_cm_been_paid)
-                                                <span class="text-dark">Received CM Pro Amount: </span>
-                                                <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->cm_payment_amount }}</span>
-                                            @else
-                                                <span class="text-dark">Expected CM Pro Amount: </span>
-                                                <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->cm_expected_payment_amount ? '$' . $cancelledBill->cm_expected_payment_amount : '-' }}</span>
-                                            @endif
-                                        </div>
-                                    @endif
-                                </div>
-                            @endforeach
-                        @endif
-                    @endif
-                </div>
-            @endif
-
             {{-- rm bills --}}
             <div class="col-6">
                 @if($patient->is_enrolled_in_rm === 'YES')
@@ -945,6 +753,198 @@
                 @endif
             </div>
 
+            {{-- cm bills --}}
+            @if($careMonth->is_tm_this_month)
+                <div class="col-6">
+                    {{-- no cm bills in tm month --}}
+                </div>
+            @else
+                <div class="col-6">
+                    @if($patient->is_enrolled_in_cm === 'YES')
+                        <div class="d-flex align-items-center">
+                            <h6 class="my-0 text-secondary font-weight-bold text-dark">CM Bill
+                                @if($activeCMBill && !$activeCMBill->is_signed_by_hcp)
+                                    <span class="small ml-1 text-secondary">(HCP Sign Pending)</span>
+                                @else
+                                    @if($activeCMBill)
+                                        <span class="small ml-1 text-secondary">(Signed by HCP)</span>
+                                    @endif
+                                @endif
+                            </h6>
+                            @if($activeCMBill === false)
+                                <span class="mx-2 text-secondary">|</span>
+                                <div moe>
+                                    <a start show class="py-0 mb-3">Generate</a>
+                                    <form url="/api/careMonth/generateBillForCm">
+                                        <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
+                                        <div class="mb-2">
+                                            <select class="form-control" name="cmCode">
+                                                <option value="">-- Select CM Code --</option>
+                                                <?php $cmRates = $pro->cmRates(); ?>
+                                                @if($cmRates && count($cmRates))
+                                                    @foreach($cmRates as $cmRate)
+                                                        <option value="{{ $cmRate->code }}">{{ $cmRate->code }}</option>
+                                                    @endforeach
+                                                @endif
+                                            </select>
+                                        </div>
+                                        <div class="mb-2">
+                                            <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="form-control form-control-sm"></textarea>
+                                        </div>
+                                        <div class="d-flex align-items-center">
+                                            <button class="btn btn-sm btn-primary mr-2" submit>Generate</button>
+                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            @else
+                                @if(!$activeCMBill->is_signed_by_hcp && $activeCMBill->hcp_pro_id === $pro->id)
+                                    <span class="mx-2 text-secondary">|</span>
+                                    <div moe>
+                                        <a start show class="py-0 mb-3 text-success">Sign as HCP</a>
+                                        <form url="/api/bill/signAsHcp">
+                                            <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
+                                            <p class="small">Sign this CM bill as HCP?</p>
+                                            <div class="d-flex align-items-center">
+                                                <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                @endif
+                                <span class="mx-2 text-secondary">|</span>
+                                <div moe>
+                                    <a start show class="py-0 mb-3 text-danger">Cancel</a>
+                                    <form url="/api/bill/markCancelled">
+                                        <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
+                                        <p class="small mb-2">Are you sure you want to cancel this CM bill?</p>
+                                        <div class="mb-2">
+                                            <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="memo-textarea form-control form-control-sm"></textarea>
+                                        </div>
+                                        <div class="d-flex align-items-center">
+                                            <button class="btn btn-sm btn-danger mr-2" submit>Yes</button>
+                                            <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            @endif
+                        </div>
+                        @if($activeCMBill !== false)
+                            <div class="border bg-white p-2 mt-2">
+                                <div class="">
+                                    Code: <span class="font-weight-bold text-dark">{{ $activeCMBill->code }}</span>
+                                    <div class="small text-secondary">Memo: {{$activeCMBill->memo}}</div>
+                                    <div class="small text-secondary">Created: {{friendly_date_time($activeCMBill->created_at)}}</div>
+                                </div>
+                                <div class="font-weight-bold text-dark mt-2 mb-1"></div>
+                                @if($activeCMBill->hcp_pro_id === $pro->id)
+                                    <div class="d-flex align-items-center">
+                                        @if($activeCMBill->has_hcp_been_paid)
+                                            <span class="text-dark">Received HCP Amount: </span>
+                                            <span class="font-weight-bold text-success ml-2">${{ $activeCMBill->hcp_payment_amount }}</span>
+                                        @else
+                                            <span class="text-dark">Expected HCP Amount: </span>
+                                            <span class="font-weight-bold text-dark ml-2">{{ $activeCMBill->hcp_expected_payment_amount ? '$' . $activeCMBill->hcp_expected_payment_amount : '-' }}</span>
+                                            <span class="ml-auto">
+                                            @if($activeCMBill->is_signed_by_hcp)
+                                                    <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                                                @else
+                                                    <div class="text-primary ml-3">
+                                                    <div moe class="text-dark">
+                                                        <a start show class="py-0 mb-3 text-primary text-sm">
+                                                            <i class="fa fa-exclamation-triangle"></i> Sign Pending
+                                                        </a>
+                                                        <form url="/api/bill/signAsHcp">
+                                                            <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
+                                                            <p class="small">Sign this RM bill as HCP?</p>
+                                                            <div class="d-flex align-items-center">
+                                                                <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                            </div>
+                                                        </form>
+                                                    </div>
+                                                </div>
+                                                @endif
+                                        </span>
+                                        @endif
+                                    </div>
+                                @endif
+                                @if($activeCMBill->cm_pro_id === $pro->id)
+                                    <div class="d-flex align-items-center">
+                                        @if($activeCMBill->has_cm_been_paid)
+                                            <span class="text-dark">Received CM Pro Amount: </span>
+                                            <span class="font-weight-bold text-success ml-2">${{ $activeCMBill->cm_payment_amount }}</span>
+                                        @else
+                                            <span class="text-dark">Expected CM Pro Amount: </span>
+                                            <span class="font-weight-bold text-dark ml-2">{{ $activeCMBill->cm_expected_payment_amount ? '$' . $activeCMBill->cm_expected_payment_amount : '-' }}</span>
+                                            <span class="ml-auto">
+                                            @if($activeCMBill->is_signed_by_cm)
+                                                    <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                                                @else
+                                                    <div class="text-primary ml-3">
+                                                    <div moe class="text-dark">
+                                                        <a start show class="py-0 mb-3 text-primary text-sm">
+                                                            <i class="fa fa-exclamation-triangle"></i> Sign Pending
+                                                        </a>
+                                                        <form url="/api/bill/signAsCm">
+                                                            <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
+                                                            <p class="small">Sign this RM bill as CM Pro?</p>
+                                                            <div class="d-flex align-items-center">
+                                                                <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                            </div>
+                                                        </form>
+                                                    </div>
+                                                </div>
+                                                @endif
+                                        </span>
+                                        @endif
+                                    </div>
+                                @endif
+                            </div>
+                        @endif
+                        {{-- cancelled cm bills --}}
+                        @if(count($cancelledCMBills))
+                            @foreach($cancelledCMBills as $cancelledBill)
+                                <div class="border bg-light p-2 mt-2 on-hover-opaque mb-3">
+                                    <div class="d-flex">
+                                        <div class="">
+                                            Code: <span class="font-weight-bold text-dark">{{ $cancelledBill->code }}</span>
+                                            <div class="small text-secondary">Memo: {{$cancelledBill->memo}}</div>
+                                            <div class="small text-secondary">Created: {{friendly_date_time($cancelledBill->created_at)}}</div>
+                                        </div>
+                                        <div class="ml-auto text-secondary font-weight-bold">CANCELLED BILL</div>
+                                    </div>
+                                    <div class="font-weight-bold text-dark mt-2 mb-1"></div>
+                                    @if($cancelledBill->hcp_pro_id === $pro->id)
+                                        <div class="d-flex align-items-center">
+                                            @if($cancelledBill->has_hcp_been_paid)
+                                                <span class="text-dark">Received HCP Amount: </span>
+                                                <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->hcp_payment_amount }}</span>
+                                            @else
+                                                <span class="text-dark">Expected HCP Amount: </span>
+                                                <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->hcp_expected_payment_amount ? '$' . $cancelledBill->hcp_expected_payment_amount : '-' }}</span>
+                                            @endif
+                                        </div>
+                                    @endif
+                                    @if($cancelledBill->cm_pro_id === $pro->id)
+                                        <div class="d-flex align-items-center">
+                                            @if($cancelledBill->has_cm_been_paid)
+                                                <span class="text-dark">Received CM Pro Amount: </span>
+                                                <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->cm_payment_amount }}</span>
+                                            @else
+                                                <span class="text-dark">Expected CM Pro Amount: </span>
+                                                <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->cm_expected_payment_amount ? '$' . $cancelledBill->cm_expected_payment_amount : '-' }}</span>
+                                            @endif
+                                        </div>
+                                    @endif
+                                </div>
+                            @endforeach
+                        @endif
+                    @endif
+                </div>
+            @endif
+
         </div>
 
     </div>