Move "dx & focus areas" to above history

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

@@ -216,28 +216,23 @@
                     </table>
                 </div>
 
-                {{-- dx --}}
-                <div class="mt-4 pb-1">
+                {{-- care_team --}}
+                <div class="mt-4">
                     <div class="d-flex align-items-center mb-2 py-2 border-top border-bottom">
-                        <h6 class="my-0 font-weight-bold text-secondary">Dx &amp; Focus Areas</h6>
+                        <h6 class="my-0 font-weight-bold text-secondary">Care Team</h6>
                         <span class="mx-2 text-secondary">|</span>
                         <div moe>
                             <a start show class="py-0 font-weight-normal">Add</a>
                             <form url="/api/clientInfoLine/create">
                                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
-                                <input type="hidden" name="category" value="dx">
-                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="contentText" value="" placeholder="Title"></div>
-                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="ICD" value="" placeholder="ICD"></div>
-                                <div class="mb-2">
-                                    <select name="Chronic or Acute" class="form-control form-control-sm pl-1">
-                                        <option>Chronic or Acute (select one)</option>
-                                        <option value="Chronic">Chronic</option>
-                                        <option value="Acute">Acute</option>
-                                    </select>
-                                </div>
-                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Prognosis" value="" placeholder="Prognosis"></div>
-                                <div class="mb-2"><textarea type="text" class="form-control form-control-sm" name="Treatment Goal" value="" placeholder="Treatment Goal"></textarea></div>
-                                <div class="mb-2"><textarea type="text" class="form-control form-control-sm" name="Treatment Plan" value="" placeholder="Treatment Plan"></textarea></div>
+                                <input type="hidden" name="category" value="care_team">
+                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="contentText" value="" placeholder="Name"></div>
+                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Specialty" value="" placeholder="Specialty"></div>
+                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Organization" value="" placeholder="Organization"></div>
+                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Phone" value="" placeholder="Phone"></div>
+                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Fax" value="" placeholder="Fax"></div>
+                                <div class="mb-2"><input type="date" class="form-control form-control-sm" name="Next Appointment" value="" placeholder="Next Appointment"></div>
+                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Memo" value="" placeholder="Memo"></div>
                                 <div class="d-flex align-items-center">
                                     <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
                                     <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
@@ -251,8 +246,8 @@
                 <a start show class="">Multi</a>
                 <form url="/api/clientInfoLine/createMultiple">
                     <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
-                    <input type="hidden" name="category" value="dx">
-                    <div class="mb-2"><textarea class="form-control form-control-sm" rows="8" name="contentTexts" value="" placeholder="Dx & Focus Areas"></textarea></div>
+                    <input type="hidden" name="category" value="care_team">
+                    <div class="mb-2"><textarea class="form-control form-control-sm" rows="8" name="contentTexts" value="" placeholder="Care Team Members..."></textarea></div>
                     <div class="d-flex align-items-center">
                         <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
                         <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
@@ -262,7 +257,7 @@
 
                         <span class="mx-2 text-secondary">|</span>
                         <a start show class="py-0 font-weight-normal"
-                           href="/patients/view/{{ $patient->uid }}/dx-and-focus-areas">
+                           href="/patients/view/{{ $patient->uid }}/care-team">
                             View All
                         </a>
                     </div>
@@ -270,7 +265,7 @@
                         <tbody>
                         <?php $itemCount = 0; ?>
                         @foreach($infoLines as $category => $lines)
-                            @if($category === "dx")
+                            @if($category === "care_team")
                                 @foreach ($lines as $line)
                                     <?php $itemCount++; ?>
                                     <tr>
@@ -296,29 +291,14 @@
                                                     <form url="/api/clientInfoLine/updateContent">
                                                         <input type="hidden" name="uid" value="{{ $line->uid }}">
                                                         <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
