Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2 into dev

app/Helpers/helpers.php

@@ -310,6 +310,25 @@ if(!function_exists('friendly_date_short_with_tz_from_timestamp_divide1000')) {
     }
 }
 
+if(!function_exists('date_short_with_tz_from_timestamp_divide1000')) {
+    function date_short_with_tz_from_timestamp_divide1000($value, $tz='EASTERN', $default = '-') {
+
+        if(!$value || empty($value)) return $default;
+        try {
+            $value = (floor($value / 1000));
+            $realTimezone = resolve_timezone($tz);
+            $date = new DateTime("@$value");
+            $date->setTimezone(new DateTimeZone($realTimezone));
+
+            return $date->format("Y-m-d");
+
+        }
+        catch (Exception $e) {
+            return $e->getMessage();
+        }
+    }
+}
+
 if(!function_exists('friendly_date')) {
     function friendly_date($value) {
         if(!$value || empty($value)) return '';

app/Http/Controllers/McpController.php

@@ -14,6 +14,7 @@ use App\Models\Handout;
 use App\Models\IncomingReport;
 use App\Models\MBClaim;
 use App\Models\MBPayer;
+use App\Models\Measurement;
 use App\Models\Note;
 use App\Models\NoteTemplate;
 use App\Models\Pro;
@@ -417,5 +418,28 @@ class McpController extends Controller
         ];
         return view('app.mcp.measurements_pending_stamping', $data);
     }
+    public function measurements_mass_stamping(Request $request){
+        $careMonthsWithMeasurementsPendingStamping = CareMonth::select('id')
+            ->where('mcp_pro_id', $this->performer->pro->id)
+            ->where('rm_num_measurements_not_stamped_by_mcp', '>', 0)
+            ->whereNotNull('rm_num_measurements_not_stamped_by_mcp')
+            ->orderBy('created_at', 'DESC')
+            ->get()
+            ->map(function($_x) {
+                return $_x->id;
+            })
+            ->toArray();
+
+        $measurementsPendingStamping = Measurement::whereIn('care_month_id', $careMonthsWithMeasurementsPendingStamping)
+            ->orderBy('created_at', 'DESC')
+            ->whereNotNull('ts')
+            ->whereNotIn('label', ['SBP', 'DBP'])
+            ->where('is_cellular_zero', '<>', true)
+            ->where('is_active', true)
+            ->where('has_been_stamped_by_mcp', false)
+            ->whereNotNull('client_bdt_measurement_id')
+            ->paginate(500);
+        return view('app.mcp.measurements_mass_stamping', compact('measurementsPendingStamping'));
+    }
 
 }

app/Models/Pro.php

@@ -96,6 +96,7 @@ class Pro extends Model
             ->where('code', 'NOT LIKE', 'CM%')
             ->where('code', 'NOT LIKE', 'RM%')
             ->where('responsibility', '<>', 'GENERIC')
+            ->where('responsibility', '<>', 'NA')
             ->get();
     }
 

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

@@ -38,6 +38,7 @@
                 <th class="border-0">MCP</th>
                 <th class="border-0">NA</th>
                 <th class="border-0">Initiative</th>
+                <th class="border-0">Source</th>
             @endif
             <th class="border-0">Email Address</th>
         </tr>
@@ -308,6 +309,7 @@
                     <td>{{@$patient->mcp ? $patient->mcp->displayName() : '--'}}</td>
                     <td>{{@$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '--'}}</td>
                     <td>{{$patient->initiative}}</td>
+                    <td>{{$patient->source}}</td>
                 @endif
                 <td>{{$patient->email_address}}</td>
             </tr>

resources/views/app/dashboard-mcp.blade.php

@@ -342,7 +342,15 @@
                             <div class="card mb-4">
                                 <div class="card-header pl-2">
                                     <strong>
-                                        Measurements Pending Stamping
+                                        <a href="{{ route('mcp.measurements_mass_stamping') }}"
+                                           native target="_blank"
+                                           open-in-stag-popup
+                                           update-parent
+                                           popup-style="tall"
+                                           mc-initer="measurements-mass-stamp"
+                                           title="Measurements Pending Stamping">
+                                            Measurements Pending Stamping
+                                        </a>
                                     </strong>
                                 </div>
                                 <div class="card-body p-0">

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

