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

app/Models/CareMonthEntry.php

@@ -11,4 +11,8 @@ class CareMonthEntry extends Model
     public function careMonth() {
         return $this->belongsTo(CareMonth::class, 'care_month_id', 'id');
     }
+
+    public function pro() {
+        return $this->hasOne(Pro::class, 'id', 'pro_id');
+    }
 }

app/Models/Client.php

@@ -752,7 +752,7 @@ class Client extends Model
         return $notes;
     }
 
-    public function cmMeasurementsMatrix($_careMonth = null) {
+    public function cmMeasurementsMatrix($_careMonth, $pro = null) {
 
         $days = [];
 
@@ -799,9 +799,13 @@ ORDER BY m.ts DESC
             // get existing entries for listing
             $match->entries = CareMonthEntry::where('care_month_id', $match->care_month_id)
                 ->where('is_removed', false)
-                ->where('effective_date', $match->dateYMD)
-                ->orderBy('created_at')
-                ->get();
+                ->where('effective_date', $match->dateYMD);
+
+            if(!!$pro) {
+                $match->entries = $match->entries->where('pro_id', $pro->id);
+            }
+
+            $match->entries = $match->entries->orderBy('created_at')->get();
 
             if(!isset($days[$match->date])) {
                 $days[$match->date] = [];

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

@@ -316,6 +316,14 @@
                     defaultDate: 0
                 });
 
+                let date = new Date();
+                let day = date.getDate();
+                day = day < 10 ? '0' + day : day;
+                let mon = parseInt(date.getMonth() + 1);
+                mon = mon < 10 ? '0' + mon : mon;
+                let dateStr = date.getFullYear() + '-' + mon + '-' + day;
+                loadEventDates(dateStr);
+
                 onDateChange(getFormattedCurrentDate());
                 selectedDate = getFormattedCurrentDate();
 

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

@@ -426,6 +426,14 @@
                     defaultDate: 0
                 });
 
+                let date = new Date();
+                let day = date.getDate();
+                day = day < 10 ? '0' + day : day;
+                let mon = parseInt(date.getMonth() + 1);
+                mon = mon < 10 ? '0' + mon : mon;
+                let dateStr = date.getFullYear() + '-' + mon + '-' + day;
+                loadEventDates(dateStr);
+
                 onDateChange(getFormattedCurrentDate());
                 selectedDate = getFormattedCurrentDate();
 

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

@@ -1,5 +1,5 @@
 <?php
