= 3 éve
szülő
commit
d585abb0f6
1 módosított fájl, 0 hozzáadás és 145 törlés
  1. 0 145
      resources/views/layouts/patient.blade.php

+ 0 - 145
resources/views/layouts/patient.blade.php

@@ -704,7 +704,6 @@
 																			@include('app.patient.coverage-status')
 																		</section>
 
-<<<<<<< HEAD
 									<ul class="vbox ml-auto mt-2 align-self-start patient-header-address">
 										<li class="d-flex align-items-start">
 											<span class="aligned-icon">
@@ -847,150 +846,6 @@
 						form.find('.if-in-clinic').hide();
 					}
 				});
-=======
-                                    <ul class="vbox ml-auto mt-2 align-self-start patient-header-address">
-                                        <li class="d-flex align-items-start">
-                                            <span class="aligned-icon">
-                                                <i class="fa fa-map-marker-alt" aria-hidden="true"></i>
-                                            </span>
-                                            <div class="position-relative">
-                                                <?php
-                                                $addressParts = [];
-                                                if (!!$patient->mailing_address_line1) $addressParts[] = $patient->mailing_address_line1;
-                                                if (!!$patient->mailing_address_line2) $addressParts[] = $patient->mailing_address_line2;
-                                                $addressParts = implode(", ", $addressParts) . "<br/>";
-                                                $addressPart2 = [];
-                                                if (!!$patient->mailing_address_city) $addressPart2[] = $patient->mailing_address_city;
-                                                if (!!$patient->mailing_address_state) $addressPart2[] = $patient->mailing_address_state;
-                                                $addressParts .= implode(", ", $addressPart2);
-                                                echo $addressParts;
-                                                ?>
-                                                {{ $patient->mailing_address_zip ? $patient->mailing_address_zip : '' }}
-                                                @if($patient->mailing_address_memo)
-                                                    <span class="position-relative c-pointer text-center stag-tooltip ml-2">
-                                                        <i class="fa fa-info-circle"></i>
-                                                        <div
-                                                            class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
-                                                            <div class="text-left font-weight-bold pb-1">Special Instructions</div>
-                                                            <div
-                                                                class="text-left font-weight-normal">{{$patient->mailing_address_memo}}</div>
-                                                        </div>
-                                                    </span>
-                                                @endif
-                                            </div>
-                                        </li>
-                                        @if($patient->cell_number)
-                                            <li>
-                                                <span class="aligned-icon">
-                                                    <i class="fa fa-phone-alt" aria-hidden="true"></i>
-                                                </span>
-                                                {{$patient->cell_number}}
-                                                <span class="small text-secondary ml-1">
-                                                    {{ $patient->cell_number_memo ? '(' . $patient->cell_number_memo . ')' : '' }}
-                                                </span>
-                                            </li>
-                                        @endif
-                                        @if($patient->phone_home)
-                                            <li>
-                                                <span class="aligned-icon"><i class="fa fa-home" aria-hidden="true"></i></span>
-                                                {{$patient->phone_home}}
-                                            </li>
-                                        @endif
-                                        <li class="{{empty($confirmedEmail) || $confirmedEmail === '-' ? 'screen-only' : ''}}">
-                                            <span class="aligned-icon"><i class="fa fa-envelope" aria-hidden="true"></i></span>
-                                            {{$confirmedEmail}}
-                                        </li>
-                                        <li class="screen-only hide-inside-popup">
-                                            <span class="aligned-icon text-primary">
-                                                <i class="fa fa-link" aria-hidden="true"></i>
-                                            </span>
-                                            <?php $numLinkedAccounts = $patient->linkedAccounts ? count($patient->linkedAccounts) : 0; ?>
-                                            <a href="{{route('patients.view.accounts', ['patient' => $patient])}}">
-                                                {{ $numLinkedAccounts === 0 ? 'No' : $numLinkedAccounts }}
-                                                account{{ $numLinkedAccounts === 1 ? '' : 's' }} linked
-                                            </a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div> <!-- z -->
-                    </div>
-                    @if(0 && $pro->pro_type === 'ADMIN')
-                        <div class="screen-only card-header py-2 d-flex align-items-center mcp-theme-1 bg-aliceblue">
-                            <b class="">Tags ({{count($patient->clientTags)}}):</b>
-                            @foreach($patient->clientTags as $tag)
-                                <div class="d-inline-flex align-items-center ml-2 py-1 px-2 rounded bg-aliceblue text-info">
-                                    <span class="text-sm">{{$tag->tag}}</span>
-                                    <div moe relative class="ml-2">
-                                        <a href="" start show><i class="fa fa-times text-secondary on-hover-opaque"></i></a>
-                                        <form url="/api/clientTag/cancel" class="mcp-theme-1 min-width-200px">
-                                            <input type="hidden" name="uid" value="{{$tag->uid}}">
-                                            <p class="text-nowrap text-dark">Cancel this tag?</p>
-                                            <div>
-                                                <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-                                                <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                            </div>
-                                        </form>
-                                    </div>
-                                </div>
-                            @endforeach
-                            <div moe relative class="ml-2">
-                                <a href="" start show class="text-sm">+ Add</a>
-                                <form url="/api/clientTag/create" class="mcp-theme-1">
-                                    <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                    <div class="mb-2">
-                                        <label class="text-secondary text-sm">Tag</label>
-                                        <input type="text" class="form-control form-control-sm"
-                                               name="tag"
-                                               placeholder="Tag" required>
-                                    </div>
-                                    <div>
-                                        <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-                                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                    </div>
-                                </form>
-                            </div>
-                        </div>
-                    @endif
-                    {{--<div class="text-container border-bottom d-flex align-items-center mcp-theme-1 px-3">
-
-                        @if($patient->mcp_pro_id !== $pro->id && $patient->active_mcp_request_id)
-                            <div moe relative class="ml-2">
-                                <a href="" start show class="btn btn-sm btn-success text-white font-weight-bold small">Claim as MCP</a>
-                                <form url="/api/mcpRequest/claim" class="mcp-theme-1" right>
-                                    <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                    <p>Claim this patient?</p>
-                                    <div>
-                                        <button submit class="btn btn-sm btn-primary mr-2">Yes</button>
-                                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                    </div>
-                                </form>
-                            </div>
-                        @endif
-                    </div>--}}
-                    <div class="card-body p-3">
-                        {{--<h1 class="h3">@yield('section-title')</h1>--}}
-                        <div class="mcp-theme-1">
-                            @yield('inner-content')
-                        </div>
-                    </div>
-                </div>
-            </main>
-        </div>
-    </div>
-    <script>
-        (function() {
-            function init() {
-                $('.note-method-select').change(function() {
-                    let form = $(this).closest('form');
-                    if(this.value === 'IN_CLINIC') {
-                        form.find('.if-in-clinic').show();
-                    }
-                    else {
-                        form.find('.if-in-clinic').hide();
-                    }
-                });
->>>>>>> 0effe8dc669281a70a2be9972fb8d653f6bae659
 
 				$('.note-method-select').each(function() {
 					let form = $(this).closest('form');