@@ -0,0 +1,154 @@
+<div class="popup-content-container px-3 d-flex flex-column" style="max-height: calc(100vh - 180px)" id="measurements-mass-stamp">
+    @if(count($measurementsPendingStamping))
+    <div class="d-flex align-items-baseline">
+        <div>
+            <a href="#" class="btn btn-primary text-white font-weight-bold btn-stamp-all">Stamp All On Page</a>
+        </div>
+        <div class="ml-auto d-inline-flex align-items-baseline">
+            <span class="mr-3"><b>{{$measurementsPendingStamping->total()}}</b> measurements remaining</span>
+            {{ $measurementsPendingStamping->onEachSide(0)->withQueryString()->links() }}
+        </div>
+    </div>
+    @endif
+    <div class="flex-grow-1 overflow-auto border mb-3">
+    @if($measurementsPendingStamping && count($measurementsPendingStamping))
+        <table class="table table-sm table-striped mb-0">
+            <thead>
+            <tr>
+                <th class="border-bottom-0 border-top-0 text-secondary">Patient</th>
+                <th class="border-bottom-0 border-top-0 text-secondary">Type</th>
+                <th class="border-bottom-0 border-top-0 text-secondary">Value</th>
+                <th class="border-bottom-0 border-top-0 text-secondary">Timestamp</th>
+            </tr>
+            </thead>
+            <tbody>
+            @foreach($measurementsPendingStamping as $row)
+                <tr class="stamp-row"
+                    data-client-uid="{{$row->client->uid}}"
+                    data-caremonth-uid="{{$row->careMonth->uid}}"
+                    data-uid="{{$row->uid}}"
+                    data-date="{{date_short_with_tz_from_timestamp_divide1000($row->ts, 'EASTERN')}}">
+                    <td class="pl-2">
+                        <a native target="_blank" href="{{ route('patients.view.dashboard', $row->client) }}">
+                            {{$row->client->displayName()}}
+                        </a>
+                    </td>
+                    <td class="text-nowrap">
+                        {{$row->label}}
+                    </td>
+                    <td>
+                        @if($row->label === 'BP')
+                            {{ $row->sbp_mm_hg }}/{{ $row->dbp_mm_hg }}
+                        @elseif($row->label === 'Wt. (lbs.)')
+                            {{ round(floatval($row->numeric_value), 2) }}
+                        @endif
+                    </td>
+                    <td class="text-secondary">
+                        {{ friendly_date_time_short_with_tz_from_timestamp_divide1000($row->ts, 'EASTERN') }} EST
+                    </td>
+                </tr>
+            @endforeach
+            </tbody>
+        </table>
+    @else
+        <div class="p-3">
+            No measurement pending stamping
+        </div>
+    @endif
+    </div>
+</div>
+<script>
+    (function() {
+        function init() {
+            $('.btn-stamp-all')
+                .off('click')
+                .on('click', function() {
+
+                    let clients = {};
+                    $('tr.stamp-row').each(function() {
+                        if(!clients[$(this).attr('data-client-uid')]) {
+                            clients[$(this).attr('data-client-uid')] = {
+                                clientUid: $(this).attr('data-client-uid'),
+                                uids: [],
+                                careMonths: {},
+                            };
+                        }
+                        clients[$(this).attr('data-client-uid')].uids.push($(this).attr('data-uid'));
+                        if(!clients[$(this).attr('data-client-uid')].careMonths[$(this).attr('data-caremonth-uid')]) {
+                            clients[$(this).attr('data-client-uid')].careMonths[$(this).attr('data-caremonth-uid')] = [];
+                        }
+                        if(clients[$(this).attr('data-client-uid')].careMonths[$(this).attr('data-caremonth-uid')].indexOf($(this).attr('data-date')) === -1) {
+                            clients[$(this).attr('data-client-uid')].careMonths[$(this).attr('data-caremonth-uid')].push($(this).attr('data-date'));
+                        }
+                    });
+
+                    // 1 bulk stamp req per client
+                        // 1 add entry req per unique date per caremonth per client
+
+                    showMask();
+
+                    let apiRequests = [];
+
+                    for(let clientUid in clients) {
+                        if(clients.hasOwnProperty(clientUid)) {
+
+                            // bulk stamp all measurements for this client
+                            let payload = {
+                                clientUid: clientUid,
+                                toStamp: clients[clientUid].uids.map(_x => {
+                                    return {
+                                        measurementUid: _x,
+                                        memo: null,
+                                        detailJson: null
+                                    }
+                                }),
+                                shouldAddEntry: 0
+                            };
+                            apiRequests.push($.ajax({
+                                url: "/api/measurement/bulkStamp",
+                                type: 'post',
+                                data: JSON.stringify(payload),
+                                contentType:"application/json; charset=utf-8",
+                                dataType:"json",
+                                success: function(jsonSaveResponse) {},
+                                error: function(jqXHR, textStatus, errorThrown) {}
+                            }));
+
+                            // for each caremonth of this client, add entry to each unique day with measurement
+                            for(let careMonthUid in clients[clientUid].careMonths) {
+                                if(clients[clientUid].careMonths.hasOwnProperty(careMonthUid)) {
+                                    for (let i = 0; i < clients[clientUid].careMonths[careMonthUid].length; i++) {
+                                        payload = {
+                                            careMonthUid: careMonthUid,
+                                            proUid: '{{$pro->uid}}',
+                                            effectiveDate: clients[clientUid].careMonths[careMonthUid][i],
+                                            timeInMinutes: 1
+                                        };
+                                        apiRequests.push($.ajax({
+                                            url: "/api/careMonthEntry/createForRm",
+                                            type: 'post',
+                                            data: payload,
+                                            dataType:"json",
+                                            success: function(jsonSaveResponse) {},
+                                            error: function(jqXHR, textStatus, errorThrown) {}
+                                        }));
+                                    }
+                                }
+                            }
+
+                        }
+                    }
+
+
+                    Promise.all(apiRequests).then(() => {
+                        hideMask();
+                        refreshDynamicStagPopup();
+                    });
+
+                    return false;
+                });
+        }
+        addMCInitializer('measurements-mass-stamp', init, '#measurements-mass-stamp')
+    }).call(window);
+</script>
+

resources/views/app/patient/care-months.blade.php

@@ -90,9 +90,9 @@
                         <label class="text-secondary text-sm mb-1">Year *</label>
                         <select name="startYear" class="form-control form-control-sm" required>
                             <option value="">-- Start Year --</option>
-                            <option value="2021" {{ date('Y') === '2021' ? 'selected' : '' }}>2021</option>
+                            <option value="2022" {{ date('Y') === '2022' ? 'selected' : '' }}>2022</option>
                             @if(date('m') === '12')
-                                <option value="2022" {{ date('Y') === '2022' ? 'selected' : '' }}>2022</option>
+                                <option value="2023" {{ date('Y') === '2023' ? 'selected' : '' }}>2023</option>
                             @endif
                         </select>
                     </div>

resources/views/app/patient/create-patient/demographics-form.blade.php

@@ -39,7 +39,7 @@
 		<div class="row align-items-center form-group">
 			<label class="col-md-2 pr-0 font-weight-bold m-0">DOB: <span class="text-danger">*</span></label>
 			<div class="col-md-10">	
-				<input type="date" required name="patientDob" value="" class="form-control input-sm">
+				<input type="date" required name="patientDob" value="" class="form-control input-sm" max="{{date('Y-m-d')}}">
 			</div>
 		</div>
 	</div>
@@ -155,8 +155,8 @@
 
 
 <div class='form-group mb-3'>