-$days = $patient->cmMeasurementsMatrix($careMonth);
+$days = $patient->cmMeasurementsMatrix($careMonth, ($pro->pro_type === 'ADMIN' ? null : $pro));
 
 $performerRole = false;
 if ($pro->pro_type === 'ADMIN') {
@@ -128,13 +128,46 @@ foreach ($days as $k => $day) {
                             </div>
                         @endif
                     </div>
-                @elseif($performerRole === 'NON-MCP')
+                @elseif($performerRole === 'NON-HCP')
                     <div class="width-100px">
                         @if($m->has_been_stamped_by_non_hcp)
                             <span class="text-secondary text-sm">
                                 <i class="fa fa-check"></i>
                                 Stamped
                             </span>
+                        @else
+                            <div moe relative>
+                                <a href="#" start show>Stamp</a>
+                                <form url="/api/measurement/stamp" right class="width-300px">
+                                    <input type="hidden" name="uid" value="{{$m->measurement_uid}}">
+                                    <p class="mb-1">Stamp this measurement?</p>
+                                    <div class="mt-2 bg-light border p-2">
+                                        <div class="mb-1 text-secondary">{{ $m->label }}</div>
+                                        <div class="font-weight-bold mb-1">
+                                            @if($m->label === 'BP')
+                                                {{ round($m->sbp_mm_hg, 2) }}/{{ round($m->dbp_mm_hg, 2) }} mmHg
+                                                <span class="font-weight-normal d-inline-block pl-2">Pulse:</span>
+                                                {{ $m->value_pulse }} {{ $m->value_irregular === 0?'Irregular':'' }} {{ $m->value_irregular === 1?'Regular':'' }}
+                                            @elseif($m->label === 'Wt. (lbs.)')
+                                                {{ round($m->numeric_value, 2) }} lbs
+                                            @else
+                                                {{ $m->value }}
+                                            @endif
+                                        </div>
+                                        <div class="text-sm">
+                                            {{ $m->date }} {{ $m->time }} EST
+                                        </div>
+                                    </div>
+                                    <div class="mb-2">
+                                        <label class="mb-1 text-secondary text-sm">Memo</label>
+                                        <textarea class="form-control form-control-sm" name="memo"></textarea>
+                                    </div>
+                                    <div class="form-group m-0">
+                                        <button submit class="btn btn-primary btn-sm mr-2">Submit</button>
+                                        <button cancel class="btn btn-default border btn-sm mr-2">Cancel</button>
+                                    </div>
+                                </form>
+                            </div>
                         @endif
                     </div>
                 @endif
@@ -225,16 +258,83 @@ foreach ($days as $k => $day) {
                                 <span>All Stamped</span>
                             </span>
                         @endif
-                    @elseif($performerRole === 'NON-MCP')
+                    @elseif($performerRole === 'NON-HCP')
+                        @if(count($unstampedNonHCP[$k]))
+                            <div moe relative class="btn-stamp-all">
+                                <a href="#" start show class="">
+                                    Stamp All
+                                </a>
+                                <form url="/api/measurement/bulkStamp" class="width-300px">
+                                    <input type="hidden" name="clientUid" value="{{$patient->uid}}">
+                                    <input type="hidden" class="measurements-uids" value="{{implode('|', $unstampedNonHCP[$k])}}">
+                                    <p class="mb-2 font-weight-bold">Stamp all measurements?</p>
+                                    <?php
+                                    $dayTotalMinutes = 0;
+                                    foreach($m->entries as $entry) {
+                                        $dayTotalMinutes += round($entry->time_in_seconds / 60);
+                                    }
+                                    $autoCheckEntry = false;
+                                    $autoCheckEntry = ($dayTotalMinutes < 2 && $patient->is_enrolled_in_rm);
+                                    ?>
+                                    <div class="p-2 border border-info bg-light mb-2">
+                                        <div class="">
+                                            <label class="mb-0 d-flex align-items-center">
+                                                <input type="checkbox" class="shouldAddEntry mr-2 my-0" {{$autoCheckEntry ? 'checked' : ''}}>
+                                                <span>Add Time Entry</span>
+                                            </label>
+                                        </div>
+                                        <div class="mb-2">
+                                            <label class="mb-1 text-secondary text-sm">Memo</label>
+                                            <textarea class="form-control form-control-sm" name="entryMemo"></textarea>
+                                        </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="2" placeholder="Time (mins.)">
+                                            </div>
+                                            <div class="mb-2">
+                                                <label class="mb-1 text-secondary text-sm">Date</label>
+                                                <input type="date" class="form-control form-control-sm w-100"
+                                                       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="form-group m-0">
+                                        <button type="button" class="btn btn-primary btn-sm mr-2 btn-bulk-stamp">Submit</button>
+                                        <button cancel class="btn btn-default border btn-sm mr-2">Cancel</button>
+                                    </div>
+                                </form>
+                            </div>
+                        @else
+                            <span class="text-secondary text-sm d-flex align-items-center">
+                                <i class="fa fa-check mr-2"></i>
+                                <span>All Stamped</span>
+                            </span>
+                        @endif
                     @endif
                 </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</b>
-                            <span class="text-secondary mr-2 text-nowrap text-sm">({{date('h:i a', strtotime($entry->created_at))}})</span>
+                            <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>
+                        @endif
                     @endforeach
                     @if($performerRole === 'MCP' || $performerRole === 'NON-HCP')
                         <div moe large relative>

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

@@ -36,10 +36,10 @@
                         <span class="text-dark font-weight-bold">Care Month</span>&nbsp;for&nbsp;<span class="text-dark font-weight-bold">{{friendly_month($careMonth->start_date)}}</span>
                     </div>
                     <div class="text-dark d-inline-flex align-items-center mt-2">
-                                    <span class="mr-2">
-                                        <i class="fa fa-exclamation-triangle"></i>
-                                        MCP Onboarding Visit Pending
-                                    </span>
+                        <span class="mr-2">
+                            <i class="fa fa-exclamation-triangle"></i>
+                            MCP Onboarding Visit Pending
+                        </span>
                         <div moe>
                             <a start show>Update</a>
                             <form url="/api/client/updateMcpOnboardingVisitInfo" class="mcp-theme-1">
@@ -71,9 +71,9 @@
                                     </select>
                                 </div>
                                 <div class="mb-2 if-note-outside-system">
-                                                <textarea class="form-control form-control-sm"
-                                                          name="reasonOnboardingVisitNoteOutsideSystem"
-                                                          placeholder="Visit note outside the system reason"></textarea>
+                                    <textarea class="form-control form-control-sm"
+                                              name="reasonOnboardingVisitNoteOutsideSystem"
+                                              placeholder="Visit note outside the system reason"></textarea>
                                 </div>
                                 <div>
                                     <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
@@ -169,6 +169,7 @@
                 <div class="d-flex align-items-baseline">
                     <span class="text-secondary">MCP:</span>
                     <span class="ml-1">{{ $careMonth->mcp ? $careMonth->mcp->displayName() : '-' }}</span>
+                    @if($pro->pro_type === 'ADMIN')
                     <div moe class="ml-2 hide-inside-popup flex-grow-1">
                         <a start show><i class="fa fa-edit"></i></a>
                         <form url="/api/careMonth/assignMcpPro" class="mcp-theme-1">
@@ -190,15 +191,62 @@
                             </div>
                         </form>
                     </div>
+                    @endif
                 </div>
             </div>
             <div class="col-3">
                 <span class="text-secondary">RMM:</span>
                 <span class="text-nowrap">{{ $careMonth->rmmPro ? $careMonth->rmmPro->displayName() : '-' }}</span>
+                @if($pro->pro_type === 'ADMIN')
+                <div moe class="ml-2 hide-inside-popup flex-grow-1">
+                    <a start show><i class="fa fa-edit"></i></a>
+                    <form url="/api/careMonth/assignRmmPro" class="mcp-theme-1">
+                        <input type="hidden" name="uid" value="{{$careMonth->uid}}">
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">RMM Pro</label>
+                            <select provider-search data-pro-uid="{{ $careMonth->rmmPro ? $careMonth->rmmPro->uid : '' }}"
+                                    name="rmmProUid"
+                                    class="form-control form-control-sm">
+                                <option value=""> --select--</option>
+                            </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>
+                @endif
             </div>
             <div class="col-3">
                 <span class="text-secondary">RME:</span>
                 <span class="text-nowrap">{{ $careMonth->rmePro ? $careMonth->rmePro->displayName() : '-' }}</span>
+                @if($pro->pro_type === 'ADMIN')
+                <div moe class="ml-2 hide-inside-popup flex-grow-1">
+                    <a start show><i class="fa fa-edit"></i></a>
+                    <form url="/api/careMonth/assignRmePro" class="mcp-theme-1">
+                        <input type="hidden" name="uid" value="{{$careMonth->uid}}">
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">RMM Pro</label>
+                            <select provider-search data-pro-uid="{{ $careMonth->rmePro ? $careMonth->rmePro->uid : '' }}"
+                                    name="rmeProUid"
+                                    class="form-control form-control-sm">
+                                <option value=""> --select--</option>
+                            </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>
+                @endif
             </div>
             {{--<div class="col-3">
                 <span class="text-secondary">CM:</span>