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

app/Http/Controllers/HomeController.php

@@ -585,7 +585,13 @@ SELECT measurement.uid as uid,
        measurement.sbp_mm_hg,
        measurement.dbp_mm_hg,
        measurement.numeric_value,
+       measurement.value_pulse,
+       measurement.value_irregular,
        measurement.ts,
+       client.mcp_pro_id,
+       client.default_na_pro_id,
+       client.rmm_pro_id,
+       client.rme_pro_id,
        client.uid as client_uid,
        client.name_last,
        client.name_first,

public/css/style.css

@@ -1702,9 +1702,6 @@ th.only-screen, td.only-screen {
 #caremonth-measurements-calendar .ui-datepicker-next {
     display: none;
 }
-#caremonth-measurements-calendar {
-    pointer-events: none !important;
-}
 #simpleSMSReminderComponent input[type="time"] {
     max-width: 90px;
     min-width: unset !important;

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

@@ -10,7 +10,6 @@
             <th class="border-0 px-2 text-secondary">Timestamp</th>
             <th class="border-0 px-2 text-secondary">Mins this month</th>
             <th class="border-0 px-2 text-secondary">Stamp</th>
-            <th class="border-0 px-2 text-secondary text-center">Entry</th>
         </tr>
     </thead>
     <tbody>
@@ -44,75 +43,66 @@
                         @endif
                     </td>
                     <td colspan="px-2">
-                        <span moe large relative>
-                            <a start show class="py-0 mb-3 font-weight-bold">Update status</a>
-                            <form url="/api/measurement/updateStatus" right>
-                                <input type="hidden" name="uid" value="{{$measurement->uid}}">
-                                <select name="status" id="" class="form-control input-sm">
-                                    <option value="">--select--</option>
-                                    <option value="ACK">Ok</option>
-                                    <option value="INVALID_ACK">Invalid</option>
-                                </select>
-                                <div class="d-flex align-items-center mt-2">
-                                    <button class="btn btn-sm btn-success mr-2" submit>Submit</button>
-                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                </div>
-                            </form>
-                        </span>
-                    </td>
-                    <td colspan="px-2">
-                        <div class="text-center">
-                            <span moe large relative>
-                                <a start show class="py-0 mb-3 font-weight-bold">Add</a>
-                                <form url="/api/careMonthEntry/createForRm" right>
-                                    <p class="mb-2 d-block text-left"><b>Add RM Entry</b></p>
-                                    <input type="hidden" name="careMonthUid" value="{{$measurement->care_month_uid}}">
-                                    <input type="hidden" name="proUid" value="{{$pro->uid}}">
-                                    <input type="hidden" name="effectiveDate" value="{{date('Y-m-d')}}">
-                                    <div class="bg-light border rounded p-2 mb-2">
-                                        <div class="mb-1 d-flex align-items-center">
-                                            <span class="width-50px text-left text-secondary">Type</span>
-                                            <div><b>{{ $measurement->label }} </b></div>
+                        <?php
+                        $stampEndPoint = '';
+                        if ($measurement->mcp_pro_id === $pro->id) {
+                            $stampEndPoint = '/api/measurement/stampAsMcp';
+                        } elseif ($measurement->default_na_pro_id === $pro->id || $measurement->rmm_pro_id === $pro->id || $measurement->rme_pro_id === $pro->id) {
+                            $stampEndPoint = '/api/measurement/stampAsNonHcp';
+                        }
+                        ?>
+                        @if(!empty($stampEndPoint))
+                            <div moe relative>
+                                <a href="#" start show>Stamp</a>
+                                <form url="{{$stampEndPoint}}" right class="width-300px">
+                                    <input type="hidden" name="uid" value="{{$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">{{ $measurement->label }}</div>
+                                        <div class="font-weight-bold mb-1">
+                                            @if($measurement->label === 'BP')
+                                                {{ round($measurement->sbp_mm_hg, 2) }}/{{ round($measurement->dbp_mm_hg, 2) }} mmHg
+                                                <span class="font-weight-normal d-inline-block pl-2">Pulse:</span>
+                                                {{ $measurement->value_pulse }} {{ $measurement->value_irregular === 0?'Irregular':'' }} {{ $measurement->value_irregular === 1?'Regular':'' }}
+                                            @elseif($measurement->label === 'Wt. (lbs.)')
+                                                {{ round($measurement->numeric_value, 2) }} lbs
+                                            @else
+                                                {{ $measurement->value }}
+                                            @endif
                                         </div>