-                                                        <input type="hidden" name="category" value="dx">
-                                                        <div class="mb-2">
-                                                            <input type="text" class="form-control form-control-sm" name="contentText" value="{{$line->contentText}}" placeholder="Title">
-                                                        </div>
-                                                        <div class="mb-2">
-                                                            <input type="text" class="form-control form-control-sm" name="ICD" value="{{ getVal($line->contentDetail, "ICD") }}" placeholder="ICD">
-                                                        </div>
-                                                        <div class="mb-2">
-                                                            <select name="Chronic or Acute" class="form-control form-control-sm pl-1">
-                                                                <option>Chronic or Acute (select one)</option>
-                                                                <option {{ getVal($line->contentDetail, ("Chronic or Acute")) === 'Chronic' ? 'selected' : '' }} value="Chronic">Chronic</option>
-                                                                <option {{ getVal($line->contentDetail, ("Chronic or Acute")) === 'Acute' ? 'selected' : '' }} value="Acute">Acute</option>
-                                                            </select>
-                                                        </div>
-                                                        <div class="mb-2">
-                                                            <input type="text" class="form-control form-control-sm" name="Prognosis" value="{{ getVal($line->contentDetail, "Prognosis") }}" placeholder="Prognosis">
-                                                        </div>
-                                                        <div class="mb-2">
-                                                            <textarea type="text" class="form-control form-control-sm" name="Treatment Goal" placeholder="Treatment Goal">{{ getVal($line->contentDetail, "Treatment Goal") }}</textarea>
-                                                        </div>
-                                                        <div class="mb-2">
-                                                            <textarea type="text" class="form-control form-control-sm" name="Treatment Plan" placeholder="Treatment Plan">{{ getVal($line->contentDetail, "Treatment Plan") }}</textarea>
-                                                        </div>
+                                                        <input type="hidden" name="category" value="care_team">
+                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="contentText" value="{{$line->contentText}}" placeholder="Name"></div>
+                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Specialty" value="{{ getVal($line->contentDetail, 'Specialty') }}" placeholder="Specialty"></div>
+                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Organization" value="{{getVal($line->contentDetail, 'Organization') }}" placeholder="Organization"></div>
+                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Phone" value="{{getVal($line->contentDetail, 'Phone') }}" placeholder="Phone"></div>
+                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Fax" value="{{getVal($line->contentDetail, 'Fax') }}" placeholder="Fax"></div>
+                                                        <div class="mb-2"><input type="date" class="form-control form-control-sm" name="Next Appointment" value="{{getVal($line->contentDetail, 'Next Appointment') }}" placeholder="Next Appointment"></div>
+                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Memo" value="{{getVal($line->contentDetail, 'Memo') }}" placeholder="Memo"></div>
                                                         <div class="d-flex align-items-center">
                                                             <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
                                                             <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
@@ -327,9 +307,9 @@
                                                 </div>
                                                 <span class="font-weight-bold">{{$line->contentText}}</span>
                                                 <span class="text-secondary mx-1">/</span>
-                                                <span class="text-secondary">{{ getVal($line->contentDetail, "Chronic or Acute") }}</span>
+                                                <span class="text-secondary">{{ getVal($line->contentDetail, 'Specialty') }}</span>
                                                 <span class="text-secondary mx-1">/</span>
-                                                <span class="text-secondary">ICD: {{ getVal($line->contentDetail, "ICD") ? $line->contentDetail("ICD") : '-' }}</span>
+                                                <span class="text-secondary">Next Apt: {{ getVal($line->contentDetail, 'Next Appointment') ? $line->contentDetail('Next Appointment') : '-' }}</span>
                                             </div>
                                         </td>
                                     </tr>
@@ -346,24 +326,31 @@
                         </tbody>
                     </table>
                 </div>
+            </div>
+            <div class="col-6">
 
-                {{-- care_team --}}
-                <div class="mt-4">
+                {{-- dx --}}
+                <div class="mt-2 pb-1">
                     <div class="d-flex align-items-center mb-2 py-2 border-top border-bottom">
