Patient note UI/intake updates

gem/forms/new-patient-intake/build/form.blade.php

@@ -17,6 +17,28 @@ $formID = rand(0, 100000);
     <?php endif; ?>
 
     <div class="gem-nodes">
+    <div class="my-3 node node-level-0" data-key="how_are_you">
+        <label>How are you doing?</label>
+        <div class="subs pl-4">
+            <div class="my-3 node node-level-2" data-key="how_are_you__with_quarantine">
+                <label>How are you doing with quarantine?</label>
+                <div class="d-flex align-items-center">
+                    <input onchange="onGemVChange_{{ $formID }}(this)" value="{{ @$contentData['how_are_you__with_quarantine'] }}" name="how_are_you__with_quarantine" type="text" class="form-control form-control-sm mr-2" placeholder="Answer">
+                    <input onchange="onGemVChange_{{ $formID }}(this)" value="{{ @$contentData['how_are_you__with_quarantine_memo'] }}" name="how_are_you__with_quarantine_memo" type="text" class="form-control form-control-sm" placeholder="Memo">
+                </div>
+            </div>
+
+            <div class="my-3 node node-level-2" data-key="how_are_you__with_health_in_general">
+                <label>How are you doing with you health in general?</label>
+                <div class="d-flex align-items-center">
+                    <input onchange="onGemVChange_{{ $formID }}(this)" value="{{ @$contentData['how_are_you__with_health_in_general'] }}" name="how_are_you__with_health_in_general" type="text" class="form-control form-control-sm mr-2" placeholder="Answer">
+                    <input onchange="onGemVChange_{{ $formID }}(this)" value="{{ @$contentData['how_are_you__with_health_in_general_memo'] }}" name="how_are_you__with_health_in_general_memo" type="text" class="form-control form-control-sm" placeholder="Memo">
+                </div>
+            </div>
+
+        </div>
+    </div>
+
     <div class="my-3 node node-level-0" data-key="blood_ox">
         <label>Blood Oxygen</label>
         <div class="subs pl-4">
@@ -976,8 +998,8 @@ $formID = rand(0, 100000);
 
 
     <div class="form-group m-0 d-flex">
-        <button class="btn btn-sm btn-primary mr-2">Submit</button>
-        <button class="btn btn-sm btn-default border" onclick="return cancelForm_NoteSection_{{ $formID }}(this)">Cancel</button>
+        <button class="btn btn-sm btn-primary mr-2">Done</button>
+        {{--<button class="btn btn-sm btn-default border" onclick="return cancelForm_NoteSection_{{ $formID }}(this)">Cancel</button>--}}
     </div>
 </form>
 <script>
@@ -1008,5 +1030,11 @@ $formID = rand(0, 100000);
                 span.text(value.join(', '));
             }
         }
+
+        // submit here
+        let form = $(_field).closest('form');
+        $.post(form[0].action, form.serialize(), function(_data) {
+            console.log('Submitted!');
+        });
     }
 </script>

gem/forms/new-patient-intake/spec.json