-	<label class='control-label font-weight-bold'>How did you hear about us?</label>
-	<input class='form-control' type='text' name='initiative' />
+	<label class='control-label font-weight-bold'>How did you hear about the program?</label>
+	<input class='form-control' type='text' name='source' />
 </div>
 
 <div class='form-group mb-3 checkbox'>

resources/views/app/patient/note/ccm-agreement.blade.php

@@ -14,6 +14,7 @@
     <?php $patient = $note->client; ?>
 
     <div class="border rounded p-3 mb-3 max-width-500px" id="ccm-agreement-reasons-{{$note->id}}">
+        <input type="hidden" name="client-ccm-reasons-count" value="{{count($patient->cmReasons)}}">
         <p><b>CCM Reasons @if(!$patient->cmReasons || count($patient->cmReasons) < 2)(2 reasons required)@else <i class="fa fa-check text-success ml-1"></i> @endif</b></p>
         <div class="min-width-300px">
             @if(!$patient->cmReasons || !count($patient->cmReasons))
@@ -25,8 +26,8 @@
                             <b class="min-width-70px">{{$reason->code}}</b>
                             <span class="max-width-200px mr-3">{{$reason->description}}</span>
                             <div moe relative class="ml-auto">
-                                <a start show><i class="fa fa-pencil-alt"></i></a>
-                                <form url="/api/clientCmRmReason/updateBasic" class="mcp-theme-1" right target="#ccm-agreement-reasons-{{$note->id}}">
+                                <a start show><i class="fa fa-edit"></i></a>
+                                <form url="/api/clientCmRmReason/updateBasic" class="mcp-theme-1" right>
                                     <input type="hidden" name="uid" value="{{$reason->uid}}">
                                     <div class="mb-2">
                                         <label class="text-sm mb-1 text-secondary">Code *</label>
@@ -48,7 +49,7 @@
                             </div>
                             <div moe relative class="ml-2">
                                 <a start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
-                                <form url="/api/clientCmRmReason/remove" class="mcp-theme-1" right target="#ccm-agreement-reasons-{{$note->id}}">
+                                <form url="/api/clientCmRmReason/remove" class="mcp-theme-1" right>
                                     <input type="hidden" name="uid" value="{{$reason->uid}}">
                                     <p>Remove this CM reason?</p>
                                     <div>
@@ -65,7 +66,7 @@
                 <div class="d-flex align-items-baseline">
                     <div moe>
                         <a start show>+ Add From Dx</a>
-                        <form url="/api/clientCmRmReason/create" class="mcp-theme-1" target="#ccm-agreement-reasons-{{$note->id}}">
+                        <form url="/api/clientCmRmReason/create" class="mcp-theme-1">
                             <input type="hidden" name="clientUid" value="{{$patient->uid}}">
                             <input type="hidden" name="cmOrRm" value="CM">
                             <input type="hidden" name="code" value="">
@@ -91,7 +92,7 @@
                     <span class="mx-2 text-secondary text-sm">|</span>
                     <div moe>
                         <a start show>+ Add</a>
-                        <form url="/api/clientCmRmReason/create" class="mcp-theme-1" target="#ccm-agreement-reasons-{{$note->id}}">
+                        <form url="/api/clientCmRmReason/create" class="mcp-theme-1">
                             <input type="hidden" name="clientUid" value="{{$patient->uid}}">
                             <input type="hidden" name="cmOrRm" value="CM">
                             <div class="mb-2">
@@ -127,7 +128,7 @@
     <hr class="m-neg-3">
 
     <div class="d-flex align-items-center justify-content-center">
-        <button class="btn btn-primary btn-sm font-weight-bold px-3 btn-ccm-agreement-submit">Submit</button>
+        <button class="btn btn-primary btn-sm font-weight-bold px-3 btn-ccm-agreement-submit" {{count($patient->cmReasons) < 2 ? 'disabled' : ''}}>Submit</button>
         <button class="ml-3 btn btn-default border btn-sm px-3" onclick="return closeStagPopup()">Close</button>
     </div>
 
@@ -148,7 +149,7 @@
                         return false;
                     @else
                         let form = parentForm.find('#ccm-agreement-form')[0];
-                        if(!form.checkValidity()) {
+                        if (!form.checkValidity()) {
                             form.reportValidity();
                             return false;
                         }
@@ -165,13 +166,17 @@
 
                         $.post('/api/client/setIsEnrolledInCmToTrue', payload, _data => {
                             hideMask();
-                            if(!hasResponseError(_data)) {
+                            if (!hasResponseError(_data)) {
                                 closeStagPopup();
-                                fastReload();
+                                if(!parentForm.closest('.stag-popup').length) {
+                                    fastReload();
+                                }
                             }
                         }, 'json');
                     @endif
                 });
+
+            runMCInitializer('icd-autocomplete');
         }
 
         addMCInitializer('ccm-agreement-{{$note->id}}', init, '#ccm-agreement-{{$note->id}}')

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

