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,95 @@
@extends('layouts.main')
@push('styles')
<link href="{{ asset('elite/bower_components/bootstrap-datepicker/bootstrap-datepicker.min.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('elite/bower_components/select2/select2.min.css') }}" rel="stylesheet" />
@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">{{ __('investigation_result_templates.add_test_code') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('investigations.dashboard') }}</a></li>
<li><a href="investigation_test_codes">{{ __('investigation_result_templates.test_codes') }}</a></li>
<li class="active">{{ __('investigation_result_templates.create') }}</li>
</ol>
</div>
</div>
<div class="white-box">
@include('flash::message')
{{ Form::open(['route' => 'investigation_test_codes.store', 'data-toggle' => 'validator']) }}
<div class="row">
<div class="col-md-6">
<div class="form-group">
{{ Form::label('investigation_id',__('investigation_result_templates.investigation')) }}
{{ Form::select('investigation_id',$investigations, '',['class' => 'form-control select compulsory', 'required', 'id'=>'investigation_id']) }}
</div>
<div class="form-group">
{{ Form::label('machine_name',__('investigation_result_templates.machine_name')) }}
{{ Form::select('machine_name',$instruments, '',['class' => 'form-control select compulsory', 'required', 'id'=>'machine_name']) }}
</div>
</div>
<div class="col-md-6">
<div class="form-group" id="specialised_variables_div" style="display: none">
{{ Form::label('investigation_specialised_variable',__('investigation_result_templates.investigation_specialised_variable')) }}
<div id="specialised_variables"></div>
</div>
{{ Form::hidden('is_specialised_variable', 0, ['id' => 'is_specialised_variable']) }}
<div class="form-group">
{{ Form::label('test_code',__('investigation_result_templates.test_code')) }}
{{ Form::text('test_code','',['class' => 'form-control compulsory', 'required']) }}
</div>
</div>
</div>
{{ Form::button(__('investigation_result_templates.submit'),['type'=>'submit','class'=>'btn btn-success waves-effect waves-light m-r-10 submit-btn']) }}
{{ Form::button(__('investigation_result_templates.cancel'),['type'=>'reset','class'=>'btn btn-default waves-effect waves-light']) }}
{{ Form::close() }}
</div>
@endsection
@push('scripts')
<script src="{{ asset('elite/js/validator.js') }}"></script>
<script src="{{ asset('elite/bower_components/select2/select2.min.js') }}"></script>
<script type="text/javascript">
$(document).ready(function () {
$("#investigation_id, #machine_name").select2({
placeholder: "-- select --"
});
$("#investigation_id").change(function () {
$.ajax({
method: 'GET',
url: '/investigation_test_codes/check_investigation_speciality_type/' + this.value,
success: function(response){
if (response !== "0") {
$('#specialised_variables_div').show();
$('#specialised_variables').html(response);
$('#is_specialised_variable').val(1);
$("#investigation_specialised_variable").select2({
placeholder: "-- select --"
});
} else {
$('#specialised_variables_div').hide();
$('#specialised_variables').html("");
$('#is_specialised_variable').val(0);
}
},
error: function () {
//
}
});
});
});
</script>
@endpush
@@ -0,0 +1,112 @@
@extends('layouts.main')
@push('styles')
<link href="{{ asset('elite/bower_components/bootstrap-datepicker/bootstrap-datepicker.min.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('elite/bower_components/select2/select2.min.css') }}" rel="stylesheet" />
@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">{{ __('investigation_result_templates.edit_test_code') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('investigations.dashboard') }}</a></li>
<li><a href="/investigation_test_codes/">{{ __('investigation_result_templates.test_codes') }}</a></li>
<li class="active">{{ __('investigation_result_templates.edit') }}</li>
</ol>
</div>
</div>
<div class="row">
<div class="col-sm-12">
@include('investigations::investigation_test_codes.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($test_code, ['method' => 'PUT', 'route' => ['investigation_test_codes.update',$test_code], 'data-toggle' => 'validator']) }}
<div class="row">
<div class="col-md-6">
<div class="form-group">
{{ Form::label('investigation_id',__('investigation_result_templates.investigation')) }}
@if($test_code->is_specialised_variable == 0)
{{ Form::select('investigation_id',$investigations, $test_code->investigation_id,['class' => 'form-control select compulsory', 'required', 'id'=>'investigation_id']) }}
@else
{{ Form::select('investigation_id',$investigations, get_name($test_code->investigation_id, 'id', 'investigation_id', 'investigation_specialised_variables'),['class' => 'form-control select compulsory', 'required', 'id'=>'investigation_id']) }}
@endif
</div>
<div class="form-group">
{{ Form::label('machine_name',__('investigation_result_templates.machine_name')) }}
{{ Form::select('machine_name',$instruments, $test_code->machine_name,['class' => 'form-control select compulsory', 'required', 'id'=>'machine_name']) }}
</div>
</div>
<div class="col-md-6">
<div class="form-group" id="specialised_variables_div" @if($test_code->is_specialised_variable == 0) style="display: none" @endif>
{{ Form::label('investigation_specialised_variable',__('investigation_result_templates.investigation_specialised_variable')) }}
<div id="specialised_variables">
{{ Form::select('investigation_specialised_variable',$specialised_variables, $test_code->investigation_id,['class' => 'form-control select compulsory', 'id'=>'investigation_specialised_variable']) }}
</div>
</div>
{{ Form::hidden('is_specialised_variable', $test_code->is_specialised_variable, ['id' => 'is_specialised_variable']) }}
<div class="form-group">
{{ Form::label('test_code',__('investigation_result_templates.test_code')) }}
{{ Form::text('test_code',$test_code->test_code,['class' => 'form-control compulsory', 'required']) }}
</div>
</div>
</div>
{{ Form::button(__('investigation_result_templates.submit'),['type'=>'submit','class'=>'btn btn-success waves-effect waves-light m-r-10']) }}
{{ Form::button(__('investigation_result_templates.cancel'),['type'=>'reset','class'=>'btn btn-default waves-effect waves-light']) }}
{{ Form::close() }}
</div>
</div>
</div>
@endsection
@push('scripts')
<script src="{{ asset('elite/js/validator.js') }}"></script>
<script src="{{ asset('elite/bower_components/select2/select2.min.js') }}"></script>
<script type="text/javascript">
$(document).ready(function () {
$("#investigation_id, #machine_name").select2({
placeholder: "-- select --"
});
$("#investigation_id").change(function () {
$.ajax({
method: 'GET',
url: '/investigation_test_codes/check_investigation_speciality_type/' + this.value,
success: function(response){
if (response !== "0") {
$('#specialised_variables_div').show();
$('#specialised_variables').html(response);
$('#is_specialised_variable').val(1);
$("#investigation_specialised_variable").select2({
placeholder: "-- select --"
});
} else {
$('#specialised_variables_div').hide();
$('#specialised_variables').html("");
$('#is_specialised_variable').val(0);
}
},
error: function () {
//
}
});
});
});
</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">{{ __('investigation_result_templates.activate_test_code') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('investigations.dashboard') }}</a></li>
<li><a href="/investigation_test_codes/">{{ __('investigation_result_templates.test_codes') }}</a></li>
<li class="active">{{ __('investigation_result_templates.activate') }}</li>
</ol>
</div>
</div>
<div class="row">
<div class="col-sm-12">
@include('investigations::investigation_test_codes.menu')
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="white-box">
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>{{ __('investigation_result_templates.investigation') }}</th>
<th>{{ __('investigation_result_templates.machine_name') }}</th>
<th>{{ __('investigation_result_templates.test_code') }}</th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
@foreach($test_codes as $test_code)
<tr>
<td>
@if($test_code->is_specialised_variable == 1)
{{ $specialised_variables[$test_code->investigation_id] }} ({{ $investigations[get_name($test_code->investigation_id, 'id', 'investigation_id', 'investigation_specialised_variables')] }})
@else
{{ $investigations[$test_code->investigation_id] }}
@endif
</td>
<td>{{ $instruments[$test_code->machine_name] }}</td>
<td>{{ $test_code->test_code }}</td>
<td>
{{ Form::model($test_code->id ,['method' => 'POST', 'route' => ['investigation_test_codes.activate', $test_code->id]]) }}
<button type="submit" class="btn btn-warning" onclick="return confirm('Are you sure?')"><i class="fa fa-check"></i> {{ __('investigation_result_templates.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
@@ -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">{{ __('investigation_result_templates.investigation_test_codes') }}</h4>
</div>
<div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">{{ __('investigations.dashboard') }}</a></li>
<li class="active">{{ __('investigation_result_templates.test_codes') }}</li>
</ol>
</div>
</div>
<div class="row">
<div class="col-sm-12">
@include('investigations::investigation_test_codes.menu')
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="white-box">
@include('flash::message')
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>{{ __('investigation_result_templates.investigation') }}</th>
<th>{{ __('investigation_result_templates.machine_name') }}</th>
<th>{{ __('investigation_result_templates.test_code') }}</th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
@foreach($test_codes as $test_code)
<tr>
<td>
@if($test_code->is_specialised_variable == 1)
{{ $specialised_variables[$test_code->investigation_id] }} ({{ $investigations[get_name($test_code->investigation_id, 'id', 'investigation_id', 'investigation_specialised_variables')] }})
@else
{{ $investigations[$test_code->investigation_id] }}
@endif
</td>
<td>{{ $instruments[$test_code->machine_name] }}</td>
<td>{{ $test_code->test_code }}</td>
<td>
<a href="/investigation_test_codes/{{ $test_code->id }}/edit/" class="btn btn-info"><i class="fa fa-pencil"></i> {{ __('investigation_result_templates.edit') }}</a>
</td>
<td>
{{ Form::model($test_code->id ,['method' => 'DELETE', 'route' => ['investigation_test_codes.destroy', $test_code->id]]) }}
<button type="submit" class="btn btn-danger" onclick="return confirm('Are you sure?')"><i class="fa fa-trash"></i> {{ __('investigation_result_templates.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', 'pdf', 'print', 'excel'
]
});
</script>
@endpush
@@ -0,0 +1,7 @@
<div class="panel panel-default">
<div class="panel-body">
<a href="{{ route('investigation_test_codes.create') }}" class="nav-item btn btn-default ti-plus"> {{ __('investigation_result_templates.add_test_code') }}</a>
<a href="{{ route('investigation_test_codes.index') }}" class="nav-item btn btn-default ti-pencil"> {{ __('investigation_result_templates.view_test_codes') }}</a>
<a href="{{ route('investigation_test_codes.inactive') }}" class="nav-item btn btn-default ti-pencil"> {{ __('investigation_result_templates.activate_test_codes') }}</a>
</div>
</div>