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

app/Http/Controllers/PracticeManagementController.php

@@ -1045,6 +1045,7 @@ SELECT client.name_first, client.name_last,
        client.dob,
        client.is_enrolled_in_rm,
        client.most_recent_completed_mcp_note_date,
+       client.cell_number,
        care_month.uid as care_month_uid,
        care_month.id as care_month_id,
        care_month.start_date,
@@ -1056,6 +1057,8 @@ SELECT client.name_first, client.name_last,
        care_month.rm_num_measurements_not_stamped_by_non_hcp,
        care_month.rm_num_measurements_not_stamped_by_rmm,
        care_month.rm_num_measurements_not_stamped_by_rme,
+       care_month.mcp_pro_id as care_month_mcp_pro_id,
+       care_month.rmm_pro_id as care_month_rmm_pro_id,
        client.mcp_pro_id,
        client.default_na_pro_id,
        client.rmm_pro_id,

app/Models/Client.php

@@ -35,7 +35,7 @@ class Client extends Model
         return $this->hasOne(ClientPrimaryCoverage::class, 'id', 'temporary_outsider_new_client_primary_coverage_id');
     }
 
-    public function displayName($_flat = false)
+    public function displayName($_flat = true)
     {
         if($_flat) return $this->name_first . ' ' . $this->name_last;
         return $this->name_last . ', ' . $this->name_first;

resources/views/app/dashboard/measurements-eloquent.blade.php

@@ -102,8 +102,8 @@
                                     <div class="mb-2">
                                         <div class="row">
                                             <div class="col-6 d-flex align-items-center">
-                                                <label class="text-secondary text-sm my-0 mr-3 text-nowrap">Time (mins)</label>
-                                                <input type="number" min="0" max="5400" class="form-control form-control-sm w-100 cm-time-value" name="timeInMinutes" value="" placeholder="Time (mins.)" required>
+                                                <label class="text-secondary text-sm my-0 mr-3 text-nowrap">Time (secs)</label>
+                                                <input type="number" min="75" max="300" class="form-control form-control-sm w-100 cm-time-value" name="timeInSeconds" value="" placeholder="Time (secs.)" required>
                                             </div>
                                         </div>
                                     </div>

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

@@ -122,7 +122,7 @@
                                             careMonthUid: careMonthUid,
                                             proUid: '{{$pro->uid}}',
                                             effectiveDate: clients[clientUid].careMonths[careMonthUid][i],
-                                            timeInMinutes: 1
+                                            timeInSeconds: 75
                                         };
                                         apiRequests.push($.ajax({
                                             url: "/api/careMonthEntry/createForRm",

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

@@ -196,19 +196,6 @@ foreach ($days as $k => $day) {
                                     <input type="hidden" name="clientUid" value="{{$patient->uid}}">
                                     <input type="hidden" class="measurements-uids" value="{{implode('|', $unstampedMCP[$k])}}">
                                     <p class="mb-2 font-weight-bold">Stamp all measurements?</p>
-                                    <!--<div class="mb-2 border border-info p-2 mt-2 bg-light width-300px">
-                                        <span>I have had interactive communication with <b>{{$patient->displayName()}}</b> during this care month.</span>
-                                        <div class="d-flex border-top mt-2">
-                                            <label class="mt-2 mb-0 d-inline-flex align-items-center mr-3">
-                                                <input type="radio" class="mr-2" name="communicatedToPatient" value="true" required>
-                                                <span>Yes</span>
-                                            </label>
-                                            <label class="mt-2 mb-0 d-inline-flex align-items-center">
-                                                <input type="radio" class="mr-2" name="communicatedToPatient" value="false" checked required>
-                                                <span>No</span>
-                                            </label>
-                                        </div>
-                                    </div>-->
                                     <?php
                                     $dayTotalMinutes = 0;
                                     foreach($m->entries as $entry) {
@@ -230,10 +217,10 @@ foreach ($days as $k => $day) {
                                         </div>
                                         <div class="if-adding-time-entry pt-2 d-none">
                                             <div class="mb-2">
-                                                <label class="mb-1 text-secondary text-sm">Minutes</label>
-                                                <input type="number" min="1" max="15"
-                                                       class="form-control form-control-sm w-100" name="entryNumberOfMinutes"
-                                                       value="1" placeholder="Time (mins.)">
+                                                <label class="mb-1 text-secondary text-sm">Seconds</label>
+                                                <input type="number" min="75" max="300"
+                                                       class="form-control form-control-sm w-100" name="entryNumberOfSeconds"
+                                                       value="75" placeholder="Time (seconds.)">
                                             </div>
                                             <div class="mb-2">
                                                 <label class="mb-1 text-secondary text-sm">Date</label>
@@ -241,12 +228,19 @@ foreach ($days as $k => $day) {
                                                        name="entryDate"
                                                        value="{{date('Y-m-d', strtotime($k))}}">
                                             </div>
-                                            <!--<div class="">
-                                                <label class="mb-0 d-flex align-items-baseline">
-                                                    <input type="checkbox" class="hasAnyoneInteractedWithClientAboutRmOutsideNote mr-2 mt-1">
-                                                    <span>Has anyone interacted with client about rm outside note?</span>
-                                                </label>
-                                            </div>-->
+                                        </div>
+                                    </div>
+                                    <div class="mb-2 border border-info p-2 mt-2 bg-light">
+                                        <span>I have had interactive communication with <b>{{$patient->displayName()}}</b> during this care month.</span>
+                                        <div class="d-flex border-top mt-2">
+                                            <label class="mt-2 mb-0 d-inline-flex align-items-center mr-3">
+                                                <input type="radio" class="mr-2" name="didProInteractWithClientAboutRm" value="true" required {{$careMonth->has_mcp_interacted_with_client_about_rm ? 'checked' : ''}}>
+                                                <span>Yes</span>
+                                            </label>
+                                            <label class="mt-2 mb-0 d-inline-flex align-items-center">
+                                                <input type="radio" class="mr-2" name="didProInteractWithClientAboutRm" value="false" required {{!$careMonth->has_mcp_interacted_with_client_about_rm ? 'checked' : ''}}>
+                                                <span>No</span>
+                                            </label>
                                         </div>
                                     </div>
                                     <div class="form-group m-0">
@@ -292,10 +286,10 @@ foreach ($days as $k => $day) {
                                         </div>
                                         <div class="if-adding-time-entry pt-2 d-none">
                                             <div class="mb-2">
-                                                <label class="mb-1 text-secondary text-sm">Minutes</label>
-                                                <input type="number" min="1" max="15"
-                                                       class="form-control form-control-sm w-100" name="entryNumberOfMinutes"
-                                                       value="1" placeholder="Time (mins.)">
+                                                <label class="mb-1 text-secondary text-sm">Seconds</label>
+                                                <input type="number" min="75" max="300"
+                                                       class="form-control form-control-sm w-100" name="entryNumberOfSeconds"
+                                                       value="75" placeholder="Time (secs.)">
                                             </div>
                                             <div class="mb-2">
                                                 <label class="mb-1 text-secondary text-sm">Date</label>
@@ -327,17 +321,50 @@ foreach ($days as $k => $day) {
                 </td>
                 <td rowspan="{{count($days[$k])}}" class="px-2">
                     @foreach($m->entries as $entry)
-                        <div class="my-1 d-flex align-items-baseline flex-nowrap">
-                            <b class="mr-2">{{round($entry->time_in_seconds / 60)}}m {{round($entry->time_in_seconds % 60)}}s</b>
-                            <span class="text-secondary mr-2 text-nowrap text-sm">({{friendly_date_time($entry->created_at)}})</span>
-                            <span class="text-secondary inline-html-container flex-grow-1">{!! $entry->content_text !!}</span>
-                        </div>
-                        @if($pro->pro_type === 'ADMIN')
-                            <div class="mt-1">
-                                <span class="text-secondary">Pro: </span>
-                                {{$entry->pro ? $entry->pro->displayName() : '-'}}
+                        <div class="border px-2 py-1 mb-1 bg-white">
+                            <div class="d-flex align-items-baseline flex-nowrap">
+                                <b class="mr-2">{{round($entry->time_in_seconds / 60)}}m {{round($entry->time_in_seconds % 60)}}s</b>
+                                <span class="text-secondary mr-2 text-nowrap text-sm">({{friendly_date_time($entry->created_at)}})</span>
+                                <span class="text-secondary inline-html-container flex-grow-1 mr-2">{!! $entry->content_text !!}</span>
                             </div>
-                        @endif
+                            @if($entry->pro_id === $pro->id)
+                                <div>
+                                    @if($performerRole === 'MCP')
+                                        <div moe relative class="mr-2">
+                                            <a href="#" start show class="text-sm">Mark as {{$entry->did_pro_interact_with_client_about_rm ? 'Not ' : ''}}Interacted</a>
+                                            <form url="/api/careMonthEntry/setDidProInteractWithClientAboutRmTo{{$entry->did_pro_interact_with_client_about_rm ? 'False' : 'True '}}">
+                                                <input type="hidden" name="uid" value="{{$entry->uid}}">
+                                                <p class="text-nowrap">Mark as {{$entry->did_pro_interact_with_client_about_rm ? 'Not ' : ''}}Interacted?</p>
+                                                <div class="d-flex align-items-center flex-nowrap">
+                                                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    @endif
+                                    <div moe relative>
+                                        <a href="#" start show class="text-sm">Update Content</a>
+                                        <form url="/api/careMonthEntry/updateContent">
+                                            <input type="hidden" name="uid" value="{{$entry->uid}}">
+                                            <div class="mb-2">
+                                                <label class="mb-1 text-secondary text-sm">Memo</label>
+                                                <textarea class="form-control form-control-sm" name="contentText">{!! $entry->content_text !!}</textarea>
+                                            </div>
+                                            <div class="d-flex align-items-center flex-nowrap">
+                                                <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                </div>
+                            @endif
+                            @if($pro->pro_type === 'ADMIN')
+                                <div class="mt-1">
+                                    <span class="text-secondary">Pro: </span>
+                                    {{$entry->pro ? $entry->pro->displayName() : '-'}}
+                                </div>
+                            @endif
+                        </div>
                     @endforeach
                     @if($performerRole === 'MCP' || $performerRole === 'NON-HCP')
                         <div moe large relative>
@@ -367,16 +394,15 @@ foreach ($days as $k => $day) {
                                                    placeholder="Effective Date" required>
                                         </div>
                                         <div class="col-4">
-                                            <input type="number" min="0" max="15" class="form-control form-control-sm w-100 cm-time-value" name="timeInMinutes"
-                                                   value="1" placeholder="Time (mins.)" required>
+                                            <input type="number" min="75" max="300" class="form-control form-control-sm w-100 cm-time-value" name="timeInSeconds"
+                                                   value="75" placeholder="Time (secs.)" required>
                                         </div>
                                     </div>
                                 </div>
                                 <div class="mb-2">
-                                    <div class="row">
-                                        <div class="col-12">
-                                            <div cm-rte data-content="Reviewed/managed patient measurements" data-name="contentText"></div>
-                                        </div>
+                                    <div class="mb-2">
+                                        <label class="mb-1 text-secondary text-sm">Memo</label>
+                                        <textarea class="form-control form-control-sm" name="contentText">Reviewed/managed patient measurements</textarea>
                                     </div>
                                 </div>
                                 <div class="d-flex align-items-center">
@@ -475,8 +501,11 @@ foreach ($days as $k => $day) {
                         shouldAddEntry: form.find('.shouldAddEntry').prop('checked') ? 1 : 0,
                         entryDate: form.find('[name="entryDate"]').val(),
                         entryMemo: form.find('[name="entryMemo"]').val(),
-                        entryNumberOfMinutes: form.find('[name="entryNumberOfMinutes"]').val() ? +(form.find('[name="entryNumberOfMinutes"]').val()) : 0,
-                        hasAnyoneInteractedWithClientAboutRmOutsideNote: form.find('.hasAnyoneInteractedWithClientAboutRmOutsideNote').prop('checked') ? 1 : 0,
+                        entryNumberOfSeconds: form.find('[name="entryNumberOfSeconds"]').val() ? +(form.find('[name="entryNumberOfSeconds"]').val()) : 0
+                    }
+
+                    if(form.find('[name="didProInteractWithClientAboutRm"]:checked').length) {
+                        payload.didProInteractWithClientAboutRm = (form.find('[name="didProInteractWithClientAboutRm"]:checked').val() === 'true');
                     }
 
                     $.ajax({

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

@@ -255,6 +255,19 @@ $days = $daysWithUnstamped;
                                                 </div>
                                             </div>
                                         </div>
+                                        <div class="mb-2 border border-info p-2 mt-2 bg-light">
+                                            <span>I have had interactive communication with <b>{{$patient->displayName()}}</b> during this care month.</span>
+                                            <div class="d-flex border-top mt-2">
+                                                <label class="mt-2 mb-0 d-inline-flex align-items-center mr-3">
+                                                    <input type="radio" class="mr-2" name="didProInteractWithClientAboutRm" value="true" required {{$careMonth->has_mcp_interacted_with_client_about_rm ? 'checked' : ''}}>
+                                                    <span>Yes</span>
+                                                </label>
+                                                <label class="mt-2 mb-0 d-inline-flex align-items-center">
+                                                    <input type="radio" class="mr-2" name="didProInteractWithClientAboutRm" value="false" required {{!$careMonth->has_mcp_interacted_with_client_about_rm ? 'checked' : ''}}>
+                                                    <span>No</span>
+                                                </label>
+                                            </div>
+                                        </div>
                                         <div class="form-group m-0">
                                             <button type="button" class="btn btn-primary btn-sm mr-2 btn-bulk-stamp">Next</button>
                                             <button cancel class="btn btn-default border btn-sm mr-2">Cancel</button>
@@ -327,17 +340,50 @@ $days = $daysWithUnstamped;
                     </td>
                     <td rowspan="{{count($days[$k])}}" class="px-2">
                         @foreach($m->entries as $entry)
-                            <div class="my-1 d-flex align-items-baseline flex-nowrap">
-                                <b class="mr-2">{{round($entry->time_in_seconds / 60)}}m {{round($entry->time_in_seconds % 60)}}s</b>
-                                <span class="text-secondary mr-2 text-nowrap text-sm">({{friendly_date_time($entry->created_at)}})</span>
-                                <span class="text-secondary inline-html-container flex-grow-1">{!! $entry->content_text !!}</span>
-                            </div>
-                            @if($pro->pro_type === 'ADMIN')
-                                <div class="mt-1">
-                                    <span class="text-secondary">Pro: </span>
-                                    {{$entry->pro ? $entry->pro->displayName() : '-'}}
+                            <div class="border px-2 py-1 mb-1 bg-white">
+                                <div class="d-flex align-items-baseline flex-nowrap">
+                                    <b class="mr-2">{{round($entry->time_in_seconds / 60)}}m {{round($entry->time_in_seconds % 60)}}s</b>
+                                    <span class="text-secondary mr-2 text-nowrap text-sm">({{friendly_date_time($entry->created_at)}})</span>
+                                    <span class="text-secondary inline-html-container flex-grow-1 mr-2">{!! $entry->content_text !!}</span>
                                 </div>
-                            @endif
+                                @if($entry->pro_id === $pro->id)
+                                    <div>
+                                        @if($performerRole === 'MCP')
+                                            <div moe relative class="mr-2">
+                                                <a href="#" start show class="text-sm">Mark as {{$entry->did_pro_interact_with_client_about_rm ? 'Not ' : ''}}Interacted</a>
+                                                <form url="/api/careMonthEntry/setDidProInteractWithClientAboutRmTo{{$entry->did_pro_interact_with_client_about_rm ? 'False' : 'True '}}">
+                                                    <input type="hidden" name="uid" value="{{$entry->uid}}">
+                                                    <p class="text-nowrap">Mark as {{$entry->did_pro_interact_with_client_about_rm ? 'Not ' : ''}}Interacted?</p>
+                                                    <div class="d-flex align-items-center flex-nowrap">
+                                                        <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                        @endif
+                                        <div moe relative>
+                                            <a href="#" start show class="text-sm">Update Content</a>
+                                            <form url="/api/careMonthEntry/updateContent">
+                                                <input type="hidden" name="uid" value="{{$entry->uid}}">
+                                                <div class="mb-2">
+                                                    <label class="mb-1 text-secondary text-sm">Memo</label>
+                                                    <textarea class="form-control form-control-sm" name="contentText">{!! $entry->content_text !!}</textarea>
+                                                </div>
+                                                <div class="d-flex align-items-center flex-nowrap">
+                                                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    </div>
+                                @endif
+                                @if($pro->pro_type === 'ADMIN')
+                                    <div class="mt-1">
+                                        <span class="text-secondary">Pro: </span>
+                                        {{$entry->pro ? $entry->pro->displayName() : '-'}}
+                                    </div>
+                                @endif
+                            </div>
                         @endforeach
                         @if($performerRole === 'MCP' || $performerRole === 'RMM')
                             <div moe large relative>
@@ -362,16 +408,15 @@ $days = $daysWithUnstamped;
                                                        placeholder="Effective Date" required>
                                             </div>
                                             <div class="col-6">
-                                                <input type="number" min="0" max="15" class="form-control form-control-sm w-100 cm-time-value" name="timeInSeconds"
+                                                <input type="number" min="75" max="300" class="form-control form-control-sm w-100 cm-time-value" name="timeInSeconds"
                                                        value="75" placeholder="Time (secs.)" required>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="mb-2">
-                                        <div class="row">
-                                            <div class="col-12">
-                                                <div cm-rte data-content="Reviewed/managed patient measurements" data-name="contentText"></div>
-                                            </div>
+                                        <div class="mb-2">
+                                            <label class="mb-1 text-secondary text-sm">Memo</label>
+                                            <textarea class="form-control form-control-sm" name="contentText">Reviewed/managed patient measurements</textarea>
                                         </div>
                                     </div>
                                     <div class="d-flex align-items-center">
@@ -481,6 +526,10 @@ $days = $daysWithUnstamped;
                         entryNumberOfSeconds: form.find('[name="entryNumberOfSeconds"]').val() ? +(form.find('[name="entryNumberOfSeconds"]').val()) : 0
                     }
 
+                    if(form.find('[name="didProInteractWithClientAboutRm"]:checked').length) {
+                        payload.didProInteractWithClientAboutRm = (form.find('[name="didProInteractWithClientAboutRm"]:checked').val() === 'true');
+                    }
+
                     $.ajax({
                         url: form.attr('url'),
                         type:"POST",

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

@@ -296,7 +296,7 @@
                                 @endif
 
                                 <div class="mt-2">
-                                    <?php $spoken = $careMonth->has_anyone_interacted_with_client_about_rm_outside_note; ?>
+                                    <?php $spoken = $careMonth->has_mcp_interacted_with_client_about_rm; ?>
                                     <span class="font-weight-bold text-secondary">MCP spoke to patient:</span>
                                     <b class="{{$spoken ? 'text-success' : 'text-warning-mellow'}}">
                                         {{$spoken ? 'Yes' : 'No'}}
@@ -306,19 +306,6 @@
                                             <i class="fa fa-check"></i>
                                         @endif
                                     </b>
-                                    @if($careMonth->mcp && $pro->id === $careMonth->mcp->id)
-                                        <div moe relative class="ml-2">
-                                            <a href="#" start show class="text-sm">Toggle</a>
-                                            <form url="/api/careMonth/setHasAnyoneInteractedWithClientAboutRmOutsideNoteTo{{$spoken ? 'False' : 'True'}}" right>
-                                                <input type="hidden" name="uid" value="{{$careMonth->uid}}">
-                                                <p>Set to {{$spoken ? 'No' : 'Yes'}}?</p>
-                                                <div class="d-flex align-items-center">
-                                                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-                                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                </div>
-                                            </form>
-                                        </div>
-                                    @endif
                                 </div>
 
                                 @if(0 && $careMonth->mcp && $pro->id === $careMonth->mcp->id)
@@ -359,9 +346,9 @@
                                                        required>
                                             </div>
                                             <div class="mb-2">
-                                                <label class="mb-1 text-secondary">Time (mins) *</label>
+                                                <label class="mb-1 text-secondary">Time (secs) *</label>
                                                 <input autofocus type="number"
-                                                       class="form-control form-control-sm" name="timeInMinutes"
+                                                       class="form-control form-control-sm" name="timeInSeconds"
                                                        required>
                                             </div>
                                             <div class="mb-2">
@@ -381,7 +368,7 @@
 
                                 @if(($daysDiff !== -1 && $daysDiff <= 90) &&
                                     $careMonth->number_of_days_with_remote_measurements >= 16 &&
-                                    $careMonth->has_anyone_interacted_with_client_about_rm_outside_note)
+                                    $careMonth->has_mcp_interacted_with_client_about_rm)
                                     <div class="mt-2 border border-info p-2">
                                         @include('app.rm-bills.inline', ['patient' => $patient, 'entityType' => 'CareMonth', 'entityUid' => $careMonth->uid, 'label' => 'RM'])
                                     </div>
@@ -879,8 +866,8 @@
                                                        placeholder="Effective Date" required>
                                             </div>
                                             <div class="col-4">
-                                                <input type="number" min="0" max="5400" class="form-control form-control-sm w-100 cm-time-value" name="timeInMinutes"
-                                                       value="" placeholder="Time (mins.)" required>
+                                                <input type="number" min="75" max="300" class="form-control form-control-sm w-100 cm-time-value" name="timeInSeconds"
+                                                       value="" placeholder="Time (secs.)" required>
                                             </div>
                                         </div>
                                     </div>

resources/views/app/practice-management/remote-monitoring.blade.php

@@ -85,20 +85,20 @@
                                 $oPatient = \App\Models\Client::where('uid', $iPatient->client_uid)->first();
 
                                 $daysDiff = -1;
-                                if($oPatient->most_recent_completed_mcp_note_date) {
+                                if($iPatient->most_recent_completed_mcp_note_date) {
                                     $careMonthLastDay = date_add(date_create($rcmStartDate), date_interval_create_from_date_string("1 month"));
                                     $careMonthLastDay = date_sub($careMonthLastDay, date_interval_create_from_date_string("1 day"));
-                                    $daysDiff = date_diff($careMonthLastDay, date_create($oPatient->most_recent_completed_mcp_note_date))->days;
+                                    $daysDiff = date_diff($careMonthLastDay, date_create($iPatient->most_recent_completed_mcp_note_date))->days;
                                 }
                                 $lastVisitWithin90Days = ($daysDiff !== -1 && $daysDiff <= 90);
 
-                                $careMonth = \App\Models\CareMonth::where('uid', $iPatient->care_month_uid)->first();
+                                // $careMonth = \App\Models\CareMonth::where('uid', $iPatient->care_month_uid)->first();
                                 $performerRole = false;
                                 if ($pro->pro_type === 'ADMIN') {
                                     $performerRole = 'ADMIN';
-                                } else if ($careMonth->mcp_pro_id === $pro->id) {
+                                } else if ($iPatient->care_month_mcp_pro_id === $pro->id) {
                                     $performerRole = 'MCP';
-                                } else if ($careMonth->rmm_pro_id === $pro->id) {
+                                } else if ($iPatient->care_month_rmm_pro_id === $pro->id) {
                                     $performerRole = 'RMM';
                                 }
 
@@ -111,7 +111,7 @@
                                     <td>{{friendly_date($iPatient->dob)}}</td>
                                     <td>{!! $iPatient->is_enrolled_in_rm === 'YES' ? '<i class="fa fa-check text-success"></i>' : 'No' !!}</td>
                                     <td>{!! $oPatient->hasBPDevice() ? '<i class="fa fa-check text-success"></i>' : 'No' !!}</td>
-                                    <td>{!! $oPatient->hasBPDevice() ? '<i class="fa fa-check text-success"></i>' : 'No' !!}</td>
+                                    <td>{!! $oPatient->hasWeightScaleDevice() ? '<i class="fa fa-check text-success"></i>' : 'No' !!}</td>
                                     <td>
                                         {{$iPatient->most_recent_cellular_bp_sbp_mm_hg ?: '-'}}/{{$iPatient->most_recent_cellular_bp_dbp_mm_hg ?: '-'}}
                                         @if($iPatient->most_recent_cellular_bp_measurement_at)
@@ -162,7 +162,7 @@
                                                                 <div class="col-6">
                                                                     <label class="text-sm text-secondary mb-1">Seconds</label>
                                                                     <input type="number" min="75" max="300" class="form-control form-control-sm w-100 cm-time-value" name="timeInSeconds"
-                                                                           value="75" placeholder="Time (seconds.)" required>
+                                                                           value="75" placeholder="Time (secs.)" required>
                                                                 </div>
                                                             </div>
                                                         </div>
@@ -180,11 +180,9 @@
                                                             </div>
                                                         </div>
                                                         <div class="mb-2">
-                                                            <div class="row">
-                                                                <div class="col-12">
-                                                                    <div cm-rte data-content="Interacted with the patient" data-name="contentText"></div>
-                                                                </div>
-                                                            </div>
+                                                            <label class="text-sm text-secondary mb-1">Memo</label>
+                                                            <textarea class="form-control form-control-sm w-100" name="contentText"
+                                                                   required>Interacted with the patient</textarea>
                                                         </div>
                                                         <div class="d-flex align-items-center">
                                                             <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
@@ -209,7 +207,7 @@
                                                         <input type="hidden" name="uid" value="{{ $iPatient->client_uid }}">
                                                         <div class="mb-2">
                                                             <label for="" class="text-sm text-secondary mb-1">Cell Number</label>
-                                                            <input type="text" class="form-control form-control-sm" name="cellNumber" value="{{$oPatient->cell_number}}">
+                                                            <input type="text" class="form-control form-control-sm" name="cellNumber" value="{{$iPatient->cell_number}}">
                                                         </div>
                                                         <div class="mb-2">
                                                             <label for="" class="text-sm text-secondary mb-1">Message</label>