@@ -0,0 +1,312 @@
+<div class="mb-3 d-flex align-items-baseline">
+    <span class="flex-grow-1">Enrollment:</span>
+    <div class="width-300px d-inline-flex align-items-center">
+        @if($patient->is_enrolled_in_cm === 'YES')
+            <span class="text-nowrap text-success">
+                <i class="fa fa-check"></i>
+                <b>Enrolled</b>
+            </span>
+            <div moe class="ml-3">
+                <a href="" show start>Undo</a>
+                <form url="/api/client/setIsEnrolledInCmToFalse" >
+                    <input type="hidden" name="uid" value="{{$patient->uid}}">
+                    <p>Un-enroll from CCM?</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>
+        @else
+            <span class="text-nowrap text-warning-mellow">
+                                            <i class="fa fa-times"></i>
+                                            <b>Not Enrolled</b>
+                                        </span>
+            @if($patient->mcp_pro_id === $pro->id || $pro->pro_type === 'ADMIN')
+                <a native target="_blank"
+                   class="screen-only ml-3"
+                   update-parent
+                   open-in-stag-popup
+                   popup-style="medium overflow-visible"
+                   mc-initer="ccm-agreement-{{$note->id}}"
+                   title="Consent To Chronic Care Management Services"
+                   href="/note/ccm-agreement/{{$note->uid}}?popupmode=1">
+                    Mark as enrolled
+                </a>
+            @endif
+        @endif
+    </div>
+</div>
+
+<div class="d-flex align-items-baseline mb-3">
+    <span class="flex-grow-1">Reasons:</span>
+    <div class="width-300px d-inline-flex align-items-center">
+        @if(!$patient->cmReasons || !count($patient->cmReasons))
+            <span class="text-secondary">None</span>
+        @else
+            <div class="w-100">
+                @foreach($patient->cmReasons as $reason)
+                    <div class="border-bottom pb-1 mb-1 d-flex align-items-start">
+                        <b class="min-width-70px">{{$reason->code}}</b>
+                        <span class="max-width-200px mr-3">{{$reason->description}}</span>
+                        <div moe relative class="ml-auto">
+                            <a start show><i class="fa fa-edit"></i></a>
+                            <form url="/api/clientCmRmReason/updateBasic" class="mcp-theme-1" right >
+                                <input type="hidden" name="uid" value="{{$reason->uid}}">
+                                <div class="mb-2">
+                                    <label class="text-sm mb-1 text-secondary">Code *</label>
+                                    <input type="text" class="form-control form-control-sm"
+                                           icd-autocomplete-code
+                                           name="code" value="{{$reason->code}}" required>
+                                </div>
+                                <div class="mb-2">
+                                    <label class="text-sm mb-1 text-secondary">Description</label>
+                                    <input type="text" class="form-control form-control-sm"
+                                           icd-autocomplete-description
+                                           name="description" value="{{$reason->description}}">
+                                </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 relative class="ml-2">
+                            <a start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
+                            <form url="/api/clientCmRmReason/remove" class="mcp-theme-1" right >
+                                <input type="hidden" name="uid" value="{{$reason->uid}}">
+                                <p>Remove this CM reason?</p>
+                                <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>
+                @endforeach
+                @if(!$patient->cmReasons || count($patient->cmReasons) < 2)
+                    <div class="d-flex align-items-baseline">
+                        <div moe>
+                            <a start show>+ Add From Dx</a>
+                            <form url="/api/clientCmRmReason/create" class="mcp-theme-1" >
+                                <input type="hidden" name="clientUid" value="{{$patient->uid}}">
+                                <input type="hidden" name="cmOrRm" value="CM">
+                                <input type="hidden" name="code" value="">
+                                <input type="hidden" name="description" value="">
+                                <div class="mb-2">
+                                    <label class="text-sm mb-1 text-secondary">Reason *</label>
+                                    <select type="text" class="form-control form-control-sm problem-select" name="problem" required>
+                                        <?php $problems = \App\Models\Point::getPointsOfCategory($patient, "PROBLEM"); ?>
+                                        <option value="">-- select --</option>
+                                        @foreach($problems as $problem)
+                                            @if(!!@($problem->data->icd))
+                                                <option value="{{$problem->uid}}" data-icd="{{$problem->data->icd}}" data-name="{{$problem->data->name}}">{{$problem->data->icd}} - {{$problem->data->name}}</option>
+                                            @endif
+                                        @endforeach
+                                    </select>
+                                </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>
+                        <span class="mx-2 text-secondary text-sm">|</span>
+                        <div moe>
+                            <a start show>+ Add</a>
+                            <form url="/api/clientCmRmReason/create" class="mcp-theme-1" >
+                                <input type="hidden" name="clientUid" value="{{$patient->uid}}">
+                                <input type="hidden" name="cmOrRm" value="CM">
+                                <div class="mb-2">
+                                    <label class="text-sm mb-1 text-secondary">Code *</label>
+                                    <input type="text" class="form-control form-control-sm"
+                                           icd-autocomplete-code
+                                           name="code" value="" required>
+                                </div>
+                                <div class="mb-2">
+                                    <label class="text-sm mb-1 text-secondary">Description</label>
+                                    <input type="text" class="form-control form-control-sm"
+                                           icd-autocomplete-description
+                                           name="description" value="">
+                                </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>
+                @endif
+            </div>
+        @endif
+    </div>
+</div>
+
+<div class="mb-3 d-flex align-items-baseline">
+    <span class="flex-grow-1">Setup:</span>
+    <div class="width-300px d-inline-flex align-items-center">
+        @if($patient->has_cm_setup_been_performed)
+            <span class="text-nowrap text-success">
+                @if($patient->cm_setup_note_id === $note->id)
+                    <i class="fa fa-check"></i>
+                    <b>Performed on this note</b>
+                @elseif($patient->cmSetupNote)
+                    <i class="fa fa-check"></i>
+                    <b>Performed on</b>
+                    <span 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>
+                    </span>
+                @else
+                    <i class="fa fa-exclamation-triangle text-warning-mellow"></i>
+                    <b class="text-warning-mellow">Performed, but CM setup note missing!</b>
+                @endif
+                                        </span>
+            @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 CCM Setup as not performed?</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 Performed</b>
+            </span>
+            @if($patient->mcp_pro_id === $pro->id || $pro->pro_type === 'ADMIN')
+                <div moe class="ml-3">
+                    <a href="#" show start>Mark Performed</a>
+                    <form url="/api/note/markCmSetupPerformed" >
+                        <input type="hidden" name="uid" value="{{$note->uid}}">
+                        <p>Mark CCM Setup as performed?</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="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>
+        <div class="width-300px d-inline-flex align-items-center">
+            <span class="pr-2">MCP Signature:</span>
+            @if($note->cm_setup_mcp_signature_status !== 'SIGNED')
+                <div moe class="">
+                    <a start show>Sign</a>
+                    <form url="/api/note/updateCmSetupMcpSignatureStatus" class="mcp-theme-1">
+                        <input type="hidden" name="uid" value="{{$note->uid}}">
+                        <input type="hidden" name="mcpSignatureStatus" value="SIGNED">
+                        <p>Sign CM Setup Performed as MCP?</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/updateCmSetupMcpSignatureStatus" class="mcp-theme-1">
+                        <input type="hidden" name="uid" value="{{$note->uid}}">
+                        <input type="hidden" name="mcpSignatureStatus" value="">
+                        <p>Undo sign as MCP 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->default_na_pro_id && $note->was_cm_setup_performed)
+    <div class="d-flex align-items-baseline">
+        <span class="min-width-140px">Care Coord. Sign.:</span>
+        <div class="d-inline-flex align-items-center flex-grow-1">
+            @if($note->cm_setup_na_signature_status !== 'SIGNED')
+                <div moe class="">
+                    <a start show>Sign</a>
+                    <form url="/api/note/updateCmSetupNaSignatureStatus" class="mcp-theme-1">
+                        <input type="hidden" name="uid" value="{{$note->uid}}">
+                        <input type="hidden" name="naSignatureStatus" value="SIGNED">
+                        <p>Sign CM Setup Performed as Care Coordinator?</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/updateCmSetupNaSignatureStatus" class="mcp-theme-1">
+                        <input type="hidden" name="uid" value="{{$note->uid}}">
+                        <input type="hidden" name="naSignatureStatus" value="">
+                        <p>Undo sign as Care Coordinator for CM Setup Performed?</p>
+                        <div>
+                            <button submit class="btn btn-sm btn-primary mr-1">Sign</button>
+                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                        </div>
+                    </form>
+                </div>
+            @endif
+        </div>
+    </div>
+@endif

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

