Merge branch 'dev' into dev-vj

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

@@ -231,7 +231,7 @@
                                         @if($measurement->measurement->device_category === 'WEIGHT')
                                             <b>{{ round($measurement->measurement->value_weight / 1000, 1) }} Kg</b>
                                         @elseif($measurement->measurement->device_category === 'BP')
-                                            <b>{{ $measurement->measurement->value_systolic }}/{{ $measurement->measurement->value_diastolic }} mmHg</b>
+                                            <b>{{ $measurement->measurement->systolic_bp_in_mm_hg }}/{{ $measurement->measurement->diastolic_bp_in_mm_hg }} mmHg</b>
                                         @endif
                                         <span class="font-weight-normal text-secondary ml-2 text-sm">({{ friendly_date_time($measurement->measurement->created_at, true) }})</span>
                                         <span class="ml-2 text-sm {{$measurement->status === 'NEW' ? 'text-info' : ($measurement->status === 'ACCEPTED' ? 'text-success' : 'text-sacondary')}}">{{$measurement->status}}</span>

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

@@ -23,7 +23,7 @@
                             @if($measurement->measurement->device_category === 'WEIGHT')
                                 <b>{{ round($measurement->measurement->value_weight / 1000, 1) }} Kg</b>
                             @elseif($measurement->measurement->device_category === 'BP')
-                                <b>{{ $measurement->measurement->value_systolic }}/{{ $measurement->measurement->value_diastolic }} mmHg</b>
+                                <b>{{ $measurement->measurement->systolic_bp_in_mm_hg }}/{{ $measurement->measurement->diastolic_bp_in_mm_hg }} mmHg</b>
                             @endif
                         </td>
                         <td class="px-2">

resources/views/layouts/template.blade.php

@@ -114,7 +114,7 @@
             @if($pro->pro_type == 'ADMIN')
             <div class="ml-2 d-inline-block">|</div>
             <div class="ml-2 ">
-                <a native target="_top" class="text-light" href="{{env('ADMIN_PORTAL_URL', 'https://scholar.securecpu.com')}}/pro_log_in_with_session_key/{{$performer->session_key}}" title="">
+                <a native target="_top" class="text-light" href="{{env('ADMIN_PORTAL_URL', 'https://pro.securecpu.com')}}/pro_log_in_with_session_key/{{$performer->session_key}}" title="">
                     Go to Admin Portal
                 </a>
             </div>