mirror of
https://gitlab.com/signalytic/client-external/streamline/streamline-emr.git
synced 2026-09-13 11:41:31 +00:00
Import latest app updates from streamline
An updated set of source files and initialization was provided by streamline to address issues observed during initial testing. These files have been updated in order to generate a new set of app images.
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
@push('scripts')
|
||||
|
||||
@endpush
|
||||
|
||||
<div class="white-box">
|
||||
@@ -10,58 +9,70 @@
|
||||
<div class="col-md-9">
|
||||
<table class="table table-bordered table-condensed table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="color: black">{{ __('layout.patient_number') }}</th>
|
||||
<th style="color: black">{{ __('layout.patient_names') }}</th>
|
||||
<th style="color: black">{{ __('layout.gender') }}</th>
|
||||
<th style="color: black">{{ __('layout.age') }}</th>
|
||||
<th style="color: black">{{ __('layout.patient_category') }}</th>
|
||||
@if(is_patient_accounts_enabled())<th style="color: black">{{ __('layout.patient_finance_account') }}</th>@endif
|
||||
</tr>
|
||||
<tr>
|
||||
<th style="color: black">{{ __('layout.patient_number') }}</th>
|
||||
<th style="color: black">{{ __('layout.patient_names') }}</th>
|
||||
<th style="color: black">{{ __('layout.gender') }}</th>
|
||||
<th style="color: black">{{ __('layout.age') }}</th>
|
||||
<th style="color: black">{{ __('layout.patient_category') }}</th>
|
||||
@if (is_patient_accounts_enabled())
|
||||
<th style="color: black">{{ __('layout.patient_finance_account') }}</th>
|
||||
@endif
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@php $dob = new Carbon\Carbon($patient->date_of_birth) @endphp
|
||||
<tr>
|
||||
<td>{{ $patient->number }}</td>
|
||||
<td>{!! insurance_flag($patient->id) !!}</td>
|
||||
<td>{{ $patient->gender == 1 ? __('layout.male') : __('layout.female') }}</td>
|
||||
<td>{{ $dob->diffInYears(Carbon\Carbon::now()) }} (yrs)</td>
|
||||
<td>{{ $categories[$patient->category_id] ?? 'N/A' }}</td>
|
||||
@if(is_patient_accounts_enabled())
|
||||
<td>
|
||||
{{ ugandan_shillings($patient->patient_account_balance) }}
|
||||
@php $dob = new Carbon\Carbon($patient->date_of_birth) @endphp
|
||||
<tr>
|
||||
<td>{{ $patient->number }}</td>
|
||||
<td>{!! insurance_flag($patient->id) !!}</td>
|
||||
<td>{{ $patient->gender == 1 ? __('layout.male') : __('layout.female') }}</td>
|
||||
<td>{{ $dob->diffInYears(Carbon\Carbon::now()) }} (yrs)</td>
|
||||
<td>{{ $categories[$patient->category_id] ?? 'N/A' }}</td>
|
||||
@if (is_patient_accounts_enabled())
|
||||
<td>
|
||||
{{ ugandan_shillings($patient->patient_account_balance) }}
|
||||
|
||||
<a href="/patient_accounts/statement/">{{ __('layout.more_details') }}</a>
|
||||
</td>
|
||||
@endif
|
||||
</tr>
|
||||
<a href="/patient_accounts/statement/">{{ __('layout.more_details') }}</a>
|
||||
</td>
|
||||
@endif
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="button-box">
|
||||
<a class="img" href="#modal-photo" data-toggle="modal" style="color: whitesmoke">
|
||||
@if(!is_null($patient->photo) && $patient->photo != "")
|
||||
<img src='{{ asset($patient->photo) }}' class="img-rounded center" style='height: 59px; width: 100%' alt='Profile Picture' />
|
||||
@if (!is_null($patient->photo) && $patient->photo != '')
|
||||
<img src='{{ asset($patient->photo) }}' class="img-rounded center"
|
||||
style='height: 59px; width: auto;' alt='Profile Picture' />
|
||||
@else
|
||||
<img src="/uploads/streamline_images/person-place-holder.jpg" class="img-rounded center" style='height: 59px; width: 50%; margin-right: auto; margin-left: auto; display: block' alt='Person' />
|
||||
<img src="/uploads/streamline_images/person-place-holder.jpg"
|
||||
class="img-rounded center"
|
||||
style='height: 59px; width: 50%; margin-right: auto; margin-left: auto; display: block'
|
||||
alt='Person' />
|
||||
@endif
|
||||
</a>
|
||||
</div>
|
||||
<div class="modal fade" id="modal-photo" tabindex="-1" role="dialog" aria-labelledby="modal-photoLabel1">
|
||||
<div class="modal fade" id="modal-photo" tabindex="-1" role="dialog"
|
||||
aria-labelledby="modal-photoLabel1">
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||
<h4 class="modal-title" id="modal-photoLabel1">{{ __('layout.insured_patient_photo') }}</h4>
|
||||
<button type="button" class="close" data-dismiss="modal"
|
||||
aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||
<h4 class="modal-title" id="modal-photoLabel1">
|
||||
{{ __('layout.insured_patient_photo') }}</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="col-sm-12">
|
||||
<img src='{{ asset($patient->photo) }}' class="img-rounded center" style="margin: auto" alt='{{ __('layout.photo_not_available') }}' />
|
||||
<div class="col-sm-12 text-center">
|
||||
<img src="@if (!is_null($patient->photo) && $patient->photo != '') {{ asset($patient->photo) }} @else {{ asset('/uploads/streamline_images/person-place-holder.jpg') }} @endif"
|
||||
class="img-rounded center" style="margin: auto"
|
||||
alt='{{ __('layout.photo_not_available') }}' />
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-danger btn-sm" data-dismiss="modal">{{ __('layout.close') }}</button>
|
||||
<button type="button" class="btn btn-danger btn-sm"
|
||||
data-dismiss="modal">{{ __('layout.close') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -76,19 +87,23 @@
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-2">
|
||||
<button type="button" class="btn btn-success btn-sm" data-toggle="modal" data-target="#demographicsModal">{{ __('layout.demographics') }}</button>
|
||||
<button type="button" class="btn btn-success btn-sm" data-toggle="modal"
|
||||
data-target="#demographicsModal">{{ __('layout.demographics') }}</button>
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<button type="submit" class="btn btn-success btn-sm show-episode-modal" data-backdrop="static" data-keyboard="false" data-toggle="modal" data-target="#episodeModal">{{ __('layout.new_episode') }}</button>
|
||||
<button type="submit" class="btn btn-success btn-sm show-episode-modal" data-backdrop="static"
|
||||
data-keyboard="false" data-toggle="modal"
|
||||
data-target="#episodeModal">{{ __('layout.new_episode') }}</button>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<a class="btn btn-success btn-sm" href="/patient_finance/customer_statement" target="_blank">{{ __('layout.customer_statement') }}</a>
|
||||
</div>
|
||||
@if(Auth::user()->can('pay-all-patient-bills'))
|
||||
<div class="col-md-3">
|
||||
<!-- If you want to uncomment the below function please know the page it leads to is severely out of date -->
|
||||
<!-- <a class="btn btn-success btn-sm" href="/patient_finance/pay_all_patient_bills/{{ $patient_id }}">Central Billing</a> -->
|
||||
<a class="btn btn-success btn-sm" href="/patient_finance/customer_statement"
|
||||
target="_blank">{{ __('layout.customer_statement') }}</a>
|
||||
</div>
|
||||
@if (Auth::user()->can('pay-all-patient-bills'))
|
||||
<div class="col-md-3">
|
||||
<!-- If you want to uncomment the below function please know the page it leads to is severely out of date -->
|
||||
<!-- <a class="btn btn-success btn-sm" href="/patient_finance/pay_all_patient_bills/{{ $patient_id }}">Central Billing</a> -->
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@@ -98,7 +113,8 @@
|
||||
<div class="modal-dialog modal-lg" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
|
||||
aria-hidden="true">×</span></button>
|
||||
<h4 class="modal-title" id="exampleModalLabel1">{{ __('layout.patient_details') }}</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
@@ -106,35 +122,36 @@
|
||||
<div class="col-sm-6">
|
||||
<table class="table table-bordered">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th class="highlight">{{ __('layout.patient_number') }}</th>
|
||||
<td>{{ $patient->number }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="highlight">{{ __('layout.patient_names') }}</th>
|
||||
<td>{{ $patient->first_name }} {{ $patient->last_name }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="highlight">{{ __('layout.gender') }}</th>
|
||||
<td>{{ $patient->gender == 1 ? __('layout.male') : __('layout.female') }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="highlight">{{ __('layout.date_of_birth') }}</th>
|
||||
<td>{{ streamline_date($patient->date_of_birth) }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="highlight">{{ __('layout.age') }}</th>
|
||||
<td>{{ $dob->diffInYears(Carbon\Carbon::now()) }} {{ __('layout.years') }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="highlight">{{ __('layout.residence') }}</th>
|
||||
<td>{{ patient_residence($patient->id) }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="highlight">{{ __('layout.marital_status') }}</th>
|
||||
<td>
|
||||
{{ isset($marital_statuses[$patient->marital_status]) ? $marital_statuses[$patient->marital_status] : "N/A" }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="highlight">{{ __('layout.patient_number') }}</th>
|
||||
<td>{{ $patient->number }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="highlight">{{ __('layout.patient_names') }}</th>
|
||||
<td>{{ $patient->first_name }} {{ $patient->last_name }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="highlight">{{ __('layout.gender') }}</th>
|
||||
<td>{{ $patient->gender == 1 ? __('layout.male') : __('layout.female') }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="highlight">{{ __('layout.date_of_birth') }}</th>
|
||||
<td>{{ streamline_date($patient->date_of_birth) }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="highlight">{{ __('layout.age') }}</th>
|
||||
<td>{{ $dob->diffInYears(Carbon\Carbon::now()) }} {{ __('layout.years') }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="highlight">{{ __('layout.residence') }}</th>
|
||||
<td>{{ patient_residence($patient->id) }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="highlight">{{ __('layout.marital_status') }}</th>
|
||||
<td>
|
||||
{{ isset($marital_statuses[$patient->marital_status]) ? $marital_statuses[$patient->marital_status] : 'N/A' }}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@@ -176,6 +193,18 @@
|
||||
<th class="highlight">{{ __('layout.patient_category') }}</th>
|
||||
<td>{{ isset($patient_categories[$patient->category_id]) ? $patient_categories[$patient->category_id] : 'N/A' }}</td>
|
||||
</tr>
|
||||
@php
|
||||
$registration_fields = !empty($patient->registration_fields)? json_decode($patient->registration_fields, true):[];
|
||||
@endphp
|
||||
@foreach ($registration_fields as $key => $registration_field)
|
||||
@php $keys =explode("_",$key) @endphp
|
||||
@if (!empty($keys[2]))
|
||||
<tr>
|
||||
<th class="highlight">{{ get_name($keys[2], 'id', 'name', 'patient_registration_fields') }}</th>
|
||||
<td>{{ $registration_field }}</td>
|
||||
</tr>
|
||||
@endif
|
||||
@endforeach
|
||||
<tr>
|
||||
<th class="highlight">{{ __('layout.registered_by') }}</th>
|
||||
<td>{{ get_full_name($patient->created_by, 'id', 'first_name', 'last_name', 'users') }}</td>
|
||||
@@ -192,8 +221,10 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('layout.close') }}</button>
|
||||
<button type="button" class="btn btn-primary" id="edit_patient" onclick="window.location.href='/patients/{{ $patient->id }}/edit'">{{ __('layout.edit_patient') }}</button>
|
||||
<button type="button" class="btn btn-default"
|
||||
data-dismiss="modal">{{ __('layout.close') }}</button>
|
||||
<button type="button" class="btn btn-primary" id="edit_patient"
|
||||
onclick="window.location.href='/patients/{{ $patient->id }}/edit'">{{ __('layout.edit_patient') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -211,7 +242,8 @@
|
||||
{{ Form::hidden('patient_id', $patient->id) }}
|
||||
{{ Form::hidden('is_from_finance', 1) }}
|
||||
<button type="submit" class="btn btn-success btn-sm">{{ __('layout.yes') }}</button>
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('layout.cancel') }}</button>
|
||||
<button type="button" class="btn btn-default"
|
||||
data-dismiss="modal">{{ __('layout.cancel') }}</button>
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
</div>
|
||||
@@ -219,8 +251,3 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user