Commit fca6f5bf authored by alissonalbuquerque's avatar alissonalbuquerque
Browse files

add atualizacoes de rotas, e controllers

parent e1adcee1
...@@ -3,17 +3,30 @@ ...@@ -3,17 +3,30 @@
namespace App\Http\Controllers\Dimensao; namespace App\Http\Controllers\Dimensao;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\Curso;
use App\Queries\CursoQuery;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class EnsinoController extends Controller class EnsinoController extends Controller
{ {
const MENU_HOME = 1;
const MENU_PAD = 2;
/** /**
* Display a listing of the resource. * Display a listing of the resource.
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function index() { public function index() {
return view('pad.dimensao.ensino'); $user = Auth::user();
$cursos = (new CursoQuery())->getQuery()->get();
return view('pad.dimensao.ensino', [
'index_menu' => self::MENU_PAD,
'cursos' => $cursos,
]);
} }
} }
...@@ -20,7 +20,7 @@ class PADController extends Controller ...@@ -20,7 +20,7 @@ class PADController extends Controller
*/ */
public function index() public function index()
{ {
$PADs = PAD::where('professor_id', '=', Auth::user()->id); $PADs = PAD::where('user_id', '=', Auth::user()->id);
return view('pad.index', ["PADs" => $PADs, 'index_menu' => 1 ]); return view('pad.index', ["PADs" => $PADs, 'index_menu' => 1 ]);
} }
......
<?php
namespace App\Queries;
use App\Models\Curso;
class CursoQuery extends Query {
public function __construct($init = [])
{
$this->query = Curso::where([]);
}
public function whereCampusId(int $campus_id, string $expression = '=') {
$this->query = $this->query->where('campus_id', $expression, $campus_id);
return $this->query;
}
}
...@@ -8,6 +8,6 @@ class Query { ...@@ -8,6 +8,6 @@ class Query {
public function getQuery(){ public function getQuery(){
return $this->query; return $this->query;
} }
} }
...@@ -13,25 +13,21 @@ class CreatePADSTable extends Migration ...@@ -13,25 +13,21 @@ class CreatePADSTable extends Migration
*/ */
public function up() public function up()
{ {
Schema::create('PADs', function (Blueprint $table) { Schema::create('pads', function (Blueprint $table) {
$table->id(); $table->id();
// $table->integer('ano')->default(false);
// $table->integer('semestre')->default(false);
// $table->integer('carga_horaria')->default(false);
// $table->string('categoria', 20)->default(false);
// $table->boolean('afastamento_total')->default(false);
// $table->boolean('afastamento_parcial')->default(false);
// $table->boolean('exerce_funcao_admin')->default(false);
// $table->boolean('exerce_funcao_sindical')->default(false);
// $table->string('licenca_de_acor_legais', 50)->default(null);
// $table->string('outras_observacoes', 200)->nullable(true);
$table->foreignId('user_id');
$table->timestamps(); $table->timestamps();
$table->integer('ano');
$table->integer('semestre');
$table->integer('carga_horaria');
$table->string('categoria', 20);
$table->boolean('afastamento_total')->default(false);
$table->boolean('afastamento_parcial')->default(false);
$table->boolean('exerce_funcao_admin')->default(false);
$table->boolean('exerce_funcao_sindical')->default(false);
$table->string('licenca_de_acor_legais', 50)->default(null);
$table->string('outras_observacoes', 200)->nullable(true);
$table->unsignedBigInteger('professor_id');
$table->foreign('professor_id')->references('id')->on('users');
$table->unsignedBigInteger('curso_id');
$table->foreign('curso_id')->references('id')->on('cursos');
}); });
} }
...@@ -42,6 +38,6 @@ class CreatePADSTable extends Migration ...@@ -42,6 +38,6 @@ class CreatePADSTable extends Migration
*/ */
public function down() public function down()
{ {
Schema::dropIfExists('PADs'); Schema::dropIfExists('pads');
} }
} }
...@@ -22,6 +22,7 @@ class DatabaseSeeder extends Seeder ...@@ -22,6 +22,7 @@ class DatabaseSeeder extends Seeder
CursoSeeder::class, CursoSeeder::class,
UserSeeder::class, UserSeeder::class,
PlanejamentoSeeder::class, PlanejamentoSeeder::class,
PADSeeder::class
]); ]);
} }
} }
<?php
namespace Database\Seeders;
use App\Models\PAD;
use App\Models\User;
use Illuminate\Database\Seeder;
class PADSeeder extends Seeder
{
/**
* Run the database seeds.
*
* @return void
*/
public function run()
{
$users = User::where('type', '=', User::TYPE_TEACHER)->get();
foreach($users as $user) {
PAD::create([
'user_id' => $user->id,
]);
}
}
}
...@@ -56,19 +56,18 @@ ...@@ -56,19 +56,18 @@
<tr id='addr0' data-id="0" class="hidden"> <tr id='addr0' data-id="0" class="hidden">
<td data-name="codigoAtividade"> <td data-name="codigoAtividade">
<input type="text" name='codigoAtividade0' placeholder='CÓDIGO ATIVIDADE' <input type="text" name='codigoAtividade0' placeholder='CÓDIGO ATIVIDADE'
class="form-control" /> class="form-control"/>
</td> </td>
<td data-name="componentecurricular"> <td data-name="componentecurricular">
<input type="text" name='componentecurricular0' <input type="text" name='componentecurricular0'
placeholder='COMPONENTE CURRICULAR' class="form-control" /> placeholder='COMPONENTE CURRICULAR' class="form-control" />
</td> </td>
<td data-name="selcurso"> <td data-name="selcurso">
<select class="custom-select mr-sm-2" id="inlineCursoSelect" <select class="custom-select mr-sm-2" name="curso_id" id="curso_id" aria-label="Default select example">
aria-label="Default select example">
<option selected>Selecionar Curso</option> <option selected>Selecionar Curso</option>
<option value="1">Um</option> @foreach($cursos as $curso)
<option value="2">Dois</option> <option value="{{ $curso->id }}"> {{ $curso->name }}</option>
<option value="3">Três</option> @endforeach
</select> </select>
</td> </td>
<td data-name="selnivel"> <td data-name="selnivel">
......
...@@ -24,25 +24,25 @@ ...@@ -24,25 +24,25 @@
</div> </div>
<div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups"> <div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups">
<div class="btn-group mr-2" role="group" aria-label="First group"> <div class="btn-group mr-2" role="group" aria-label="First group">
<a href="" class="btn-pad-dimensao"> <a href="{{ route('dimensao_ensino') }}" class="btn-pad-dimensao">
<i class="bi bi-mortarboard-fill"></i> <i class="bi bi-mortarboard-fill"></i>
<h2>ENSINO</h2> <h2>ENSINO</h2>
</a> </a>
</div> </div>
<div class="btn-group" role="group" aria-label="Third group"> <div class="btn-group" role="group" aria-label="Third group">
<a href="" class="btn-pad-dimensao"> <a href="{{ route('dimensao_pesquisa') }}" class="btn-pad-dimensao">
<i class="bi bi-search"></i> <i class="bi bi-search"></i>
<h2>PESQUISA</h2> <h2>PESQUISA</h2>
</a> </a>
</div> </div>
<div class="btn-group mr-2" role="group" aria-label="Second group"> <div class="btn-group mr-2" role="group" aria-label="Second group">
<a href="" class="btn-pad-dimensao"> <a href="{{ route('dimensao_extensao') }}" class="btn-pad-dimensao">
<i class="bi bi-person-plus-fill"></i> <i class="bi bi-person-plus-fill"></i>
<h2>EXTENSÃO</h2> <h2>EXTENSÃO</h2>
</a> </a>
</div> </div>
<div class="btn-group" role="group" aria-label="Third group"> <div class="btn-group" role="group" aria-label="Third group">
<a href="" class="btn-pad-dimensao"> <a href="{{ route('dimensao_gestao') }}" class="btn-pad-dimensao">
<i class="bi bi-people-fill"></i> <i class="bi bi-people-fill"></i>
<h2>GESTÃO</h2> <h2>GESTÃO</h2>
</a> </a>
......
...@@ -64,7 +64,7 @@ Route::post('/curso/store', [CursoController::class, 'store'])->name('curso_stor ...@@ -64,7 +64,7 @@ Route::post('/curso/store', [CursoController::class, 'store'])->name('curso_stor
Route::get('/listar/unidade', [UnidadeController::class, 'getAll'])->name('listar_unidades'); 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::get('/list/campus/{unidade_id}', [CampusController::class, 'findByUnidade'])->name('list_campus_by_unidade');
Route::get('/dimensao/gestao', [GestaoController::class, 'index'])->name('dimensao_gestao'); Route::get('/pad/dimensao/gestao', [GestaoController::class, 'index'])->name('dimensao_gestao');
Route::get('/dimensao/ensino', [EnsinoController::class, 'index'])->name('dimensao_ensino'); Route::get('/pad/dimensao/ensino', [EnsinoController::class, 'index'])->name('dimensao_ensino');
Route::get('/dimensao/pesquisa', [PesquisaController::class, 'index'])->name('dimensao_pesquisa'); Route::get('/pad/dimensao/pesquisa', [PesquisaController::class, 'index'])->name('dimensao_pesquisa');
Route::get('/dimensao/extensao', [ExtensaoController::class, 'index'])->name('dimensao_extensao'); Route::get('/pad/dimensao/extensao', [ExtensaoController::class, 'index'])->name('dimensao_extensao');
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