Skip to content

GitLab

Commit 6a80f1d5 authored by alissonalbuquerque's avatar alissonalbuquerque
Browse files

corecao de conflito

parents f65027b8 7db22da7
Hide whitespace changes
Inline Side-by-side
app/Http/Controllers/Dimensao/EnsinoController.php
View file @ 6a80f1d5
......@@ -26,6 +26,7 @@ class EnsinoController extends Controller
$cursos = (new CursoQuery())->getQuery()->get();
$niveis = EnsinoAula::listNivel();
$modalidades = EnsinoAula::listModalidade();
$ensinoAula = EnsinoAula::all();
return view('pad.dimensao.ensino', [
'pad_id' => 1,
......@@ -33,6 +34,7 @@ class EnsinoController extends Controller
'niveis' => $niveis,
'modalidades' => $modalidades,
'index_menu' => self::MENU_PAD,
'ensinoAula' => $ensinoAula,
]);
}
}
app/Http/Controllers/Tabelas/Ensino/EnsinoAulaController.php
View file @ 6a80f1d5
......@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Tabelas\Ensino;
use App\Http\Controllers\Controller;
use App\Models\Tabelas\Ensino\EnsinoAula;
use Illuminate\Http\Request;
class EnsinoAulaController extends Controller
......@@ -13,7 +14,11 @@ class EnsinoAulaController extends Controller
* @return \Illuminate\Http\Response
*/
public function create(Request $request) {
$model = new EnsinoAula();
$model->fill($request->all());
$model->save();
return redirect()->route('dimensao_ensino');
}
public function store(){
......
resources/views/pad/dimensao/ensino.blade.php
View file @ 6a80f1d5
......@@ -52,40 +52,42 @@
</tr>
</thead>
<tbody>
<tr>
<th class="text-center">
</th>
<th class="text-center">
</th>
<th class="text-center">
</th>
<th class="text-center">
</th>
<th class="text-center">
</th>
<th class="text-center">
</th>
<th class="text-center">
</th>
<th class="text-center">
<button name="del0" class='btn btn-danger glyphicon glyphicon-remove row-remove'>
<span aria-hidden="true">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
fill="currentColor" class="bi bi-trash-fill" viewBox="0 0 16 16">
<path
d="M2.5 1a1 1 0 0 0-1 1v1a1 1 0 0 0 1 1H3v9a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V4h.5a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1H10a1 1 0 0 0-1-1H7a1 1 0 0 0-1 1H2.5zm3 4a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-1 0v-7a.5.5 0 0 1 .5-.5zM8 5a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-1 0v-7A.5.5 0 0 1 8 5zm3 .5v7a.5.5 0 0 1-1 0v-7a.5.5 0 0 1 1 0z" />
</svg>
</span>
</button>
</th>
</tr>
@foreach ($ensinoAula as $ensino)
<tr>
<th class="text-center">
{{ $ensino->cod_atividade }}
</th>
<th class="text-center">
{{ $ensino->componente_curricular }}
</th>
<th class="text-center">
{{ $ensino->nivel }}
</th>
<th class="text-center">
{{ $ensino->modalidade }}
</th>
<th class="text-center">
{{ $ensino->ch_semanal }}
</th>
<th class="text-center">
{{ $ensino->ch_total }}
</th>
<th class="text-center">
{{ $ensino->pad_id }}
</th>
<th class="text-center">
<button name="del0" class='btn btn-danger glyphicon glyphicon-remove row-remove'>
<span aria-hidden="true">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
fill="currentColor" class="bi bi-trash-fill" viewBox="0 0 16 16">
<path
d="M2.5 1a1 1 0 0 0-1 1v1a1 1 0 0 0 1 1H3v9a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V4h.5a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1H10a1 1 0 0 0-1-1H7a1 1 0 0 0-1 1H2.5zm3 4a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-1 0v-7a.5.5 0 0 1 .5-.5zM8 5a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-1 0v-7A.5.5 0 0 1 8 5zm3 .5v7a.5.5 0 0 1-1 0v-7a.5.5 0 0 1 1 0z" />
</svg>
</span>
</button>
</th>
</tr>
@endforeach
</tbody>
</table>
</div>
......@@ -95,38 +97,39 @@
@method('POST')
<div class="form-group" style="width: 200px;">
<label for="inputNameProfessor">CÓDIGO ATIVIDADE</label>
<input type="text" name="cod_atividade" class="form-control" disable id="cod_atividade" placeholder="Automomático " disabled>
<input type="text" name="cod_atividade" class="form-control" disable id="cod_atividade"
placeholder="Automomático " disabled>
</div><br>
<div class="form-row">
<div class="form-group col-md-6">
<label for="selectCurso">CURSO</label>
<select name="curso_id" class="custom-select mr-sm-2" id="curso_id"
aria-label="Default select example">
<option selected>Selecionar Curso</option>
@foreach ($cursos as $curso)
<option value="{{ $curso->id }}"> {{ $curso->name }}</option>
@endforeach
</select>
</div>
<div class="form-group col-md-6">
<label for="selectCurso">COMPONENTE CURRICULAR</label>
<select name="componente_curricular" class="custom-select mr-sm-2" id="componente_curricular" aria-label="Default select example">
<select name="componente_curricular" class="custom-select mr-sm-2" id="componente_curricular"
aria-label="Default select example">
</select>
</div>
<div class="form-group col-md-6">
<label for="selectCurso">NÍVEL</label>
<select class="custom-select mr-sm-2" name="nivel" id="nivel"
aria-label="Default select example">
<select class="custom-select mr-sm-2" name="nivel" id="nivel" aria-label="Default select example">
<option value="0" selected>Selecionar Nível</option>
@foreach ($niveis as $key => $nivel)
<option value="{{ $key }}"> {{ $nivel }}</option>
@endforeach
</select>
</div>
<div class="form-group col-md-6">
......@@ -138,7 +141,7 @@
@foreach ($modalidades as $key => $modalidade)
<option value="{{ $key }}"> {{ $modalidade }}</option>
@endforeach
</select>
</div>
<div class="form-group col-md-3">
......@@ -152,8 +155,8 @@
<input type="hidden" value="{{ $pad_id }}" name="pad_id" id="pad_id">
</div>
<button type="submit" class="btn btn-success"> Salvar</button>
<button type="submit" class="btn btn-success"> Salvar</button>
</form>
</div>
</div>
......@@ -163,4 +166,4 @@
@include('layouts.pad-ensino-jquery.ensino-aula')
@endsection
\ No newline at end of file
@endsection
routes/web.php
View file @ 6a80f1d5
......@@ -73,8 +73,6 @@ Route::get('/pad/dimensao/pesquisa', [PesquisaController::class, 'index'])->name
Route::get('/pad/dimensao/extensao', [ExtensaoController::class, 'index'])->name('dimensao_extensao');
Route::post('/pad/dimensao/ensino/aula/create', [EnsinoAulaController::class, 'create'])->name('ensino_aula_create');
//Route::post('/pad/dimensao/ensino/aula/store', [EnsinoAulaController::class, 'store'])->name('ensino_aula_store');
/** json */
Route::get('/disciplina/{curso_id}', [DisciplinaController::class, 'getDisciplinaByCurso'])->name('get_disciplina_by_curso');
\ 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