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

corecao de conflito

parents f65027b8 7db22da7
...@@ -26,6 +26,7 @@ class EnsinoController extends Controller ...@@ -26,6 +26,7 @@ class EnsinoController extends Controller
$cursos = (new CursoQuery())->getQuery()->get(); $cursos = (new CursoQuery())->getQuery()->get();
$niveis = EnsinoAula::listNivel(); $niveis = EnsinoAula::listNivel();
$modalidades = EnsinoAula::listModalidade(); $modalidades = EnsinoAula::listModalidade();
$ensinoAula = EnsinoAula::all();
return view('pad.dimensao.ensino', [ return view('pad.dimensao.ensino', [
'pad_id' => 1, 'pad_id' => 1,
...@@ -33,6 +34,7 @@ class EnsinoController extends Controller ...@@ -33,6 +34,7 @@ class EnsinoController extends Controller
'niveis' => $niveis, 'niveis' => $niveis,
'modalidades' => $modalidades, 'modalidades' => $modalidades,
'index_menu' => self::MENU_PAD, 'index_menu' => self::MENU_PAD,
'ensinoAula' => $ensinoAula,
]); ]);
} }
} }
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Tabelas\Ensino; namespace App\Http\Controllers\Tabelas\Ensino;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\Tabelas\Ensino\EnsinoAula;
use Illuminate\Http\Request; use Illuminate\Http\Request;
class EnsinoAulaController extends Controller class EnsinoAulaController extends Controller
...@@ -13,7 +14,11 @@ class EnsinoAulaController extends Controller ...@@ -13,7 +14,11 @@ class EnsinoAulaController extends Controller
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function create(Request $request) { public function create(Request $request) {
$model = new EnsinoAula();
$model->fill($request->all());
$model->save();
return redirect()->route('dimensao_ensino');
} }
public function store(){ public function store(){
......
...@@ -52,27 +52,28 @@ ...@@ -52,27 +52,28 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach ($ensinoAula as $ensino)
<tr> <tr>
<th class="text-center"> <th class="text-center">
{{ $ensino->cod_atividade }}
</th> </th>
<th class="text-center"> <th class="text-center">
{{ $ensino->componente_curricular }}
</th> </th>
<th class="text-center"> <th class="text-center">
{{ $ensino->nivel }}
</th> </th>
<th class="text-center"> <th class="text-center">
{{ $ensino->modalidade }}
</th> </th>
<th class="text-center"> <th class="text-center">
{{ $ensino->ch_semanal }}
</th> </th>
<th class="text-center"> <th class="text-center">
{{ $ensino->ch_total }}
</th> </th>
<th class="text-center"> <th class="text-center">
{{ $ensino->pad_id }}
</th> </th>
<th class="text-center"> <th class="text-center">
<button name="del0" class='btn btn-danger glyphicon glyphicon-remove row-remove'> <button name="del0" class='btn btn-danger glyphicon glyphicon-remove row-remove'>
...@@ -86,6 +87,7 @@ ...@@ -86,6 +87,7 @@
</button> </button>
</th> </th>
</tr> </tr>
@endforeach
</tbody> </tbody>
</table> </table>
</div> </div>
...@@ -95,7 +97,8 @@ ...@@ -95,7 +97,8 @@
@method('POST') @method('POST')
<div class="form-group" style="width: 200px;"> <div class="form-group" style="width: 200px;">
<label for="inputNameProfessor">CÓDIGO ATIVIDADE</label> <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><br>
<div class="form-row"> <div class="form-row">
...@@ -113,14 +116,14 @@ ...@@ -113,14 +116,14 @@
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="selectCurso">COMPONENTE CURRICULAR</label> <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> </select>
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="selectCurso">NÍVEL</label> <label for="selectCurso">NÍVEL</label>
<select class="custom-select mr-sm-2" name="nivel" id="nivel" <select class="custom-select mr-sm-2" name="nivel" id="nivel" aria-label="Default select example">
aria-label="Default select example">
<option value="0" selected>Selecionar Nível</option> <option value="0" selected>Selecionar Nível</option>
@foreach ($niveis as $key => $nivel) @foreach ($niveis as $key => $nivel)
......
...@@ -73,8 +73,6 @@ Route::get('/pad/dimensao/pesquisa', [PesquisaController::class, 'index'])->name ...@@ -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::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/create', [EnsinoAulaController::class, 'create'])->name('ensino_aula_create');
//Route::post('/pad/dimensao/ensino/aula/store', [EnsinoAulaController::class, 'store'])->name('ensino_aula_store');
/** 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');
\ 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