@@ -616,330 +616,6 @@
                 </div>
                 @endif
 
-                <div class="p-3 border-bottom 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">Chronic Care Management (CCM)</p>
-                    </div>
-
-                    <div class="mb-3 d-flex align-items-baseline">
-                        <span class="min-width-140px">CCM Enrollment:</span>
-                        <div class="d-inline-flex align-items-center flex-grow-1">
-                            @if($patient->is_enrolled_in_cm === 'YES')
-                                <span class="text-nowrap text-success">
-                                    <i class="fa fa-check"></i>
-                                    <b>Enrolled</b>
-                                </span>
-                                <div moe class="ml-3">
-                                    <a href="" show start>Undo</a>
-                                    <form url="/api/client/setIsEnrolledInCmToFalse" target='[data-non-segment-section="CM Setup"]'>
-                                        <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                        <p>Un-enroll from CCM?</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>
-                            @else
-                                <span class="text-nowrap text-warning-mellow">
-                                    <i class="fa fa-times"></i>
-                                    <b>Not Enrolled</b>
-                                </span>
-                                @if($patient->mcp_pro_id === $pro->id || $pro->pro_type === 'ADMIN')
-                                    <a native target="_blank"
-                                       class="screen-only ml-3"
-                                       open-in-stag-popup
-                                       popup-style="medium overflow-visible"
-                                       mc-initer="ccm-agreement-{{$note->id}}"
-                                       title="Consent To Chronic Care Management Services"
-                                       href="/note/ccm-agreement/{{$note->uid}}?popupmode=1">
-                                        Mark as enrolled
-                                    </a>
-                                @endif
-                            @endif
-                        </div>
-                    </div>
-
-                    <div class="mb-3 d-flex align-items-baseline">
-                        <span class="min-width-140px">CCM Setup:</span>
-                        <div class="d-inline-flex align-items-center flex-grow-1">
-                            @if($patient->has_cm_setup_been_performed)
-                                <span class="text-nowrap text-success">
-                                    @if($patient->cm_setup_note_id === $note->id)
-                                        <i class="fa fa-check"></i>
-                                        <b>Performed on this note</b>
-                                    @elseif($patient->cmSetupNote)
-                                        <i class="fa fa-check"></i>
-                                        <b>Performed on</b>
-                                        <span 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>
-                                        </span>
-                                    @else
-                                        <i class="fa fa-exclamation-triangle text-warning-mellow"></i>
-                                        <b class="text-warning-mellow">Performed, but CM setup note missing!</b>
-                                    @endif
-                                </span>
-                                @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" target='[data-non-segment-section="CM Setup"]'>
-                                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                                            <p>Mark CCM Setup as not performed?</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 Performed</b>
-                                </span>
-                                @if($patient->mcp_pro_id === $pro->id || $pro->pro_type === 'ADMIN')
-                                    <div moe class="ml-3">
-                                        <a href="#" show start>Mark Performed</a>
-                                        <form url="/api/note/markCmSetupPerformed" target='[data-non-segment-section="CM Setup"]'>
-                                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                                            <p>Mark CCM Setup as performed?</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>
-
-                    <div class="d-flex align-items-baseline mb-3">
-                        <span class="min-width-140px">CCM Reasons:</span>
-                        <div class="min-width-300px">
-                            @if(!$patient->cmReasons || !count($patient->cmReasons))
-                                <span class="text-secondary">None</span>
-                            @else
-                                <div>
-                                @foreach($patient->cmReasons as $reason)
-                                    <div class="border-bottom pb-1 mb-1 d-flex align-items-start">
-                                        <b class="min-width-70px">{{$reason->code}}</b>
-                                        <span class="max-width-200px mr-3">{{$reason->description}}</span>
-                                        <div moe relative class="ml-auto">
-                                            <a start show><i class="fa fa-pencil-alt"></i></a>
-                                            <form url="/api/clientCmRmReason/updateBasic" class="mcp-theme-1" right target='[data-non-segment-section="CM Setup"]'>
-                                                <input type="hidden" name="uid" value="{{$reason->uid}}">
-                                                <div class="mb-2">
-                                                    <label class="text-sm mb-1 text-secondary">Code *</label>
-                                                    <input type="text" class="form-control form-control-sm"
-                                                           icd-autocomplete-code
-                                                           name="code" value="{{$reason->code}}" required>
-                                                </div>
-                                                <div class="mb-2">
-                                                    <label class="text-sm mb-1 text-secondary">Description</label>
-                                                    <input type="text" class="form-control form-control-sm"
-                                                           icd-autocomplete-description
-                                                           name="description" value="{{$reason->description}}">
-                                                </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 relative class="ml-2">
-                                            <a start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
-                                            <form url="/api/clientCmRmReason/remove" class="mcp-theme-1" right target='[data-non-segment-section="CM Setup"]'>
-                                                <input type="hidden" name="uid" value="{{$reason->uid}}">
-                                                <p>Remove this CM reason?</p>
-                                                <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>
-                                @endforeach
-                                </div>
-                            @endif
-                            @if(!$patient->cmReasons || count($patient->cmReasons) < 2)
-                                <div class="d-flex align-items-baseline">
-                                    <div moe>
-                                        <a start show>+ Add From Dx</a>
-                                        <form url="/api/clientCmRmReason/create" class="mcp-theme-1" target='[data-non-segment-section="CM Setup"]'>
-                                            <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                            <input type="hidden" name="cmOrRm" value="CM">
-                                            <input type="hidden" name="code" value="">
-                                            <input type="hidden" name="description" value="">
-                                            <div class="mb-2">
-                                                <label class="text-sm mb-1 text-secondary">Reason *</label>
-                                                <select type="text" class="form-control form-control-sm problem-select" name="problem" required>
-                                                    <?php $problems = \App\Models\Point::getPointsOfCategory($patient, "PROBLEM"); ?>
-                                                    <option value="">-- select --</option>
-                                                    @foreach($problems as $problem)
-                                                        @if(!!@($problem->data->icd))
-                                                            <option value="{{$problem->uid}}" data-icd="{{$problem->data->icd}}" data-name="{{$problem->data->name}}">{{$problem->data->icd}} - {{$problem->data->name}}</option>
-                                                        @endif
-                                                    @endforeach
-                                                </select>
-                                            </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>
-                                    <span class="mx-2 text-secondary text-sm">|</span>
-                                    <div moe>
-                                        <a start show>+ Add</a>
-                                        <form url="/api/clientCmRmReason/create" class="mcp-theme-1" target='[data-non-segment-section="CM Setup"]'>
-                                            <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                            <input type="hidden" name="cmOrRm" value="CM">
-                                            <div class="mb-2">
-                                                <label class="text-sm mb-1 text-secondary">Code *</label>
-                                                <input type="text" class="form-control form-control-sm"
-                                                       icd-autocomplete-code
-                                                       name="code" value="" required>
-                                            </div>
-                                            <div class="mb-2">
-                                                <label class="text-sm mb-1 text-secondary">Description</label>
-                                                <input type="text" class="form-control form-control-sm"
-                                                       icd-autocomplete-description
-                                                       name="description" value="">
-                                            </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>
-                            @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">Manager Signature:</span>
-                        <div class="d-inline-flex align-items-center flex-grow-1">
-                            @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">Sign</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="min-width-140px">MCP Signature:</span>
-                        <div class="d-inline-flex align-items-center flex-grow-1">
-                            @if($note->cm_setup_mcp_signature_status !== 'SIGNED')
-                                <div moe class="">
-                                    <a start show>Sign</a>
-                                    <form url="/api/note/updateCmSetupMcpSignatureStatus" class="mcp-theme-1">
-                                        <input type="hidden" name="uid" value="{{$note->uid}}">
-                                        <input type="hidden" name="mcpSignatureStatus" value="SIGNED">
-                                        <p>Sign CM Setup Performed as MCP?</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/updateCmSetupMcpSignatureStatus" class="mcp-theme-1">
-                                        <input type="hidden" name="uid" value="{{$note->uid}}">
-                                        <input type="hidden" name="mcpSignatureStatus" value="">
-                                        <p>Undo sign as MCP for CM Setup Performed?</p>
-                                        <div>
-                                            <button submit class="btn btn-sm btn-primary mr-1">Sign</button>
-                                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                        </div>
-                                    </form>
-                                </div>
-                            @endif
-                        </div>
-                    </div>
-                    @endif
-
-                    @if($pro->id === $patient->default_na_pro_id && $note->was_cm_setup_performed)
-                    <div class="d-flex align-items-baseline">
-                        <span class="min-width-140px">Care Coord. Sign.:</span>
-                        <div class="d-inline-flex align-items-center flex-grow-1">
-                            @if($note->cm_setup_na_signature_status !== 'SIGNED')
-                                <div moe class="">
-                                    <a start show>Sign</a>
-                                    <form url="/api/note/updateCmSetupNaSignatureStatus" class="mcp-theme-1">
-                                        <input type="hidden" name="uid" value="{{$note->uid}}">
-                                        <input type="hidden" name="naSignatureStatus" value="SIGNED">
-                                        <p>Sign CM Setup Performed as Care Coordinator?</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/updateCmSetupNaSignatureStatus" class="mcp-theme-1">
-                                        <input type="hidden" name="uid" value="{{$note->uid}}">
-                                        <input type="hidden" name="naSignatureStatus" value="">
-                                        <p>Undo sign as Care Coordinator for CM Setup Performed?</p>
-                                        <div>
-                                            <button submit class="btn btn-sm btn-primary mr-1">Sign</button>
-                                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                        </div>
-                                    </form>
-                                </div>
-                            @endif
-                        </div>
-                    </div>
-                    @endif
-
-                </div>
-
-                <div class="p-3 border-bottom screen-only" 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">RM Setup</p>
-                    </div>
-                    @include('app.patient.note.rm-setup')
-                </div>
-
                 <div class="p-3 border-bottom screen-only" data-non-segment-section="Supply Orders Summary">
                     <div class="">
                         <div class="d-flex align-items-center mb-2">
