"app/git@sites.upe.br:walter.felipe/pad-upe.git" did not exist on "ba4ee3bd7064240d141b7ce79803288526c06279"
Commit bbc48f36 authored by alissonalbuquerque's avatar alissonalbuquerque
Browse files

Add correções parciais

parent c91c35f5
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</div> </div>
<div class="" id=""> <div class="" id="">
@include('pad.components.templates.table', ['table_id' => 'ensino_coordenacao_docente-table']) @include('pad.components.templates.table', ['table_id' => 'ensino_coordenacao_docente-table', 'colunas' => ['Cód', ]])
</div> </div>
</div> </div>
\ No newline at end of file
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</div> </div>
<div class="" id=""> <div class="" id="">
@include('pad.components.templates.table', ['table_id' => 'ensino_orientacao-table']) @include('pad.components.templates.table', ['table_id' => 'ensino_orientacao-table', 'colunas' => ['Cód', ]])
</div> </div>
</div> </div>
\ No newline at end of file
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</div> </div>
<div class="" id=""> <div class="" id="">
@include('pad.components.templates.table', ['table_id' => 'ensino_aulas-table']) @include('pad.components.templates.table', ['table_id' => 'ensino_aulas-table', 'colunas' => ['Cód', ]])
</div> </div>
</div> </div>
\ No newline at end of file
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</div> </div>
<div class="" id=""> <div class="" id="">
@include('pad.components.templates.table', ['table_id' => 'ensino_projeto-table']) @include('pad.components.templates.table', ['table_id' => 'ensino_projeto-table', 'colunas' => ['Cód', ]])
</div> </div>
</div> </div>
\ No newline at end of file
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</div> </div>
<div class="" id=""> <div class="" id="">
@include('pad.components.templates.table', ['table_id' => 'ensino_supervisao-table']) @include('pad.components.templates.table', ['table_id' => 'ensino_supervisao-table', 'colunas' => ['Cód', ]])
</div> </div>
</div> </div>
\ No newline at end of file
...@@ -2,9 +2,18 @@ ...@@ -2,9 +2,18 @@
<div class="mb-3 row"> <div class="mb-3 row">
<div class=""> <div class="">
<select class="form-select" name="get-divs" id="get-divs"> <select class="form-select" name="get-divs" id="get-divs">
<option selected value="0">Selecione uma categoria</option> <option value="0">Selecione uma categoria</option>
@foreach ($divs as $div) @foreach ($divs as $div)
@if(isset($form_selected))
@if($div['id'] === $form_selected)
<option selected value="{{ $div['id'] }}"> {{ $div['name'] }}</option>
@else
<option value="{{ $div['id'] }}"> {{ $div['name'] }}</option> <option value="{{ $div['id'] }}"> {{ $div['name'] }}</option>
@endif
@else
<option value="{{ $div['id'] }}"> {{ $div['name'] }}</option>
@endif
@endforeach @endforeach
</select> </select>
</div> </div>
......
<table class="table" id="{{$table_id}}"> <div class="border rounded px-4">
<thead>
<table class="table table-hover mt-4" id="{{$table_id}}">
<thead>
<tr>
<!-- <th scole="col">#</th> -->
@foreach($colunas as $coluna)
<th scole="col">{{ $coluna }}</th>
@endforeach
</tr>
</thead> </thead>
<tbody> <tbody>
</tbody> </tbody>
</table> </table>
\ No newline at end of file
</div>
\ No newline at end of file
...@@ -16,21 +16,23 @@ ...@@ -16,21 +16,23 @@
@include('pad.components.templates.dropdown-eixo', ['divs' => $divs]) @include('pad.components.templates.dropdown-eixo', ['divs' => $divs])
@include('pad.components.templates.dimensao.ensino.ensino_aulas') @include('components.alerts')
@include('pad.components.templates.dimensao.ensino.ensino_coordenacao_disciplina') @include('pad.components.templates.dimensao.ensino.ensino_aulas', ['user_pad_id' => $user_pad_id])
@include('pad.components.templates.dimensao.ensino.ensino_orientacao') @include('pad.components.templates.dimensao.ensino.ensino_coordenacao_disciplina', ['user_pad_id' => $user_pad_id])
@include('pad.components.templates.dimensao.ensino.ensino_supervisao') @include('pad.components.templates.dimensao.ensino.ensino_orientacao', ['user_pad_id' => $user_pad_id])
@include('pad.components.templates.dimensao.ensino.ensino_atendimento_discente') @include('pad.components.templates.dimensao.ensino.ensino_supervisao', ['user_pad_id' => $user_pad_id])
@include('pad.components.templates.dimensao.ensino.ensino_projeto') @include('pad.components.templates.dimensao.ensino.ensino_atendimento_discente', ['user_pad_id' => $user_pad_id])
@include('pad.components.templates.dimensao.ensino.ensino_participacao') @include('pad.components.templates.dimensao.ensino.ensino_projeto', ['user_pad_id' => $user_pad_id])
@include('pad.components.templates.dimensao.ensino.ensino_coordenacao_docente') @include('pad.components.templates.dimensao.ensino.ensino_participacao', ['user_pad_id' => $user_pad_id])
@include('pad.components.templates.dimensao.ensino.ensino_coordenacao_docente', ['user_pad_id' => $user_pad_id])
</div> </div>
@endsection @endsection
...@@ -38,6 +40,8 @@ ...@@ -38,6 +40,8 @@
@section('scripts') @section('scripts')
@include('pad.components.scripts.dropdown-eixo', ['divs' => $divs]) @include('pad.components.scripts.dropdown-eixo', ['divs' => $divs])
@include('pad.components.scripts.dimensao.ensino.ensino')
@include('pad.components.scripts.dimensao.ensino.ensino_aulas')
@include('pad.components.scripts.dimensao.ensino.ensino_orientacao') @include('pad.components.scripts.dimensao.ensino.ensino_orientacao')
@include('pad.components.scripts.dimensao.ensino.ensino_supervisao') @include('pad.components.scripts.dimensao.ensino.ensino_supervisao')
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
@endif @endif
<h5 class="text-center"> PAD: {{ $userPad->pad->nome }} </h4> <h5 class="text-center"> PAD: {{ $userPad->pad->nome }} </h4>
<h5 class="text-center"> Status: {{ $userPad->pad->getStatusAsText() }} </h4> <h5 class="text-center"> Status: {{ $userPad->pad->getStatusAsText() }} </h4>
<a class="stretched-link" href="{{ route('pad_view', ['id' => $userPad->pad_id]) }}" target="_blank"></a> <a class="stretched-link" href="{{ route('pad_view', ['id' => $userPad->id]) }}"></a>
</div> </div>
</div> </div>
@endforeach @endforeach
......
...@@ -16,16 +16,6 @@ ...@@ -16,16 +16,6 @@
]) ])
@endsection @endsection
@section('body') @section('body')
<!-- <div class="content"> -->
<!-- <div class="header" id="bordcab"> -->
<!-- <h1 class="titulo pt-4 pb-4 mb-3 border-bottom">PLANO DE ATIVIDADES DOCENTES (PAD)</h1> -->
<!-- <p class="pb-4 mb-3 text-center text-muted align-items-center"><a href="{{ route('pad_anexo') }}">ANEXO B</a> -->
<!-- </p> -->
<!-- <p class="pb-4 mb-3 text-center text-muted align-items-center"> -->
<!-- Insira os dados correspondentes nos campos exibidos abaixo -->
<!-- </p> -->
<!-- </div> -->
<!-- </div> -->
<div class="d-flex"> <div class="d-flex">
...@@ -33,7 +23,7 @@ ...@@ -33,7 +23,7 @@
<div class="card-body"> <div class="card-body">
<h2 class="text-center"> <i class="bi bi-mortarboard-fill"></i> </h2> <h2 class="text-center"> <i class="bi bi-mortarboard-fill"></i> </h2>
<h3 class="text-center">Ensino</h3> <h3 class="text-center">Ensino</h3>
<a class="stretched-link" href="{{ route('dimensao_ensino') }}" class="btn-pad-dimensao"></a> <a class="stretched-link" href="{{ route('dimensao_ensino', ['user_pad_id' => $user_pad_id]) }}" class="btn-pad-dimensao"></a>
</div> </div>
</div> </div>
...@@ -41,7 +31,7 @@ ...@@ -41,7 +31,7 @@
<div class="card-body"> <div class="card-body">
<h2 class="text-center"> <i class="bi bi-search"></i> </h2> <h2 class="text-center"> <i class="bi bi-search"></i> </h2>
<h3 class="text-center">Pesquisa</h3> <h3 class="text-center">Pesquisa</h3>
<a class="stretched-link" href="{{ route('dimensao_pesquisa') }}" class="btn-pad-dimensao"></a> <a class="stretched-link" href="{{ route('dimensao_pesquisa', ['user_pad_id' => $user_pad_id]) }}" class="btn-pad-dimensao"></a>
</div> </div>
</div> </div>
...@@ -49,7 +39,7 @@ ...@@ -49,7 +39,7 @@
<div class="card-body"> <div class="card-body">
<h2 class="text-center"> <i class="bi bi-clipboard-data-fill"></i> </h2> <h2 class="text-center"> <i class="bi bi-clipboard-data-fill"></i> </h2>
<h3 class="text-center">Extensão</h3> <h3 class="text-center">Extensão</h3>
<a class="stretched-link" href="{{ route('dimensao_extensao') }}" class="btn-pad-dimensao"></a> <a class="stretched-link" href="{{ route('dimensao_extensao', ['user_pad_id' => $user_pad_id]) }}" class="btn-pad-dimensao"></a>
</div> </div>
</div> </div>
...@@ -57,7 +47,7 @@ ...@@ -57,7 +47,7 @@
<div class="card-body"> <div class="card-body">
<h2 class="text-center"> <i class="bi bi-people-fill"></i> </h2> <h2 class="text-center"> <i class="bi bi-people-fill"></i> </h2>
<h3 class="text-center">Gestão</h3> <h3 class="text-center">Gestão</h3>
<a class="stretched-link" href="{{ route('dimensao_gestao') }}" class="btn-pad-dimensao"></a> <a class="stretched-link" href="{{ route('dimensao_gestao', ['user_pad_id' => $user_pad_id]) }}" class="btn-pad-dimensao"></a>
</div> </div>
</div> </div>
......
...@@ -88,10 +88,10 @@ Route::prefix('/pad/professor')->group(function () { ...@@ -88,10 +88,10 @@ Route::prefix('/pad/professor')->group(function () {
}); });
Route::prefix('/pad/dimensao/')->group(function () { Route::prefix('/pad/dimensao/')->group(function () {
Route::get('/gestao', [GestaoController::class, 'index'])->name('dimensao_gestao'); Route::get('/gestao/{user_pad_id}/{form_selected?}/{model_id?}', [GestaoController::class, 'index'])->name('dimensao_gestao');
Route::get('/ensino', [EnsinoController::class, 'index'])->name('dimensao_ensino'); Route::get('/ensino/{user_pad_id}/{form_selected?}/{model_id?}', [EnsinoController::class, 'index'])->name('dimensao_ensino');
Route::get('/pesquisa', [PesquisaController::class, 'index'])->name('dimensao_pesquisa'); Route::get('/pesquisa/{user_pad_id}/{form_selected?}/{model_id?}', [PesquisaController::class, 'index'])->name('dimensao_pesquisa');
Route::get('/extensao', [ExtensaoController::class, 'index'])->name('dimensao_extensao'); Route::get('/extensao/{user_pad_id}/{form_selected?}/{model_id?}', [ExtensaoController::class, 'index'])->name('dimensao_extensao');
}); });
Route::prefix('/coordenador')->group(function () { Route::prefix('/coordenador')->group(function () {
...@@ -112,16 +112,6 @@ Route::prefix('/diretor')->group(function () { ...@@ -112,16 +112,6 @@ Route::prefix('/diretor')->group(function () {
Route::delete('/delete/{id}', [DiretorController::class, 'destroy'])->name('diretor_delete'); Route::delete('/delete/{id}', [DiretorController::class, 'destroy'])->name('diretor_delete');
}); });
// 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');
Route::prefix('/pad/dimensao/ensino')->group(function () {
Route::post('/aulas/create', [EnsinoAulaController::class, 'create'])->name('ensino_aula_create');
// Route::get('/ensino/aulas/update', [EnsinoAulaController::class, 'update'])->name('ensino_aula_update');
// Route::get('/ensino/aulas/delete', [EnsinoAulaController::class, 'update'])->name('ensino_aula_delete');
Route::get('/aulas/{pad_id}', [EnsinoAulaController::class, 'getAll'])->name('ensino_aula_all');
});
Route::prefix('/user')->group(function () { Route::prefix('/user')->group(function () {
Route::get('/edit/perfil', [UserController::class, 'editPerfil'])->name('edit_perfil'); Route::get('/edit/perfil', [UserController::class, 'editPerfil'])->name('edit_perfil');
...@@ -131,3 +121,18 @@ Route::prefix('/user')->group(function () { ...@@ -131,3 +121,18 @@ Route::prefix('/user')->group(function () {
/** json */ /** json */
Route::get('/disciplina/{curso_id}', [DisciplinaController::class, 'getDisciplinaByCurso'])->name('get_disciplina_by_curso'); Route::get('/disciplina/{curso_id}', [DisciplinaController::class, 'getDisciplinaByCurso'])->name('get_disciplina_by_curso');
/* EnsinoAulaController */
Route::prefix('/pad/dimensao/ensino')->group(function () {
Route::post('/aulas/create', [EnsinoAulaController::class, 'create'])->name('ensino_aula_create');
Route::post('/ensino/aulas/update/{id?}', [EnsinoAulaController::class, 'update'])->name('ensino_aula_update');
Route::delete('/ensino/aulas/delete/{id?}', [EnsinoAulaController::class, 'delete'])->name('ensino_aula_delete');
});
// EndPoints Ajax
Route::get('/pad/dimensao/ensino_aulas/search/{user_pad_id?}', [EnsinoAulaController::class, 'search'])->name('ensino_aula_search');
// 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