Skip to content

GitLab

Commit dafe5d5e authored by alissonalbuquerque's avatar alissonalbuquerque
Browse files

Merge branch 'updates_deploy' into deploy_not_map

parents 5e88423d cbdb1f6b
Show whitespace changes
Inline Side-by-side
resources/views/user-type/create.blade.php 0 → 100644
View file @ dafe5d5e
<div class="mb-3">
<h3 class="h3"> Cadastrar Papel </h3>
</div>
<form id="form-user_type" action="{{ route('user-type_store') }}" method="post">
@csrf
@method('POST')
@include('user-type._form', [
'user' => $user,
'model' => $model,
'types' => $types,
'status' => $status,
])
<div class="mt-1 text-end">
<div class="modal-footer">
@include('components.buttons.btn-save', [
'id' => 'btn_submit',
'content' => 'Cadastrar',
])
@include('components.buttons.btn-close_modal')
</div>
</div>
</form>
@include('pad.components.scripts.ajaxValidation', [
'btn_submit_id' => 'btn_submit',
'form_id' => 'form-user_type',
'form_type' => 'create_and_update',
'route' => route('user-type_ajax_validation'),
])
\ No newline at end of file
resources/views/user-type/update.blade.php 0 → 100644
View file @ dafe5d5e
<div class="mb-3">
<h3 class="h3"> Atualizar Papel </h3>
</div>
<form id="form-user_type" action="{{ route('user-type_update', ['id' => $model->id]) }}" method="post">
@csrf
@method('POST')
@include('user-type._form', [
'user' => $user,
'model' => $model,
'types' => $types,
'status' => $status,
])
<div class="mt-1 text-end">
<div class="modal-footer">
@include('components.buttons.btn-save', [
'id' => 'btn_submit',
'content' => 'Atualizar',
])
@include('components.buttons.btn-close_modal')
</div>
</div>
</form>
@include('pad.components.scripts.ajaxValidation', [
'btn_submit_id' => 'btn_submit',
'form_id' => 'form-user_type',
'form_type' => 'create_and_update',
'route' => route('user-type_ajax_validation'),
])
\ No newline at end of file
resources/views/users/_form.blade.php
View file @ dafe5d5e
......@@ -16,7 +16,9 @@
<div id="tab-containers" class="tab-content">
<div id="user-container" class="tab-pane fade show active" role="tabpanel" aria-labelledby="user-tab">
<div class="border border-rounded mt-2 p-2">
<div class="mt-2 px-2">
<form action="{{ $action }}" method="POST">
<div class="row">
@csrf
......@@ -82,31 +84,70 @@
</div>
@endif
</div>
</div>
</div>
@if( $model->exists )
<div id="paper-container" class="tab-pane fade" role="tabpanel" aria-labelledby="paper-tab">
<div class="border border-rounded mt-2 p-2">
<div class="row">
<div class="mt-1 text-end">
@php
$btnSaveContent = !$model->exists ? 'Cadastrar' : 'Atualizar';
@endphp
@include('components.buttons.btn-save', ['content' => $btnSaveContent])
@include('components.buttons.btn-cancel', ['content' => 'Cancelar', 'route' => route('user_index')])
</div>
</form>
</div>
</div>
@endif
<div class="mt-1 text-end">
<div class="modal-footer">
@if( !$model->exists )
@include('components.buttons.btn-save', ['content' => 'Cadastrar'])
@endif
@if( $model->exists )
@include('components.buttons.btn-save', ['content' => 'Atualizar'])
@endif
<div id="paper-container" class="tab-pane fade" role="tabpanel" aria-labelledby="paper-tab">
<div class="text-end my-2">
<button type="button" class="btn btn-success user-type-create"> Cadastrar Papel </button>
</div>
<div class="border rounded px-2">
<table id="user_pad-table" class="table table-hover">
<thead>
<tr>
<th scope="col"> Usuário </th>
<th scope="col"> Papel </th>
<th scope="col"> Status </th>
<th scope="col"> Opções </th>
</tr>
</thead>
<tbody>
@foreach($profiles as $profile)
<tr>
<td>{{ $profile->user }}</td>
<td>{{ $profile->typeAsString() }}</td>
<td>{{ $profile->statusAsString() }}</td>
<td>
<div class="btn-group" role="group">
<div class="me-1">
@include('components.buttons.btn-edit-task', [
'btn_class' => 'btn-edit_user_type',
'btn_id' => $profile->id,
])
</div>
<div class="me-1">
@include('components.buttons.btn-delete', [
'id' => $profile->id,
'btn_class' => 'btn btn-danger',
'route' => route('user-type_delete', ['id' => $profile->id])
])
</div>
</div>
</td>
</tr>
@endforeach
</tbody>
</table>
@include('components.buttons.btn-cancel', ['content' => 'Cancelar', 'route' => route('user_index')])
</div>
</div>
@endif
</div>
resources/views/users/create.blade.php
View file @ dafe5d5e
......@@ -25,9 +25,10 @@
<h3 class="h4"> Cadastrar - Usuário </h3>
</div>
<form action="{{route('user_store')}}" method="POST">
@include('users._form', ['model' => $model])
</form>
@include('users._form', [
'action' => route('user_store'),
'model' => $model,
])
</div>
......
resources/views/users/update.blade.php
View file @ dafe5d5e
......@@ -25,13 +25,32 @@
<h3 class="h4"> Atualizar - Usuário </h3>
</div>
<form action="{{route('user_update', ['id' => $model->id])}}" method="POST">
@include('users._form', [
'action' => route('user_update', ['id' => $model->id]),
'model' => $model,
'status' => $status,
'profiles' => $profiles,
])
</form>
@include('components.modal', [
'size' => 'modal-lg',
])
</div>
@endsection
@section('scripts')
@include('pad.components.scripts.dimensao.ensino.show_modal', [
'modal_id' => 'modal',
'route' => route('user-type_create', ['user_id' => $model->id]),
'btn_class' => 'user-type-create',
])
@include('pad.components.scripts.dimensao.ensino.show_modal', [
'modal_id' => 'modal',
'route' => route('user-type_edit'),
'btn_class' => 'btn-edit_user_type',
])
@endsection
\ No newline at end of file
routes/web.php
View file @ dafe5d5e
......@@ -12,6 +12,8 @@ use App\Http\Controllers\CoordenadorController;
use App\Http\Controllers\DiretorController;
use App\Http\Controllers\ProfessorController;
use App\Http\Controllers\AvaliadorController;
use App\Http\Controllers\UserPadController;
use App\Http\Controllers\UserTypeController;
use Illuminate\Support\Facades\Route;
/*
......@@ -150,6 +152,27 @@ Route::prefix('/pad/professor')->group(function () {
Route::get('/anexo/{id}', [PadController::class, 'anexo'])->name('pad_anexo');
});
/** UserType */
Route::prefix('/user-type')->group(function() {
Route::get('/create/{user_id?}', [UserTypeController::class, 'actionCreate'])->name('user-type_create');
Route::post('/store', [UserTypeController::class, 'actionStore'])->name('user-type_store');
Route::get('/edit/{id?}', [UserTypeController::class, 'actionEdit'])->name('user-type_edit');
Route::post('/update/{id}', [UserTypeController::class, 'actionUpdate'])->name('user-type_update');
Route::delete('/delete/{id}', [UserTypeController::class, 'actionDelete'])->name('user-type_delete');
Route::post('/validate', [UserTypeController::class, 'ajaxValidation'])->name('user-type_ajax_validation');
});
/** UserPad */
Route::prefix('/user-pad')->group(function() {
Route::get('/create/{pad_id?}', [UserPadController::class, 'actionCreate'])->name('user-pad_create');
Route::post('/store', [UserPadController::class, 'actionStore'])->name('user-pad_store');
Route::get('/edit/{id?}', [UserPadController::class, 'actionEdit'])->name('user-pad_edit');
Route::post('/update/{id}', [UserPadController::class, 'actionUpdate'])->name('user-pad_update');
Route::delete('/delete/{id}', [UserPadController::class, 'actionDelete'])->name('user-pad_delete');
Route::post('/validate', [UserPadController::class, 'ajaxValidation'])->name('user-pad_ajax_validation');
});
// return json
Route::get('/listar/unidade', [UnidadeController::class, 'getAll'])->name('listar_unidades');
Route::get('/list/campus/{unidade_id}', [CampusController::class, 'findByUnidade'])->name('list_campus_by_unidade');
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment