Patient settings UI update

public/js/yemi.js

@@ -309,10 +309,10 @@ var initMoes = function() {
                                 $('[moe]>form:not([show]):visible').hide();
                                 $(realForm).toggle(100);
                                 initPrimaryForm($(realForm));
-                               /* setTimeout(function() {
+                                setTimeout(function() {
                                     let submitButton = $(realForm).find('[submit]');
-                                    if(submitButton.length) submitButton[0].scrollIntoView({behavior : "smooth"});
-                                }, 150);*/
+                                    if(submitButton.length) submitButton[0].scrollIntoView({behavior : "smooth", block: "nearest"});
+                                }, 150);
                             }, 100);
                         }
                     }

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

@@ -19,6 +19,10 @@
                         @if (session('message'))
                             <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>
+                            <textarea class='form-control' type='text' name='how_are_you'></textarea>
+                        </div>
                         <div class='form-group mb-3'>
                             <label class='control-label'>First Name *</label>
                             <input class='form-control' type='text' name='nameFirst' required>

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

@@ -1,61 +1,119 @@
 @extends ('layouts.patient')
 
 @section('inner-content')
-    <div class="font-weight-bold mb-2">Contact Info</div>
-    <div class="mb-2">
+    <div class="font-weight-bold mb-2">Home Address</div>
+    <div class="pl-3">
         <div class="mb-1">
-            Phone: <b>{{ $patient->cell_number }}</b>
+            Address Line 1: <b>{{ $patient->home_address_line1 }}</b>
         </div>
         <div class="mb-1">
-            Email: <b>{{ $patient->email_address }}</b>
+            Address Line 2: <b>{{ $patient->home_address_line2 }}</b>
         </div>
         <div class="mb-1">
-            Home City: <b>{{ $patient->home_address_city }}</b>
+            City: <b>{{ $patient->home_address_city }}</b>
         </div>
         <div class="mb-1">
-            Home State: <b>{{ $patient->home_address_state }}</b>
+            State: <b>{{ $patient->home_address_state }}</b>
         </div>
-        <div class="mt-3">
-            <div moe>
-                <a start show><i class="fa fa-edit"></i> Edit Info</a>
-                <form url="/api/client/putContactInfo" class="mcp-theme-1">
-                    <input type="hidden" name="uid" value="{{$patient->uid}}">
-                    <div class="mb-2">
-                        <input type="tel"
-                               class="form-control form-control-sm"
-                               name="cellNumber"
-                               placeholder="Phone Number"
-                               value="{{ $patient->cell_number }}">
-                    </div>
-                    <div class="mb-2">
-                        <input type="text"
-                               class="form-control form-control-sm"
-                               name="email"
-                               placeholder="Email"
-                               value="{{ $patient->email_address }}">
-                    </div>
-                    <div class="mb-2">
-                        <input type="text"
-                               class="form-control form-control-sm"
-                               name="city"
-                               placeholder="City"
-                               value="{{ $patient->home_address_city }}">
-                    </div>
-                    <div class="mb-2">
-                        <input type="text"
-                               class="form-control form-control-sm"
-                               name="state"
-                               placeholder="State"
-                               value="{{ $patient->home_address_state }}">
-                    </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>
+        <div class="mb-1">
+            ZIP: <b>{{ $patient->home_address_zip }}</b>
+        </div>
+    </div>
+
+    <div class="font-weight-bold mb-2 mt-3">Mailing Address</div>
+    <div class="pl-3">
+        <div class="mb-1">
+            Address Line 1: <b>{{ $patient->mailing_address_line1 }}</b>
+        </div>
+        <div class="mb-1">
+            Address Line 2: <b>{{ $patient->mailing_address_line2 }}</b>
+        </div>
+        <div class="mb-1">
+            City: <b>{{ $patient->mailing_address_city }}</b>
+        </div>
+        <div class="mb-1">
+            State: <b>{{ $patient->mailing_address_state }}</b>
+        </div>
+        <div class="mb-1">
+            ZIP: <b>{{ $patient->mailing_address_zip }}</b>
         </div>
     </div>