@@ -988,14 +664,14 @@
                                                         {{$iSupplyOrder->shipment->status ? $iSupplyOrder->shipment->status : 'CREATED'}}
                                                     @elseif($iSupplyOrder->is_cleared_for_shipment)
                                                         <span class="text-info">
-                                                            <i class="fa fa-user-nurse"></i>
-                                                            Cleared for shipment
-                                                        </span>
+                                                        <i class="fa fa-user-nurse"></i>
+                                                        Cleared for shipment
+                                                    </span>
                                                     @else
                                                         <span class="text-warning-mellow">
-                                                            <i class="fa fa-user-nurse"></i>
-                                                            Not cleared for shipment
-                                                        </span>
+                                                        <i class="fa fa-user-nurse"></i>
+                                                        Not cleared for shipment
+                                                    </span>
                                                     @endif
                                                 </td>
                                             </tr>
@@ -1038,14 +714,14 @@
                                                     {{$iSupplyOrder->shipment->status ? $iSupplyOrder->shipment->status : 'CREATED'}}
                                                 @elseif($iSupplyOrder->is_cleared_for_shipment)
                                                     <span class="text-info">
-                                                            <i class="fa fa-user-nurse"></i>
-                                                            Cleared for shipment
-                                                        </span>
+                                                        <i class="fa fa-user-nurse"></i>
+                                                        Cleared for shipment
+                                                    </span>
                                                 @else
                                                     <span class="text-warning-mellow">
