mirror of
https://gitlab.com/signalytic/client-external/streamline/streamline-emr.git
synced 2026-09-12 11:11:31 +00:00
resolved conflicts
This commit is contained in:
+134
@@ -0,0 +1,134 @@
|
||||
@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">{{ __('observations.add_observation') }}</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="/observations/index">{{ __('observations.observations') }}</a></li>
|
||||
<li class="active">{{ __('observations.create') }}</li>
|
||||
</ol>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
@include('clinical_data::observations.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' => 'observations.store', 'data-toggle' => 'validator']) }}
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<div class="form-group">
|
||||
{{ Form::label('name', __('observations.observation_name')) }}
|
||||
{{ Form::text('name', '', ['class' => 'form-control compulsory', 'required']) }}
|
||||
<div class="help-block with-errors"></div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
{{ Form::label('measurement', __('observations.measurement_unit')) }}
|
||||
{{ Form::text('measurement', '', ['class' => 'form-control']) }}
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
{{ Form::label('options_or_range',__('observations.options_or_range')) }}
|
||||
<br>
|
||||
{{ Form::radio('options_or_range', 1, false, ["required",'id'=>'set_range','onclick'=>'setRangeOrOptions()']) }} {{ __('observations.set_ranges') }}
|
||||
{{ 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-ranges" style="display: none;">
|
||||
<div class="form-group">
|
||||
{{ Form::label('lower_limit', __('observations.lower_limit')) }}
|
||||
{{ Form::number('lower_limit', '', ['class'=>'form-control']) }}
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
{{ Form::label('upper_limit', __('observations.upper_limit')) }}
|
||||
{{ Form::number('upper_limit', '', ['class'=>'form-control']) }}
|
||||
</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']) }}
|
||||
<br>
|
||||
</div>
|
||||
<a href="#" id="addOption">{{ __('observations.add_another_option') }}</a><br><br>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="form-group">
|
||||
{{ Form::label('option_for_normal', __('observations.set_normal_option')) }}
|
||||
{{ Form::text('option_for_normal', '', ['class'=>'form-control']) }}
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
{{ Form::label('age_group',__('observations.age_group')) }}
|
||||
<br>
|
||||
@foreach($age_groups as $group => $value)
|
||||
{{ Form::checkbox('age_group[]', $group, false) }} {{ $value }}
|
||||
@endforeach
|
||||
<div class="help-block with-errors"></div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
{{ Form::label('compulsory',__('observations.is_observation_compulsory')) }}
|
||||
{{ Form::radio('compulsory', 1, false, ['required']) }} {{ __('observations.yes') }}
|
||||
{{ Form::radio('compulsory', 0, false, ['required']) }} {{ __('observations.no') }}
|
||||
<div class="help-block with-errors"></div>
|
||||
</div>
|
||||
</div>
|
||||
<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_range").checked) {
|
||||
document.querySelector(".set-ranges").style.display = "block";
|
||||
document.querySelector(".set-options").style.display = "none";
|
||||
}
|
||||
if (document.getElementById("set_option").checked) {
|
||||
document.querySelector(".set-options").style.display = "block";
|
||||
document.querySelector(".set-ranges").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' /></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
|
||||
+166
@@ -0,0 +1,166 @@
|
||||
@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">{{ __('observations.edit_observation') }}</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="/observations/index">{{ __('observations.observations') }}</a></li>
|
||||
<li class="active">{{ __('observations.edit') }}</li>
|
||||
</ol>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
@include('clinical_data::observations.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($observation, ['method' => 'PUT', 'route' => ['observations.update',$observation], 'data-toggle' => 'validator']) }}
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<div class="form-group">
|
||||
{{ Form::label('name', __('observations.observation_name')) }}
|
||||
{{ Form::text('name', $observation->name, ['class' => 'form-control compulsory', 'required']) }}
|
||||
<div class="help-block with-errors"></div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
{{ Form::label('measurement', __('observations.measurement_unit')) }}
|
||||
{{ Form::text('measurement', $observation->measurement, ['class' => 'form-control']) }}
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
{{ Form::label('options_or_range',__('observations.options_or_range')) }}
|
||||
<br>
|
||||
{{ Form::radio('options_or_range', 1, false, ["required",'id'=>'set_range','onclick'=>'setRangeOrOptions()']) }} {{ __('observations.set_ranges') }}
|
||||
{{ 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-ranges" style="display: none;">
|
||||
<div class="form-group">
|
||||
{{ Form::label('lower_limit', __('observations.lower_limit')) }}
|
||||
{{ Form::number('lower_limit', $observation->lower_limit , ['class'=>'form-control']) }}
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
{{ Form::label('upper_limit', __('observations.upper_limit')) }}
|
||||
{{ Form::number('upper_limit', $observation->upper_limit , ['class'=>'form-control']) }}
|
||||
</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(",", $observation->options); @endphp
|
||||
|
||||
@foreach($options as $option)
|
||||
<div>
|
||||
<div class="row">
|
||||
<div class="col-md-10">
|
||||
{{ Form::text('options[]', $option, ['class'=>'form-control']) }}
|
||||
</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 class="col-sm-6">
|
||||
<div class="form-group">
|
||||
{{ Form::label('option_for_normal', __('observations.set_normal_option')) }}
|
||||
{{ Form::text('option_for_normal', $observation->option_for_normal , ['class'=>'form-control']) }}
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
{{ Form::label('age_group',__('observations.age_group')) }}
|
||||
<br>
|
||||
@php
|
||||
$saved_age_groups_array = is_null($observation->age_group) ? [] : explode(",",$observation->age_group);
|
||||
@endphp
|
||||
@foreach($age_groups as $group => $value)
|
||||
{{ Form::checkbox('age_group[]', $group, in_array($group,$saved_age_groups_array)) }} {{ $value }}
|
||||
@endforeach
|
||||
<div class="help-block with-errors"></div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
{{ Form::label('compulsory',__('observations.is_observation_compulsory')) }}
|
||||
{{ Form::checkbox('compulsory', 1, $observation->compulsory == 1) }} {{ __('observations.yes') }}
|
||||
{{ Form::checkbox('compulsory', 0, $observation->compulsory == 0) }} {{ __('observations.no') }}
|
||||
<div class="help-block with-errors"></div>
|
||||
</div>
|
||||
</div>
|
||||
<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(){
|
||||
var observation = {!! json_encode($observation) !!};
|
||||
|
||||
if (observation.lower_limit!=null || observation.lower_limit!="") {
|
||||
document.getElementById("set_range").checked = true;
|
||||
setRangeOrOptions();
|
||||
}
|
||||
|
||||
if (observation.options != null || observation.lower_limit != "") {
|
||||
document.getElementById("set_option").checked = true;
|
||||
setRangeOrOptions();
|
||||
}
|
||||
}
|
||||
|
||||
function setRangeOrOptions() {
|
||||
if (document.getElementById("set_range").checked) {
|
||||
document.querySelector(".set-ranges").style.display = "block";
|
||||
document.querySelector(".set-options").style.display = "none";
|
||||
}
|
||||
if (document.getElementById("set_option").checked) {
|
||||
document.querySelector(".set-options").style.display = "block";
|
||||
document.querySelector(".set-ranges").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' /></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
|
||||
+90
@@ -0,0 +1,90 @@
|
||||
@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">{{ __('observations.observations') }}</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="/observations/index">{{ __('observations.observations') }}</a></li>
|
||||
<li class="active">{{ __('observations.activate') }}</li>
|
||||
</ol>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
@include('clinical_data::observations.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>{{ __('observations.measurement') }}</th>
|
||||
<th>{{ __('observations.lower_limit') }}</th>
|
||||
<th>{{ __('observations.upper_limit') }}</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($observations as $observation):
|
||||
<tr>
|
||||
<td>{{ $observation->name }}</td>
|
||||
<td>{{ $observation->measurement }}</td>
|
||||
<td>{{ $observation->lower_limit }}</td>
|
||||
<td>{{ $observation->upper_limit }}</td>
|
||||
<td>
|
||||
{{ Form::model($observation->id ,['method' => 'POST', 'route' => ['observations.activate', $observation->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',
|
||||
buttons: [
|
||||
'copy', 'csv', 'excel', 'pdf', 'print'
|
||||
]
|
||||
});
|
||||
|
||||
</script>
|
||||
@endpush
|
||||
+93
@@ -0,0 +1,93 @@
|
||||
@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">{{ __('observations.observations') }}</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="/observations/index">{{ __('observations.observations') }}</a></li>
|
||||
<li class="active">{{ __('observations.') }}</li>
|
||||
</ol>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
@include('clinical_data::observations.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>{{ __('observations.measurement') }}</th>
|
||||
<th>{{ __('observations.options') }}</th>
|
||||
<th>{{ __('observations.lower_limit') }}</th>
|
||||
<th>{{ __('observations.upper_limit') }}</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($observations as $observation)
|
||||
<tr>
|
||||
<td>{{ $observation->name }}</td>
|
||||
<td>{{ $observation->measurement }}</td>
|
||||
<td>{{ $observation->options }}</td>
|
||||
<td>{{ $observation->lower_limit }}</td>
|
||||
<td>{{ $observation->upper_limit }}</td>
|
||||
<td>
|
||||
<a href="/observations/{{ $observation->id }}/edit/" class="btn btn-info"><i class="fa fa-pencil"></i> {{ __('observations.edit') }}</a>
|
||||
</td>
|
||||
<td>
|
||||
{{ Form::model($observation->id ,['method' => 'DELETE', 'route' => ['observations.destroy', $observation->id]]) }}
|
||||
<button type="submit" class="btn btn-danger" onclick="return confirm('Are you sure?')"><i class="fa fa-trash"></i> {{ __('observations.delete') }}</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',
|
||||
buttons: [
|
||||
'copy', 'csv', 'excel', 'pdf', 'print'
|
||||
]
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-body">
|
||||
<a href="{{ route('observations.create') }}" class="nav-item btn btn-default ti-plus"> {{ __('observations.add_observation') }}</a>
|
||||
<a href="{{ route('observations.index') }}" class="nav-item btn btn-default ti-pencil"> {{ __('observations.view_observations') }}</a>
|
||||
<a href="{{ route('observations.inactive') }}" class="nav-item btn btn-default ti-pencil"> {{ __('observations.activate_observation') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
Reference in New Issue
Block a user