RPM work matrix - logic updates

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/_work_matrix.blade.php

@@ -340,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>
@@ -375,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">
@@ -494,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

@@ -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>