CM removal and related updates

resources/views/app/admin/client-ccm-rm-status-table.blade.php

@@ -19,12 +19,6 @@
 				<th class="border-0">Next Appt.</th>
 				<th class="border-0">Status</th>
 
-				@if($pro->pro_type == 'ADMIN')
-				<th class="border-0">Is Eligible For CCM</th>
-				<th class="border-0">Is Enrolled In CCM</th>
-				<th class="border-0">CCM Setup Performed</th>
-				@endif
-
 				@if($pro->pro_type !== 'ADMIN')
 					<th class="border-0">Cellular BP</th>
 					<th class="border-0">Last BP</th>
@@ -83,35 +77,6 @@
 				<td>{{$patient->nextMcpAppointment ? friendly_date_time($patient->nextMcpAppointment->raw_date.' '.$patient->nextMcpAppointment->raw_start_time) : '-'}}</td>
 				<td>{{$patient->nextMcpAppointment ? $patient->nextMcpAppointment->status : '-'}}</td>
 
-				@if($pro->pro_type == 'ADMIN')
-				<td>
-					<div>{{$patient->is_eligible_for_cm}}</div>
-					@if(!$patient->is_eligible_for_cm)
-						<div>
-							@if($patient->why_not_eligible_for_cm_category)[{{$patient->why_not_eligible_for_cm_category}}] @endif {{$patient->why_not_eligible_for_cm_cmemo}}
-						</div>
-					@endif 
-				</td>
-				<td>
-					<div>{{$patient->is_enrolled_in_cm}}</div>
-					@if($patient->is_enrolled_in_cm)
-						<div>
-							@if($patient->cm_enrollment_consent_method)[{{$patient->cm_enrollment_consent_method}}] @endif {{$patient->cm_enrollment_consent_method_memo}}
-						</div>
-					@else 
-						<div>
-							@if($patient->why_not_enrolled_in_cm_category)[{{$patient->why_not_enrolled_in_cm_category}}] @endif {{$patient->why_not_enrolled_in_cm_memo}}
-						</div>
-					@endif
-				</td>
-				<td>
-					{{$patient->has_cm_setup_been_performed ? 'YES': 'NO'}}
-					@if($patient->has_cm_setup_been_performed && $patient->cmSetupNote)
-						<a href="{{route('patients.view.notes.view.dashboard', ['patient' => $patient, 'note' => $patient->cmSetupNote])}}">CM Setup Note</a>
-					@endif
-				</td>
-				@endif
-
 				@if($pro->pro_type !== 'ADMIN')
 				<td>
 					<?php $bpDevice = $patient->firstCellularBPDevice(); ?>
@@ -141,7 +106,7 @@
 					<div>{{$patient->is_eligible_for_rm}}</div>
 					@if(!$patient->is_eligible_for_rm)
 						<div>
-							@if($patient->why_not_eligible_for_rm_category)[{{$patient->why_not_eligible_for_rm_category}}] @endif {{$patient->why_not_eligible_for_rm_cmemo}}
+							@if($patient->why_not_eligible_for_rm_category)[{{$patient->why_not_eligible_for_rm_category}}] @endif {{$patient->why_not_eligible_for_rm_memo}}
 						</div>
 					@endif 
 				</td>
@@ -149,7 +114,7 @@
 					<div>{{$patient->is_enrolled_in_rm}}</div>
 					@if(!$patient->is_enrolled_in_rm)
 						<div>
-							@if($patient->why_not_enrolled_in_rm_category)[{{$patient->why_not_enrolled_in_rm_category}}] @endif {{$patient->why_not_enrolled_in_rm_cmemo}}
+							@if($patient->why_not_enrolled_in_rm_category)[{{$patient->why_not_enrolled_in_rm_category}}] @endif {{$patient->why_not_enrolled_in_rm_memo}}
 						</div>
 					@endif 
 				</td>

resources/views/app/admin/client-ccm-rm-status.blade.php

@@ -7,11 +7,7 @@
         <div class="card-header px-3 py-2 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-user"></i>
-                @if($pro->pro_type == 'ADMIN')
-                    Client CCM/RM Status
-                @else
-                    Client RM Status
-                @endif
+                Client RM Status
             </strong>
         </div>
 

resources/views/app/admin/client_ccm_rm_status_filters.blade.php

@@ -145,44 +145,6 @@
 		</div>
 	</div>
 
-	@if($pro->pro_type == 'ADMIN')
-	<!-- CM -->
-	<div class="sm-section">
-		<div class="form-group">
-			<label>Eligible For CM:</label>
-			<select name="is_eligible_for_cm" class="form-control input-sm" v-model="filters.is_eligible_for_cm">
-				<option value="">All</option>
-				<option value="YES">Yes</option>
-				<option value="NO">No</option>
-				<option value="UNKNOWN">Uknown</option>
-			</select>
-		</div>
-	</div>
-
-	<div class="sm-section">
-		<div class="form-group">
-			<label>Enrolled In CM:</label>
-			<select name="is_enrolled_in_cm" class="form-control input-sm" v-model="filters.is_enrolled_in_cm">
-				<option value="">All</option>
-				<option value="YES">Yes</option>
-				<option value="NO">No</option>
-				<option value="UNKNOWN">Uknown</option>
-			</select>
-		</div>
-	</div>
-
-	<div class="sm-section">
-		<div class="form-group">
-			<label>CM Setup:</label>
-			<select name="has_cm_setup_been_performed" class="form-control input-sm" v-model="filters.has_cm_setup_been_performed">
-				<option value="">All</option>
-				<option value="YES">Yes</option>
-				<option value="NO">No</option>
-			</select>
-		</div>
-	</div>
-	@endif
-
 	<div class="sm-section">
 		<div class="form-group">
 			<label>Eligible For RM:</label>
@@ -223,7 +185,7 @@
 			<label>&nbsp;</label>
 			<div class=" d-flex">
 				<button type="button" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
-				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.patients')}}')" class="btn btn-link btn-sm text-danger">Clear Filters</a>
+				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.patients')}}')" class="btn btn-link btn-sm text-secondary">Clear Filters</a>
 			</div>
 		</div>
 	</div>