-                                        <div class="d-flex align-items-center">
-                                            <span class="width-50px text-left text-secondary">Value</span>
-                                            <div>
-                                                @if($measurement->label == 'BP')
-                                                <div>
-                                                    <b>{{ $measurement->sbp_mm_hg }}/{{ $measurement->dbp_mm_hg }} mmHg</b>
-                                                </div>
-                                                @endif
-                                                @if($measurement->label == 'Wt. (lbs.)')
-                                                <div>
-                                                    <b>{{ round(floatval($measurement->numeric_value), 2) }}</b> lbs
-                                                </div>
-                                                @endif
-                                            </div>
+                                        <div class="text-sm">
+                                            <?php $timestampInSec = floor($measurement->ts / 1000); ?>
+                                            {{ friendly_date_time_short_with_tz_from_timestamp($timestampInSec, 'EASTERN') }} EST
                                         </div>
                                     </div>
-                                    <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>
+                                    @if($measurement->mcp_pro_id !== $pro->id)
+                                        <div class="mb-2 border border-info p-2 mt-2 bg-light">
+                                            <span>I have had interactive communication with {{$measurement->name_first}} {{$measurement->name_last}} 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">
+                                                    <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>
+                                                    <span>No</span>
+                                                </label>
                                             </div>
                                         </div>
-                                    </div>
+                                    @else
+                                        <input type="hidden" name="communicatedToPatient" value="false">
+                                    @endif
                                     <div class="mb-2">
-                                        <div class="row">
-                                            <div class="col-12 text-left">
-                                                <label class="text-secondary text-sm mb-1">Details</label>
-                                                <textarea class="form-control form-control-sm" rows="4" name="contentText">{{ 'Reviewed ' . $measurement->label . ' measurement' }}</textarea>
-                                            </div>
-                                        </div>
+                                        <label class="mb-1 text-secondary text-sm">Memo</label>
+                                        <textarea class="form-control form-control-sm" name="memo"></textarea>
                                     </div>
-                                    <div class="d-flex align-items-center">
-                                        <button class="btn btn-sm btn-success mr-2" submit>Submit</button>
-                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                    <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>
-                            </span>
-                        </div>
+                            </div>
+                        @endif
                     </td>
                 </tr>
             <?php endforeach ?>

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

@@ -391,6 +391,7 @@
                             <th class="px-2 text-secondary">Effective Date</th>
                             <th class="px-2 text-secondary w-25">Category</th>
                             <th class="px-2 text-secondary w-25">Value</th>
+                            <th class="px-2 text-secondary">Stamp</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -422,6 +423,68 @@
                                             {{ $measurement->value }}
                                         @endif
                                     </td>
+                                    <td colspan="px-2">
+                                        <?php
+                                        $stampEndPoint = '';
+                                        if ($measurement->client->mcp_pro_id === $pro->id) {
+                                            $stampEndPoint = '/api/measurement/stampAsMcp';
+                                        } elseif ($measurement->client->default_na_pro_id === $pro->id || $measurement->client->rmm_pro_id === $pro->id || $measurement->client->rme_pro_id === $pro->id) {
+                                            $stampEndPoint = '/api/measurement/stampAsNonHcp';
+                                        }
+                                        ?>
+                                        @if(!empty($stampEndPoint))
+                                            <div moe relative>
+                                                <a href="#" start show>Stamp</a>
+                                                <form url="{{$stampEndPoint}}" right class="width-300px">
+                                            <input type="hidden" name="uid" value="{{$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">{{ $measurement->label }}</div>
+                                                <div class="font-weight-bold mb-1">
+                                                    @if($measurement->label === 'BP')
+                                                        {{ round($measurement->sbp_mm_hg, 2) }}/{{ round($measurement->dbp_mm_hg, 2) }} mmHg
+                                                        <span class="font-weight-normal d-inline-block pl-2">Pulse:</span>
+                                                        {{ $measurement->value_pulse }} {{ $measurement->value_irregular === 0?'Irregular':'' }} {{ $measurement->value_irregular === 1?'Regular':'' }}
+                                                    @elseif($measurement->label === 'Wt. (lbs.)')
+                                                        {{ round($measurement->numeric_value, 2) }} lbs
+                                                    @else
+                                                        {{ $measurement->value }}
+                                                    @endif
+                                                </div>
+                                                <div class="text-sm">
+                                                    <?php $timestampInSec = floor($measurement->ts / 1000); ?>
+                                                    {{ friendly_date_time_short_with_tz_from_timestamp($timestampInSec, 'EASTERN') }} EST
+                                                </div>
+                                            </div>
+                                            @if($measurement->mcp_pro_id !== $pro->id)
+                                                <div class="mb-2 border border-info p-2 mt-2 bg-light">
+                                                    <span>I have had interactive communication with {{$measurement->name_first}} {{$measurement->name_last}} 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">
+                                                            <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>
+                                                            <span>No</span>
+                                                        </label>
+                                                    </div>
+                                                </div>
+                                            @else
+                                                <input type="hidden" name="communicatedToPatient" value="false">
+                                            @endif
+                                            <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
+                                    </td>
                                 </tr>
 
                                 <?php