resolved conflicts

This commit is contained in:
2025-03-31 03:46:05 +03:00
6454 changed files with 1520539 additions and 9 deletions
@@ -0,0 +1,104 @@
@extends('layouts.main')
@section('content')
<div class="row bg-title">
<div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
<h4 class="page-title">{{ __('patients.create_patient_registration_fields') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('patients.dashboard') }}</a></li>
<li><a href="{{ route('patient_registration_fields.index') }}">{{ __('patients.view_patient_registration_fields') }}</a></li>
<li class="active">{{ __('patients.create') }}</li>
</ol>
</div>
</div>
<div class="row">
<div class="col-sm-12">
@include('clinical_data::patient_registration_fields.menu')
</div>
</div>
<div class="row">
<div class="col-sm-12">
<!--Flash messages at the top -->
@include('flash::message')
<div class="white-box">
{{ Form::open(['route' => 'patient_registration_fields.store', 'data-toggle' => 'validator']) }}
<div class="row">
<div class="col">
<div class="form-group">
{{ Form::label('name', __('patients.patient_registration_field_name')) }}
{{ Form::text('name', '', ['class' => 'form-control compulsory', 'required']) }}
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col">
<div class="form-group">
{{ Form::label('compulsory',__('patients.patient_registration_field_compulsory')) }} <br>
{{ Form::radio('compulsory', 1, false, ['required']) }} {{ __('observations.yes') }} &nbsp; &nbsp;
{{ Form::radio('compulsory', 0, false, ['required']) }} {{ __('observations.no') }}
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col">
<div class="form-group">
{{ Form::label('options_or_range',__('patients.patient_registration_field_options')) }}
<br>
{{ Form::radio('options_or_range', 1, false, ["required",'id'=>'free_text', 'onclick'=>'setRangeOrOptions()']) }} {{ __('patients.text') }} &nbsp;&nbsp;
{{ Form::radio('options_or_range', 2, false, ["required",'id'=>'set_option','onclick'=>'setRangeOrOptions()']) }} {{ __('observations.set_dropdown_options') }}
<div class="help-block with-errors"></div>
</div>
<div class="set-options" style="display: none;">
<div class="form-group" id="optionsList">
{{ Form::label('option', __('observations.set_drop_down_options')) }}
{{ Form::text('options[]', '', ['class'=>'form-control', 'id'=>'option_1']) }}
<br>
</div>
<a href="#" id="addOption">{{ __('observations.add_another_option') }}</a><br><br>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6"><hr></div>
<div class="col-md-6">
{{ Form::button(__('observations.submit'),['type'=>'submit','class'=>'btn btn-success waves-effect waves-light m-r-10']) }}
{{ Form::button(__('observations.cancel'),['type'=>'reset','class'=>'btn btn-default waves-effect waves-light']) }}
{{ Form::close() }}
</div>
</div>
</div>
</div>
</div>
@endsection
@push('scripts')
<script src="{{ asset('elite/js/validator.js') }}"></script>
<script type="text/javascript">
function setRangeOrOptions() {
if (document.getElementById("set_option").checked) {
document.querySelector(".set-options").style.display = "block";
$('#option_1').prop('required', true);
$('#option_1').addClass('compulsory');
}
if($('#free_text').is(':checked')) document.querySelector(".set-options").style.display = "none";
}
$(wrapper).on("click", ".remove_field", function (e) {
e.preventDefault();
$(this).parent('div').parent('div').parent('div').remove();
});
$("#addOption").click(function(e) {
let html_code = "<div><div class='row'>" +
"<div class='col-md-10'><input type='text' name='options[]' placeholder='' class='form-control compulsory' required /></div>" +
"<div class='col-md-2'><button class='remove_field btn btn-sm btn-rounded btn-danger' style='color: white; margin-left: 25px;'><i class='fa fa-trash'></i></button></div>" +
"</div><br></div>";
$("#optionsList").append(html_code);
});
</script>
@endpush
@@ -0,0 +1,115 @@
@extends('layouts.main')
@section('content')
<div class="row bg-title">
<div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
<h4 class="page-title">{{ __('patients.edit_patient_registration_fields') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('patients.dashboard') }}</a></li>
<li><a href="{{ route('patient_registration_fields.index') }}">{{ __('patients.view_patient_registration_fields') }}</a></li>
<li class="active">{{ __('patients.edit') }}</li>
</ol>
</div>
</div>
<div class="row">
<div class="col-sm-12">
@include('clinical_data::patient_registration_fields.menu')
</div>
</div>
<div class="row">
<div class="col-sm-12">
<!--Flash messages at the top -->
@include('flash::message')
<div class="white-box">
{{ Form::model($patient_registration_field, ['method' => 'PUT', 'route' => ['patient_registration_fields.update',$patient_registration_field], 'data-toggle' => 'validator']) }}
<div class="row">
<div class="col">
<div class="form-group">
{{ Form::label('name', __('observations.observation_name')) }}
{{ Form::text('name', $patient_registration_field->name, ['class' => 'form-control compulsory', 'required']) }}
<div class="help-block with-errors"></div>
</div>
<div class="form-group">
{{ Form::label('compulsory',__('patients.patient_registration_field_compulsory')) }} <br>
{{ Form::radio('compulsory', 1, ($patient_registration_field->compulsory == 1)? true: false, ["required"]) }} {{ __('observations.yes') }} &nbsp; &nbsp;
{{ Form::radio('compulsory', 0, ($patient_registration_field->compulsory == 0)? true: false, ["required"]) }} {{ __('observations.no') }}
<div class="help-block with-errors"></div>
</div>
<div class="form-group">
{{ Form::label('options_or_range',__('patients.patient_registration_field_options')) }} <br>
{{ Form::radio('options_or_range', 1, empty($patient_registration_field->options) ? true: false, ["required",'id'=>'free_text', 'onclick'=>'setRangeOrOptions()']) }} {{ __('patients.text') }} &nbsp;&nbsp;
{{ Form::radio('options_or_range', 2, !empty($patient_registration_field->options) ? true: false, ["required",'id'=>'set_option','onclick'=>'setRangeOrOptions()']) }} {{ __('observations.set_dropdown_options') }}
<div class="help-block with-errors"></div>
</div>
<div class="set-options" style="display: none;">
<div class="form-group" id="optionsList">
{{ Form::label('option', __('observations.set_drop_down_options')) }}
@php $options = explode(",", $patient_registration_field->options); @endphp
@foreach($options as $option)
<div>
<div class="row">
<div class="col-md-10">
{{ Form::text('options[]', $option, ['class'=>'form-control compulsory', 'required']) }}
</div>
<div class="col-md-2">
<button class='remove_field btn btn-sm btn-rounded btn-danger' style='color: white; margin-left: 25px;'><i class='fa fa-trash'></i></button>
</div>
</div>
<br>
</div>
@endforeach
</div>
<a href="#" id="addOption">{{ __('observations.add_another_option') }}</a><br><br>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6"><hr></div>
<div class="col-md-6">
{{ Form::button(__('observations.submit'),['type'=>'submit','class'=>'btn btn-success waves-effect waves-light m-r-10']) }}
{{ Form::button(__('observations.cancel'),['type'=>'reset','class'=>'btn btn-default waves-effect waves-light']) }}
{{ Form::close() }}
</div>
</div>
</div>
</div>
</div>
@endsection
@push('scripts')
<script src="{{ asset('elite/js/validator.js') }}"></script>
<script type="text/javascript">
window.onload = function(){
if ($('#set_option').is(':checked')) setRangeOrOptions();
}
function setRangeOrOptions() {
if (document.getElementById("set_option").checked) {
document.querySelector(".set-options").style.display = "block";
}
if($('#free_text').is(':checked')) document.querySelector(".set-options").style.display = "none";
}
$(wrapper).on("click", ".remove_field", function (e) {
e.preventDefault();
$(this).parent('div').parent('div').parent('div').remove();
});
$("#addOption").click(function(e) {
let html_code = "<br><div class='row'>" +
"<div class='col-md-10'><input type='text' name='options[]' placeholder='' class='form-control compulsory' required/></div>" +
"<div class='col-md-2'><button class='remove_field btn btn-sm btn-rounded btn-danger' style='color: white; margin-left: 25px;'><i class='fa fa-trash'></i></button></div>" +
"</div>";
$("#optionsList").append(html_code);
});
</script>
@endpush
@@ -0,0 +1,89 @@
@extends('layouts.main')
@push('styles')
<link href="{{ asset('/elite/bower_components/datatables/jquery.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('elite/tables/css/buttons.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
@endpush
@section('content')
<div class="row bg-title">
<div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
<h4 class="page-title">{{ __('patients.patient_registration_fields') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('observations.dashboard') }}</a></li>
<li><a href="{{ route('patient_registration_fields.index') }}">{{ __('patients.view_patient_registration_fields') }}</a></li>
<li class="active">{{ __('patients.activate') }}</li>
</ol>
</div>
</div>
<div class="row">
<div class="col-sm-12">
@include('clinical_data::patient_registration_fields.menu')
</div>
</div>
@include('flash::message')
<div class="row">
<div class="col-sm-12">
<div class="white-box">
<p class="text-muted m-b-30">{{ __('observations.export_data') }}</p>
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>{{ __('observations.category') }}</th>
<th>{{ __('patients.compulsory') }}</th>
<th>{{ __('observations.options') }}</th>
<th>Created by</th>
<th>Actions</th>
</tr>
</thead>
<tbody>
@foreach($patient_registration_fields as $patient_registration_field)
<tr>
<td>{{ $patient_registration_field->name }}</td>
<td>{{ ($patient_registration_field->compulsory == '1')? 'Yes':'No' }}</td>
<td>{{ $patient_registration_field->options }}</td>
<td>{{ get_name( $patient_registration_field->created_by, 'id', 'first_name', 'users') . " " . get_name( $patient_registration_field->created_by, 'id', 'last_name', 'users'); }}</td>
<td style="white-space: nowrap; display:inline-flex">
{{ Form::model($patient_registration_field->id ,['method' => 'POST', 'route' => ['patient_registration_fields.activate', $patient_registration_field->id]]) }}
<button type="submit" class="btn btn-warning" onclick="return confirm('Are you sure?')"><i class="fa fa-check"></i> {{ __('observations.activate') }}</button>
{{ Form::close() }}
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>
@endsection
@push('scripts')
<script src="{{ asset('elite/bower_components/datatables/jquery.dataTables.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/dataTables.buttons.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.flash.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/jszip.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/pdfmake.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/vfs_fonts.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.html5.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.print.min.js') }}"></script>
<script>
$('.table').DataTable({
dom: 'Bfrtip',
ordering:false,
buttons: [
'copy', 'csv', 'excel', 'pdf', 'print'
]
});
</script>
@endpush
@@ -0,0 +1,94 @@
@extends('layouts.main')
@push('styles')
<link href="{{ asset('/elite/bower_components/datatables/jquery.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('elite/tables/css/buttons.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
@endpush
@section('content')
<div class="row bg-title">
<div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
<h4 class="page-title">{{ __('patients.patient_registration_fields') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('observations.dashboard') }}</a></li>
<li class="active">{{ __('patients.view_patient_registration_fields') }}</li>
</ol>
</div>
</div>
<div class="row">
<div class="col-sm-12">
@include('clinical_data::patient_registration_fields.menu')
</div>
</div>
@include('flash::message')
<div class="row">
<div class="col-sm-12">
<div class="white-box">
<p class="text-muted m-b-30">{{ __('observations.export_data') }}</p>
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>#</th>
<th>{{ __('patients.name') }}</th>
<th>{{ __('patients.compulsory') }}</th>
<th>{{ __('observations.options') }}</th>
<th>Created by</th>
<th>Actions</th>
</tr>
</thead>
<tbody>
@php $counter = 0; @endphp
@foreach($patient_registration_fields as $patient_registration_field)
<tr>
<td>{{ ++$counter }}</td>
<td>{{ $patient_registration_field->name }}</td>
<td>{{ ($patient_registration_field->compulsory == '1')? 'Yes':'No' }}</td>
<td>{{ $patient_registration_field->options }}</td>
<td>{{ get_name( $patient_registration_field->created_by, 'id', 'first_name', 'users') . " " . get_name( $patient_registration_field->created_by, 'id', 'last_name', 'users'); }}</td>
<td style="white-space: nowrap; display:inline-flex">
<a href="/patient_registration_fields/{{ $patient_registration_field->id }}/edit/" class="btn btn-info" style="border-radius: 5px;"><i class="fa fa-pencil"></i> {{ __('observations.edit') }}</a> &nbsp;
@php $in_use = Streamline\Patient::where('registration_fields', 'LIKE', '%reg_field_'.$patient_registration_field->id.'%')->first(); @endphp
@if (empty($in_use))
{{ Form::model($patient_registration_field->id ,['method' => 'DELETE', 'route' => ['patient_registration_fields.destroy', $patient_registration_field->id]]) }}
<button type="submit" class="btn btn-danger" onclick="return confirm('Are you sure?')" style="border-radius: 5px;"><i class="fa fa-trash"></i> {{ __('observations.delete') }}</button>
{{ Form::close() }}
@endif
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>
@endsection
@push('scripts')
<script src="{{ asset('elite/bower_components/datatables/jquery.dataTables.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/dataTables.buttons.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.flash.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/jszip.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/pdfmake.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/vfs_fonts.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.html5.min.js') }}"></script>
<script src="{{ asset('elite/tables/js/buttons.print.min.js') }}"></script>
<script>
$('.table').DataTable({
dom: 'Bfrtip',
ordering:false,
buttons: [
'copy', 'csv', 'excel', 'pdf', 'print'
]
});
</script>
@endpush
@@ -0,0 +1,13 @@
<div class="panel panel-default">
<div class="panel-body">
@if( Auth::user()->can('list-patient-registration-fields'))
<a href="{{ route('patient_registration_fields.index') }}" class="nav-item btn btn-info" style="border-radius: 5px;"><i class="fa fa-eye" aria-hidden="true"></i> <span style="margin-left: 5px">{{ __('patients.view_patient_registration_fields') }}</span></a>
@endif
@if( Auth::user()->can('create-patient-registration-field') )
<a href="{{ route('patient_registration_fields.create') }}" class="nav-item btn btn-success" title='Create new Budget' style="border-radius: 5px;"><i class="fa fa-plus" aria-hidden="true"></i> <span style="margin-left: 5px">{{ __('patients.create_patient_registration_fields') }}</span></a>
@endif
@if( Auth::user()->can('delete-patient-registration-field'))
<a href="{{ route('patient_registration_fields.inactive') }}" class="nav-item btn btn-danger" title='Deleted Budgets' style="border-radius: 5px;"><i class="fa fa-undo" aria-hidden="true"></i> <span style="margin-left: 5px">{{ __('patients.inactive_patient_registration_fields') }}</span></a>
@endif
</div>
</div>