+
+    <div class="font-weight-bold mb-2 mt-3">Contact Info</div>
+    <div class="pl-3">
+        <div class="mb-1">
+            Phone: <b>{{ $patient->cell_number }}</b>
+        </div>
+        <div class="mb-1">
+            Email: <b>{{ $patient->email_address }}</b>
+        </div>
+    </div>
+
+    <div class="mt-3 d-flex align-items-center">
+        <div moe wide>
+            <a start show><i class="fa fa-edit"></i> Edit Contact Info</a>
+            <form url="/api/client/putContactInfo" class="mcp-theme-1">
+                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                <div class="mb-2">
+                    <input type="tel" class="form-control form-control-sm" name="cellNumber" placeholder="Phone Number" value="{{ $patient->cell_number }}">
+                </div>
+                <div class="mb-2">
+                    <input type="text" class="form-control form-control-sm" name="email" placeholder="Email" value="{{ $patient->email_address }}">
+                </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>
+        <span class="mx-2 text-secondary">|</span>
+        <div moe wide>
+            <a start show><i class="fa fa-edit"></i> Edit Address</a>
+            <form url="/api/client/editAddress" class="mcp-theme-1">
+                <input type="hidden" name="uid" value="{{$patient->uid}}">
+
+                <p class="mb-2 font-weight-bold">Home Address</p>
+                <div class="mb-2">
+                    <input type="text" class="form-control form-control-sm" name="homeAddressLine1" placeholder="Address Line 1" value="{{ $patient->home_address_line1 }}">
+                </div>
+                <div class="mb-2">
+                    <input type="text" class="form-control form-control-sm" name="homeAddressLine2" placeholder="Address Line 2" value="{{ $patient->home_address_line2 }}">
+                </div>
+                <div class="mb-2">
+                    <input type="text" class="form-control form-control-sm" name="homeAddressCity" placeholder="City" value="{{ $patient->home_address_city }}">
+                </div>
+                <div class="mb-2">
+                    <input type="text" class="form-control form-control-sm" name="homeAddressState" placeholder="State" value="{{ $patient->home_address_state }}">
+                </div>
+                <div class="mb-2">
+                    <input type="text" class="form-control form-control-sm" name="homeAddressZip" placeholder="ZIP" value="{{ $patient->home_address_zip }}">
+                </div>
+
+                <p class="mb-2 mt-3 font-weight-bold">Mailing Address</p>
+                <div class="mb-2">
+                    <input type="text" class="form-control form-control-sm" name="mailingAddressLine1" placeholder="Address Line 1" value="{{ $patient->mailing_address_line1 }}">
+                </div>
+                <div class="mb-2">
+                    <input type="text" class="form-control form-control-sm" name="mailingAddressLine2" placeholder="Address Line 2" value="{{ $patient->mailing_address_line2 }}">
+                </div>
+                <div class="mb-2">
+                    <input type="text" class="form-control form-control-sm" name="mailingAddressCity" placeholder="City" value="{{ $patient->mailing_address_city }}">
+                </div>
+                <div class="mb-2">
+                    <input type="text" class="form-control form-control-sm" name="mailingAddressState" placeholder="State" value="{{ $patient->mailing_address_state }}">
+                </div>
+                <div class="mb-2">
+                    <input type="text" class="form-control form-control-sm" name="mailingAddressZip" placeholder="ZIP" value="{{ $patient->mailing_address_zip }}">
+                </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>
+    </div>
+
     <hr class="m-negator my-3">
     <span>MCP Onboarding Visit: <b>{{ $patient->has_mcp_done_onboarding_visit }}</b></span>
     <span moe class="ml-2">

resources/views/layouts/patient.blade.php

@@ -423,10 +423,18 @@
                                         </span>
                                     </div>
                                 </section>
-                                <ul class="vbox ml-auto align-self-start">
+                                <ul class="vbox ml-auto mt-2 align-self-start">
                                     <li>
                                         <span class="aligned-icon"><i class="fa fa-map-marker-alt" aria-hidden="true"></i></span>
-                                        {{$location}}
+                                        <?php
+                                        $addressParts = [];
+                                        if(!!$patient->mcn_address_street_line1) $addressParts[] = $patient->mcn_address_street_line1;
+                                        if(!!$patient->mcn_address_street_line2) $addressParts[] = $patient->mcn_address_street_line2;
+                                        if(!!$patient->mcn_address_city) $addressParts[] = $patient->mcn_address_city;
+                                        if(!!$patient->mcn_address_state) $addressParts[] = $patient->mcn_address_state;
+                                        if(!!$patient->mcn_address_zip) $addressParts[] = $patient->mcn_address_zip;
+                                        echo implode(", ", $addressParts);
+                                        ?>
                                     </li>
                                     <li>
                                         <span class="aligned-icon"><i class="fa fa-phone-alt" aria-hidden="true"></i></span>