-                        <h6 class="my-0 font-weight-bold text-secondary">Care Team</h6>
+                        <h6 class="my-0 font-weight-bold text-secondary">Dx &amp; Focus Areas</h6>
                         <span class="mx-2 text-secondary">|</span>
                         <div moe>
                             <a start show class="py-0 font-weight-normal">Add</a>
                             <form url="/api/clientInfoLine/create">
                                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
-                                <input type="hidden" name="category" value="care_team">
-                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="contentText" value="" placeholder="Name"></div>
-                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Specialty" value="" placeholder="Specialty"></div>
-                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Organization" value="" placeholder="Organization"></div>
-                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Phone" value="" placeholder="Phone"></div>
-                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Fax" value="" placeholder="Fax"></div>
-                                <div class="mb-2"><input type="date" class="form-control form-control-sm" name="Next Appointment" value="" placeholder="Next Appointment"></div>
-                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Memo" value="" placeholder="Memo"></div>
+                                <input type="hidden" name="category" value="dx">
+                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="contentText" value="" placeholder="Title"></div>
+                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="ICD" value="" placeholder="ICD"></div>
+                                <div class="mb-2">
+                                    <select name="Chronic or Acute" class="form-control form-control-sm pl-1">
+                                        <option>Chronic or Acute (select one)</option>
+                                        <option value="Chronic">Chronic</option>
+                                        <option value="Acute">Acute</option>
+                                    </select>
+                                </div>
+                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Prognosis" value="" placeholder="Prognosis"></div>
+                                <div class="mb-2"><textarea type="text" class="form-control form-control-sm" name="Treatment Goal" value="" placeholder="Treatment Goal"></textarea></div>
+                                <div class="mb-2"><textarea type="text" class="form-control form-control-sm" name="Treatment Plan" value="" placeholder="Treatment Plan"></textarea></div>
                                 <div class="d-flex align-items-center">
                                     <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
                                     <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
@@ -371,24 +358,24 @@
                             </form>
                         </div>
 
-                         <span class="mx-2 text-secondary">|</span>
+                        <span class="mx-2 text-secondary">|</span>
 
-            <div moe>
-                <a start show class="">Multi</a>
-                <form url="/api/clientInfoLine/createMultiple">
-                    <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
-                    <input type="hidden" name="category" value="care_team">
-                    <div class="mb-2"><textarea class="form-control form-control-sm" rows="8" name="contentTexts" value="" placeholder="Care Team Members..."></textarea></div>
-                    <div class="d-flex align-items-center">
-                        <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                    </div>
-                </form>
-            </div>
+                        <div moe>
+                            <a start show class="">Multi</a>
+                            <form url="/api/clientInfoLine/createMultiple">
+                                <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
+                                <input type="hidden" name="category" value="dx">
+                                <div class="mb-2"><textarea class="form-control form-control-sm" rows="8" name="contentTexts" value="" placeholder="Dx & Focus Areas"></textarea></div>
+                                <div class="d-flex align-items-center">
+                                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
 
                         <span class="mx-2 text-secondary">|</span>
                         <a start show class="py-0 font-weight-normal"
-                           href="/patients/view/{{ $patient->uid }}/care-team">
+                           href="/patients/view/{{ $patient->uid }}/dx-and-focus-areas">
                             View All
                         </a>
                     </div>
@@ -396,7 +383,7 @@
                         <tbody>
                         <?php $itemCount = 0; ?>
                         @foreach($infoLines as $category => $lines)
-                            @if($category === "care_team")
+                            @if($category === "dx")
                                 @foreach ($lines as $line)
                                     <?php $itemCount++; ?>
                                     <tr>
@@ -422,14 +409,29 @@
                                                     <form url="/api/clientInfoLine/updateContent">
                                                         <input type="hidden" name="uid" value="{{ $line->uid }}">
                                                         <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