-                                                            <i class="fa fa-user-nurse"></i>
-                                                            Not cleared for shipment
-                                                        </span>
+                                                        <i class="fa fa-user-nurse"></i>
+                                                        Not cleared for shipment
+                                                    </span>
                                                 @endif
                                             </td>
                                         </tr>
@@ -1060,6 +736,25 @@
                     </div>
                 </div>
 
+                <div class="row border-bottom">
+                    <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="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>
+                            </div>
+                            @include('app.patient.note.rm-setup')
+                        </div>
+                    </div>
+                </div>
+
                 <div class="p-3 border-bottom screen-only" data-non-segment-section="Vitals Settings">
                     <div class="d-flex align-items-center mb-3">
                         <p class="font-weight-bold text-secondary m-0 font-size-14">Vitals Settings</p>
@@ -2509,7 +2204,7 @@
                                         <td>
                                             <div class="d-flex align-items-center">
                                                 <div moe relative class="mr-2">
-                                                    <a href="" show start><i class="fa fa-pencil-alt"></i></a>
+                                                    <a href="" show start><i class="fa fa-edit"></i></a>
                                                     <form url="/api/noteAddendum/updateMemo" right>
                                                         <input type="hidden" name="uid" value="{{$addendum->uid}}">
                                                         <div class="mb-2 d-block">
@@ -2789,7 +2484,7 @@
             (function() {
                 function init() {
                     initVSplitter('stag-note', $('.note-left-panel'), $('.note-right-panel'));
-                    initStagScrollbar(34);
+                    initStagScrollbar({{$note->is_signed_by_hcp ? 1 : 34}});
                     addMCHook('onNoteMethodUpdate', function() {
                         $('.visit-segment[data-segment-template-name="disclaimers"]').find('.refresh-segment').trigger('click');
                         fastReload();

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

@@ -52,7 +52,7 @@
         @endif
 
         <div class="d-flex align-items-baseline mb-3">
-            <span class="min-width-140px">RM Enrollment:</span>
+            <span class="min-width-140px">Enrollment:</span>
             <div class="">
                 <div class="d-inline-flex align-items-start">
                     <b>{{ ucwords($patient->is_enrolled_in_rm ? $patient->is_enrolled_in_rm : '-') }}</b>
@@ -84,7 +84,7 @@
         </div>
 
         <div class="d-flex align-items-baseline mb-3">
-            <span class="min-width-140px">RM Reasons:</span>
+            <span class="min-width-140px">Reasons:</span>
             <div class="flex-grow-1">
                 @if(!$patient->rmReasons || !count($patient->rmReasons))
                     <span class="text-secondary">None</span>
@@ -95,7 +95,7 @@
                                 <b class="min-width-70px">{{$reason->code}}</b>
                                 <span class="max-width-200px mr-3">{{$reason->description}}</span>
                                 <div moe relative class="ml-auto">
-                                    <a start show><i class="fa fa-pencil-alt"></i></a>
+                                    <a start show><i class="fa fa-edit"></i></a>
                                     <form url="/api/clientCmRmReason/updateBasic" class="mcp-theme-1" right target='[data-non-segment-section="RM Setup"]'>
                                         <input type="hidden" name="uid" value="{{$reason->uid}}">
                                         <div class="mb-2">

resources/views/app/patient/note/rpm-agreement.blade.php

@@ -54,7 +54,7 @@
                             <b class="min-width-70px">{{$reason->code}}</b>
                             <span class="max-width-200px mr-3">{{$reason->description}}</span>
                             <div moe relative class="ml-auto">
-                                <a start show><i class="fa fa-pencil-alt"></i></a>
+                                <a start show><i class="fa fa-edit"></i></a>
                                 <form url="/api/clientCmRmReason/updateBasic" class="mcp-theme-1" right target="#rpm-agreement-reasons-{{$note->id}}">
                                     <input type="hidden" name="uid" value="{{$reason->uid}}">
                                     <div class="mb-2">
@@ -177,6 +177,8 @@
                         }
                     }, 'json');
                 });
+
+            runMCInitializer('icd-autocomplete');
         }
 
         addMCInitializer('rpm-agreement-{{$note->id}}', init, '#rpm-agreement-{{$note->id}}')

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

@@ -92,54 +92,12 @@
         </div>
     </div>
 