@@ -1,5 +1,21 @@
 
 [
+    {
+        "Q": "How are you doing?",
+        "K": "how_are_you",
+        "S": [
+            {
+                "Q": "How are you doing with quarantine?",
+                "T": "Text with Memo",
+                "K": "with_quarantine"
+            },
+            {
+                "Q": "How are you doing with you health in general?",
+                "T": "Text with Memo",
+                "K": "with_health_in_general"
+            }
+        ]
+    },
     {
         "Q": "Blood Oxygen",
         "K": "blood_ox",

gem/templates/form.blade.php

@@ -19,8 +19,8 @@ $formID = rand(0, 100000);
 <!-- __GENERATED_MARKUP__ -->
 
     <div class="form-group m-0 d-flex">
-        <button class="btn btn-sm btn-primary mr-2">Submit</button>
-        <button class="btn btn-sm btn-default border" onclick="return cancelForm_NoteSection_{{ $formID }}(this)">Cancel</button>
+        <button class="btn btn-sm btn-primary mr-2">Done</button>
+        {{--<button class="btn btn-sm btn-default border" onclick="return cancelForm_NoteSection_{{ $formID }}(this)">Cancel</button>--}}
     </div>
 </form>
 <script>

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

@@ -21,7 +21,7 @@
                         @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>
+                            <textarea class='form-control' type='text' name='howIsQuarantine'></textarea>
                         </div>
                         <div class='form-group mb-3'>
                             <label class='control-label'>First Name *</label>

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

@@ -601,7 +601,7 @@
 
                 $('.note-section.pending-initialization').each(function() {
                     let sName = $(this).attr('data-section-template-name');
-                    if(['vitals', 'allergies', 'medication', 'care-team', 'assessment'].indexOf(sName) === -1) {
+                    if(['vitals', 'allergies', 'medication', 'care-team', 'assessment', 'new-patient-intake'].indexOf(sName) === -1) {
                         $(this).removeClass('pending-initialization');
                     }
                 });
@@ -622,17 +622,22 @@
 
             function initializeSection(_sectionUid, _sectionTemplateName) {
                 $.get('/get-default-section-data/' + _sectionTemplateName + '/{{$patient->uid}}' , function(_data) {
-                    if(!_data.value || _data.value === '') {
+                    if(!_data) {
                         numSectionsPendingInitialization--;
                         if(numSectionsPendingInitialization <= 0) {
                             fastReload();
                         }
                         return;
                     }
-                    $.post('/process_form_submit', {
-                        section_uid: _sectionUid,
-                        value: _data.value
-                    }, function(_data) {
+                    let payload = {
+                        section_uid: _sectionUid
+                    };
+                    for(let x in _data) {
+                        if(_data.hasOwnProperty(x)) {
+                            payload[x] = _data[x];
+                        }
+                    }
+                    $.post('/process_form_submit', payload, function(_data) {
                         console.log('done: ', _sectionTemplateName);
                         numSectionsPendingInitialization--;
                         if(numSectionsPendingInitialization <= 0) {

resources/views/layouts/patient.blade.php

@@ -428,13 +428,13 @@
                                         <span class="aligned-icon"><i class="fa fa-map-marker-alt" aria-hidden="true"></i></span>
                                         <?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;
+                                        if(!!$patient->mailing_address_line1) $addressParts[] = $patient->mailing_address_line1;
+                                        if(!!$patient->mailing_address_line2) $addressParts[] = $patient->mailing_address_line2;
+                                        if(!!$patient->mailing_address_city) $addressParts[] = $patient->mailing_address_city;
+                                        if(!!$patient->mailing_address_state) $addressParts[] = $patient->mailing_address_state;
                                         echo implode(", ", $addressParts);
                                         ?>
+                                        {{ $patient->mailing_address_zip ? $patient->mailing_address_zip : '' }}
                                     </li>
                                     <li>
                                         <span class="aligned-icon"><i class="fa fa-phone-alt" aria-hidden="true"></i></span>

storage/sections/new-patient-intake/default.php

@@ -0,0 +1,4 @@
+<?php
+$defaultData = [
+    "how_are_you__with_quarantine" => $patient->how_is_quarantine
+];

storage/sections/new-patient-intake/form.blade.php

@@ -17,6 +17,28 @@ $formID = rand(0, 100000);
     <?php endif; ?>
 
     <div class="gem-nodes">
+    <div class="my-3 node node-level-0" data-key="how_are_you">
+        <label>How are you doing?</label>
+        <div class="subs pl-4">
+            <div class="my-3 node node-level-2" data-key="how_are_you__with_quarantine">
+                <label>How are you doing with quarantine?</label>
+                <div class="d-flex align-items-center">
+                    <input onchange="onGemVChange_{{ $formID }}(this)" value="{{ @$contentData['how_are_you__with_quarantine'] }}" name="how_are_you__with_quarantine" type="text" class="form-control form-control-sm mr-2" placeholder="Answer">
+                    <input onchange="onGemVChange_{{ $formID }}(this)" value="{{ @$contentData['how_are_you__with_quarantine_memo'] }}" name="how_are_you__with_quarantine_memo" type="text" class="form-control form-control-sm" placeholder="Memo">
+                </div>
+            </div>
+
+            <div class="my-3 node node-level-2" data-key="how_are_you__with_health_in_general">
+                <label>How are you doing with you health in general?</label>
+                <div class="d-flex align-items-center">
+                    <input onchange="onGemVChange_{{ $formID }}(this)" value="{{ @$contentData['how_are_you__with_health_in_general'] }}" name="how_are_you__with_health_in_general" type="text" class="form-control form-control-sm mr-2" placeholder="Answer">
+                    <input onchange="onGemVChange_{{ $formID }}(this)" value="{{ @$contentData['how_are_you__with_health_in_general_memo'] }}" name="how_are_you__with_health_in_general_memo" type="text" class="form-control form-control-sm" placeholder="Memo">
+                </div>
+            </div>
+
+        </div>
+    </div>
+
     <div class="my-3 node node-level-0" data-key="blood_ox">
         <label>Blood Oxygen</label>
         <div class="subs pl-4">
@@ -976,8 +998,8 @@ $formID = rand(0, 100000);
 
 
     <div class="form-group m-0 d-flex">
-        <button class="btn btn-sm btn-primary mr-2">Submit</button>
-        <button class="btn btn-sm btn-default border" onclick="return cancelForm_NoteSection_{{ $formID }}(this)">Cancel</button>
+        <button class="btn btn-sm btn-primary mr-2">Done</button>
+        {{--<button class="btn btn-sm btn-default border" onclick="return cancelForm_NoteSection_{{ $formID }}(this)">Cancel</button>--}}
     </div>
 </form>
 <script>