Merge branch 'master' into dev-vj

app/Http/Controllers/HomeController.php

@@ -42,7 +42,7 @@ class HomeController extends Controller
 
         try {
 
-            $url = env('BACKEND_URL', 'http://localhost:8080/api') . '/session/confirmSmsAuthToken';
+            $url = config('stag.backendUrl') . '/session/confirmSmsAuthToken';
 
             $data = [
                 'cellNumber' => $request->input('cellNumber'),
@@ -78,7 +78,7 @@ class HomeController extends Controller
 
         try {
 
-            $url = env('BACKEND_URL', 'http://localhost:8080/api') . '/session/resendSmsAuthToken';
+            $url =  config('stag.backendUrl') . '/session/resendSmsAuthToken';
 
             $data = [];
 
@@ -110,7 +110,7 @@ class HomeController extends Controller
     {
         try {
 
-            $url = env('BACKEND_URL', 'http://localhost:8080/api') . '/pro/selfPutPassword';
+            $url =  config('stag.backendUrl') . '/pro/selfPutPassword';
 
             $data = [
                 'newPassword' => $request->input('newPassword'),

app/Http/Controllers/LoginController.php

@@ -32,7 +32,7 @@ class LoginController extends Controller
     {
         try {
 
-            $url = env('BACKEND_URL', 'http://localhost:8080/api') . '/pro/requestPasswordReset';
+            $url =  config('stag.backendUrl') . '/pro/requestPasswordReset';
 
             $data = [
                 'cellNumber' => $request->input('cellNumber'),
@@ -77,7 +77,7 @@ class LoginController extends Controller
     {
         try {
 
-            $url = env('BACKEND_URL', 'http://localhost:8080/api') . '/pro/selfResetPassword';
+            $url =  config('stag.backendUrl') . '/pro/selfResetPassword';
 
             $data = [
                 'cellNumber' => $request->input('cellNumber'),
@@ -180,7 +180,7 @@ class LoginController extends Controller
         }
 
 
-        return redirect()->to(env('AUTH_URL','https://scholar.securecpu.com'));
+        return redirect()->to(config('stag.authUrl'));
     }
 
     public function loginWithSessionKey($sessionKey, Request $request){

app/Http/Controllers/NoteController.php

@@ -130,7 +130,7 @@ class NoteController extends Controller
     }
 
     private function callJava($request, $endPoint, $data){
-        $url = env('BACKEND_URL', 'http://localhost:8080/api') . $endPoint;
+        $url =  config('stag.backendUrl') . $endPoint;
         $response = Http::asForm()
         ->withHeaders(['sessionKey'=>$request->cookie('sessionKey')])
         ->post($url, $data)

app/Http/Middleware/ProAuthenticated.php

@@ -19,9 +19,14 @@ class ProAuthenticated
         $sessionKey = $request->cookie('sessionKey');
         $appSession = AppSession::where('session_key', $sessionKey)->where('is_active', true)->first();
         $authenticated = $sessionKey && $appSession;
-
+       
         if (!$authenticated) {
-            return redirect(env('AUTH_URL'));
+            $authUrl = config('stag.authUrl');
+            if(!$authUrl){
+                echo('AUTH_URL is not specified.');
+                exit;
+            }
+            return redirect($authUrl);
         }
 
         return $next($request);

app/Lib/Backend.php

@@ -21,7 +21,7 @@ class Backend
 
     public function __construct()
     {
-        $this->url = env('BACKEND_URL', "http://localhost:8080/api");
+        $this->url = config('stag.backendUrl');
     }
 
 

config/stag.php

@@ -0,0 +1,6 @@
+<?php 
+
+return [
+    'authUrl' => env('AUTH_URL'),
+    'backendUrl' => env('BACKEND_URL','https://scholar.securecpu.com')
+];

resources/views/app/new-patient.blade.php

@@ -20,7 +20,7 @@
                             <div class="alert alert-danger">{{ session('message') }}</div>
                         @endif
                         <div class='form-group mb-3'>
-                            <label class='control-label'>How is the quarantine treating you?</label>
+                            <label class='control-label'>How is quarantine treating you?</label>
                             <textarea class='form-control' type='text' name='howIsQuarantine'></textarea>
                         </div>
                         <div class='form-group mb-3'>

resources/views/app/patient/partials/vitals.blade.php

@@ -17,6 +17,15 @@ $vitalLabels = ['Ht. (in.)','Wt. (lbs.)','Temp. (F)','Pulse','Resp.','Pulse Ox.'
 
 $vitalValues = json_decode($patient->latest_measurements, true);
 
+foreach($vitalLabels as $vitalLabel){
+    if(!isset($vitalValues[$vitalLabel])){
+        $vitalValues[$vitalLabel] = [
+            'value' => '',
+            'effectiveDate'=>''
+        ];
+    }
+}
+
 ?>
 
 <div moe-parent

resources/views/layouts/template.blade.php

@@ -61,7 +61,9 @@
             <ul class="navbar-nav mr-auto">
                 <li class="nav-item"><a class="nav-link" href="{{ route('dashboard') }}"><i class="mr-1 fas fa-tachometer-alt"></i> Dashboard</a> </li>
                 <li class="nav-item"><a class="nav-link" href="{{ route('patients') }}"><i class="mr-1 fas fa-user-injured"></i> Patients</a> </li>
+                @if($pro && $pro->pro_type == 'ADMIN')
                 <li class="nav-item"><a class="nav-link" href="{{ route('new-patient') }}"><i class="mr-1 fas fa-user-plus"></i> New Patient</a> </li>
+                @endif
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="#" id="practice-management" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="mr-1 fas fa-tasks"></i> Practice</a>
                     <div class="dropdown-menu" aria-labelledby="practice-management">
@@ -86,7 +88,7 @@
             </div>
             <div class="d-flex align-items-center">
                 <p class="text-white my-0 mr-2 small">Hello, <b title="Cell# {{$pro->cell_number}}">{{ $pro->name_first }}!</b></p>
-                <a native target="_top" href="{{ env('AUTH_URL') }}/logout" class="btn btn-sm btn-link text-light">
+                <a native target="_top" href="{{ config('stag.authUrl') }}/logout" class="btn btn-sm btn-link text-light">
                     <i class="fas fa-sign-out-alt"></i>
                     Log Out
                 </a>