RPM work matrix - logic updates

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({