-                                                        <input type="hidden" name="category" value="care_team">
-                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="contentText" value="{{$line->contentText}}" placeholder="Name"></div>
-                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Specialty" value="{{ getVal($line->contentDetail, 'Specialty') }}" placeholder="Specialty"></div>
-                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Organization" value="{{getVal($line->contentDetail, 'Organization') }}" placeholder="Organization"></div>
-                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Phone" value="{{getVal($line->contentDetail, 'Phone') }}" placeholder="Phone"></div>
-                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Fax" value="{{getVal($line->contentDetail, 'Fax') }}" placeholder="Fax"></div>
-                                                        <div class="mb-2"><input type="date" class="form-control form-control-sm" name="Next Appointment" value="{{getVal($line->contentDetail, 'Next Appointment') }}" placeholder="Next Appointment"></div>
-                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Memo" value="{{getVal($line->contentDetail, 'Memo') }}" placeholder="Memo"></div>
+                                                        <input type="hidden" name="category" value="dx">
+                                                        <div class="mb-2">
+                                                            <input type="text" class="form-control form-control-sm" name="contentText" value="{{$line->contentText}}" placeholder="Title">
+                                                        </div>
+                                                        <div class="mb-2">
+                                                            <input type="text" class="form-control form-control-sm" name="ICD" value="{{ getVal($line->contentDetail, "ICD") }}" placeholder="ICD">
+                                                        </div>
+                                                        <div class="mb-2">
+                                                            <select name="Chronic or Acute" class="form-control form-control-sm pl-1">
+                                                                <option>Chronic or Acute (select one)</option>
+                                                                <option {{ getVal($line->contentDetail, ("Chronic or Acute")) === 'Chronic' ? 'selected' : '' }} value="Chronic">Chronic</option>
+                                                                <option {{ getVal($line->contentDetail, ("Chronic or Acute")) === 'Acute' ? 'selected' : '' }} value="Acute">Acute</option>
+                                                            </select>
+                                                        </div>
+                                                        <div class="mb-2">
+                                                            <input type="text" class="form-control form-control-sm" name="Prognosis" value="{{ getVal($line->contentDetail, "Prognosis") }}" placeholder="Prognosis">
+                                                        </div>
+                                                        <div class="mb-2">
+                                                            <textarea type="text" class="form-control form-control-sm" name="Treatment Goal" placeholder="Treatment Goal">{{ getVal($line->contentDetail, "Treatment Goal") }}</textarea>
+                                                        </div>
+                                                        <div class="mb-2">
+                                                            <textarea type="text" class="form-control form-control-sm" name="Treatment Plan" placeholder="Treatment Plan">{{ getVal($line->contentDetail, "Treatment Plan") }}</textarea>
+                                                        </div>
                                                         <div class="d-flex align-items-center">
                                                             <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
                                                             <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
@@ -438,9 +440,9 @@
                                                 </div>
                                                 <span class="font-weight-bold">{{$line->contentText}}</span>
                                                 <span class="text-secondary mx-1">/</span>
-                                                <span class="text-secondary">{{ getVal($line->contentDetail, 'Specialty') }}</span>
+                                                <span class="text-secondary">{{ getVal($line->contentDetail, "Chronic or Acute") }}</span>
                                                 <span class="text-secondary mx-1">/</span>
-                                                <span class="text-secondary">Next Apt: {{ getVal($line->contentDetail, 'Next Appointment') ? $line->contentDetail('Next Appointment') : '-' }}</span>
+                                                <span class="text-secondary">ICD: {{ getVal($line->contentDetail, "ICD") ? $line->contentDetail("ICD") : '-' }}</span>
                                             </div>
                                         </td>
                                     </tr>
@@ -457,8 +459,6 @@
                         </tbody>
                     </table>
                 </div>
-            </div>
-            <div class="col-6">
 
                 <div class="mt-2">
                     <div class="d-flex align-items-center mb-2 py-2 border-top border-bottom">