@@ -251,9 +213,6 @@ $allFilterKeys = [
 	'next_appointment_value_1',
 	'sex',
 	'status',
-	'is_eligible_for_cm',
-	'is_enrolled_in_cm',
-	'has_cm_setup_been_performed',
 	'is_eligible_for_rm',
 	'is_enrolled_in_rm',
 	'has_rm_setup_been_performed',

resources/views/app/admin/patients-table-extended.blade.php

@@ -37,7 +37,6 @@
 
             {{-- <th>Scale <i class="fa fa-battery"></i></th>--}}
             {{-- <th class="border-0">RPM</th>--}}
-            {{-- <th class="border-0">CCM</th>--}}
             {{-- <th class="border-0 d-none">Last Weight-In</th>--}}
             {{-- <th class="border-0 d-none">Last BP</th>--}}
             <th class="border-0">Assigned On</th>
@@ -303,7 +302,6 @@
 
                 <td>{{ friendlier_date_time($patient->most_recent_cellular_weight_measurement_at, false) }}</td>
 
-                {{-- <td>{{$patient->is_enrolled_in_cm ? 'Yes' : 'No'}}</td>--}}
                 {{-- <td>{{$patient->is_enrolled_in_rm ? 'Yes' : 'No'}}</td>--}}
                 <td class="d-none text-nowrap">
                     <?php $m = $patient->lastMeasurementOfType('Wt. (lbs.)'); ?>

resources/views/app/admin/patients-table.blade.php

@@ -22,7 +22,6 @@
 
 				{{-- <th>Scale <i class="fa fa-battery"></i></th>--}}
 				{{-- <th class="border-0">RPM</th>--}}
-				{{-- <th class="border-0">CCM</th>--}}
 				{{-- <th class="border-0 d-none">Last Weight-In</th>--}}
 				{{-- <th class="border-0 d-none">Last BP</th>--}}
 				<th class="border-0">Assigned On</th>
@@ -97,7 +96,6 @@
 
 				<td>{{ friendlier_date_time($patient->most_recent_cellular_weight_measurement_at, false) }}</td>
 
-				{{-- <td>{{$patient->is_enrolled_in_cm ? 'Yes' : 'No'}}</td>--}}
 				{{-- <td>{{$patient->is_enrolled_in_rm ? 'Yes' : 'No'}}</td>--}}
 				<td class="d-none text-nowrap">
 					<?php $m = $patient->lastMeasurementOfType('Wt. (lbs.)'); ?>

resources/views/app/generic-bills/add-bill-form/_default-script.blade.php

@@ -21,19 +21,6 @@
                         maxHours = (maxNumberOf5Minutes * 5) / 60,
                         unitsSelect = $(_trigger).closest('form').find('[name="numberOfUnits"]');
 
-                    // CRITERIA TO BILL UP TO 60 MINS. is note.hcp_pro_id == client.mcp_pro_id AND note.wasCmSetupPerformed IS TRUE
-                    $('.cm-setup-alert').remove();
-                    @if(@$note && @$patient && $note->hcp_pro_id === $patient->mcp_pro_id && $note->was_cm_setup_performed)
-                    maxHours = 1;
-                    @endif
-                    @if(@$note && @$patient && $note->hcp_pro_id === $patient->mcp_pro_id && !$note->was_cm_setup_performed)
-                    $('<div/>')
-                        .addClass('alert alert-warning my-2 cm-setup-alert border border-warning p-2')
-                        .html('<div class="mb-2">CCM setup may have been performed, but has not been marked as such in the note.</div>' +
-                            'Please ask the HCP if they need to do that, and then you can bill up to 60 mins. because patient needs education re: CM')
-                        .insertAfter(unitsSelect);
-                    @endif
-
                     unitsSelect.find('option').each(function () {
                         if (this.value) {
                             if (+this.value > maxHours) {

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

@@ -24,7 +24,6 @@
                         <th class="border-0">Last Visit</th>
                         <th class="border-0">Next Appt.</th>
                         <th class="border-0">Status</th>
-                        <th class="border-0">CCM</th>
                         <th class="border-0">RPM</th>
                         <th class="border-0 d-none">Last Weight-In</th>
                         <th class="border-0 d-none">Last BP</th>
@@ -49,7 +48,6 @@
                             <td>{{$row->lastMcpAppointment() ? @$row->lastMcpAppointment()->start_date : '-'}}</td>
                             <td>{{$row->nextMcpAppointment() ? @$row->nextMcpAppointment()->start_date : '-'}}</td>
                             <td>{{$row->nextMcpAppointment() ? @$row->nextMcpAppointment()->status : '-'}}</td>
-                            <td>{{$row->is_enrolled_in_cm ? 'Yes' : 'No'}}</td>
                             <td>{{$row->is_enrolled_in_rm ? 'Yes' : 'No'}}</td>
                             <td class="d-none">
                                 <?php $m = $row->lastMeasurementOfType('Wt. (lbs.)'); ?>

resources/views/app/mcp/patients-table.blade.php

@@ -1,5 +1,5 @@
 <div class="table-responsive">
-	<table class="table table-striped p-0 m-0 table-sm border-top border-bottom text-nowrap">
+	<table class="table table-striped p-0 m-0 table-sm border-top border-bottom text-nowrap table-bordered">
 		<thead class="bg-light">
 			<tr>
 				<th class="border-0">#</th>
@@ -7,7 +7,6 @@
 				<th class="border-0">DOB</th>
 				<th class="border-0">Age</th>
 				<th class="border-0">Sex</th>
-				<th class="border-0">BMI</th>
 				<th class="border-0">Insurance</th>
 				<th class="border-0">Last Visit</th>
 				<th class="border-0">Next Appt.</th>
@@ -22,7 +21,6 @@
 
 				{{-- <th>Scale <i class="fa fa-battery"></i></th>--}}
 				{{-- <th class="border-0">RPM</th>--}}
-				{{-- <th class="border-0">CCM</th>--}}
 				{{-- <th class="border-0 d-none">Last Weight-In</th>--}}
 				{{-- <th class="border-0 d-none">Last BP</th>--}}
 				<th class="border-0">Assigned On</th>
@@ -45,16 +43,6 @@
 				<td>{{ friendly_date_time($patient->dob, false) }}</td>
 				<td>{{ $patient->age_in_years ?  $patient->age_in_years : '-' }}</td>
 				<td>{{ $patient->sex }}</td>
-				<td>
-					<div class="d-none d-dflex flex-column">
-						@if($patient->usual_bmi_min && $patient->usual_bmi_max)
-						<small class="text-muted">BMI (Usual): <b>{{ $patient->usual_bmi_min }}</b> {{ $patient->usual_bmi_min_category }} to <b>{{ $patient->usual_bmi_max }}</b> {{ $patient->usual_bmi_max_category }}</small>
-						@endif
-						@if($patient->ideal_bmi)
-						<small class="text-muted">BMI (Ideal) <b>{{ $patient->ideal_bmi }}</b> {{ $patient->ideal_bmi_category }}</small>
-						@endif
-					</div>
-				</td>
 				<td>
 					@include('app.patient.coverage_column_renderer', ['patient'=>$patient])
 				</td>
@@ -81,7 +69,6 @@
 
 				<td>{{ friendlier_date_time($patient->most_recent_cellular_weight_measurement_at, false) }}</td>
 
-				{{-- <td>{{$patient->is_enrolled_in_cm ? 'Yes' : 'No'}}</td>--}}
 				{{-- <td>{{$patient->is_enrolled_in_rm ? 'Yes' : 'No'}}</td>--}}
 				<td class="d-none text-nowrap">
 					<?php $m = $patient->lastMeasurementOfType('Wt. (lbs.)'); ?>

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

@@ -23,14 +23,14 @@
 </style>
 <form id="mcp-patients-filters" method="GET" action="{{ route('mcp.patients') }}" class="filter-container" v-cloak>
 	<div class="sm-section">
-		<div class="form-group">
+		<div class="form-group mb-0">
 			<label>Name:</label>
 			<input name="name" class="form-control input-sm" v-model="filters.name">
 		</div>
 	</div>
 	<!-- AGE	 -->
 	<div class="sm-section">
-		<div class="form-group">
+		<div class="form-group mb-0">
 			<label>Age:</label>
 			<select name="age_category" class="form-control input-sm" v-model="filters.age_category">
 				<option value="">All</option>
@@ -52,7 +52,7 @@
 	</div>
 	<!-- SEX -->
 	<div class="sm-section">
-		<div class="form-group">
+		<div class="form-group mb-0">
 			<label>Sex:</label>
 			<select name="sex" class="form-control input-sm" v-model="filters.sex">
 				<option value="">All</option>
@@ -61,32 +61,10 @@
 			</select>
 		</div>
 	</div>
-	<!-- BMI -->
-	<div class="sm-section">
-		<div class="form-group">
-			<label>BMI:</label>
-			<select name="bmi_category" class="form-control input-sm" v-model="filters.bmi_category">
-				<option value="">All</option>
-				<option value="EXACTLY">Exactly</option>
-				<option value="LESS_THAN">Less Than</option>
-				<option value="GREATER_THAN">Greater Than</option>
-				<option value="BETWEEN">Between</option>
-				<option value="NOT_BETWEEN">Not Between</option>
-			</select>
-			<div v-show="filters.bmi_category" class="mt-2">
-				<div>
-					<input  name="bmi_value_1" v-model="filters.bmi_value_1" type="number" class="form-control input-sm" :placeholder="(filters.bmi_category === 'BETWEEN' || filters.bmi_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
-				</div>
-				<div v-show="filters.bmi_category === 'BETWEEN' || filters.bmi_category === 'NOT_BETWEEN'" class="mt-2">
-					<input name="bmi_value_2" v-model="filters.bmi_value_2" type="number" class="form-control input-sm" placeholder="To" />
-				</div>
-			</div>
-		</div>
-	</div>
 
 	<!-- LAST VISIT -->
 	<div class="sm-section">
-		<div class="form-group">
+		<div class="form-group mb-0">
 			<label>Last Visit:</label>
 			<select name="last_visit_category" class="form-control input-sm" v-model="filters.last_visit_category">
 				<option value="">All</option>
@@ -109,7 +87,7 @@
 
 	<!-- NEXT APPOINTMENT -->
 	<div>
-		<div class="form-group">
+		<div class="form-group mb-0">
 			<label>Next Appointment:</label>
 			<select name="next_appointment_category" class="form-control input-sm" v-model="filters.next_appointment_category">
 				<option value="">All</option>
@@ -132,7 +110,7 @@
 
 	<!-- STATUS -->
 	<div class="sm-section">
-		<div class="form-group">
+		<div class="form-group mb-0">
 			<label>Status:</label>
 			<select name="status" class="form-control input-sm" v-model="filters.status">
 				<option value="">All</option>
@@ -152,7 +130,7 @@
 
 	@if($performer->pro->pro_type == 'ADMIN')
 	<div class="sm-section">
-		<div class="form-group">
+		<div class="form-group mb-0">
 			<label>Initiative:</label>
 			<input type="text" name="initiative" class="form-control input-sm" v-model="filters.initiative">
 		</div>
@@ -161,7 +139,7 @@
 
 	@if($performer->pro->pro_type == 'ADMIN')
 	<div class="sm-section">
-		<div class="form-group">
+		<div class="form-group mb-0">
 			<div class="checkbox mt-4 pt-2">
 				<label>
 					<input type="checkbox" name="include_test_records"  v-model="filters.include_test_records">
@@ -174,7 +152,7 @@
 
 	<!-- LAST WEIGHED-IN -->
 	<!-- <div class="col-md-2 d-none">
-		<div class="form-group">
+		<div class="form-group mb-0">
 			<label>Last Weighed-In:</label>
 			<select name="last_weighed_in_category" class="form-control input-sm" v-model="filters.last_weighed_in_category">
 				<option value="">All</option>
@@ -197,7 +175,7 @@
 
 	<!-- LAST BP -->
 	<!-- <div class="col-md-2 d-none">
-		<div class="form-group">
+		<div class="form-group mb-0">
 			<label>Last BP:</label>
 			<select name="last_bp_category" class="form-control input-sm" v-model="filters.last_bp_category">
 				<option value="">All</option>
@@ -219,11 +197,11 @@
 	</div> -->
 
 	<div>
-		<div class="form-group">
+		<div class="form-group mb-0">
 			<label>&nbsp;</label>
 			<div class=" d-flex">
 				<button type="button" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
-				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.patients')}}')" class="btn btn-link btn-sm text-danger">Clear Filters</a>
+				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.patients')}}')" class="btn btn-link btn-sm text-secondary">Clear Filters</a>
 			</div>
 		</div>
 	</div>

resources/views/app/new-patient.blade.php

@@ -20,7 +20,6 @@ $medicaidStates = Config::get('constants.medicaid_states');
 </style>
 
 <div class="p-3 mcp-theme-1" id="newPatientContainer" v-cloak>
-	@include('app.stat-tree.view', ['slug' => 'rm-tree', 'showForPro' => $pro])
 	<div class="col-12">
 		<div class="card d-block mb-3" moe="">
 

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

@@ -97,69 +97,8 @@
                     <div>
                         <span class="text-dark font-weight-bold font-size-14">Care Month</span>&nbsp;for&nbsp;<span class="text-dark font-weight-bold">{{friendly_month($careMonth->start_date)}}</span>
                     </div>
-                    {{--@if(!$careMonth->is_tm_this_month)
-                        <div moe class="mt-2">
-                            <a start show>Mark as Transitional Month</a>
-                            <form url="/api/careMonth/setIsTmThisMonthToTrue">
-                                <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
-                                <p>Mark this care month as <b>Transitional Month</b>?</p>
-                                <div class="d-flex align-items-center">
-                                    <button class="btn btn-sm btn-primary mr-2" submit>Yes</button>
-                                    <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
-                                </div>
-                            </form>
-                        </div>
-                    @endif--}}
                 </div>
             </h6>
-            {{--<div class="d-flex align-items-start ml-auto text-secondary">
-                <div class="d-inline-flex align-items-start">
-                    <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="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->rm_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>
-                </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">CM</span>
-                            <span class="font-weight-bold text-dark text-nowrap">
-                                {{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->cm_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>
-                </div>
-            </div>--}}
         </div>
 
         <hr class="m-negator mb-0">
@@ -248,10 +187,6 @@
                 </div>
                 @endif
             </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">
@@ -259,18 +194,6 @@
         <?php
         $entries = $careMonth->entries;
 
-        $cmBills = $careMonth->getBillsOfType('CM');
-        $activeCMBill = false;
-        $cancelledCMBills = new \Illuminate\Support\Collection();
-        foreach ($cmBills as $cmBill) {
-            if(!$cmBill->is_cancelled && $careMonth->cm_bill_id === $cmBill->id) {
-                $activeCMBill = $cmBill;
-            }
-            else if($cmBill->is_cancelled) {
-                $cancelledCMBills->add($cmBill);
-            }
-        }
-
         $rmBills = $careMonth->getBillsOfType('RM');
         $activeRMBill = false;
         $cancelledRMBills = new \Illuminate\Support\Collection();
@@ -1250,426 +1173,12 @@
                 @endif
             </div>
 
-            {{-- CM --}}
-            <?php /*
-            @if($careMonth->is_tm_this_month)
-                <div class="col-6">
-                    <div class="d-flex align-items-center">
-                        <h6 class="my-0 text-secondary font-weight-bold text-dark lh-24px">CM Time Entries</h6>
-                    </div>
-                    <div class="alert alert-secondary mb-0 mt-2">
-                        This care month has been marked as <b>Transitional Month</b>.
-                        <span moe class="">
-                        <a start show class="font-weight-bold">Undo</a>
-                        <form url="/api/careMonth/setIsTmThisMonthToFalse">
-                            <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
-                            <p>Undo mark as <b>Transitional Month</b>?</p>
-                            <div class="d-flex align-items-center">
-                                <button class="btn btn-sm btn-primary mr-2" submit>Yes</button>
-                                <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
-                            </div>
-                        </form>
-                    </span>
-                    </div>
-                </div>
-            @else
-                @if($careMonth->is_client_enrolled_in_cm)
-                    <div class="col-6">
-                        <div class="d-flex align-items-center">
-                            <h6 class="my-0 text-secondary font-weight-bold text-dark lh-24px">CM Time Entries</h6>
-                            @if(!$activeCMBill)
-                                <span class="mx-2 text-secondary">|</span>
-                                <span moe large relative>
-                                    <a start show class="py-0 mb-3">Add</a>
-                                    <form url="/api/careMonthEntry/createForCm" right>
-                                        <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, 'cm-time-value', 'cm-time-range')">
-                                                    </div>
-                                                </div>
-                                                <div class="col-4 pr-0">
-                                                    <input type="time" class="form-control form-control-sm cm-time-range" name="startingTime"
-                                                           value="" placeholder="Starting Time" disabled>
-                                                </div>
-                                                <div class="col-4">
-                                                    <input type="time" class="form-control form-control-sm cm-time-range" name="endingTime"
-                                                           value="" placeholder="Ending Time" disabled>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        @include('app/entry-templates/cm/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>
-                                </span>
-                                <span class="mx-2 text-secondary">|</span>
-                                <span moe>
-                                    <a start show class="py-0 mb-3 text-danger">Un-Enroll</a>
-                                    <form url="/api/careMonth/setIsClientEnrolledInCmToFalse">
-                                        <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
-                                        <p class="small">Are you sure you want to un-enroll this client from CM?</p>
-                                        <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>
-                                </span>
-                            @else
-                                <span class="mx-2 text-secondary">|</span>
-                                <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 === "CM")
-                                    <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(!$activeCMBill)
-                                                <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 CM 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">CM Time Entries</h6>
-                        <div class="alert alert-secondary mb-0">
-                            <b>{{ $patient->displayName() }}</b> is currently not enrolled in <b>CM</b>.
-                            <span moe class="">
-                            <a start show class="font-weight-bold">Enroll Now</a>
-                            <form url="/api/careMonth/setIsClientEnrolledInCmToTrue">
-                                <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
-                                <p class="small">Enroll this client in CM?</p>
-                                <div class="d-flex align-items-center">
-                                    <button class="btn btn-sm btn-primary mr-2" submit>Yes</button>
-                                    <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
-                                </div>
-                            </form>
-                        </span>
-                        </div>
-                    </div>
-                @endif
-            @endif
-            */ ?>
         </div>
 
         @if($careMonth->number_of_days_with_remote_measurements >= 16)
 
             <hr class="m-negator mt-4 mb-3">
 
-            {{--<div class="row">
-
-                <!-- rm bills -->
-                <div class="col-12">
-                    @if($careMonth->is_client_enrolled_in_rm)
-                        <div class="d-flex align-items-center">
-                            <h6 class="my-0 text-secondary font-weight-bold text-dark">RM Bill
-                                @if($activeRMBill && !$activeRMBill->is_signed_by_hcp)
-                                    <span class="small ml-1 text-secondary">(HCP Sign Pending)</span>
-                                @else
-                                    @if($activeRMBill)
-                                        <span class="small ml-1 text-secondary">(Signed by HCP)</span>
-                                    @endif
-                                @endif
-                            </h6>
-                            @if($activeRMBill === false)
-                                <span class="mx-2 text-secondary">|</span>
-                                <div moe>
-                                    <a start show class="py-0 mb-3">Generate</a>
-                                    <form url="/api/careMonth/generateBillForRm">
-                                        <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
-                                        <div class="mb-2">
-                                            <select class="form-control" name="rmCode">
-                                                <option value="">-- Select RM Code --</option>
-                                                @if($rmCodes && count($rmCodes))
-                                                    @foreach($rmCodes as $rmRate)
-                                                        <option value="{{ $rmRate }}">{{ $rmRate }}</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(!$activeRMBill->is_signed_by_hcp && $activeRMBill->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="{{ $activeRMBill->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>
-                                @endif
-                                <span class="mx-2 text-secondary">|</span>
-                                <div moe relative>
-                                    <a start show class="py-0 mb-3 text-danger">Cancel</a>
-                                    <form url="/api/bill/markCancelled" right>
-                                        <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
-                                        <p class="small mb-2">Are you sure you want to cancel this RM 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($activeRMBill !== false)
-                            <div class="border bg-white p-2 mt-2">
-                                <div class="">
-                                    Code: <span class="font-weight-bold text-dark">{{ $activeRMBill->code }}</span>
-                                    <div class="small text-secondary">Memo: {{$activeRMBill->memo}}</div>
-                                    <div class="small text-secondary">Created: {{friendly_date_time($activeRMBill->created_at)}}</div>
-                                </div>
-                                <div class="font-weight-bold text-dark mt-2 mb-1"></div>
-                                @if($activeRMBill->hcp_pro_id === $pro->id)
-                                    <div class="d-flex align-items-center">
-                                        @if($activeRMBill->has_hcp_been_paid)
-                                            <span class="text-dark">Received HCP Amount: </span>
-                                            <span class="font-weight-bold text-success ml-2">${{ $activeRMBill->hcp_payment_amount }}</span>
-                                        @else
-                                            <span class="text-dark">Expected HCP Amount: </span>
-                                            <span class="font-weight-bold text-dark ml-2">{{ $activeRMBill->hcp_expected_payment_amount ? '$' . $activeRMBill->hcp_expected_payment_amount : '-' }}</span>
-                                            <span class="ml-auto">
-                                                @if($activeRMBill->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="{{ $activeRMBill->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($activeRMBill->rmm_pro_id === $pro->id)
-                                    <div class="d-flex align-items-center">
-                                        @if($activeRMBill->has_rmm_been_paid)
-                                            <span class="text-dark">Received RMM Pro Amount: </span>
-                                            <span class="font-weight-bold text-success ml-2">${{ $activeRMBill->rmm_payment_amount }}</span>
-                                        @else
-                                            <span class="text-dark">Expected RMM Pro Amount: </span>
-                                            <span class="font-weight-bold text-dark ml-2">{{ $activeRMBill->rmm_expected_payment_amount ? '$' . $activeRMBill->rmm_expected_payment_amount : '-' }}</span>
-                                            <span class="ml-auto">
-                                                @if($activeRMBill->is_signed_by_rmm)
-                                                    <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/signAsRmm">
-                                                                <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
-                                                                <p class="small">Sign this RM bill as RMM 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
-                                @if($activeRMBill->rme_pro_id === $pro->id)
-                                    <div class="d-flex align-items-center">
-                                        @if($activeRMBill->has_rme_been_paid)
-                                            <span class="text-success">Received RME Pro Amount: </span>
-                                            <span class="font-weight-bold text-dark ml-2">${{ $activeRMBill->rme_payment_amount }}</span>
-                                        @else
-                                            <span class="text-dark">Expected RME Pro Amount: </span>
-                                            <span class="font-weight-bold text-dark ml-2">{{ $activeRMBill->rme_expected_payment_amount ? '$' . $activeRMBill->rme_expected_payment_amount : '-' }}</span>
-                                            <span class="ml-auto">
-                                                @if($activeRMBill->is_signed_by_rme)
-                                                    <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/signAsRme">
-                                                                <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
-                                                                <p class="small">Sign this RM bill as RME 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 rm bills -->
-                        @if(count($cancelledRMBills))
-                            @foreach($cancelledRMBills 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->rmm_pro_id === $pro->id)
-                                        <div class="d-flex align-items-center">
-                                            @if($cancelledBill->has_rmm_been_paid)
-                                                <span class="text-dark">Received RMM Pro Amount: </span>
-                                                <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->rmm_payment_amount }}</span>
-                                            @else
-                                                <span class="text-dark">Expected RMM Pro Amount: </span>
-                                                <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->rmm_expected_payment_amount ? '$' . $cancelledBill->rmm_expected_payment_amount : '-' }}</span>
-                                            @endif
-                                        </div>
-                                    @endif
-                                    @if($cancelledBill->rme_pro_id === $pro->id)
-                                        <div class="d-flex align-items-center">
-                                            @if($cancelledBill->has_rme_been_paid)
-                                                <span class="text-success">Received RME Pro Amount: </span>
-                                                <span class="font-weight-bold text-dark ml-2">${{ $cancelledBill->rme_payment_amount }}</span>
-                                            @else
-                                                <span class="text-dark">Expected RME Pro Amount: </span>
-                                                <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->rme_expected_payment_amount ? '$' . $cancelledBill->rme_expected_payment_amount : '-' }}</span>
-                                            @endif
-                                        </div>
-                                    @endif
-                                </div>
-                            @endforeach
-                        @endif
-                    @endif
-                </div>
-
-            </div>
-
-            <hr class="m-negator mt-4 mb-3">--}}
-
-
-
-
             {{-- bills --}} {{-- only admins --}}
             @if($pro->pro_type === 'ADMIN')
                 @if($careMonth->bills->count())

resources/views/app/patient/note/_create-claim.blade.php

@@ -4,7 +4,7 @@
     <span class="mx-2 text-secondary">|</span>
     <span class="text-warning-mellow font-weight-bold">
         <i class="fa fa-exclamation-triangle"></i>
-        CM setup was performed, but manager sign is pending
+        Please sign off on the comprehensive care plan before creating claims.
     </span>
 @else
     <span class="mx-2 text-secondary">|</span>
@@ -53,12 +53,7 @@
         </span>
     @endif
 @endif
-<style>
-.stag-popup>form, .stag-popup>.stag-popup-content {
-	width: 100%;
-}
-</style>
-<div class="stag-popup stag-popup-md mcp-theme-1" style="width:100%" stag-popup-key="create-claim">
+<div class="stag-popup huge stag-popup-md mcp-theme-1" style="width:100%" stag-popup-key="create-claim">
     <form action="/api/claim/createForNote" id="createClaimApp">
         <h3 class="stag-popup-title border-bottom-0 mb-0">
             <span>Create Claim</span>

resources/views/app/patient/note/cm-setup.blade.php

@@ -201,43 +201,6 @@
     </div>
 </div>
 
-@if($pro->pro_type === 'ADMIN' && $note->was_cm_setup_performed)
-    <div class="d-flex align-items-baseline mb-3">
-        <span class="flex-grow-1"></span>
-        <div class="width-300px d-inline-flex align-items-center">
-            <span class="pr-2">Manager Signature:</span>
-            @if($note->cm_setup_manager_signature_status !== 'SIGNED')
-                <div moe class="">
-                    <a start show>Sign</a>
-                    <form url="/api/note/updateCmSetupManagerSignatureStatus" class="mcp-theme-1">
-                        <input type="hidden" name="uid" value="{{$note->uid}}">
-                        <input type="hidden" name="managerSignatureStatus" value="SIGNED">
-                        <p>Sign CM Setup Performed as Manager?</p>
-                        <div>
-                            <button submit class="btn btn-sm btn-success mr-1">Sign</button>
-                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                        </div>
-                    </form>
-                </div>
-            @else
-                <b>SIGNED</b>
-                <div moe class="ml-3">
-                    <a start show>Undo</a>
-                    <form url="/api/note/updateCmSetupManagerSignatureStatus" class="mcp-theme-1">
-                        <input type="hidden" name="uid" value="{{$note->uid}}">
-                        <input type="hidden" name="managerSignatureStatus" value="">
-                        <p>Undo sign as manager for CM Setup Performed?</p>
-                        <div>
-                            <button submit class="btn btn-sm btn-primary mr-1">Undo</button>
-                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                        </div>
-                    </form>
-                </div>
-            @endif
-        </div>
-    </div>
-@endif
-
 @if($pro->id === $patient->mcp_pro_id && $note->was_cm_setup_performed)
     <div class="d-flex align-items-baseline">
         <span class="flex-grow-1"></span>

resources/views/app/patient/note/dashboard.blade.php

@@ -774,15 +774,7 @@
                 </div>
 
                 <div class="row border-bottom mx-0">
-                    <div class="col-4 pr-0">
-                        <div class="p-3 screen-only" data-non-segment-section="CM Setup">
-                            <div class="d-flex align-items-center mb-3">
-                                <p class="font-weight-bold text-secondary m-0 font-size-14">Care Management</p>
-                            </div>
-                            @include('app.patient.note.cm-setup')
-                        </div>
-                    </div>
-                    <div class="col-8 pl-0 border-left">
+                    <div class="col-12 px-0">
                         <div class="p-3 screen-only h-100" data-non-segment-section="RM Setup">
                             <div class="d-flex align-items-center mb-3">
                                 <p class="font-weight-bold text-secondary m-0 font-size-14">Remote Monitoring</p>

resources/views/app/patient/note/lhs-tree.blade.php

@@ -48,7 +48,6 @@
     <hr>
     <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="Handouts" href="#">Handouts</a></div>
     <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="Prescriptions" href="#">ERx &amp; Orders</a></div>
-    <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="CM Setup" href="#">Chronic Care Management</a></div>
     <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="RM Setup" href="#">RM Setup</a></div>
     <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="Supply Orders Summary" href="#">Supply Orders Summary</a></div>
     <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="Vitals Settings" href="#">Vitals Settings</a></div>

resources/views/app/patient/note/rm-setup.blade.php

@@ -214,6 +214,102 @@
             </div>
         </div>
 
+        <div class="mb-3 d-flex align-items-baseline">
+            <span class="min-width-140px">Care Plan:</span>
+            <div class="width-300px d-inline-flex align-items-center">
+                @if($patient->has_cm_setup_been_performed)
+                    <div class="text-nowrap text-success">
+                        @if($patient->cm_setup_note_id === $note->id)
+                            <i class="fa fa-check"></i>
+                            <b>Created on this note</b>
+                        @elseif($patient->cmSetupNote)
+                            <i class="fa fa-check"></i>
+                            <b>Created on</b>
+                            <div class="d-inline position-relative on-click-menu">
+                                <span class="text-primary c-pointer">{{friendly_date($patient->cmSetupNote->effective_dateest)}}</span>
+                                <div menu right class="bg-white border">
+                                    <a native target="_blank"
+                                       href="<?= route('patients.view.notes.view.dashboard', ['patient' => $patient, 'note' => $patient->cmSetupNote]) ?>"
+                                       class="px-2 py-1 d-block text-nowrap text-sm">Go to note</a>
+                                </div>
+                            </div>
+                        @else
+                            <i class="fa fa-exclamation-triangle text-warning-mellow"></i>
+                            <b class="text-warning-mellow">Performed, but CM setup note missing!</b> <!-- will never reach this point -->
+                        @endif
+                    </div>
+                    @if($patient->mcp_pro_id === $pro->id || $pro->pro_type === 'ADMIN')
+                        <div moe class="ml-3">
+                            <a href="" show start>Undo</a>
+                            <form url="/api/note/undoMarkCmSetupPerformed" >
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <p>Mark Comprehensive Care Plan as not created?</p>
+                                <div class="mb-0">
+                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    @endif
+                @else
+                    <span class="text-nowrap text-warning-mellow">
+                        <i class="fa fa-times"></i>
+                        <b>Not Created</b>
+                    </span>
+                    @if($patient->mcp_pro_id === $pro->id || $pro->pro_type === 'ADMIN')
+                        <div moe class="ml-3">
+                            <a href="#" show start>Mark as created</a>
+                            <form url="/api/note/markCmSetupPerformed" >
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <p>Mark Comprehensive Care Plan as created?</p>
+                                <div class="mb-0">
+                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    @endif
+                @endif
+            </div>
+        </div>
+
+        @if($pro->pro_type === 'ADMIN' && $note->was_cm_setup_performed)
+            <div class="d-flex align-items-baseline mb-3">
+                <span class="min-width-140px"></span>
+                <div class="d-inline-flex align-items-center flex-grow-1">
+                    <span class="pr-2">Manager Signature:</span>
+                    @if($note->cm_setup_manager_signature_status !== 'SIGNED')
+                        <div moe class="">
+                            <a start show>Sign</a>
+                            <form url="/api/note/updateCmSetupManagerSignatureStatus" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <input type="hidden" name="managerSignatureStatus" value="SIGNED">
+                                <p>Sign Off Care Plan Creation as Manager?</p>
+                                <div>
+                                    <button submit class="btn btn-sm btn-success mr-1">Sign</button>
+                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    @else
+                        <b>SIGNED</b>
+                        <div moe class="ml-3">
+                            <a start show>Undo</a>
+                            <form url="/api/note/updateCmSetupManagerSignatureStatus" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <input type="hidden" name="managerSignatureStatus" value="">
+                                <p>Undo sign as manager for Care Plan Creation?</p>
+                                <div>
+                                    <button submit class="btn btn-sm btn-primary mr-1">Undo</button>
+                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    @endif
+                </div>
+            </div>
+        @endif
+
         @if($pro->pro_type === 'ADMIN')
             <div class="d-flex align-items-baseline mb-3">
                 <span class="min-width-140px">RME Pro:</span>

resources/views/app/patient/note/sign-confirmation.blade.php

@@ -92,14 +92,6 @@
         </div>
     </div>
 
-    @if($note->new_or_fu_or_na === "FU" && $patient->mcp_pro_id === $pro->id && ($patient->is_enrolled_in_cm !== 'YES' || !$patient->has_cm_setup_been_performed))
-        <hr class="m-neg-3">
-        <div class="max-width-500px">
-            <p class="mb-2 text-secondary font-weight-bold">Care Management</p>
-            @include('app.patient.note.cm-setup')
-        </div>
-    @endif
-
     {{-- get problems(plan) and medications(plan) segments --}}
     <?php
     $problemsPlan = null;

resources/views/app/patient/settings.blade.php

@@ -569,144 +569,6 @@
                     </div>
                 </div>
                 <hr class="m-negator-3 my-3">
-                <div>
-                    <p>Is Eligible For Cm: {{$patient->is_eligible_for_cm}}</p>
-		            <p>Why Not Eligible For Cm Category: {{$patient->why_not_eligible_for_cm_category}}</p>
-		            <p>Why Not Eligible For Cm Memo: {{$patient->why_not_eligible_for_cm_memo}}</p>
-                </div>
-                <div moe class="ml-2">
-                    <a start show><i class="fa fa-edit"></i>Update CM Eligibility</a>
-                    <form url="/api/client/updateCmEligibility" class="mcp-theme-1">
-                        <input type="hidden" name="uid" value="{{$patient->uid}}">
-                        <div class="form-group">
-                            <label class="control-label">Is Eligible For Cm </label>
-                            <select name="isEligibleForCm" class="form-control">
-                                <option value="">--</option>
-                                <option value="YES">Yes</option>
-                                <option value="NO">No</option>
-                                <option value="UNKNOWN">Unknown</option>
-                            </select>
-                        </div>
-                        <div class="form-group">
-                            <label class="control-label">Why Not Eligible For Cm Category</label>
-                            <input type="text" name="whyNotEligibleForCmCategory" class="form-control">
-                        </div>
-                        <div class="form-group">
-                            <label class="control-label">Why Not Eligible For Cm Memo</label>
-                            <input type="text" name="whyNotEligibleForCmMemo" class="form-control">
-                        </div>
-                        <div>
-                            <button submit class="btn btn-sm btn-primary mr-1">Submit
-                            </button>
-                            <button cancel class="btn btn-sm btn-default border">
-                                Cancel
-                            </button>
-                        </div>
-                    </form>
-                </div>
-
-                <hr class="m-negator-3 my-3">
-                <div>
-                    <p>Is enrolled to CM: {{$patient->is_enrolled_in_cm}}</p>
-                    @if($patient->is_enrolled_in_cm == 'YES')
-                        <p>Cm Enrollment Consent Method Memo: {{$patient->cm_enrollment_consent_method}}</p>
-                        <p>Cm Enrollment Consent Method Memo: {{$patient->cm_enrollment_consent_method_memo}}</p>
-                    @else
-                        <p>Why Not Enrolled In Cm Category:   {{$patient->why_not_enrolled_in_cm_category}}</p>
-		                <p>Why Not Enrolled In Cm Memo:   {{$patient->why_not_enrolled_in_cm_memo}}</p>
-                    @endif
-                </div>
-                @if($patient->is_enrolled_in_cm == 'YES')
-                <div moe class="ml-2">
-                    <a start show><i class="fa fa-edit"></i>Set is enrolled to CM to false</a>
-                    <form url="/api/client/setIsEnrolledInCmToFalse" class="mcp-theme-1">
-                        <input type="hidden" name="uid" value="{{$patient->uid}}">
-                        <div class="form-group">
-                            <label class="control-label">Why Not Enrolled In Cm Category</label>
-                            <input type="text" name="whyNotEnrolledInCmCategory" class="form-control">
-                        </div>
-                        <div class="form-group">
-                            <label class="control-label">Why Not Enrolled In Cm Memo</label>
-                            <input type="text" name="whyNotEnrolledInCmMemo" class="form-control">
-                        </div>
-                        <div>
-                            <button submit class="btn btn-sm btn-primary mr-1">Submit
-                            </button>
-                            <button cancel class="btn btn-sm btn-default border">
-                                Cancel
-                            </button>
-                        </div>
-                    </form>
-                </div>
-
-                <div moe class="ml-2">
-                    <a start show><i class="fa fa-edit"></i>Update CM Enrollemnt Consent Info</a>
-                    <form url="/api/client/updateCmEnrollmentConsentInfo" class="mcp-theme-1">
-                        <input type="hidden" name="uid" value="{{$patient->uid}}">
-                        <div class="form-group">
-                            <label class="control-label">Cm Enrollment Consent Method</label>
-                            <input type="text" name="cmEnrollmentConsentMethod" value="{{$patient->cm_enrollment_consent_method}}" class="form-control">
-                        </div>
-                        <div class="form-group">
-                            <label class="control-label">Cm Enrollment Consent Method Memo</label>
-                            <input type="text" name="cmEnrollmentConsentMethodMemo" value="{{$patient->cm_enrollment_consent_method_memo}}" class="form-control">
-                        </div>
-                        <div>
-                            <button submit class="btn btn-sm btn-primary mr-1">Submit
-                            </button>
-                            <button cancel class="btn btn-sm btn-default border">
-                                Cancel
-                            </button>
-                        </div>
-                    </form>
-                </div>
-
-                @else
-                <div moe class="ml-2">
-                    <a start show><i class="fa fa-edit"></i>Set is enrolled to CM to YES</a>
-                    <form url="/api/client/setIsEnrolledInCmToTrue" class="mcp-theme-1">
-                        <input type="hidden" name="uid" value="{{$patient->uid}}">
-                        <div class="form-group">
-                            <label class="control-label">Cm Enrollment Consent Method</label>
-                            <input type="text" name="cmEnrollmentConsentMethod" class="form-control">
-                        </div>
-                        <div class="form-group">
-                            <label class="control-label">Cm Enrollment Consent Method Memo</label>
-                            <input type="text" name="cmEnrollmentConsentMethodMemo" class="form-control">
-                        </div>
-                        <div>
-                            <button submit class="btn btn-sm btn-primary mr-1">Submit
-                            </button>
-                            <button cancel class="btn btn-sm btn-default border">
-                                Cancel
-                            </button>
-                        </div>
-                    </form>
-                </div>
-
-                <div moe class="ml-2">
-                    <a start show><i class="fa fa-edit"></i>Update Why Not Enrolled In CM</a>
-                    <form url="/api/client/updateWhyNotEnrolledInCm" class="mcp-theme-1">
-                        <input type="hidden" name="uid" value="{{$patient->uid}}">
-                        <div class="form-group">
-                            <label class="control-label">Why Not Enrolled In Cm Category</label>
-                            <input type="text" name="whyNotEnrolledInCmCategory" value="{{$patient->why_not_enrolled_in_cm_category}}" class="form-control">
-                        </div>
-                        <div class="form-group">
-                            <label class="control-label">Why Not Enrolled In Cm Memo</label>
-                            <input type="text" name="whyNotEnrolledInCmMemo" value="{{$patient->why_not_enrolled_in_cm_memo}}" class="form-control">
-                        </div>
-                        <div>
-                            <button submit class="btn btn-sm btn-primary mr-1">Submit
-                            </button>
-                            <button cancel class="btn btn-sm btn-default border">
-                                Cancel
-                            </button>
-                        </div>
-                    </form>
-                </div>
-                @endif
-                <hr class="m-negator-3 my-3">
                 <div>
                     <p>Is Eligible For RM: {{$patient->is_eligible_for_rm}}</p>
 		            <p>Why Not Eligible For RM Category: {{$patient->why_not_eligible_for_rm_category}}</p>

resources/views/app/patient/supply-orders.blade.php

@@ -9,54 +9,55 @@
                     <a start show href="#">Add</a>
                     <form url="/api/supplyOrder/createAndSignAsPro" redir="/patients/view/{{ $patient->uid }}/supply-orders/[data]?{{request()->input('popupmode') ? 'popupmode=1' : ''}}&note-uid={{request()->input('note-uid')}}">
 
-                        {{--@if(!$patient->has_cm_setup_been_performed)
-                            <p class="font-weight-bold alert alert-warning border-warning mb-0">You need to enroll this patient into CM before adding supply orders.</p>
-                        @else--}}
-                            <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
-                            <input type="hidden" name="noteUid" value="{{ request()->input('note-uid') }}">
-                            <label class="text-secondary font-weight-bold">Add Supply Order</label>
-                            <div class="mb-2">
-                                <label class="text-secondary text-sm">Product</label>
-                                <select name="productUid" class="form-control form-control-sm">
-                                    <option value=""> --select--</option>
-                                    @foreach($products as $product)
-                                        <option
-                                                value="{{$product->uid}}">{{$product->title}}</option>
-                                    @endforeach
-                                </select>
-                            </div>
-                            <div class="mb-2">
-                                <label class="text-secondary text-sm">Address Line1</label>
-                                <input type="text" class="form-control form-control-sm" name="mailingAddressLine1" value="{{$patient->mailing_address_line1}}">
-                            </div>
-                            <div class="mb-2">
-                                <label class="text-secondary text-sm">Address Line2</label>
-                                <input type="text" class="form-control form-control-sm" name="mailingAddressLine2" value="{{$patient->mailing_address_line2}}">
-                            </div>
-                            <div class="mb-2">
-                                <label class="text-secondary text-sm">Address City</label>
-                                <input type="text" class="form-control form-control-sm" name="mailingAddressCity" value="{{$patient->mailing_address_city}}">
-                            </div>
-                            <div class="mb-2">
-                                <label class="text-secondary text-sm">Address State</label>
-                                <input type="text" class="form-control form-control-sm" name="mailingAddressState" value="{{$patient->mailing_address_state}}">
-                            </div>
-                            <div class="mb-2">
-                                <label class="text-secondary text-sm">Address Zip</label>
-                                <input type="text" class="form-control form-control-sm" name="mailingAddressZip" value="{{$patient->mailing_address_zip}}">
-                            </div>
-                            <div class="mb-2">
-                                <label class="text-secondary text-sm">Reason</label>
-                                <input type="text" class="form-control form-control-sm" name="reason">
-                            </div>
-                            <div class="mb-2">
-                                <label class="text-secondary text-sm">Client Understanding Memo</label>
-                                <input type="text" class="form-control form-control-sm" name="clientUnderstandingMemo">
-                            </div>
-                            <div class="d-flex align-items-center">
-                                <button class="btn btn-sm btn-primary mr-2" type="button" submit>Save</button>
-                            </div>
-                        {{--@endif--}}
+                        @if(!$patient->has_cm_setup_been_performed)
+                            <p class="font-weight-bold alert alert-warning border-warning mb-2">You need to complete the patient's comprehensive care plan before ordering cellular devices.</p>
+                        @endif
+
+                        <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
+                        <input type="hidden" name="noteUid" value="{{ request()->input('note-uid') }}">
+                        <label class="text-secondary font-weight-bold">Add Supply Order</label>
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">Product</label>
+                            <select name="productUid" class="form-control form-control-sm">
+                                <option value=""> --select--</option>
+                                @foreach($products as $product)
+                                    @if($patient->has_cm_setup_been_performed || !$product->has_imei_number)
+                                        <option value="{{$product->uid}}">{{$product->title}}</option>
+                                    @endif
+                                @endforeach
+                            </select>
+                        </div>
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">Address Line1</label>
+                            <input type="text" class="form-control form-control-sm" name="mailingAddressLine1" value="{{$patient->mailing_address_line1}}">
+                        </div>
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">Address Line2</label>
+                            <input type="text" class="form-control form-control-sm" name="mailingAddressLine2" value="{{$patient->mailing_address_line2}}">
+                        </div>
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">Address City</label>
+                            <input type="text" class="form-control form-control-sm" name="mailingAddressCity" value="{{$patient->mailing_address_city}}">
+                        </div>
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">Address State</label>
+                            <input type="text" class="form-control form-control-sm" name="mailingAddressState" value="{{$patient->mailing_address_state}}">
+                        </div>
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">Address Zip</label>
+                            <input type="text" class="form-control form-control-sm" name="mailingAddressZip" value="{{$patient->mailing_address_zip}}">
+                        </div>
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">Reason</label>
+                            <input type="text" class="form-control form-control-sm" name="reason">
+                        </div>
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">Client Understanding Memo</label>
+                            <input type="text" class="form-control form-control-sm" name="clientUnderstandingMemo">
+                        </div>
+                        <div class="d-flex align-items-center">
+                            <button class="btn btn-sm btn-primary mr-2" type="button" submit>Save</button>
+                        </div>
 
                     </form>
                 </div>

resources/views/app/rm-bills/add-bill-form/_default-script.blade.php

@@ -21,19 +21,6 @@
                         maxHours = (maxNumberOf5Minutes * 5) / 60,
                         unitsSelect = $(_trigger).closest('form').find('[name="numberOfUnits"]');
 
-                    // CRITERIA TO BILL UP TO 60 MINS. is note.hcp_pro_id == client.mcp_pro_id AND note.wasCmSetupPerformed IS TRUE
-                    $('.cm-setup-alert').remove();
-                    @if(@$note && @$patient && $note->hcp_pro_id === $patient->mcp_pro_id && $note->was_cm_setup_performed)
-                    maxHours = 1;
-                    @endif
-                    @if(@$note && @$patient && $note->hcp_pro_id === $patient->mcp_pro_id && !$note->was_cm_setup_performed)
-                    $('<div/>')
-                        .addClass('alert alert-warning my-2 cm-setup-alert border border-warning p-2')
-                        .html('<div class="mb-2">CCM setup may have been performed, but has not been marked as such in the note.</div>' +
-                            'Please ask the HCP if they need to do that, and then you can bill up to 60 mins. because patient needs education re: CM')
-                        .insertAfter(unitsSelect);
-                    @endif
-
                     unitsSelect.find('option').each(function () {
                         if (this.value) {
                             if (+this.value > maxHours) {

resources/views/layouts/template.blade.php

@@ -147,7 +147,6 @@
                             <a class="dropdown-item" href="{{ route('practice-management.proAvailability') }}">Pro Availability</a>
                             <a class="dropdown-item" href="{{ route('practice-management.proCalendar') }}">Pro Calendar</a>
                             <a class="dropdown-item" href="{{ route('practice-management.remoteMonitoringReport') }}">Remote Monitoring Report</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.rm-launch-and-clean') }}">RM: Launch &amp; Clean</a>
 
                             <a class="dropdown-item" href="{{ route('practice-management.billingManager') }}">Billing Manager</a>
                             <a class="dropdown-item" href="{{ route('practice-management.billing-report') }}">Billing Report</a>
@@ -162,7 +161,7 @@
                             <a class="dropdown-item" href="{{ route('practice-management.process-claims') }}">Process Claims</a>
                             <a class="dropdown-item" href="{{ route('practice-management.process-notes') }}">Process Notes</a>
                             <a class="dropdown-item" href="{{ route('practice-management.notes-processing-center') }}">Notes Processing Center</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.client-ccm-rm-status') }}">Client CM/RM Status</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.client-ccm-rm-status') }}">Client RM Status</a>
                             <a class="dropdown-item" href="{{ route('practice-management.rmActionReport') }}">RM Action Report</a>
                             <a class="dropdown-item" href="{{ route('practice-management.hcp-note-activity') }}">HCP Note Activity</a>