-    @if($note->new_or_fu_or_na === "FU")
-        @if($patient->mcp_pro_id === $pro->id)
-            @if($patient->is_enrolled_in_cm !== 'YES')
-                <hr class="m-neg-3">
-                <div class="pl-3 border-left">
-                    <p class="mb-2 font-weight-bold font-size-13 text-secondary">CCM</p>
-                    <div class="mb-2">
-                        <i class="fa fa-exclamation-triangle text-warning-mellow"></i>
-                        WARNING: You are the MCP and patient is not currently enrolled in CCM.
-                    </div>
-                    <div class="mb-2">Would you like to mark them as enrolled?</div>
-                    <div moe class="d-block">
-                        <a href="" show start><b>Yes, mark as enrolled</b></a>
-                        <form url="/api/client/setIsEnrolledInCmToTrue">
-                            <input type="hidden" name="uid" value="{{$patient->uid}}">
-                            <p>Mark as enrolled in CCM?</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>
-                </div>
-            @else
-                @if(!$patient->has_cm_setup_been_performed)
-                    <hr class="m-neg-3">
-                    <div class="pl-3 border-left">
-                        <p class="mb-2 font-weight-bold font-size-13 text-secondary">CCM</p>
-                        <div class="mb-2">
-                            <i class="fa fa-exclamation-triangle text-warning-mellow"></i>
-                            WARNING: CM Setup has not been performed.
-                        </div>
-                        <div class="mb-2">Would you like to mark CM setup as performed?</div>
-                        <div moe class="d-block">
-                            <a href="" show start><b>Yes, mark as performed</b></a>
-                            <form url="/api/note/markCmSetupPerformedAsMcp">
-                                <input type="hidden" name="uid" value="{{$note->uid}}">
-                                <p>Mark CM Setup as performed?</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>
-                    </div>
-                @endif
-            @endif
-        @endif
+    @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 --}}
@@ -205,6 +163,8 @@
                     }, 'json');
                     return false;
                 });
+
+            runMCInitializer('icd-autocomplete');
         }
 
         addMCInitializer('note-sign-confirmation-{{$note->id}}', init, '#note-sign-confirmation-{{$note->id}}')

resources/views/app/patient/segment-templates/covid_follow-up/edit.blade.php

@@ -126,7 +126,7 @@ $submitFormUrl = '/api/visitPoint/upsertChildReview';
                                 </label>
                                 <label class="mr-3">Reviewed CDC "<b>How to Protect Yourself & Others</b>" with the patient
                                         <br />
-                                        <a href="https://www.cdc.gov/coronavirus/2019-ncov/prevent-getting-sick/prevention.html" target="_blank">https://www.cdc.gov/coronavirus/2019-ncov/prevent-getting-sick/prevention.html</a>
+                                        <a native href="https://www.cdc.gov/coronavirus/2019-ncov/prevent-getting-sick/prevention.html" target="_blank">https://www.cdc.gov/coronavirus/2019-ncov/prevent-getting-sick/prevention.html</a>
                                 </label>
                         </div>
                 </div>
@@ -242,7 +242,7 @@ $submitFormUrl = '/api/visitPoint/upsertChildReview';
                                         </label>
                                 </div>
                                 <div>
-                                        <a href="https://www.cdc.gov/mentalhealth/stress-coping/cope-with-stress/index.html" target="_blank">https://www.cdc.gov/mentalhealth/stress-coping/cope-with-stress/index.html</a>
+                                        <a native href="https://www.cdc.gov/mentalhealth/stress-coping/cope-with-stress/index.html" target="_blank">https://www.cdc.gov/mentalhealth/stress-coping/cope-with-stress/index.html</a>
                                 </div>
                         </div>
                         <div class="mb-2">

resources/views/app/patient/segment-templates/covid_follow-up/summary.blade.php

@@ -100,7 +100,7 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
     <div class="mb-2">
         <label>Reviewed “<b>CDC: How to Protect Yourself & Others</b>” with patient.</label>
         <div>
-            <a href="https://www.cdc.gov/coronavirus/2019-ncov/prevent-getting-sick/prevention.html" target="_blank">https://www.cdc.gov/coronavirus/2019-ncov/prevent-getting-sick/prevention.html</a>
+            <a native href="https://www.cdc.gov/coronavirus/2019-ncov/prevent-getting-sick/prevention.html" target="_blank">https://www.cdc.gov/coronavirus/2019-ncov/prevent-getting-sick/prevention.html</a>
         </div>
     </div>
     @endif
@@ -163,14 +163,14 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
     <div class="mb-2">
         <label>Patient has received printed materials from the CDC “<b>Coping with Stress</b>”.</label>
         <div>
-            <a href="https://www.cdc.gov/mentalhealth/stress-coping/cope-with-stress/index.html" target="_blank">https://www.cdc.gov/mentalhealth/stress-coping/cope-with-stress/index.html</a>
+            <a native href="https://www.cdc.gov/mentalhealth/stress-coping/cope-with-stress/index.html" target="_blank">https://www.cdc.gov/mentalhealth/stress-coping/cope-with-stress/index.html</a>
         </div>
     </div>
     @elseif(@$contentData['ans_has_received_printed_cdc_mental_health_matrials'] == 'no')
     <div class="mb-2">
         <label>Patient has not received printed materials from the CDC “<b>Coping with Stress</b>”.</label>
         <div>
-            <a href="https://www.cdc.gov/mentalhealth/stress-coping/cope-with-stress/index.html" target="_blank">https://www.cdc.gov/mentalhealth/stress-coping/cope-with-stress/index.html</a>
+            <a native href="https://www.cdc.gov/mentalhealth/stress-coping/cope-with-stress/index.html" target="_blank">https://www.cdc.gov/mentalhealth/stress-coping/cope-with-stress/index.html</a>
         </div>
     </div>
     @endif

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

@@ -7,7 +7,7 @@
                 <span class="mx-2 text-secondary">|</span>
                 <div moe large>
                     <a start show href="#">Add</a>
-                    <form url="/api/supplyOrder/create" redir="/patients/view/{{ $patient->uid }}/supply-orders/[data]?{{request()->input('popupmode') ? 'popupmode=1' : ''}}&note-uid={{request()->input('note-uid')}}">
+                    <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>

routes/web.php

@@ -107,6 +107,8 @@ Route::middleware('pro.auth')->group(function () {
 
         Route::get('measurements-pending-stamping', 'McpController@measurements_pending_stamping')->name('measurements_pending_stamping');
 
+        Route::get('measurements-mass-stamping', 'McpController@measurements_mass_stamping')->name('measurements_mass_stamping');
+
     });
 
     Route::name('hcp.')->prefix('h')->group(function () {