diff --git a/app/Http/Controllers/CampusController.php b/app/Http/Controllers/CampusController.php
index 6f62b74f362623d0bd34dc35c71990c2e7eaa790..11b8a3bf0b707ff1d06911ce78259f882135b35c 100644
--- a/app/Http/Controllers/CampusController.php
+++ b/app/Http/Controllers/CampusController.php
@@ -20,6 +20,7 @@ class CampusController extends Controller
public function index()
{
$campus = Campus::all();
+
return view('campus.index', [
'index_menu' => MenuItemsAdmin::CAMPUS,
'campus' => $campus
@@ -122,6 +123,6 @@ class CampusController extends Controller
public function findByUnidade(int $unidade_id)
{
- return CampusQuery::whereUnidadeId($unidade_id)->orderBy('name')->get();
+ return Campus::initQuery()->whereUnidadeId($unidade_id)->orderBy('name')->get();
}
}
diff --git a/app/Http/Controllers/CursoController.php b/app/Http/Controllers/CursoController.php
index 374ac0aea9c5e06f33e9c63fc546f2b4c23acee5..7a52cf1e832f3ba0430108e23d9274d61cac5d1a 100644
--- a/app/Http/Controllers/CursoController.php
+++ b/app/Http/Controllers/CursoController.php
@@ -87,7 +87,7 @@ class CursoController extends Controller
$curso = Curso::findOrFail($id);
return view('curso.update', [
'allCampus' => Campus::all(),
- 'index_menu' => MenuItemsAdmin::CAMPUS,
+ 'index_menu' => MenuItemsAdmin::CURSOS,
'curso' => $curso,
]);
}
diff --git a/app/Http/Controllers/Dimensao/EnsinoController.php b/app/Http/Controllers/Dimensao/EnsinoController.php
index e9a836989215b79f4ca119db21aede758dc9ed0d..548741f35ab980cb8463e90b4114641ac26ea98c 100644
--- a/app/Http/Controllers/Dimensao/EnsinoController.php
+++ b/app/Http/Controllers/Dimensao/EnsinoController.php
@@ -4,13 +4,14 @@ namespace App\Http\Controllers\Dimensao;
use App\Http\Controllers\Controller;
use App\Models\Tabelas\Constants;
+use App\Models\Tabelas\Ensino\EnsinoAula;
use App\Models\Util\MenuItemsTeacher;
use App\Models\Util\PadTables;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class EnsinoController extends Controller
-{
+{
const MENU_HOME = 1;
const MENU_PAD = 2;
@@ -20,30 +21,38 @@ class EnsinoController extends Controller
*
* @return \Illuminate\Http\Response
*/
- public function index($user_pad_id, $form_selected = null, $model_id = null) {
-
- $user = Auth::user();
+ public function index($user_pad_id, $form_selected = null) {
+
$niveis = Constants::listNivel();
$modalidades = Constants::listModalidade();
$orientacoes = Constants::listOrientacao();
- $funcoes_projeto = Constants::listFuncao();
- $funcoes_ensino = Constants::listFuncao();
+ $funcoes_projeto = Constants::listFuncaoProjeto();
+ $funcoes_ensino = Constants::listFuncaoEnsino();
$naturezas = Constants::listNatureza();
$divs = PadTables::tablesEnsino();
+ $ensinoAulas =
+ EnsinoAula::initQuery()
+ ->whereUserPad($user_pad_id)
+ ->orderBy('cod_atividade')
+ ->get();
+
return view('pad.dimensao.ensino', [
'user_pad_id' => $user_pad_id,
'form_selected' => $form_selected,
- 'model_id' => $model_id,
+
'niveis' => $niveis,
- 'modalidades' => $modalidades,
- 'categorias' => $orientacoes,
- 'funcoes_ensino' => array_diff($funcoes_ensino, [Constants::listFuncao(Constants::FUNCAO_COLABORADOR)]),
- 'funcoes_projeto' => array_diff($funcoes_projeto, [Constants::listFuncao(Constants::FUNCAO_MEMBRO)]),
'naturezas' => $naturezas,
+ 'categorias' => $orientacoes,
+ 'modalidades' => $modalidades,
+ 'funcoes_ensino' => $funcoes_ensino,
+ 'funcoes_projeto' => $funcoes_projeto,
+
'divs' => $divs,
'index_menu' => MenuItemsTeacher::PAD,
+
+ 'ensinoAulas' => $ensinoAulas,
]);
}
}
diff --git a/app/Http/Controllers/Dimensao/PesquisaController.php b/app/Http/Controllers/Dimensao/PesquisaController.php
index fb79a740f32608ece07c2ed41e574d1d59521106..7f9fdf9e68aa4914637176483dfd2bb53542dc05 100644
--- a/app/Http/Controllers/Dimensao/PesquisaController.php
+++ b/app/Http/Controllers/Dimensao/PesquisaController.php
@@ -3,6 +3,12 @@
namespace App\Http\Controllers\Dimensao;
use App\Http\Controllers\Controller;
+use App\Models\Tabelas\Constants;
+use App\Models\Tabelas\Pesquisa\PesquisaCoordenacao;
+use App\Models\Tabelas\Pesquisa\PesquisaLideranca;
+use App\Models\Tabelas\Pesquisa\PesquisaOrientacao;
+use App\Models\Util\MenuItemsTeacher;
+use App\Models\Util\PadTables;
use Illuminate\Http\Request;
class PesquisaController extends Controller
@@ -12,7 +18,41 @@ class PesquisaController extends Controller
*
* @return \Illuminate\Http\Response
*/
- public function index() {
- return view('pad.dimensao.pesquisa');
+ public function index($user_pad_id, $form_selected = null)
+ {
+ $divs = PadTables::tablesPesquisa();
+ $funcoesProjeto = Constants::listFuncaoProjeto();
+
+ $pesquisasCoordenacao =
+ PesquisaCoordenacao::initQuery()
+ ->whereUserPad($user_pad_id)
+ ->orderBy('cod_atividade')
+ ->get();
+
+ $pesquisasLideranca =
+ PesquisaLideranca::initQuery()
+ ->whereUserPad($user_pad_id)
+ ->orderBy('cod_atividade')
+ ->get();
+
+ $pesquisasOrientacao =
+ PesquisaOrientacao::initQuery()
+ ->whereUserPad($user_pad_id)
+ ->orderBy('cod_atividade')
+ ->get();
+
+ return view('pad.dimensao.pesquisa', [
+ 'user_pad_id' => $user_pad_id,
+ 'form_selected' => $form_selected,
+
+ 'pesquisasCoordenacao' => $pesquisasCoordenacao,
+ 'pesquisasLideranca' => $pesquisasLideranca,
+ 'pesquisasOrientacao' => $pesquisasOrientacao,
+
+ 'funcoesProjeto' => $funcoesProjeto,
+
+ 'divs' => $divs,
+ 'index_menu' => MenuItemsTeacher::PAD,
+ ]);
}
}
diff --git a/app/Http/Controllers/Dimensao/Tabelas/Ensino/EnsinoAulaController.php b/app/Http/Controllers/Dimensao/Tabelas/Ensino/EnsinoAulaController.php
index a7ef0f27db173f9abc530d3f4c2d9e7891591545..e91ed51d604a46dcf775db40807ec5ab219afa96 100644
--- a/app/Http/Controllers/Dimensao/Tabelas/Ensino/EnsinoAulaController.php
+++ b/app/Http/Controllers/Dimensao/Tabelas/Ensino/EnsinoAulaController.php
@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Dimensao\Tabelas\Ensino;
use App\Http\Controllers\Controller;
+use App\Models\Tabelas\Constants;
use App\Models\Tabelas\Ensino\EnsinoAula;
use App\Models\UserPad;
use Illuminate\Http\Request;
@@ -45,12 +46,44 @@ class EnsinoAulaController extends Controller
}
public function update($id, Request $request) {
-
- dd($request->id);
+
+ $validator = Validator::make($request->all(), EnsinoAula::rules(), EnsinoAula::messages());
+
+ $model = EnsinoAula::find($id);
+ $model->fill($request->all());
+
+ $user_pad_id = $model->user_pad_id;
+ $div_selected = 'ensino_aulas';
+
+ if($validator->fails())
+ {
+ return redirect()
+ ->route('dimensao_ensino', ['user_pad_id' => $user_pad_id, 'form_selected' => $div_selected])
+ ->with('fail', 'Erro ao atualizar Atividade!');
+ }
+
+ if($model->save()) {
+ return redirect()->route('dimensao_ensino', ['user_pad_id' => $user_pad_id, 'form_selected' => $div_selected])->with('success', 'Atualizado com sucesso!');
+ } else {
+ return redirect()->route('dimensao_ensino', ['user_pad_id' => $user_pad_id, 'form_selected' => $div_selected])->with('fail', 'Erro ao atualizar Atividade!');
+ }
+
}
- public function delete($id = null, $user_pad_id = null)
+
+ public function ajaxValidation(Request $request)
{
+ $validator = Validator::make($request->all(), EnsinoAula::rules(), EnsinoAula::messages());
+
+ if($validator->passes()) {
+ return Response::json(['message' => true, 'status' => 200]);
+ }
+
+ return Response::json(['errors' => $validator->errors(), 'status' => 400]);
+ }
+
+ public function delete($id)
+ {
$model = EnsinoAula::find($id);
$user_pad_id = $model->user_pad_id;
$model->delete();
@@ -68,4 +101,17 @@ class EnsinoAulaController extends Controller
return Response::json($query->get());
}
+
+ public function edit($id) {
+
+ $model = EnsinoAula::find($id);
+ $niveis = Constants::listNivel();
+ $modalidades = Constants::listModalidade();
+
+ return view('pad.components.templates.dimensao.ensino.aulas.form_update', [
+ 'model' => $model,
+ 'niveis' => $niveis,
+ 'modalidades' => $modalidades
+ ]);
+ }
}
diff --git a/app/Http/Controllers/Dimensao/Tabelas/Pesquisa/PesquisaCoordenacaoController.php b/app/Http/Controllers/Dimensao/Tabelas/Pesquisa/PesquisaCoordenacaoController.php
new file mode 100644
index 0000000000000000000000000000000000000000..dc375cb5daea078ff90b8b73e732513c332d06c5
--- /dev/null
+++ b/app/Http/Controllers/Dimensao/Tabelas/Pesquisa/PesquisaCoordenacaoController.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Http\Controllers\Dimensao\Tabelas\Pesquisa;
+
+use App\Http\Controllers\Controller;
+use App\Models\Tabelas\Constants;
+use App\Models\Tabelas\Pesquisa\PesquisaCoordenacao;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Validator;
+
+class PesquisaCoordenacaoController extends Controller
+{
+
+ public function create(Request $request)
+ {
+ $validator = Validator::make($request->all(), PesquisaCoordenacao::rules(), PesquisaCoordenacao::messages());
+
+ if($validator->fails())
+ {
+ return redirect()
+ ->route('dimensao_pesquisa', [
+ 'user_pad_id' => $request->user_pad_id,
+ 'form_selected' => 'pesquisa_coordenacao',
+ ])
+ ->withErrors($validator->errors())
+ ->withInput();
+ }
+
+ $model = new PesquisaCoordenacao($request->all());
+ $model->dimensao = Constants::DIMENSAO_PESQUISA;
+
+ if($model->save()) {
+ return redirect()->route(
+ 'dimensao_pesquisa', ['user_pad_id' => $request->user_pad_id, 'form_selected' => 'pesquisa_coordenacao'
+ ])->with('success', 'Cadastro realizado com sucesso!');
+ } else {
+ return redirect()->route(
+ 'dimensao_pesquisa', ['user_pad_id' => $request->user_pad_id, 'form_selected' => 'pesquisa_coordenacao'
+ ])->with('fail', 'Erro ao cadastrar Atividade!');
+ }
+
+ }
+
+ public function update($id, Request $request)
+ {
+
+ }
+
+ public function delete($id)
+ {
+
+ }
+
+ public function edit($id)
+ {
+ $model = PesquisaCoordenacao::find($id);
+ $funcoesProjeto = Constants::listFuncaoProjeto();
+
+ return view('pad.components.templates.dimensao.pesquisa.coordenacao.form_update', [
+ 'model' => $model,
+ 'funcoesProjeto' => $funcoesProjeto
+ ]);
+ }
+
+ public function ajaxValidation(Request $request)
+ {
+
+ }
+
+ public function search($user_pad_id = null)
+ {
+ $query = PesquisaCoordenacao::initQuery();
+
+ if($user_pad_id)
+ {
+ $query->whereUserPad($user_pad_id);
+ }
+
+ return Response::json($query->get());
+ }
+
+}
\ No newline at end of file
diff --git a/app/Models/Campus.php b/app/Models/Campus.php
index 1ca5fea8555e9d3aa6fdfd6bf7d25957c337de34..28ab5c3f765df5243486c85311829804fbeb103b 100644
--- a/app/Models/Campus.php
+++ b/app/Models/Campus.php
@@ -2,6 +2,7 @@
namespace App\Models;
+use App\Queries\CampusQuery;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
@@ -66,4 +67,9 @@ class Campus extends Model
}
}
+
+ public static function initQuery()
+ {
+ return new CampusQuery(get_called_class());
+ }
}
diff --git a/app/Models/Tabelas/Constants.php b/app/Models/Tabelas/Constants.php
index db52248ab494cb2b26637e39f8263ddd1f790a80..7b39dd8df744ce379e3026640b8390d0da304184 100644
--- a/app/Models/Tabelas/Constants.php
+++ b/app/Models/Tabelas/Constants.php
@@ -17,7 +17,9 @@ class Constants {
const FUNCAO_COORDENADOR = 1;
const FUNCAO_COLABORADOR = 2;
- const FUNCAO_MEMBRO = 3;
+ const FUNCAO_ORIENTADOR = 4;
+ const FUNCAO_CO_ORIENTADOR = 5;
+ const FUNCAO_MEMBRO = 6;
const NATUREZA_INOVACAO = 1;
const NATUREZA_PEDAGOGICA = 2;
@@ -28,6 +30,12 @@ class Constants {
const STATUS_INATIVO = 2;
const STATUS_ARQUIVADO = 3;
+ const DIMENSAO_ENSINO = 1;
+ const DIMENSAO_PESQUISA = 2;
+ const DIMENSAO_EXTENSAO = 3;
+ const DIMENSAO_GESTAO = 4;
+ const DIMENSAO_ANEXO = 5;
+
/**
* @return array|string
@@ -71,16 +79,39 @@ class Constants {
/**
* @return array|string
*/
- public static function listFuncao($value = null) {
+ public static function listFuncaoEnsino($value = null) {
$values = [
self::FUNCAO_COORDENADOR => 'Coordenador',
- self::FUNCAO_COLABORADOR => 'Colaborador',
self::FUNCAO_MEMBRO => 'Membro',
];
return $value !== null? $values[$value] : $values;
}
+ /**
+ * @return array|string
+ */
+ public static function listFuncaoOrientador($value = null) {
+ $values = [
+ self::FUNCAO_ORIENTADOR => 'Orientador',
+ self::FUNCAO_CO_ORIENTADOR => 'Coorientador',
+ ];
+
+ return $value !== null? $values[$value] : $values;
+ }
+
+ /**
+ * @return array|string
+ */
+ public static function listFuncaoProjeto($value = null) {
+ $values = [
+ self::FUNCAO_COORDENADOR => 'Coordenador',
+ self::FUNCAO_COLABORADOR => 'Colaborador',
+ ];
+
+ return $value !== null? $values[$value] : $values;
+ }
+
/**
* @return array|string
*/
@@ -105,5 +136,19 @@ class Constants {
return $value !== null? $values[$value] : $values;
}
+
+ public static function listDimensao($value = null) {
+
+ $values = [
+ self::DIMENSAO_ENSINO => 'Ensino',
+ self::DIMENSAO_PESQUISA => 'Pesquisa',
+ self::DIMENSAO_EXTENSAO => 'Extensão',
+ self::DIMENSAO_GESTAO => 'Gestão',
+ self::DIMENSAO_ANEXO => 'Anexo',
+ ];
+
+ return $value !== null? $values[$value] : $values;
+ }
+
}
\ No newline at end of file
diff --git a/app/Models/Tabelas/Ensino/EnsinoAula.php b/app/Models/Tabelas/Ensino/EnsinoAula.php
index fbf128d9b3e6831f85a956f6cc50e042a97e36f6..60413cc7f049a4bc5df87d4ab45ef921c79d3c8f 100644
--- a/app/Models/Tabelas/Ensino/EnsinoAula.php
+++ b/app/Models/Tabelas/Ensino/EnsinoAula.php
@@ -30,6 +30,13 @@ class EnsinoAula extends Model
*/
protected $fillable = ['user_pad_id', 'cod_atividade', 'componente_curricular', 'curso', 'nivel', 'modalidade', 'ch_semanal', 'ch_total'];
+ public function nivelAsString() {
+ return Constants::listNivel($this->nivel);
+ }
+
+ public function modalidadeAsString() {
+ return Constants::listModalidade($this->modalidade);
+ }
/**
* cod_dimensao from planejamento table
diff --git a/app/Models/Tabelas/Pesquisa/PesquisaCoordenacao.php b/app/Models/Tabelas/Pesquisa/PesquisaCoordenacao.php
new file mode 100644
index 0000000000000000000000000000000000000000..f9eb620506ef4724e55e386a16ae3f58db2cf27a
--- /dev/null
+++ b/app/Models/Tabelas/Pesquisa/PesquisaCoordenacao.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Models\Tabelas\Pesquisa;
+
+use App\Models\Tabelas\Constants;
+use App\Queries\Tabelas\Pesquisa\PesquisaCoordenacaoQuery;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class PesquisaCoordenacao extends Model
+{
+ use SoftDeletes;
+
+ protected $table = 'pesquisa_coordenacao';
+
+ protected $fillable = ['dimensao', 'user_pad_id', 'cod_atividade', 'titulo_projeto', 'linha_grupo_pesquisa', 'funcao', 'ch_semanal'];
+
+ protected $dates = ['deleted_at'];
+
+ public static function initQuery()
+ {
+ return new PesquisaCoordenacaoQuery(get_called_class());
+ }
+
+ public function dimensaoAsString()
+ {
+ return Constants::listDimensao($this->dimensao);
+ }
+
+ public function funcaoAsString()
+ {
+ return Constants::listFuncaoProjeto($this->funcao);
+ }
+
+ public static function rules()
+ {
+ return [
+
+ ];
+ }
+
+ public static function messages()
+ {
+ return [
+
+ ];
+ }
+
+}
diff --git a/app/Models/Tabelas/Pesquisa/PesquisaLideranca.php b/app/Models/Tabelas/Pesquisa/PesquisaLideranca.php
new file mode 100644
index 0000000000000000000000000000000000000000..67a10e4f6d34a5a1387a8e6667389feda20e21ea
--- /dev/null
+++ b/app/Models/Tabelas/Pesquisa/PesquisaLideranca.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Models\Tabelas\Pesquisa;
+
+use App\Models\Tabelas\Constants;
+use App\Queries\Tabelas\Pesquisa\PesquisaLiderancaQuery;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class PesquisaLideranca extends Model
+{
+ use SoftDeletes;
+
+ protected $table = 'pesquisa_lideranca';
+
+ protected $fillable = ['dimensao', 'user_pad_id', 'cod_atividade', 'grupo_pesquisa', 'atividade', 'funcao', 'ch_semanal'];
+
+ protected $dates = ['deleted_at'];
+
+ public static function initQuery()
+ {
+ return new PesquisaLiderancaQuery(get_called_class());
+ }
+
+ public function dimensaoAsString()
+ {
+ return Constants::listDimensao($this->dimensao);
+ }
+
+ public function funcaoAsString()
+ {
+ return Constants::listFuncaoProjeto($this->funcao);
+ }
+
+}
diff --git a/app/Models/Tabelas/Pesquisa/PesquisaOrientacao.php b/app/Models/Tabelas/Pesquisa/PesquisaOrientacao.php
new file mode 100644
index 0000000000000000000000000000000000000000..95083fcc0a771f1f3eab42d70078225699384f62
--- /dev/null
+++ b/app/Models/Tabelas/Pesquisa/PesquisaOrientacao.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Models\Tabelas\Pesquisa;
+
+use App\Models\Tabelas\Constants;
+use App\Queries\Tabelas\Pesquisa\PesquisaOrientacaoQuery;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class PesquisaOrientacao extends Model
+{
+ use SoftDeletes;
+
+ protected $table = 'pesquisa_orientacao';
+
+ protected $fillable = ['dimensao', 'user_pad_id', 'cod_atividade', 'titulo_projeto', 'nome_orientando', 'funcao', 'ch_semanal'];
+
+ protected $dates = ['deleted_at'];
+
+ public static function initQuery()
+ {
+ return new PesquisaOrientacaoQuery(get_called_class());
+ }
+
+ public function dimensaoAsString()
+ {
+ return Constants::listDimensao($this->dimensao);
+ }
+
+ public function funcaoAsString()
+ {
+ return Constants::listFuncaoOrientador($this->funcao);
+ }
+
+}
diff --git a/app/Models/Util/PadTables.php b/app/Models/Util/PadTables.php
index 7dfa93fdc60642ad5e3388dacea40cc8e88d62c5..3b9876fee5e5d085ce23a786ea7e9f587642cfa3 100644
--- a/app/Models/Util/PadTables.php
+++ b/app/Models/Util/PadTables.php
@@ -10,7 +10,7 @@ class PadTables {
['id' => 'ensino_coordenacao_disciplina', 'name' => '2. ENSINO (COORDENAÇÃO/ REGÊNCIA COMPONENTES CURRICULARES)'],
['id' => 'ensino_orientacao', 'name' => '3. ENSINO (ORIENTAÇÕES: ORIENTAÇÃO DE ESTÃGIO, ORIENTAÇÃO DE TCC, ORIENTAÇÃO DE RESIDÊNCIA, ORIENTAÇÃO DE MESTRADO E/OU ORIENTAÇÃO DE DOUTORADO. COORIENTAÇÕES: TCC, MESTRADO E/OU DOUTORADO)'],
['id' => 'ensino_supervisao', 'name' => '4. ENSINO (SUPERVISÕES: SUPERVISÃO/PRECEPTORIA DE ESTÃGIO, SUPERVISÃO DE ESTÃGIO DOCENCIA, SUPERVISÃO/TUTORIA DE RESIDÊNCIA)'],
- ['id' => 'ensino_atendimento_discente', 'name' => '.5 ENSINO – ATENDIMENTO AO DISCENTE (O DOCENTE DEVERà PUBLICAR NA UNIDADE OS DIAS, HORÃRIOS E LOCAIS QUE PRESTARà O ATENDIMENTO)'],
+ ['id' => 'ensino_atendimento_discente', 'name' => '5. ENSINO – ATENDIMENTO AO DISCENTE (O DOCENTE DEVERà PUBLICAR NA UNIDADE OS DIAS, HORÃRIOS E LOCAIS QUE PRESTARà O ATENDIMENTO)'],
['id' => 'ensino_projeto', 'name' => '6. ENSINO (PROJETOS OU AÇÕES DE ENSINO)'],
['id' => 'ensino_participacao', 'name' => '7. ENSINO (PARTICIPAÇÃO NAS REUNIÕES DOS COLEGIADOS DE PLENO DE CURSO DE GRADUAÇÃO E PÓS-GRADUAÇÃO)'],
['id' => 'ensino_coordenacao_docente', 'name' => '8. ENSINO (COORDENAÇÃO OU MEMBRO DE NÚCLEO DOCENTE ESTRUTURANTE OU NÚCLEO DOCENTE ESTRUTURANTE ASSISTENCIAL)'],
@@ -19,19 +19,28 @@ class PadTables {
public static function tablesPesquisa() {
return [
-
+ ['id' => 'pesquisa_coordenacao', 'name' => '1. PESQUISA (COORDENAÇÃO OU PARTICIPAÇÃO EM PROJETOS DE PESQUISA CADASTRADOS NO SISPG)'],
+ ['id' => 'pesquisa_lideranca', 'name' => '2. PESQUISA (LIDERANÇA OU PARTICIPAÇÃO EM GRUPOS DE PESQUISA CERTIFICADOS PELA UPE)'],
+ ['id' => 'pesquisa_orientacao', 'name' => '3. PESQUISA (ORIENTAÇÃO DE INICIAÇÃO CIENTÃFICA DE PROJETOS VINCULADOS CADASTRADOS NO SISPG)'],
];
}
public static function tablesExtensao() {
return [
-
+ ['id' => 'extensao_coordenacao', 'name' => '1. EXTENSÃO (COORDENAÇÃO OU PARTICIPAÇÃO EM ATIVIDADES DE EXTENSÃO HOMOLOGADAS PELA PROEC)'],
+ ['id' => 'extensao_orientacao', 'name' => '2. EXTENSÃO (ORIENTAÇÃO OU ACOMPANHAMENTO DE ESTUDANTES EM ATIVIDADES DE EXTENSÃO HOMOLOGADAS PELA PROEC)'],
];
}
public static function tablesGestao() {
return [
-
+ ['id' => 'gestao_membro_comissao', 'name' => '1. GESTÃO (MEMBRO DE COMISSÃO/COMITÊ/NÚCLEO, FORMALMENTE DESIGNADO(A) NO MBITO DA UPE)'],
+ ['id' => 'gestao_membro_conselho', 'name' => '2. GESTÃO (MEMBRO DE CONSELHO/COMISSÃO/COMITÊ/NÚCLEO, FORMALMENTE DESIGNADO (A) PARA REPRESENTAÇÃO DA UPE)'],
+ ['id' => 'gestao_membro_titular_conselho', 'name' => '3. GESTÃO (MEMBRO TITULAR DOS CONSELHOS DA UPE (CEPE, CONSUN OU CGA))'],
+ ['id' => 'gestao_representante_unidade_educacao', 'name' => '4. GESTÃO (REPRESENTANTE NAS UNIDADES DE EDUCAÇÃO OU DE EDUCAÇÃO E SAÚDE FORMALMENTE DESIGNADO (A) PELA ENTIDADE SINDICAL)'],
+ ['id' => 'gestao_membro_camaras', 'name' => '5. GESTÃO (PARTICIPAÇÃO COMO MEMBRO NAS CÂMARAS CONSULTIVAS DOS CONSELHOS SUPERIORES)'],
+ ['id' => 'gestao_coordenacao_laboratorios_didaticos', 'name' => '6. GESTÃO (COORDENAÇÃO DE LABORATÓRIOS DIDÃTICOS, DE INFORMÃTICA OU DE ENSINO)'],
+ ['id' => 'gestao_coordenacao_programa_institucional', 'name' => '7. GESTÃO (COORDENAÇÃO DE PROGRAMA INSTITUCIONAL)'],
];
}
diff --git a/app/Queries/CampusQuery.php b/app/Queries/CampusQuery.php
index 177b1a5d5533d112f00b21f5e9196afa664d00b1..f64d23de7cc6c30547a342b0a52577cf55c5d614 100644
--- a/app/Queries/CampusQuery.php
+++ b/app/Queries/CampusQuery.php
@@ -4,16 +4,25 @@ namespace App\Queries;
use App\Models\Campus;
-class CampusQuery extends Campus {
+class CampusQuery extends CustomQuery
+{
+
+ public function __construct()
+ {
+ $this->query = Campus::where([]);
+
+ self::$instance = $this;
+ }
/**
* @param integer $id
* @param string $expression
* @return array|Campus|null
*/
- public static function whereUnidadeId(int $id, string $expression = '=')
+ public function whereUnidadeId(int $id, string $expression = '=')
{
- return Campus::where('unidade_id', $expression, $id);
+ $this->query = $this->query->where('unidade_id', $expression, $id);
+ return self::$instance;
}
}
\ No newline at end of file
diff --git a/app/Queries/CursoQuery.php b/app/Queries/CursoQuery.php
index 2a783f2185ea02e60ae7756ab3ee622ed4ef0230..48a830329e04f17f878d4a72f5a9b8f498489815 100644
--- a/app/Queries/CursoQuery.php
+++ b/app/Queries/CursoQuery.php
@@ -4,16 +4,21 @@ namespace App\Queries;
use App\Models\Curso;
-class CursoQuery extends Query {
+class CursoQuery extends CustomQuery
+{
- public function __construct($init = [])
+ public function __construct()
{
$this->query = Curso::where([]);
+
+ self::$instance = $this;
}
- public function whereCampusId(int $campus_id, string $expression = '=') {
+ public function whereCampusId(int $campus_id, string $expression = '=')
+ {
$this->query = $this->query->where('campus_id', $expression, $campus_id);
- return $this->query;
+
+ return self::$instance;
}
}
diff --git a/app/Queries/DisciplinaQuery.php b/app/Queries/DisciplinaQuery.php
index edcbc04cdcf72c4c7560d4a2fc8ff7b0c0ca73ab..80fc59e7da18918522f8446c1faf476fdbe0353d 100644
--- a/app/Queries/DisciplinaQuery.php
+++ b/app/Queries/DisciplinaQuery.php
@@ -5,10 +5,14 @@ namespace App\Queries;
use App\Models\Disciplina;
use App\Queries\Query;
-class DisciplinaQuery extends Query {
+class DisciplinaQuery extends CustomQuery
+{
- public function __construct($init = []) {
- $this->query = Disciplina::where($init);
+ public function __construct()
+ {
+ $this->query = Disciplina::where([]);
+
+ self::$instance = $this;
}
/**
@@ -16,9 +20,11 @@ class DisciplinaQuery extends Query {
* @param string $expression
* @return Builder
*/
- public function whereCursoId($curso_id, string $expression = '=') {
- $this->query->where('curso_id', $expression, $curso_id);
- return $this->query;
+ public function whereCursoId($curso_id, string $expression = '=')
+ {
+ $this->query = $this->query->where('curso_id', $expression, $curso_id);
+
+ return self::$instance;
}
}
\ No newline at end of file
diff --git a/app/Queries/PADQuery.php b/app/Queries/PADQuery.php
index 402e0b7174c875d5131009f467f2e4b6b0bce031..157e7dd70ea45f0de0809edd5a925befa373ba3a 100644
--- a/app/Queries/PADQuery.php
+++ b/app/Queries/PADQuery.php
@@ -2,18 +2,28 @@
namespace App\Queries;
-use App\Models\PAD;
+use App\Models\Pad;
-class PADQuery extends PAD {
+class PadQuery extends CustomQuery
+{
+
+ public function __construct()
+ {
+ $this->query = Pad::where([]);
+
+ self::$instance = $this;
+ }
/**
* @param integer $id
* @param string $expression
* @return PAD|null
*/
- public static function whereUnidadeId(int $id, string $expression = '=')
+ public function whereUnidadeId(int $id, string $expression = '=')
{
- return PAD::where('unidade_id', $expression, $id);
+ $this->query = $this->query->where('unidade_id', $expression, $id);
+
+ return self::$instance;
}
}
\ No newline at end of file
diff --git a/app/Queries/PlanejamentoQuery.php b/app/Queries/PlanejamentoQuery.php
index dee96b596e07d03cb543fae412f3ba10dadcbc79..45441a74d5045bec262c6fd375364df2e9bbf4bb 100644
--- a/app/Queries/PlanejamentoQuery.php
+++ b/app/Queries/PlanejamentoQuery.php
@@ -4,10 +4,14 @@ namespace App\Queries;
use App\Models\Planejamento;
-class PlanejamentoQuery extends Query {
+class PlanejamentoQuery extends CustomQuery
+{
- public function __construct() {
+ public function __construct()
+ {
$this->query = Planejamento::where([]);
+
+ self::$instance = $this;
}
/**
@@ -15,9 +19,10 @@ class PlanejamentoQuery extends Query {
* @param string $expression
* @return Builder
*/
- public function whereDimensao(int $dimensao, string $expression = '=') {
+ public function whereDimensao(int $dimensao, string $expression = '=')
+ {
$this->query = $this->query->where('dimensao', $expression, $dimensao);
- return $this->query;
+ return self::$instance;
}
/**
@@ -25,9 +30,10 @@ class PlanejamentoQuery extends Query {
* @param string $expression
* @return Builder
*/
- public function whereCodDimensao(string $cod_dimensao, string $expression = '=') {
+ public function whereCodDimensao(string $cod_dimensao, string $expression = '=')
+ {
$this->query = $this->query->where('cod_dimensao', $expression, $cod_dimensao);
- return $this->query;
+ return self::$instance;
}
/**
@@ -35,9 +41,10 @@ class PlanejamentoQuery extends Query {
* @param string $expression
* @return Builder
*/
- public function whereInCodDimensao($codes_dimensao) {
+ public function whereInCodDimensao($codes_dimensao)
+ {
$this->query = $this->query->whereIn('cod_dimensao', $codes_dimensao);
- return $this->query;
+ return self::$instance;
}
}
diff --git a/app/Queries/Query.php b/app/Queries/Query.php
deleted file mode 100644
index 97b46a03488a1bbc5cabf705affc54ba94e82ed2..0000000000000000000000000000000000000000
--- a/app/Queries/Query.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Queries;
-class Query {
-
- protected $query;
-
- public function getQuery(){
- return $this->query;
- }
-
-}
-
diff --git a/app/Queries/Tabelas/Ensino/EnsinoAulaQuery.php b/app/Queries/Tabelas/Ensino/EnsinoAulaQuery.php
index 0b59738ff13d59ec517593f9489c1febf9abeac8..89936cf180eb9ba7562a0ce378b6c55c6cc06cbb 100644
--- a/app/Queries/Tabelas/Ensino/EnsinoAulaQuery.php
+++ b/app/Queries/Tabelas/Ensino/EnsinoAulaQuery.php
@@ -2,16 +2,16 @@
namespace App\Queries\Tabelas\Ensino;
-use App\Models\EnsinoAula;
-use App\Models\Tabelas\Ensino\EnsinoAula as EnsinoEnsinoAula;
+
+use App\Models\Tabelas\Ensino\EnsinoAula;
use App\Queries\CustomQuery;
-use App\Queries\Query;
-class EnsinoAulaQuery extends CustomQuery {
+class EnsinoAulaQuery extends CustomQuery
+{
public function __construct()
{
- $this->query = EnsinoEnsinoAula::where([]);
+ $this->query = EnsinoAula::where([]);
self::$instance = $this;
}
diff --git a/app/Queries/Tabelas/Pesquisa/PesquisaCoordenacaoQuery.php b/app/Queries/Tabelas/Pesquisa/PesquisaCoordenacaoQuery.php
new file mode 100644
index 0000000000000000000000000000000000000000..3d8e6654c70907d964393b7eb4672c82c58de07f
--- /dev/null
+++ b/app/Queries/Tabelas/Pesquisa/PesquisaCoordenacaoQuery.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Queries\Tabelas\Pesquisa;
+
+use App\Models\Tabelas\Pesquisa\PesquisaCoordenacao;
+use App\Queries\CustomQuery;
+
+class PesquisaCoordenacaoQuery extends CustomQuery
+{
+ public function __construct()
+ {
+ $this->query = PesquisaCoordenacao::where([]);
+
+ self::$instance = $this;
+ }
+
+ public function whereUserPad($user_pad_id, $operator = '=')
+ {
+ $this->query = $this->query->where('user_pad_id', $operator, $user_pad_id);
+
+ return self::$instance;
+ }
+
+}
\ No newline at end of file
diff --git a/app/Queries/Tabelas/Pesquisa/PesquisaLiderancaQuery.php b/app/Queries/Tabelas/Pesquisa/PesquisaLiderancaQuery.php
new file mode 100644
index 0000000000000000000000000000000000000000..760378f2156e038ec0f0e26823d4c76340c8ba25
--- /dev/null
+++ b/app/Queries/Tabelas/Pesquisa/PesquisaLiderancaQuery.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Queries\Tabelas\Pesquisa;
+
+use App\Models\Tabelas\Pesquisa\PesquisaLideranca;
+use App\Queries\CustomQuery;
+
+class PesquisaLiderancaQuery extends CustomQuery
+{
+ public function __construct()
+ {
+ $this->query = PesquisaLideranca::where([]);
+
+ self::$instance = $this;
+ }
+
+ public function whereUserPad($user_pad_id, $operator = '=')
+ {
+ $this->query = $this->query->where('user_pad_id', $operator, $user_pad_id);
+
+ return self::$instance;
+ }
+
+}
\ No newline at end of file
diff --git a/app/Queries/Tabelas/Pesquisa/PesquisaOrientacaoQuery.php b/app/Queries/Tabelas/Pesquisa/PesquisaOrientacaoQuery.php
new file mode 100644
index 0000000000000000000000000000000000000000..07ca680d0415024bf33de6b4ab9f82d14b56c6af
--- /dev/null
+++ b/app/Queries/Tabelas/Pesquisa/PesquisaOrientacaoQuery.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Queries\Tabelas\Pesquisa;
+
+use App\Models\Tabelas\Pesquisa\PesquisaOrientacao;
+use App\Queries\CustomQuery;
+
+class PesquisaOrientacaoQuery extends CustomQuery
+{
+ public function __construct()
+ {
+ $this->query = PesquisaOrientacao::where([]);
+
+ self::$instance = $this;
+ }
+
+ public function whereUserPad($user_pad_id, $operator = '=')
+ {
+ $this->query = $this->query->where('user_pad_id', $operator, $user_pad_id);
+
+ return self::$instance;
+ }
+
+}
\ No newline at end of file
diff --git a/app/Queries/UnidadeQuery.php b/app/Queries/UnidadeQuery.php
index 36fa19922caa9b0b783235c0dbb83056030dfa05..7561c924114eac8e2e3e9bb2774b88d589306ae5 100644
--- a/app/Queries/UnidadeQuery.php
+++ b/app/Queries/UnidadeQuery.php
@@ -4,6 +4,13 @@ namespace App\Queries;
use App\Models\Unidade;
-class UnidadeQuery extends Unidade {
+class UnidadeQuery extends CustomQuery
+{
+ public function __construct()
+ {
+ $this->query = Unidade::where([]);
+
+ self::$instance = $this;
+ }
}
\ No newline at end of file
diff --git a/app/Queries/UserPadQuery.php b/app/Queries/UserPadQuery.php
index 93058f857e0ff29cb903c7cb7c1785ff2ea91605..fa474e5e582ed373626c781f825b35da64cf6419 100644
--- a/app/Queries/UserPadQuery.php
+++ b/app/Queries/UserPadQuery.php
@@ -4,7 +4,8 @@ namespace App\Queries;
use App\Models\UserPad;
-class UserPadQuery extends CustomQuery {
+class UserPadQuery extends CustomQuery
+{
public function __construct()
{
diff --git a/app/Queries/UserQuery.php b/app/Queries/UserQuery.php
index 85612fba1a39a944f5d7fff4daa2cfc1d5e03b56..9e2795e238c3df2c136bd2fe9ce7e637cb562701 100644
--- a/app/Queries/UserQuery.php
+++ b/app/Queries/UserQuery.php
@@ -4,13 +4,14 @@ namespace App\Queries;
use App\Models\User;
-class UserQuery {
-
- private $query;
+class UserQuery extends CustomQuery
+{
public function __construct()
{
$this->query = User::where([]);
+
+ self::$instance = $this;
}
/**
@@ -20,7 +21,7 @@ class UserQuery {
public function whereId($id, $expression = '=')
{
$this->query = $this->query->where('id', $expression, $id);
- return $this->query;
+ return self::$instance;
}
/**
@@ -30,14 +31,7 @@ class UserQuery {
public function whereType($type, $expression = '=')
{
$this->query = $this->query->where('type', $expression, $type);
- return $this->query;
+ return self::$instance;
}
- /**
- * @return Builder
- */
- public function getQuery()
- {
- return $this->query;
- }
}
\ No newline at end of file
diff --git a/database/migrations/2022_07_17_021525_create_pesquisa_coordenacao_table.php b/database/migrations/2022_07_17_021525_create_pesquisa_coordenacao_table.php
new file mode 100644
index 0000000000000000000000000000000000000000..a13122fafed90d881e8a8d53963153f93fc131bd
--- /dev/null
+++ b/database/migrations/2022_07_17_021525_create_pesquisa_coordenacao_table.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreatePesquisaCoordenacaoTable extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::create('pesquisa_coordenacao', function (Blueprint $table) {
+ $table->id();
+ $table->tinyInteger('dimensao');
+ $table->foreignId('user_pad_id')->notNull();
+ $table->string('cod_atividade')->notNull();
+ $table->string('titulo_projeto')->notNull();
+ $table->string('linha_grupo_pesquisa')->notNull();
+ $table->tinyInteger('funcao')->notNull();
+ $table->integer('ch_semanal')->notNull();
+ $table->softDeletes();
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('pesquisa_coordenacao');
+ }
+}
diff --git a/database/migrations/2022_07_17_023304_create_pesquisa_lideranca_table.php b/database/migrations/2022_07_17_023304_create_pesquisa_lideranca_table.php
new file mode 100644
index 0000000000000000000000000000000000000000..8863b97fdee3d6addaf9ad960a1656d02187ae3d
--- /dev/null
+++ b/database/migrations/2022_07_17_023304_create_pesquisa_lideranca_table.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreatePesquisaLiderancaTable extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::create('pesquisa_lideranca', function (Blueprint $table) {
+ $table->id();
+ $table->tinyInteger('dimensao');
+ $table->foreignId('user_pad_id')->notNull();
+ $table->string('cod_atividade')->notNull();
+ $table->string('grupo_pesquisa')->notNull();
+ $table->string('atividade')->notNull();
+ $table->tinyInteger('funcao')->notNull();
+ $table->integer('ch_semanal')->notNull();
+ $table->softDeletes();
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('pesquisa_lideranca');
+ }
+}
diff --git a/database/migrations/2022_07_17_024129_create_pesquisa_orientacao_table.php b/database/migrations/2022_07_17_024129_create_pesquisa_orientacao_table.php
new file mode 100644
index 0000000000000000000000000000000000000000..1a9bff585711d68170153a70aeaef1e1c2d9bce2
--- /dev/null
+++ b/database/migrations/2022_07_17_024129_create_pesquisa_orientacao_table.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreatePesquisaOrientacaoTable extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::create('pesquisa_orientacao', function (Blueprint $table) {
+ $table->id();
+ $table->tinyInteger('dimensao');
+ $table->foreignId('user_pad_id')->notNull();
+ $table->string('cod_atividade')->notNull();
+ $table->string('titulo_projeto')->notNull();
+ $table->string('nome_orientando')->notNull();
+ $table->tinyInteger('funcao')->notNull();
+ $table->integer('ch_semanal')->notNull();
+ $table->softDeletes();
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('pesquisa_orientacao');
+ }
+}
diff --git a/resources/views/campus/create.blade.php b/resources/views/campus/create.blade.php
index cd933d9bd6fe2f465a1c0b412350e91ccb5150dc..e3448384364daf3777e429f0a5e0397a8613c02b 100644
--- a/resources/views/campus/create.blade.php
+++ b/resources/views/campus/create.blade.php
@@ -22,37 +22,50 @@
<form action="{{ route('campus_store') }}" method="post">
@csrf
@method('POST')
- <div class="form-group">
- <label for="inputNameCampus">Nome do Campus</label>
- <input type="text" name="name" class="form-control" id="inputNameCampus"
- placeholder="Insira o nome do Campus" value="{{ old('name') }}">
- @error('name')
- <span class="text-danger"> {{ $message }} </span>
- @enderror
- </div>
- <div class="form-group">
- <label for="selectCampus">Campus</label>
- <select class="custom-select" name="unidade_id" id="unidade_id">
- <option value="" disabled selected hidden> selecione... </option>
- @foreach ($unidades as $unidade)
- <option value="{{ $unidade->id }}" {{ old('unidade_id') == $unidade->id ? 'selected' : '' }}>
- {{ $unidade->name }} </option>
- @endforeach
- </select>
- @error('unidade_id')
- <span class="text-danger"> {{ $message }} </span>
- @enderror
- </div>
- <div class="d-flex justify-content-between">
- @include('components.buttons.btn-cancel', [
- 'route' => route('campus_index'),
- ])
- @include('components.buttons.btn-save', [
- 'content' => 'Cadastrar',
- 'btn_class' => 'btn btn-outline-success',
- 'i_class' => '',
- ])
+
+ <div class='row'>
+
+ <div class='mb-3 col-sm-6'>
+ <div class="form-group">
+ <label for="name">Nome do Campus</label>
+ <input type="text" name="name" class="form-control" id="name"
+ placeholder="Campus" value="{{ old('name') }}">
+ @error('name')
+ <span class="text-danger"> {{ $message }} </span>
+ @enderror
+ </div>
+ </div>
+
+ <div class='mb-3 col-sm-6'>
+ <div class="form-group">
+ <label for="unidade_id">Unidade</label>
+ <select class="form-select" name="unidade_id" id="unidade_id">
+ <option value="" disabled selected hidden> selecione... </option>
+ @foreach ($unidades as $unidade)
+ <option value="{{ $unidade->id }}" {{ old('unidade_id') == $unidade->id ? 'selected' : '' }}>
+ {{ $unidade->name }} </option>
+ @endforeach
+ </select>
+ @error('unidade_id')
+ <span class="text-danger"> {{ $message }} </span>
+ @enderror
+ </div>
+ </div>
+
+ <div class='mt-1 text-end'>
+ @include('components.buttons.btn-cancel', [
+ 'route' => route('campus_index'),
+ 'content' => 'Cancelar'
+ ])
+
+ @include('components.buttons.btn-save', [
+ 'content' => 'Cadastrar'
+ ])
+ </div>
+
</div>
+
</form>
+
</div>
@endsection
\ No newline at end of file
diff --git a/resources/views/campus/index.blade.php b/resources/views/campus/index.blade.php
index 4b8bba9ceb485de21c9db2f814c1b9ce71e21941..bc15df959fee06758a5728d385c197334bcd0d93 100644
--- a/resources/views/campus/index.blade.php
+++ b/resources/views/campus/index.blade.php
@@ -17,9 +17,9 @@
<h2 class="">TODOS OS CAMPUS</h2>
@include('components.buttons.btn-create', [
'route' => route('campus_create'),
- 'class' => '',
+ 'class' => 'btn btn-success',
'content' => 'Novo Campus',
- 'id' => '',
+ 'id' => 'campus_create',
])
</div>
@@ -41,11 +41,12 @@
<td>{{ $camp->unidade }}</td>
<td>
@include('components.buttons.btn-edit', [
- 'btn_class' => 'btn btn-warning',
'route' => route('campus_edit', ['id' => $camp->id]),
])
- @include('components.buttons.btn-soft-delete', [
- 'modal_id' => $camp->id, 'route' => route('campus_delete', ['id' => $camp->id])
+
+ @include('components.buttons.btn-delete', [
+ 'id' => $camp->id,
+ 'route' => route('campus_delete', ['id' => $camp->id])
])
</td>
</tr>
diff --git a/resources/views/campus/update.blade.php b/resources/views/campus/update.blade.php
index bcf97f1203cacc1b8aa2e794ad63cc18734472f7..ef00f8dd94abec5fce2810eb48ee346af8762dc4 100644
--- a/resources/views/campus/update.blade.php
+++ b/resources/views/campus/update.blade.php
@@ -21,37 +21,52 @@
<form action="{{ route('campus_update', $campus->id) }}" method="post">
@csrf
@method('POST')
- <div class="form-group">
- <label for="inputNameCampus">Nome do Campus</label>
- <input type="text" name="name" class="form-control" id="inputNameCampus"
- placeholder="Insira o nome do Campus" value="{{ $campus->name }}{{ old('name') }}">
- @error('name')
- <span class="text-danger"> {{ $message }} </span>
- @enderror
- </div>
- <div class="form-group">
- <label for="selectCampus">Campus</label>
- <select class="custom-select" name="unidade_id" id="unidade_id">
- <option value="" disabled selected hidden> selecione... </option>
- @foreach ($unidades as $unidade)
- <option value="{{ $unidade->id }}" {{ $campus->unidade->id == $unidade->id ? 'selected' : '' }}>
- {{ $unidade->name }} </option>
- @endforeach
- </select>
- @error('unidade_id')
- <span class="text-danger"> {{ $message }} </span>
- @enderror
- </div>
- <div class="d-flex justify-content-between">
- @include('components.buttons.btn-cancel', [
- 'route' => route('campus_index'),
- ])
- @include('components.buttons.btn-save', [
- 'content' => 'Atualizar',
- 'btn_class' => 'btn btn-outline-success',
- 'i_class' => '',
- ])
+
+ <div class='row'>
+
+ <div class='mb-3 col-sm-6'>
+ <div class="form-group">
+ <label for="name">Nome do Campus</label>
+ <input type="text" id="name" name="name" class="form-control" id="name" placeholder="Campus" value="{{ $campus->name }}{{ old('name') }}">
+ @error('name')
+ <span class="text-danger"> {{ $message }} </span>
+ @enderror
+ </div>
+ </div>
+
+ <div class='mb-3 col-sm-6'>
+ <div class="form-group">
+ <label for="unidade_id">Unidade</label>
+ <select class="form-select" name="unidade_id" id="unidade_id">
+ <option value="" disabled selected hidden> selecione... </option>
+ @foreach ($unidades as $unidade)
+ @if($campus->unidade_id == $unidade->id)
+ <option selected value="{{ $unidade->id }}"> {{ $unidade->name }} </option>
+ @else
+ <option value="{{ $unidade->id }}"> {{ $unidade->name }} </option>
+ @endif
+
+ @endforeach
+ </select>
+ @error('unidade_id')
+ <span class="text-danger"> {{ $message }} </span>
+ @enderror
+ </div>
+ </div>
+
+ <div class='mt-1 text-end'>
+ @include('components.buttons.btn-cancel', [
+ 'route' => route('campus_index'),
+ 'content' => 'Cancelar'
+ ])
+
+ @include('components.buttons.btn-save', [
+ 'content' => 'Atualizar',
+ ])
+ </div>
+
</div>
+
</form>
</div>
@endsection
\ No newline at end of file
diff --git a/resources/views/components/buttons/btn-cancel.blade.php b/resources/views/components/buttons/btn-cancel.blade.php
index a6947785a0a6a73179e730bb47345f0b3ad0d611..febb0490a2e98a860ff7e779ee097185d7c4d8bc 100644
--- a/resources/views/components/buttons/btn-cancel.blade.php
+++ b/resources/views/components/buttons/btn-cancel.blade.php
@@ -1,4 +1,11 @@
-<a class="btn btn-secondary" href="{{$route}}">
- <i class="bi bi-x-square-fill"></i>
- Cancelar
+{{--
+ @include('components.buttons.btn-cancel', [
+ 'route' => '',
+ 'content' => ''
+ ])
+--}}
+
+<a class="btn btn-secondary" href="{{ $route }}">
+ <i class="bi bi-x-circle"></i>
+ {{ $content }}
</a>
diff --git a/resources/views/components/buttons/btn-close_modal.blade.php b/resources/views/components/buttons/btn-close_modal.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..1dac803d32315ceab60d54d817487aa53ce64f3d
--- /dev/null
+++ b/resources/views/components/buttons/btn-close_modal.blade.php
@@ -0,0 +1,7 @@
+{{--
+ @include('components.buttons.btn-close_modal')
+--}}
+<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+ <i class="bi bi-x-circle"></i>
+ Cancelar
+</button>
\ No newline at end of file
diff --git a/resources/views/components/buttons/btn-create.blade.php b/resources/views/components/buttons/btn-create.blade.php
index f47346070d7d4c40caca43aa277164664dbdc5b0..3310d814905f33c43cb177ebb913aaa4629d0ef6 100644
--- a/resources/views/components/buttons/btn-create.blade.php
+++ b/resources/views/components/buttons/btn-create.blade.php
@@ -1,4 +1,12 @@
-<a class="btn {{$class}}" href="{{$route}}" id="{{$id}}">
+{{--
+ @include('components.buttons.btn-create', [
+ 'id' => '',
+ 'route' => '',
+ 'content' => ''
+ ])
+--}}
+
+<a class="btn btn-success" href="{{$route}}" id="{{$id}}">
<i class="bi bi-plus-circle"></i>
{{$content}}
</a>
diff --git a/resources/views/components/buttons/btn-delete.blade.php b/resources/views/components/buttons/btn-delete.blade.php
index f8e601b7b6ecaa894bca4bfbf6f2c8d097f76b18..aaf0e1dc5658074ab048eca7c031696827dfb504 100644
--- a/resources/views/components/buttons/btn-delete.blade.php
+++ b/resources/views/components/buttons/btn-delete.blade.php
@@ -1,5 +1,14 @@
+{{--
+
+ @include('components.buttons.btn-delete', [
+ 'id' => $id,
+ 'route' => route('')
+ ])
+
+--}}
+
<!-- Button trigger modal -->
-<button type="button" class="{{ $btn_class }}" data-bs-toggle="modal" data-bs-target="#modal-delete-{{ $id }}">
+<button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#modal-delete-{{ $id }}">
<i class="bi bi-trash"></i>
</button>
@@ -8,7 +17,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
- <h5 class="modal-title" id="$modal-label-title-{{ $id }}">Excluir Item</h5>
+ <h5 class="modal-title" id="modal-label-title-{{ $id }}">Excluir Item</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
diff --git a/resources/views/components/buttons/btn-edit-task.blade.php b/resources/views/components/buttons/btn-edit-task.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..c89faf7f73f4d5678a2a45e13a1521d5465f744c
--- /dev/null
+++ b/resources/views/components/buttons/btn-edit-task.blade.php
@@ -0,0 +1,12 @@
+{{--
+ @include('components.buttons.btn-edit-task', [
+ 'btn_class' => '',
+ 'btn_id' => ''
+ ])
+--}}
+
+<div class="btn-edit-tasks">
+ <button type="button" class="btn btn-primary {{ $btn_class }}" id="{{ $btn_id }}">
+ <i class="bi bi-pencil-square"></i>
+ </button>
+</div>
\ No newline at end of file
diff --git a/resources/views/components/buttons/btn-edit.blade.php b/resources/views/components/buttons/btn-edit.blade.php
index 140eb3c835f889e8dd21945eba41deaedd6663ff..39259267684ecc3024f1bf43f208d638ea314286 100644
--- a/resources/views/components/buttons/btn-edit.blade.php
+++ b/resources/views/components/buttons/btn-edit.blade.php
@@ -1 +1,8 @@
-<a class="{{$btn_class}}" href="{{$route}}"><i class="bi bi-pencil-square"></i></a>
\ No newline at end of file
+{{--
+ @include('components.buttons.btn-edit', [
+ 'route' => ''
+ ])
+--}}
+<a class="btn btn-warning" href="{{$route}}">
+ <i class="bi bi-pencil-square"></i>
+</a>
\ No newline at end of file
diff --git a/resources/views/components/buttons/btn-save.blade.php b/resources/views/components/buttons/btn-save.blade.php
index 25e196f1ba52c8c1574eff1867f76802cb9a313f..095ceea8efeb31193cad4ab37d6f383dbf4edb63 100644
--- a/resources/views/components/buttons/btn-save.blade.php
+++ b/resources/views/components/buttons/btn-save.blade.php
@@ -1,4 +1,18 @@
-<button class="{{$btn_class}}" type="submit">
- <i class="{{$i_class}}"></i>
- {{$content}}
+{{--
+ @include('components.buttons.btn-save', [
+ 'id' => '',
+ 'content' => '',
+ ])
+--}}
+
+@php
+ if(!isset($id))
+ {
+ $id = '';
+ }
+@endphp
+
+<button class="btn btn-success" id="{{ $id }}" type="submit">
+ <i class=""></i>
+ {{ $content }}
</button>
diff --git a/resources/views/components/buttons/btn-soft-delete.blade.php b/resources/views/components/buttons/btn-soft-delete.blade.php
index 4ffd03ca5271822ec26aa211ff8f3a703e23d162..93af8b529881e986af12741ea6b4cf829f3674c3 100644
--- a/resources/views/components/buttons/btn-soft-delete.blade.php
+++ b/resources/views/components/buttons/btn-soft-delete.blade.php
@@ -1,6 +1,6 @@
<!-- Button trigger modal -->
<button type="button" class="btn btn-danger" data-toggle="modal" data-target="#modal-delete-{{ $modal_id }}">
- <i class="fas fa-trash"></i>
+ <i class="bi bi-trash"></i>
</button>
<!-- Modal -->
diff --git a/resources/views/components/divs/errors.blade.php b/resources/views/components/divs/errors.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..27183774db51b8bdfabd04b7c3afebcb05f691b9
--- /dev/null
+++ b/resources/views/components/divs/errors.blade.php
@@ -0,0 +1,28 @@
+{{--
+ @include('components.divs.errors', [
+ 'form' => '',
+ 'field' => '',
+ ])
+--}}
+
+@php
+ if(!isset($form)) {
+ $div_id = $field;
+ } else {
+ $div_id = $form . '_' . $field;
+ }
+@endphp
+
+@if( $errors->has($field) )
+ @error($field)
+ <div class="alert alert-danger">
+ <span>{{$message}}</span>
+ </div>
+ @enderror
+@endif
+
+@if( !$errors->has($field) )
+ <div id="{{ $div_id }}-error" class="ajax-errors">
+ <span></span>
+ </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/components/frontend-libs.blade.php b/resources/views/components/frontend-libs.blade.php
index ce0c394ecb727c83b024b0d108754c8dc32c9247..b6e1dd4d60e1fa7cb60c3d276a410ddb5b401274 100644
--- a/resources/views/components/frontend-libs.blade.php
+++ b/resources/views/components/frontend-libs.blade.php
@@ -11,9 +11,9 @@
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.10.2/dist/umd/popper.min.js" integrity="sha384-7+zCNj/IqJ95wo16oMtfsKbZ9ccEh31eOz1HGyDuCQ6wgnyJNSYdrPa03rtR1zdB" crossorigin="anonymous"></script>
-<!-- Font Awesome -->
-<!-- <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.15.4/css/all.css" integrity="sha384-DyZ88mC6Up2uqS4h/KRgHuoeGwBcD4Ng9SiP4dIRy0EXTlnuz47vAwmeGwVChigm" crossorigin="anonymous"/> -->
-
-
<!-- Bootstrap Icons -->
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.1/font/bootstrap-icons.css">
\ No newline at end of file
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.1/font/bootstrap-icons.css">
+
+<!-- Toastfy -->
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/toastify-js"></script>
+<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/toastify-js/src/toastify.min.css">
diff --git a/resources/views/components/modal.blade.php b/resources/views/components/modal.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..82c2e8392b828ac3dbfd2fc084a7e8b3d800817c
--- /dev/null
+++ b/resources/views/components/modal.blade.php
@@ -0,0 +1,49 @@
+{{--
+ @include('components.modal', [
+ 'id' => '',
+ 'size' => '',
+ 'header' => '',
+ 'content' => '',
+ ])
+--}}
+
+@php
+ if(!isset($id)) {
+ $id = 'modal';
+ }
+
+ if(!isset($size)) {
+ $size = '';
+ }
+
+ if(!isset($header)) {
+ $header = 'Modal';
+ }
+
+ if(!isset($title)) {
+ $title = 'header';
+ }
+
+ if(!isset($content)) {
+ $content = '';
+ }
+@endphp
+
+<!-- <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#{{ $id }}">
+ <i class="bi bi-trash"></i>
+</button> -->
+
+<!-- Modal -->
+<div class="modal fade" id="{{ $id }}" tabindex="-1" aria-labelledby="modal-label-{{ $id }}" aria-hidden="true">
+ <div class="modal-dialog {{ $size }}">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title" id="modal-label-title-header-{{ $id }}">{{ $header }}</h5>
+ <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+ </div>
+ <div id="{{ $id }}-content" class="modal-body">
+ {{ $content }}
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/coordenador/create.blade.php b/resources/views/coordenador/create.blade.php
index 301e488d0c9a7e937bea3fe0e434db8fc9a4d610..0e1578f8e44ebba1961815796341b38a1b3ffa49 100644
--- a/resources/views/coordenador/create.blade.php
+++ b/resources/views/coordenador/create.blade.php
@@ -23,34 +23,62 @@
<form action="{{ route('diretor_store') }}" method="post">
@csrf
@method('POST')
- <div class="form-group">
- <label for="inputNameCoordenador">Nome</label>
- <input type="text" class="form-control" id="inputNameCoordenador" placeholder="Nome">
- </div>
- <div class="form-group">
- <label for="inputEmailCoordenador">Email</label>
- <input type="email" class="form-control" id="inputEmailCoordenador" placeholder="nome@upe.br">
- </div>
- <div class="form-row">
- <div class="form-group col-md-6">
- <label for="inputCPF">CPF</label>
- <input type="text" class="form-control" id="inputCPF" placeholder="000.000.000-00">
- </div>
- <div class="form-group col-md-6">
- <label for="inputMatricula">Matricula</label>
- <input type="text" class="form-control" id="inputMatricula" placeholder="Nº Matricula">
- </div>
- </div>
- <div class="form-group">
- <label for="selectArea">Dimensão de atuação</label>
- <select class="custom-select mr-sm-2" id="inlineFormCustomSelect" aria-label="Default select example">
- <option selected>Selecionar dimensão de atuação</option>
- <option value="1">ENSINO</option>
- <option value="2">PESQUISA</option>
- <option value="3">EXTENSÃO</option>
- <option value="4">GESTÃO</option>
- </select>
- </div>
+
+ <div class="row">
+
+ <div class="mb-3 col-sm-6">
+ <div class="form-group">
+ <label for="name">Nome</label>
+ <input type="text" id="name" name="name" class="form-control" value="{{ old('name') }}" placeholder="Nome">
+ </div>
+ </div>
+
+ <div class="mb-3 col-sm-6">
+ <div class="form-group">
+ <label for="email">Email</label>
+ <input type="email" class="form-control" id="email" name="email" placeholder="email@upe.br">
+ </div>
+ </div>
+
+ <div class="mb-3 col-sm-6">
+ <div class="form-group">
+ <label for="document">Documento (CPF)</label>
+ <input type="text" class="form-control" id="document" name="document" placeholder="000.000.000-00">
+ </div>
+ </div>
+
+ <div class="mb-3 col-sm-6">
+ <div class="form-group">
+ <label for="matricula">Matricula</label>
+ <input type="text" class="form-control" id="matricula" name="matricula" placeholder="Nº Matricula">
+ </div>
+ </div>
+
+ <div class="mb-3 col-sm-6">
+ <div class="form-group">
+ <label for="dimensao_type">Dimensão de Atuação</label>
+ <select class="form-select" id="dimensao_type" name="dimensao_type">
+ <option selected>Selecione</option>
+ <option value="1">ENSINO</option>
+ <option value="2">PESQUISA</option>
+ <option value="3">EXTENSÃO</option>
+ <option value="4">GESTÃO</option>
+ </select>
+ </div>
+ </div>
+
+ <div class="mt-1 text-end">
+
+ @include('components.buttons.btn-cancel', [
+ 'route' => route('coordenador_index'),
+ 'content' => 'Cancelar'
+ ])
+
+ @include('components.buttons.btn-save', [
+ 'content' => 'Cadastrar'
+ ])
+ </div>
+
<!--
<div class="form-row">
<div class="form-group col-md-6">
@@ -73,11 +101,7 @@
</div>
</div>
-->
- <div class="d-flex justify-content-between">
- @include('components.buttons.btn-cancel', [
- 'route' => route('unidade_index'),
- ])
- @include('components.buttons.btn-save')
+
</div>
</form>
</div>
diff --git a/resources/views/coordenador/index.blade.php b/resources/views/coordenador/index.blade.php
index 59bcf0a38464291b48088f68fc892b1bfa91b596..74c46934a9d89e4887c8dc24527f7f7ccf8af4b0 100644
--- a/resources/views/coordenador/index.blade.php
+++ b/resources/views/coordenador/index.blade.php
@@ -28,7 +28,7 @@
<thead class="thead-dark">
<tr>
<th scope="col">Nome</th>
- <th scope="col">CPF</th>
+ <th scope="col">Documento</th>
<th scope="col">Ações</th>
</tr>
</thead>
@@ -39,12 +39,12 @@
<td>{{ $coordenador->document }}</td>
<td>
@include('components.buttons.btn-edit', [
- 'btn_class' => 'btn btn-warning',
'route' => route('coordenador_edit', ['id' => $coordenador->id]),
])
- @include('components.buttons.btn-soft-delete', [
+
+ @include('components.buttons.btn-delete', [
+ 'id' => $coordenador->id,
'route' => route('coordenador_delete', ['id' => $coordenador->id]),
- 'modal_id' => $coordenador->id,
])
</td>
</tr>
diff --git a/resources/views/curso/create.blade.php b/resources/views/curso/create.blade.php
index 2a25e6aebbf9972c89245448a7f7dcec165d5abe..7d35944a8977f1d7f4de7ee7f41b0f9fe56bedd0 100644
--- a/resources/views/curso/create.blade.php
+++ b/resources/views/curso/create.blade.php
@@ -21,37 +21,50 @@
<form action="{{ route('curso_store') }}" method="post">
@csrf
@method('POST')
- <div class="form-group">
- <label for="inputNameCurso">Nome do Curso</label>
- <input type="text" class="form-control" name="name" id="inputNameCurso"
- placeholder="Insira o nome do Curso" value="{{ old('name') }}">
- @error('name')
- <span class="text-danger"> {{ $message }} </span>
- @enderror
- </div>
- <div class="form-group">
- <label for="selectCampus">Campus</label>
- <select class="custom-select mr-sm-2" name="campus_id" id="inlineFormCustomSelect"
- aria-label="Default select example">
- <option value="" disabled selected hidden> selecione... </option>
- @foreach ($allCampus as $campus)
- <option value="{{ $campus->id }}" {{ old('campus_id') == $campus->id ? 'selected' : '' }}>{{ $campus->name }}</option>
- @endforeach
- </select>
- @error('campus_id')
- <span class="text-danger"> {{ $message }} </span>
- @enderror
- </div>
- <div class="d-flex justify-content-between">
- @include('components.buttons.btn-cancel', [
- 'route' => route('curso_index'),
- ])
- @include('components.buttons.btn-save', [
- 'content' => 'Cadastrar',
- 'btn_class' => 'btn btn-outline-success',
- 'i_class' => '',
- ])
+
+ <div class="row">
+
+ <div class="mb-3 col-sm-6">
+ <div class="form-group">
+ <label for="inputNameCurso">Nome do Curso</label>
+ <input type="text" class="form-control" name="name" id="name"
+ placeholder="Curso" value="{{ old('name') }}">
+ @error('name')
+ <span class="text-danger"> {{ $message }} </span>
+ @enderror
+ </div>
+ </div>
+
+ <div class="mb-3 col-sm-6">
+ <div class="form-group">
+ <label for="campus_id">Campus</label>
+ <select class="form-select" name="campus_id" id="campus_id"
+ aria-label="Default select example">
+ <option value="" disabled selected hidden> selecione... </option>
+ @foreach ($allCampus as $campus)
+ <option value="{{ $campus->id }}" {{ old('campus_id') == $campus->id ? 'selected' : '' }}>{{ $campus->name }}</option>
+ @endforeach
+ </select>
+ @error('campus_id')
+ <span class="text-danger"> {{ $message }} </span>
+ @enderror
+ </div>
+ </div>
+
+ <div class="mt-1 text-end">
+ @include('components.buttons.btn-cancel', [
+ 'route' => route('curso_index'),
+ 'content' => 'Cancelar'
+ ])
+
+ @include('components.buttons.btn-save', [
+ 'btn_class' => 'btn btn-outline-success',
+ 'content' => 'Cadastrar',
+ ])
+ </div>
+
</div>
+
</form>
</div>
@endsection
diff --git a/resources/views/curso/index.blade.php b/resources/views/curso/index.blade.php
index ebeef55ce832ecb5313862b7988cd62c96860faa..4b115c3f3553698081379bcd35bfb6cdd7d3ef5c 100644
--- a/resources/views/curso/index.blade.php
+++ b/resources/views/curso/index.blade.php
@@ -40,12 +40,12 @@
<td>{{ $curso->campus }}</td>
<td>
@include('components.buttons.btn-edit', [
- 'btn_class' => 'btn btn-warning',
'route' => route('curso_edit', ['id' => $curso->id]),
])
- @include('components.buttons.btn-soft-delete', [
+
+ @include('components.buttons.btn-delete', [
+ 'id' => $curso->id,
'route' => route('curso_delete', ['id' => $curso->id]),
- 'modal_id' => $curso->id,
])
</td>
</tr>
@@ -54,48 +54,4 @@
</tbody>
</table>
</div>
- {{-- <div class="accordion" id="accordionExample">
- @foreach ($campusWithCursos as $campusWithCurso)
- <div class="card" style="width: 50vw;">
- <div class="card-header" id="heading{{ $campusWithCurso->id }}">
- <h5 class="mb-0">
- <button class="btn btn-link p-0" type="button" data-toggle="collapse"
- data-target="#collapse{{ $campusWithCurso->id }}" aria-expanded="true"
- aria-controls="collapse{{ $campusWithCurso->id }}">
- {{ $campusWithCurso->name }}
- </button>
- </h5>
- </div>
-
- <div id="collapse{{ $campusWithCurso->id }}" class="collapse"
- aria-labelledby="heading{{ $campusWithCurso->id }}"
- data-parent="#accordion{{ $campusWithCurso->id }}">
-
- <div class="card-body">
- <div class="accordion-body">
- <table class="table">
- <thead>
- <tr>
- <th scope="col">#</th>
- <th scope="col">Name</th>
- <th scope="col">Campus</th>
- </tr>
- </thead>
- <tbody>
- @foreach ($campusWithCurso->cursos as $curso)
- <tr>
- <th>{{ $curso->id }}</th>
- <td>{{ $curso->name }}</td>
- <td>{{ $curso->campus }}</td>
- </tr>
- @endforeach
- </tbody>
- </table>
- </div>
- </div>
- </div>
- </div>
- @endforeach
- </div> --}}
-
@endsection
diff --git a/resources/views/curso/update.blade.php b/resources/views/curso/update.blade.php
index c6560b797a288b46921d8e028dce0400de4ee142..dbf6d526a841043890c6749f92bdfdb168b34b8a 100644
--- a/resources/views/curso/update.blade.php
+++ b/resources/views/curso/update.blade.php
@@ -17,35 +17,58 @@
<p class="pb-4 mb-3 text-center text-muted align-items-center">
Insira os dados correspondentes nos campos exibidos abaixo
</p>
+
<!-- Formulario -->
<form action="{{ route('curso_update', $curso->id ) }}" method="post">
@csrf
@method('POST')
- <div class="form-group">
- <label for="inputNameCurso">Nome do Curso</label>
- <input type="text" class="form-control" name="name" id="inputNameCurso"
- placeholder="Insira o nome do Curso" value="{{ $curso->name }}">
- </div>
- <div class="form-group">
- <label for="selectCampus">Campus</label>
- <select class="custom-select mr-sm-2" name="campus_id" id="inlineFormCustomSelect"
- aria-label="Default select example">
- <option selected>Selecionar o Campus</option>
- @foreach ($allCampus as $campus)
- <option value="{{ $campus->id }}" {{ $curso->campus->id == $campus->id ? 'selected' : '' }}>{{ $campus->name }}</option>
- @endforeach
- </select>
- </div>
- <div class="d-flex justify-content-between">
- @include('components.buttons.btn-cancel', [
- 'route' => route('curso_index'),
- ])
- @include('components.buttons.btn-save', [
- 'content' => 'Atualizar',
- 'btn_class' => 'btn btn-outline-success',
- 'i_class' => '',
- ])
+
+ <div class="row">
+
+ <div class="mb-3 col-sm-6">
+ <div class="form-group">
+ <label for="inputNameCurso">Nome do Curso</label>
+ <input type="text" class="form-control" name="name" id="name" placeholder="Curso" value="{{ $curso->name }}">
+ @error('name')
+ <span class="text-danger"> {{ $message }} </span>
+ @enderror
+ </div>
+ </div>
+
+ <div class="mb-3 col-sm-6">
+ <div class="form-group">
+ <label for="campus_id">Campus</label>
+ <select class="form-select" name="campus_id" id="campus_id"
+ aria-label="Default select example">
+ <option value="" disabled selected hidden> selecione... </option>
+ @foreach ($allCampus as $campus)
+ @if($curso->campus_id == $campus->id)
+ <option selected value="{{ $campus->id }}">{{ $campus->name }}</option>
+ @else
+ <option value="{{ $campus->id }}">{{ $campus->name }}</option>
+ @endif
+ @endforeach
+ </select>
+ @error('campus_id')
+ <span class="text-danger"> {{ $message }} </span>
+ @enderror
+ </div>
+ </div>
+
+ <div class="mt-1 text-end">
+ @include('components.buttons.btn-cancel', [
+ 'route' => route('curso_index'),
+ 'content' => 'Cancelar'
+ ])
+
+ @include('components.buttons.btn-save', [
+ 'btn_class' => 'btn btn-outline-success',
+ 'content' => 'Atualizar',
+ ])
+ </div>
+
</div>
+
</form>
</div>
@endsection
diff --git a/resources/views/diretor/create.blade.php b/resources/views/diretor/create.blade.php
index 669f4c98d1211d44a1250e671581f9a5814bce42..b398b9fc782d0bccdba9a2e36ef4987afa6cbcdf 100644
--- a/resources/views/diretor/create.blade.php
+++ b/resources/views/diretor/create.blade.php
@@ -27,50 +27,63 @@
@csrf
@method('POST')
- <div class="form-group">
- <label for="email"> E-mail </label>
- <input type="email" class="form-control" name="email" id="email" placeholder="example@email.com"
- value="">
- <small id="email_information" class="form-text text-muted"> {{-- --}} </small>
- @error('email')
- <span class="text-danger"> {{ $message }} </span>
- @enderror
- </div>
- <div class="form-group">
- <label for="name"> Nome </label>
- <input type="name" class="form-control" name="name" id="name" placeholder="Nome Completo"
- value="">
- <small id="name_information" class="form-text text-muted"> {{-- --}} </small>
- @error('name')
- <span class="text-danger"> {{ $message }} </span>
- @enderror
- </div>
- <div class="form-group">
- <label for="document"> CPF </label>
- <input type="document" class="form-control" name="document" id="document" placeholder="Senha"
- value="">
- <small id="document_information" class="form-text text-muted"> {{-- --}} </small>
- @error('document')
- <span class="text-danger"> {{ $message }} </span>
- @enderror
- </div>
+ <div class="row">
- <div class="form-group">
- <label for="selectUnidade">Unidade</label>
- <select class="custom-select mr-sm-2" name="unidade_id" id="selectUnidade"
- aria-label="Default select example">
- <option value="" disabled selected hidden> selecione... </option>
- @foreach ($unidades as $unidade)
- <option value="{{ $unidade->id }}" {{ old('unidade_id') == $unidade->id ? 'selected' : '' }}>{{ $unidade->name }}</option>
- @endforeach
- </select>
- @error('unidade_id')
- <span class="text-danger"> {{ $message }} </span>
- @enderror
- </div>
+ <div class="mb-3 col-sm-6">
+ <div class="form-group">
+ <label for="email"> E-mail </label>
+ <input type="email" class="form-control" name="email" id="email" placeholder="example@email.com" value="{{ old('email') }}">
+ <small id="email_information" class="form-text text-muted"> {{-- --}} </small>
+ @error('email')
+ <span class="text-danger"> {{ $message }} </span>
+ @enderror
+ </div>
+ </div>
- <div class="row">
- <div class="col-6">
+ <div class="mb-3 col-sm-6">
+ <div class="form-group">
+ <label for="name"> Nome </label>
+ <input type="name" class="form-control" name="name" id="name" placeholder="Nome Completo" value="{{ old('name') }}">
+ <small id="name_information" class="form-text text-muted"> {{-- --}} </small>
+ @error('name')
+ <span class="text-danger"> {{ $message }} </span>
+ @enderror
+ </div>
+ </div>
+
+ <div class="mb-3 col-sm-6">
+ <div class="form-group">
+ <label for="document"> Documento (CPF) </label>
+ <input type="document" class="form-control" name="document" id="document" value="{{ old('document') }}" placeholder="Documento (CPF)" >
+ <small id="document_information" class="form-text text-muted"> {{-- --}} </small>
+ @error('document')
+ <span class="text-danger"> {{ $message }} </span>
+ @enderror
+ </div>
+ </div>
+
+ <div class="mb-3 col-sm-6">
+ <div class="form-group">
+ <label for="unidade_id">Unidade</label>
+ <select class="form-select" name="unidade_id" id="unidade_id"
+ aria-label="Default select example">
+ <option value="" disabled selected hidden> selecione... </option>
+ @foreach ($unidades as $unidade)
+ @if( old('unidade_id') == $unidade->id)
+ <option selected value="{{ $unidade->id }}">{{ $unidade->name }}</option>
+ @else
+ <option value="{{ $unidade->id }}">{{ $unidade->name }}</option>
+ @endif
+ @endforeach
+ </select>
+ @error('unidade_id')
+ <span class="text-danger"> {{ $message }} </span>
+ @enderror
+ </div>
+ </div>
+
+
+ <div class="mb-3 col-sm-6">
<div class="form-group">
<label for="password"> Senha </label>
<input type="password" class="form-control" name="password" id="password" placeholder="Senha">
@@ -79,12 +92,25 @@
<span class="text-danger"> {{ $message }} </span>
@enderror
</div>
+
</div>
- </div>
- <div class="d-flex justify-content-end">
- <button class="btn btn-success" type="submit"> Salvar </button>
+ <div class="mb-3 col-sm-6">
+ <!-- Confirmação de Senha -->
+ </div>
+
+ <div class="mt-1 text-end">
+ @include('components.buttons.btn-cancel', [
+ 'route' => route('diretor_index'),
+ 'content' => 'Cancelar'
+ ])
+
+ @include('components.buttons.btn-save', [
+ 'content' => 'Cadastrar'
+ ])
+ </div>
</div>
+
</form>
</div>
@endsection
diff --git a/resources/views/diretor/index.blade.php b/resources/views/diretor/index.blade.php
index 5a3764b0210227ab31ea6d2e96bfc15331f7ca9f..df4b0d8f653b899aff3e1c311388ef1d4e358d94 100644
--- a/resources/views/diretor/index.blade.php
+++ b/resources/views/diretor/index.blade.php
@@ -28,7 +28,7 @@
<thead class="thead-dark">
<tr>
<th scope="col">Nome</th>
- <th scope="col">CPF</th>
+ <th scope="col">Documento</th>
<th scope="col">Ações</th>
</tr>
</thead>
@@ -40,12 +40,12 @@
<td>{{ $diretor->document }}</td>
<td>
@include('components.buttons.btn-edit', [
- 'btn_class' => 'btn btn-warning',
'route' => route('diretor_edit', ['id' => $diretor->id]),
])
- @include('components.buttons.btn-soft-delete', [
+
+ @include('components.buttons.btn-delete', [
+ 'id' => $diretor->id,
'route' => route('diretor_delete', ['id' => $diretor->id]),
- 'modal_id' => $diretor->id,
])
</td>
</tr>
diff --git a/resources/views/diretor/update.blade.php b/resources/views/diretor/update.blade.php
index 2557f5a41e346ad7c44b95b86425bedec01e4fe6..394014e44c9cf22af48c36ae82127a6b3e332dbc 100644
--- a/resources/views/diretor/update.blade.php
+++ b/resources/views/diretor/update.blade.php
@@ -17,6 +17,7 @@
@section('body')
@include('components.alerts')
+ {{ dd('implementar') }}
{{ dd($user) }}
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
<h1 class="h2"> Atualizar Perfil </h1>
diff --git a/resources/views/layouts/user-dashboard/dashboard_admin.blade.php b/resources/views/layouts/user-dashboard/dashboard_admin.blade.php
index 5f600da6cc7c4f33df859cf7524a4641f4687c44..8e7bb2a6b883a6b7b5bd4016a18c7f259493de2d 100644
--- a/resources/views/layouts/user-dashboard/dashboard_admin.blade.php
+++ b/resources/views/layouts/user-dashboard/dashboard_admin.blade.php
@@ -3,21 +3,17 @@
class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
<h1 class="h2">Bem Vindo ao PAD</h1>
</div>
- <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3">
+ <!-- <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3">
<h2 class="h3">
- <svg xmlns="http://www.w3.org/2000/svg" width="26" height="26" fill="currentColor"
- class="bi bi-exclamation-octagon-fill" viewBox="0 0 16 16">
- <path
- d="M11.46.146A.5.5 0 0 0 11.107 0H4.893a.5.5 0 0 0-.353.146L.146 4.54A.5.5 0 0 0 0 4.893v6.214a.5.5 0 0 0 .146.353l4.394 4.394a.5.5 0 0 0 .353.146h6.214a.5.5 0 0 0 .353-.146l4.394-4.394a.5.5 0 0 0 .146-.353V4.893a.5.5 0 0 0-.146-.353L11.46.146zM8 4c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 4.995A.905.905 0 0 1 8 4zm.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" />
- </svg>
+ <i class="bi bi-exclamation-octagon-fill"></i>
Atividades a serem realizadas
</h2>
- </div>
- <div
+ </div> -->
+ <!-- <div
class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-top">
<ul class="inf-list">
<li><a href="" rel="noopener" target="_blank">Cronograma de atividades PAD 2022</a></li>
<li><a href="" rel="noopener" target="_blank">Informações sobre o processo PAD 2022</a></li>
</ul>
- </div>
+ </div> -->
</div>
\ No newline at end of file
diff --git a/resources/views/pad/admin/create.blade.php b/resources/views/pad/admin/create.blade.php
index 5fb87225ad6e4ad0d87bc2c5fc1cc65039503267..72793a2ca57fe942589a148e7dbbc794f85d924a 100644
--- a/resources/views/pad/admin/create.blade.php
+++ b/resources/views/pad/admin/create.blade.php
@@ -67,13 +67,18 @@
</div>
- <div class="d-flex justify-content-end mt-4">
+ <div class="mt-1 text-end">
+ @include('components.buttons.btn-cancel', [
+ 'route' => route('pad_index'),
+ 'content' => 'Cancelar'
+ ])
+
@include('components.buttons.btn-save', [
'btn_class' => 'btn btn-outline-success',
- 'i_class' => '',
'content' => 'Cadastrar',
])
</div>
+
</form>
</div>
diff --git a/resources/views/pad/admin/edit.blade.php b/resources/views/pad/admin/edit.blade.php
index 9a1fea9ef8993d5353d7dadeaad718100007ce01..b950e2055a537dcd3123c20b1a3dfb0536e2d6ee 100644
--- a/resources/views/pad/admin/edit.blade.php
+++ b/resources/views/pad/admin/edit.blade.php
@@ -68,10 +68,14 @@
</div>
- <div class="d-flex justify-content-end mt-4">
+ <div class="mt-1 text-end">
+ @include('components.buttons.btn-cancel', [
+ 'route' => route('pad_index'),
+ 'content' => 'Cancelar'
+ ])
+
@include('components.buttons.btn-save', [
'btn_class' => 'btn btn-outline-success',
- 'i_class' => '',
'content' => 'Atualizar',
])
</div>
diff --git a/resources/views/pad/admin/index.blade.php b/resources/views/pad/admin/index.blade.php
index aa9ffc0880e3f49df417e9078c7bd1bd37e51d2e..4f52bcf22ccf48194f2c0c2b0a5c2070bb17747a 100644
--- a/resources/views/pad/admin/index.blade.php
+++ b/resources/views/pad/admin/index.blade.php
@@ -25,7 +25,7 @@
<div class="d-flex justify-content-end mb-2">
@include('components.buttons.btn-create', [
'id' => 'pad_create',
- 'class' => 'btn-outline-success',
+ 'class' => 'btn-success',
'route' => route('pad_create'),
'content' => 'Cadastrar',
])
@@ -58,13 +58,13 @@
<td>{{ $pad->getStatusAsText() }}</td>
<td>
@include('components.buttons.btn-edit', [
- 'btn_class' => 'btn btn-outline-primary',
+ 'btn_class' => 'btn btn-primary',
'route' => route('pad_edit', ['id' => $pad->id])
])
@include('components.buttons.btn-delete', [
'id' => $pad->id,
- 'btn_class' => 'btn btn-outline-danger',
+ 'btn_class' => 'btn btn-danger',
'route' => route('pad_delete', ['id' => $pad->id])
])
</td>
diff --git a/resources/views/pad/components/scripts/ajaxValidation.blade.php b/resources/views/pad/components/scripts/ajaxValidation.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..5d140eab6323cd7468c0e2b068e8c1cd86dae271
--- /dev/null
+++ b/resources/views/pad/components/scripts/ajaxValidation.blade.php
@@ -0,0 +1,52 @@
+{{--
+ @include('pad.components.scripts.ajaxValidation', [
+ 'btn_submit_id' => '',
+ 'form_id' => '',
+ 'route' => '',
+ 'div_errors' => '',
+ ])
+--}}
+
+<script type="text/javascript">
+
+ $('#{{ $btn_submit_id }}').click(function(e) {
+ e.preventDefault()
+
+ const values = $('#{{ $form_id }}').serializeArray()
+
+ $('.ajax-errors').removeClass('alert alert-danger')
+ $('.ajax-errors span').empty();
+
+ $.ajax({
+ type: 'POST',
+ url: "{{ route('ensino_aula_validate') }}",
+ data: values
+ }).done(function(data, status) {
+
+ if(data.status == 200) {
+ $('#{{ $form_id }}').submit()
+ } else {
+ Toastify({
+ text: "Erro no preenchimento dos campos",
+ duration: 3000
+ }).showToast();
+
+ let keys = Object.keys(data.errors)
+
+ keys.forEach((key) => {
+ $('#'+'{{ $div_errors }}'+'_'+key+'-error').addClass('alert alert-danger')
+ $('#'+'{{ $div_errors }}'+'_'+key+'-error span').text(data.errors[key].shift())
+ })
+
+ }
+
+ }).fail(function(data, status) {
+ Toastify({
+ text: "Erro ao atualizar a atividade",
+ backgroundColor: '#e74c3c',
+ duration: 3000
+ }).showToast();
+ })
+ })
+
+</script>
diff --git a/resources/views/pad/components/scripts/cod_atividade.blade.php b/resources/views/pad/components/scripts/cod_atividade.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..b030cb96b889d5249b310ead7a8f8551d4d733c6
--- /dev/null
+++ b/resources/views/pad/components/scripts/cod_atividade.blade.php
@@ -0,0 +1,41 @@
+{{--
+ @include('pad.components.scripts.cod_atividade', [
+ 'cod_atividade' => '',
+ 'form_id' => '',
+ 'div_selected' => '',
+ 'route' => '',
+ ])
+--}}
+
+<script type="text/javascript">
+
+ $('#get-divs').change(function(e) {
+ e.preventDefault()
+
+ const self = $(this)
+ const cod_atividade = "{{ $cod_atividade }}"
+ const user_pad_id = $('#user_pad_id').val()
+ const field_cod_atividade = $('#{{ $form_id }} input[name=cod_atividade]')
+
+ if(self.val() === '{{ $div_selected }}') {
+ $.ajax({
+ type: 'GET',
+ url: "{{ $route }}" + '/' + user_pad_id
+ }).done(function(data, status) {
+
+ let alpha_aulas = data.map((item) => {
+ return item.cod_atividade.split('-').pop();
+ })
+
+ let new_alpha_aulas = alpha.filter((item) => !alpha_aulas.includes(item))
+
+ field_cod_atividade.val(cod_atividade+new_alpha_aulas.shift())
+
+ }).fail(function(message, status) {
+
+ })
+ }
+
+ }).change();
+
+</script>
\ No newline at end of file
diff --git a/resources/views/pad/components/scripts/dimensao/ensino/aulas.blade.php b/resources/views/pad/components/scripts/dimensao/ensino/aulas.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..dcecf519deef85213cfa53d7a7bd68c10442635c
--- /dev/null
+++ b/resources/views/pad/components/scripts/dimensao/ensino/aulas.blade.php
@@ -0,0 +1,20 @@
+@include('pad.components.scripts.cod_atividade', [
+ 'cod_atividade' => '1-',
+ 'form_id' => 'ensino_aulas-form',
+ 'div_selected' => 'ensino_aulas',
+ 'route' => route('ensino_aula_search'),
+])
+
+@include('pad.components.scripts.ajaxValidation', [
+ 'btn_submit_id' => 'btn-submit_ensino_aulas',
+ 'form_id' => 'ensino_aulas-form',
+ 'route' => route('ensino_aula_validate'),
+ 'div_errors' => 'ensino_aulas_form_create',
+])
+
+@include('pad.components.scripts.dimensao.ensino.show_modal', [
+ 'btn_edit_class' => 'btn-edit_ensino_aula',
+ 'route' => route('view_ensino_aula_update'),
+ 'modal_id' => 'modal',
+ 'header' => 'Ensino - Aulas',
+])
\ No newline at end of file
diff --git a/resources/views/pad/components/scripts/dimensao/ensino/ensino.blade.php b/resources/views/pad/components/scripts/dimensao/ensino/ensino.blade.php
index 9a5092560d9b650404790b40e8c24b71a663db6d..58033c05c8c70e92230110ee665606b1539fa90b 100644
--- a/resources/views/pad/components/scripts/dimensao/ensino/ensino.blade.php
+++ b/resources/views/pad/components/scripts/dimensao/ensino/ensino.blade.php
@@ -1,40 +1,3 @@
<script type="text/javascript">
const alpha = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'];
-
- const niveis = new Map()
- niveis.set(1, 'Graduação')
- niveis.set(2, 'Pós-graduação Stricto Sensu')
- niveis.set(3, 'Pós-Graduação Lato Sensu')
-
- const modalidades = new Map()
- modalidades.set(1, 'EAD')
- modalidades.set(2, 'Presencial')
-
- function nivel_select_options(nivel) {
- let options = '';
-
- niveis.forEach((value, index) => {
- if(nivel == index) {
- options = options + `<option selected value="${index}"> ${value} </option>`
- } else {
- options = options + `<option value="${index}"> ${value} </option>`
- }
- })
-
- return options;
- }
-
- function modalidade_select_options(modalidade) {
- let options = '';
-
- modalidades.forEach((value, index) => {
- if(modalidade == index) {
- options = options + `<option selected value="${index}"> ${value} </option>`
- } else {
- options = options + `<option value="${index}"> ${value} </option>`
- }
- })
-
- return options;
- }
</script>
\ No newline at end of file
diff --git a/resources/views/pad/components/scripts/dimensao/ensino/ensino_aulas.blade.php b/resources/views/pad/components/scripts/dimensao/ensino/ensino_aulas.blade.php
deleted file mode 100644
index 2ecb924599013ffb70db11a7fa63b8c60f86bec9..0000000000000000000000000000000000000000
--- a/resources/views/pad/components/scripts/dimensao/ensino/ensino_aulas.blade.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<script type="text/javascript">
-
- $('#get-divs').change(function(e) {
- e.preventDefault()
-
- const self = $(this)
- const cod_atividade = "1-"
- const user_pad_id = "{{ $user_pad_id }}"
- const field_cod_atividade = $('#ensino_aulas-form input[name=cod_atividade]')
-
- const route_ensino_aula_search = "{{ route('ensino_aula_search') }}"
- const route_ensino_aula_delete = "{{ route('ensino_aula_delete') }}"
- const route_ensino_aula_update = "{{ route('ensino_aula_update') }}"
-
- $('#ensino_aulas-table > tbody').empty()
-
- if(self.val() === 'ensino_aulas') {
- $.ajax({
- type: 'GET',
- url: route_ensino_aula_search + '/' + user_pad_id
- }).done(function(data, status) {
-
- if(!$('#ensino_aulas-form input[name=model_id]').val())
- {
- let alpha_aulas = data.map((item) => {
- return item.cod_atividade.split('-').pop();
- })
-
- let new_alpha_aulas = alpha.filter((item) => !alpha_aulas.includes(item))
-
- field_cod_atividade.val(cod_atividade+new_alpha_aulas.shift())
-
- data.forEach((item) => {
- $('#ensino_aulas-table > tbody').append(
- `<tr>
- <td> ${item.cod_atividade} </td>
- <td> ${item.componente_curricular} </td>
- <td> ${item.curso} </td>
- <td> ${niveis.get(item.nivel)} </td>
- <td> ${modalidades.get(item.modalidade)} </td>
- <td> ${item.ch_semanal} </td>
- <td> ${item.ch_total} </td>
- <td>
- <div class="edit_ensino_aula">
- <!-- Button trigger modal -->
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#modal_ensino_aula_edit-${item.id}">
- <i class="bi bi-pencil-square"></i>
- </button>
-
- <!-- Modal -->
- <div class="modal fade" id="modal_ensino_aula_edit-${item.id}" tabindex="-1" aria-labelledby="modal_ensino_aula_edit_label-${item.id}" aria-hidden="true">
- <div class="modal-dialog modal-lg">
- <div class="modal-content">
- <div class="modal-header">
- <h5 class="modal-title" id="modal_ensino_aula_edit_label_title-${item.id}">Atualizar</h5>
- <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
- </div>
- <div class="modal-body">
-
- <form action="${route_ensino_aula_update}" method="post" id="ensino_aulas_update_${item.id}-form" class="">
- @csrf
-
- <div class="row">
-
- <input type="hidden" id="id" name="id" value="${item.id}">
-
- <input type="hidden" name="user_pad_id" value="${item.user_pad_id}">
-
- <div class="mb-3 col-sm-2">
- <label class="form-label" for="cod_atividade">Cód. Atividade</label>
- <input class="form-control @error('cod_atividade') is-invalid @enderror" type="text" name="cod_atividade" id="cod_atividade" value=${item.cod_atividade} readonly>
- </div>
-
- <div class="mb-3 col-sm-5">
- <label class="form-label" for="componente_curricular">Componente Curricular</label>
- <input class="form-control @error('componente_curricular') is-invalid @enderror" type="text" name="componente_curricular" id="componente_curricular" value="${item.componente_curricular}">
- @error('componente_curricular')
- <div class="alert alert-danger">
- <span>{{$message}}</span>
- </div>
- @enderror
- </div>
-
- <div class="mb-3 col-sm-5">
- <label class="form-label" for="curso">Curso</label>
- <input class="form-control @error('curso') is-invalid @enderror" type="text" name="curso" id="curso" value="${item.curso}">
- @error('curso')
- <div class="alert alert-danger">
- <span>{{$message}}</span>
- </div>
- @enderror
- </div>
-
- <div class="mb-3 col-sm-3">
- <label class="form-label" for="nivel">NÃvel</label>
- <select class="form-select @error('nivel') is-invalid @enderror" name="nivel" id="nivel">
- ${nivel_select_options(item.nivel)}
- </select>
- @error('nivel')
- <div class="alert alert-danger">
- <span>{{$message}}</span>
- </div>
- @enderror
- </div>
-
- <div class="mb-3 col-sm-3">
- <label class="form-label" for="modalidade">Modalidade</label>
- <select class="form-select @error('modalidade') is-invalid @enderror" name="modalidade" id="modalidade">
- ${modalidade_select_options(item.modalidade)}
- </select>
- @error('modalidade')
- <div class="alert alert-danger">
- <span>{{$message}}</span>
- </div>
- @enderror
- </div>
-
- <div class="mb-3 col-sm-3">
- <label class="form-label" for="ch_semanal">CH. Semanal</label>
- <input class="form-control @error('ch_semanal') is-invalid @enderror" type="number" name="ch_semanal" id="ch_semanal" value="${item.ch_semanal}">
- @error('ch_semanal')
- <div class="alert alert-danger">
- <span>{{$message}}</span>
- </div>
- @enderror
- </div>
-
- <div class="mb-3 col-sm-3">
- <label class="form-label" for="ch_total">CH. Total</label>
- <input class="form-control @error('ch_total') is-invalid @enderror" type="number" name="ch_total" id="ch_total" value="${item.ch_total}">
- @error('ch_total')
- <div class="alert alert-danger">
- <span>{{$message}}</span>
- </div>
- @enderror
- </div>
- </div>
-
- <div class="modal-footer">
- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancelar</button>
-
- <button type="submit" class="btn btn-success rounded">Atualizar</button>
- </div>
-
- </form>
-
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <div class="delete_ensino_aula">
- <!-- Button trigger modal -->
- <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#modal_ensino_aula_delete-${item.id}">
- <i class="bi bi-trash"></i>
- </button>
-
- <!-- Modal -->
- <div class="modal fade" id="modal_ensino_aula_delete-${item.id}" tabindex="-1" aria-labelledby="modal_ensino_aula_delete_label-${item.id}" aria-hidden="true">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="modal-header">
- <h5 class="modal-title" id="modal_ensino_aula_delete_label_title-${item.id}">Excluir Item</h5>
- <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
- </div>
- <div class="modal-body">
- Você tem certeza que deseja excluir o item "${item.cod_atividade+' : '+item.componente_curricular}"?
- </div>
- <div class="modal-footer">
- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancelar</button>
- <form action="${route_ensino_aula_delete+'/'+item.id}" method="post">
- @method('DELETE')
- @csrf
- <button id="btn-ok" type="submit" class="btn btn-primary">OK</button>
- </form>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- </td>
- </tr>`
- )
- })
-
- } else {
-
- }
-
- }).fail(function(message, status) {
-
- })
- }
-
-
- }).change();
-
-</script>
\ No newline at end of file
diff --git a/resources/views/pad/components/scripts/dimensao/ensino/show_modal.blade.php b/resources/views/pad/components/scripts/dimensao/ensino/show_modal.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..9f35e78dbd838a02a2fc3481467e2fe991eaf165
--- /dev/null
+++ b/resources/views/pad/components/scripts/dimensao/ensino/show_modal.blade.php
@@ -0,0 +1,33 @@
+{{--
+ @include('pad.components.scripts.dimensao.ensino.show_modal', [
+ 'btn_edit_class' => '',
+ 'route' => '',
+ 'modal_id' => '',
+ 'header' => '',
+ ])
+--}}
+
+
+<script type="text/javascript">
+ $('.{{ $btn_edit_class }}').click(function(e) {
+
+ const id = $(this).attr('id')
+
+
+ $('#modal-label-title-header-{{ $modal_id }}').text('{{ $header }}')
+
+ $.ajax({
+ type: 'GET',
+ url: "{{ $route }}" + "/" + id
+ }).done((data, status) => {
+ $('#{{ $modal_id }}-content').empty()
+ $('#{{ $modal_id }}-content').append(data)
+ }).fail((data, status) => {
+ $('#{{ $modal_id }}-content').empty()
+ $('#{{ $modal_id }}-content').append('Erro em Carregar Modal')
+ })
+
+
+ $('#{{ $modal_id }}').modal('show')
+ })
+</script>
\ No newline at end of file
diff --git a/resources/views/pad/components/scripts/dimensao/pesquisa/coordenacao.blade.php b/resources/views/pad/components/scripts/dimensao/pesquisa/coordenacao.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..226155b8e49872f60782d7a61029e4e27892300c
--- /dev/null
+++ b/resources/views/pad/components/scripts/dimensao/pesquisa/coordenacao.blade.php
@@ -0,0 +1,55 @@
+<script type="text/javascript">
+
+ $('#get-divs').change(function(e) {
+ e.preventDefault()
+
+ const self = $(this)
+ const cod_atividade = "1-"
+ const user_pad_id = $('#user_pad_id').val()
+ const field_cod_atividade = $('#pesquisa_coordenacao-form input[name=cod_atividade]')
+
+ if(self.val() === 'pesquisa_coordenacao') {
+ $.ajax({
+ type: 'GET',
+ url: "{{route('pesquisa_coordenacao_search')}}" + '/' + user_pad_id
+ }).done(function(data, status) {
+
+ let alpha_aulas = data.map((item) => {
+ return item.cod_atividade.split('-').pop();
+ })
+
+ let new_alpha_aulas = alpha.filter((item) => !alpha_aulas.includes(item))
+
+ field_cod_atividade.val(cod_atividade+new_alpha_aulas.shift())
+
+ }).fail(function(message, status) {
+
+ })
+ }
+
+ }).change();
+
+
+ $('.btn-edit_pesquisa_coordenacao').click(function(e) {
+
+ const id = $(this).attr('id')
+ const route_pesquisa_coordenacao_edit = "{{route('pesquisa_coordenacao_edit')}}" + "/" + id
+
+ $('#modal-label-title-header').text('Pesquisa - Coordenação')
+
+ $.ajax({
+ type: 'GET',
+ url: route_pesquisa_coordenacao_edit
+ }).done((data, status) => {
+ $('#modal-content').empty()
+ $('#modal-content').append(data)
+ }).fail((data, status) => {
+ $('#modal-content').empty()
+ $('#modal-content').append('Erro em Carregar Modal')
+ })
+
+
+ $('#modal').modal('show')
+ })
+
+</script>
\ No newline at end of file
diff --git a/resources/views/pad/components/scripts/dimensao/pesquisa/general.blade.php b/resources/views/pad/components/scripts/dimensao/pesquisa/general.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..58033c05c8c70e92230110ee665606b1539fa90b
--- /dev/null
+++ b/resources/views/pad/components/scripts/dimensao/pesquisa/general.blade.php
@@ -0,0 +1,3 @@
+<script type="text/javascript">
+ const alpha = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'];
+</script>
\ No newline at end of file
diff --git a/resources/views/pad/components/templates/dimensao/ensino/aulas/form_create.blade.php b/resources/views/pad/components/templates/dimensao/ensino/aulas/form_create.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..c51642c9d56b88f6be929b5f1daa6e6784f3448e
--- /dev/null
+++ b/resources/views/pad/components/templates/dimensao/ensino/aulas/form_create.blade.php
@@ -0,0 +1,153 @@
+
+<div id="ensino_aulas">
+ <div>
+ <div class="mb-3">
+ <h3 class="h3"> Ensino - Aulas </h3 class="h3">
+ </div>
+ <form action="{{route('ensino_aula_create')}}" method="post" id="ensino_aulas-form" class="">
+
+ @csrf
+
+ <div class="row">
+
+ <input type="hidden" id="user_pad_id" name="user_pad_id" value="{{$user_pad_id}}">
+
+ <div class="mb-3 col-sm-2">
+ <label class="form-label" for="cod_atividade">Cód. Atividade</label>
+ <input class="form-control @error('cod_atividade') is-invalid @enderror" type="text" name="cod_atividade" id="cod_atividade" readonly>
+ </div>
+
+ <div class="mb-3 col-sm-5">
+ <label class="form-label" for="componente_curricular">Componente Curricular</label>
+ <input class="form-control @error('componente_curricular') is-invalid @enderror" type="text" name="componente_curricular" id="componente_curricular" value="{{ old('componente_curricular') }}">
+
+ @include('components.divs.errors', [
+ 'form' => 'ensino_aulas_form_create',
+ 'field' => 'componente_curricular',
+ ])
+ </div>
+
+ <div class="mb-3 col-sm-5">
+ <label class="form-label" for="curso">Curso</label>
+ <input class="form-control @error('curso') is-invalid @enderror" type="text" name="curso" id="curso" value="{{ old('curso') }}">
+
+ @include('components.divs.errors', [
+ 'form' => 'ensino_aulas_form_create',
+ 'field' => 'curso'
+ ])
+ </div>
+
+ <div class="mb-3 col-sm-3">
+ <label class="form-label" for="nivel">NÃvel</label>
+ <select class="form-select @error('nivel') is-invalid @enderror" name="nivel" id="nivel" value="{{ old('nivel') }}">
+ <option value="0">Selecione um NÃvel</option>
+ @foreach($niveis as $value => $nivel)
+ @if( $value == old('nivel') )
+ <option selected value="{{$value}}">{{$nivel}}</option>
+ @else
+ <option value="{{$value}}">{{$nivel}}</option>
+ @endif
+ @endforeach
+ </select>
+
+ @include('components.divs.errors', [
+ 'form' => 'ensino_aulas_form_create',
+ 'field' => 'nivel'
+ ])
+ </div>
+
+ <div class="mb-3 col-sm-3">
+ <label class="form-label" for="modalidade">Modalidade</label>
+ <select class="form-select @error('modalidade') is-invalid @enderror" name="modalidade" id="modalidade" value="{{ old('modalidade') }}">
+ <option value="0">Selecione uma Modalidade</option>
+ @foreach($modalidades as $value => $modalidade)
+ @if( $value == old('modalidade') )
+ <option selected value="{{$value}}">{{$modalidade}}</option>
+ @else
+ <option value="{{$value}}">{{$modalidade}}</option>
+ @endif
+ @endforeach
+ </select>
+
+ @include('components.divs.errors', [
+ 'form' => 'ensino_aulas_form_create',
+ 'field' => 'modalidade'
+ ])
+ </div>
+
+ <div class="mb-3 col-sm-3">
+ <label class="form-label" for="ch_semanal">CH. Semanal</label>
+ <input class="form-control @error('ch_semanal') is-invalid @enderror" type="number" name="ch_semanal" id="ch_semanal" value="{{ old('ch_semanal') }}">
+
+ @include('components.divs.errors', [
+ 'form' => 'ensino_aulas_form_create',
+ 'field' => 'ch_semanal'
+ ])
+ </div>
+
+ <div class="mb-3 col-sm-3">
+ <label class="form-label" for="ch_total">CH. Total</label>
+ <input class="form-control @error('ch_total') is-invalid @enderror" type="number" name="ch_total" id="ch_total" value="{{ old('ch_total') }}">
+
+ @include('components.divs.errors', [
+ 'form' => 'ensino_aulas_form_create',
+ 'field' => 'ch_total'
+ ])
+ </div>
+ </div>
+
+ <div class="mt-1 text-end">
+ @include('components.buttons.btn-save', [
+ 'content' => 'Cadastrar',
+ 'id' => 'btn-submit_ensino_aulas'
+ ])
+ </div>
+
+ </form>
+ </div>
+
+ <div class="border rounded px-4 mt-4">
+
+ <table class="table table-hover" id="ensino_aulas-table-">
+ <thead>
+ <tr>
+ <!-- <th scole="col">#</th> -->
+ <th scope="col"> Cód </th>
+ <th scope="col"> Componente Curricular </th>
+ <th scope="col"> Curso </th>
+ <th scope="col"> NÃvel </th>
+ <th scope="col"> Modalidade </th>
+ <th scope="col"> CH Semanal </th>
+ <th scope="col"> CH Total </th>
+ <th scope="col"> Opções </th>
+ </tr>
+ </thead>
+
+ <tbody>
+ @foreach($ensinoAulas as $ensinoAula)
+ <tr>
+ <td>{{ $ensinoAula->cod_atividade }}</td>
+ <td>{{ $ensinoAula->componente_curricular }}</td>
+ <td>{{ $ensinoAula->curso }}</td>
+ <td>{{ $ensinoAula->nivelAsString() }}</td>
+ <td>{{ $ensinoAula->modalidadeAsString() }}</td>
+ <td>{{ $ensinoAula->ch_semanal }}</td>
+ <td>{{ $ensinoAula->ch_total }}</td>
+ <td>
+ @include('components.buttons.btn-edit-task', [
+ 'btn_class' => 'btn-edit_ensino_aula',
+ 'btn_id' => $ensinoAula->id,
+ ])
+
+ @include('components.buttons.btn-delete', [
+ 'id' => $ensinoAula->id,
+ 'route' => route('ensino_aula_delete', ['id' => $ensinoAula->id])
+ ])
+ </td>
+ </tr>
+ @endforeach
+ </tbody>
+ </table>
+
+ </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/pad/components/templates/dimensao/ensino/ensino_aulas.blade.php b/resources/views/pad/components/templates/dimensao/ensino/aulas/form_update.blade.php
similarity index 56%
rename from resources/views/pad/components/templates/dimensao/ensino/ensino_aulas.blade.php
rename to resources/views/pad/components/templates/dimensao/ensino/aulas/form_update.blade.php
index f0f4c7e55acf7560b2b13d562228bb62704d9736..f6b2d02bd3c2f49a7916c2e6916559a5c707c5b9 100644
--- a/resources/views/pad/components/templates/dimensao/ensino/ensino_aulas.blade.php
+++ b/resources/views/pad/components/templates/dimensao/ensino/aulas/form_update.blade.php
@@ -4,36 +4,35 @@
<div class="mb-3">
<h3 class="h3"> Ensino - Aulas </h3 class="h3">
</div>
- <form action="{{route('ensino_aula_create')}}" method="post" id="ensino_aulas-form" class="">
+ <form action="{{route('ensino_aula_update', ['id' => $model->id])}}" method="post" id="ensino_aulas_update-form" class="">
@csrf
<div class="row">
-
- <input type="hidden" name="user_pad_id" value="{{$user_pad_id}}">
<div class="mb-3 col-sm-2">
<label class="form-label" for="cod_atividade">Cód. Atividade</label>
- <input class="form-control @error('cod_atividade') is-invalid @enderror" type="text" name="cod_atividade" id="cod_atividade" readonly>
+ <input class="form-control @error('cod_atividade') is-invalid @enderror" type="text" name="cod_atividade" id="cod_atividade" value="{{$model->cod_atividade}}" readonly>
</div>
<div class="mb-3 col-sm-5">
<label class="form-label" for="componente_curricular">Componente Curricular</label>
- <input class="form-control @error('componente_curricular') is-invalid @enderror" type="text" name="componente_curricular" id="componente_curricular" value="{{ old('componente_curricular') }}">
- @error('componente_curricular')
- <div class="alert alert-danger">
- <span>{{$message}}</span>
- </div>
- @enderror
+ <input class="form-control @error('componente_curricular') is-invalid @enderror" type="text" name="componente_curricular" id="componente_curricular" value="{{$model->componente_curricular}}">
+
+ @include('components.divs.errors', [
+ 'form' => 'ensino_aulas_form_update',
+ 'field' => 'componente_curricular',
+ ])
+
</div>
<div class="mb-3 col-sm-5">
<label class="form-label" for="curso">Curso</label>
- <input class="form-control @error('curso') is-invalid @enderror" type="text" name="curso" id="curso" value="{{ old('curso') }}">
- @error('curso')
- <div class="alert alert-danger">
- <span>{{$message}}</span>
- </div>
- @enderror
+ <input class="form-control @error('curso') is-invalid @enderror" type="text" name="curso" id="curso" value="{{$model->curso}}">
+
+ @include('components.divs.errors', [
+ 'form' => 'ensino_aulas_form_update',
+ 'field' => 'curso',
+ ])
</div>
<div class="mb-3 col-sm-3">
@@ -41,69 +40,76 @@
<select class="form-select @error('nivel') is-invalid @enderror" name="nivel" id="nivel" value="{{ old('nivel') }}">
<option value="0">Selecione um NÃvel</option>
@foreach($niveis as $value => $nivel)
- @if( $value == old('nivel') )
+ @if( $value == $model->nivel )
<option selected value="{{$value}}">{{$nivel}}</option>
@else
<option value="{{$value}}">{{$nivel}}</option>
@endif
@endforeach
</select>
- @error('nivel')
- <div class="alert alert-danger">
- <span>{{$message}}</span>
- </div>
- @enderror
+
+ @include('components.divs.errors', [
+ 'form' => 'ensino_aulas_form_update',
+ 'field' => 'nivel',
+ ])
</div>
<div class="mb-3 col-sm-3">
<label class="form-label" for="modalidade">Modalidade</label>
- <select class="form-select @error('modalidade') is-invalid @enderror" name="modalidade" id="modalidade" value="{{ old('modalidade') }}">
+ <select class="form-select @error('modalidade') is-invalid @enderror" name="modalidade" id="modalidade">
<option value="0">Selecione uma Modalidade</option>
@foreach($modalidades as $value => $modalidade)
- @if( $value == old('modalidade') )
+ @if( $value == $model->modalidade )
<option selected value="{{$value}}">{{$modalidade}}</option>
@else
<option value="{{$value}}">{{$modalidade}}</option>
@endif
@endforeach
</select>
- @error('modalidade')
- <div class="alert alert-danger">
- <span>{{$message}}</span>
- </div>
- @enderror
+
+ @include('components.divs.errors', [
+ 'form' => 'ensino_aulas_form_update',
+ 'field' => 'modalidade',
+ ])
</div>
<div class="mb-3 col-sm-3">
<label class="form-label" for="ch_semanal">CH. Semanal</label>
- <input class="form-control @error('ch_semanal') is-invalid @enderror" type="number" name="ch_semanal" id="ch_semanal" value="{{ old('ch_semanal') }}">
- @error('ch_semanal')
- <div class="alert alert-danger">
- <span>{{$message}}</span>
- </div>
- @enderror
+ <input class="form-control @error('ch_semanal') is-invalid @enderror" type="number" name="ch_semanal" id="ch_semanal" value="{{$model->ch_semanal}}">
+
+ @include('components.divs.errors', [
+ 'form' => 'ensino_aulas_form_update',
+ 'field' => 'ch_semanal',
+ ])
</div>
<div class="mb-3 col-sm-3">
<label class="form-label" for="ch_total">CH. Total</label>
- <input class="form-control @error('ch_total') is-invalid @enderror" type="number" name="ch_total" id="ch_total" value="{{ old('ch_total') }}">
- @error('ch_total')
- <div class="alert alert-danger">
- <span>{{$message}}</span>
- </div>
- @enderror
+ <input class="form-control @error('ch_total') is-invalid @enderror" type="number" name="ch_total" id="ch_total" value="{{$model->ch_total}}">
+
+ @include('components.divs.errors', [
+ 'form' => 'ensino_aulas_form_update',
+ 'field' => 'ch_total',
+ ])
</div>
</div>
<div class="mt-1 text-end">
- <button type="submit" class="btn btn-success rounded">Cadastrar</button>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancelar</button>
+ <button type="submit" id="btn-submit_ensino_aulas-update" class="btn btn-success rounded">Atualizar</button>
+
+ </div>
</div>
</form>
</div>
- <div class="mt-4">
- @include('pad.components.templates.table', ['table_id' => 'ensino_aulas-table', 'colunas' => ['Cód', 'Componente Curricular', 'Curso', 'NÃvel', 'Modalidade', 'CH Semanal', 'CH Total', 'Opções']])
- </div>
+</div>
-</div>
\ No newline at end of file
+@include('pad.components.scripts.ajaxValidation', [
+ 'btn_submit_id' => 'btn-submit_ensino_aulas-update',
+ 'form_id' => 'ensino_aulas_update-form',
+ 'route' => route('ensino_aula_validate'),
+ 'div_errors' => 'ensino_aulas_form_update',
+])
\ No newline at end of file
diff --git a/resources/views/pad/components/templates/dimensao/pesquisa/coordenacao/form_create.blade.php b/resources/views/pad/components/templates/dimensao/pesquisa/coordenacao/form_create.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..bd0c4ca0736fa7c95983f9d59816b293a1b28995
--- /dev/null
+++ b/resources/views/pad/components/templates/dimensao/pesquisa/coordenacao/form_create.blade.php
@@ -0,0 +1,118 @@
+
+<div id="pesquisa_coordenacao">
+ <div>
+ <div class="mb-3">
+ <h3 class="h3"> Pesquisa - Coordenação </h3 class="h3">
+ </div>
+ <form action="{{route('pesquisa_coordenacao_create')}}" method="post" id="pesquisa_coordenacao-form" class="">
+ @csrf
+
+ <div class="row">
+
+ <input type="hidden" id="user_pad_id" name="user_pad_id" value="{{$user_pad_id}}">
+
+ <div class="mb-3 col-sm-2">
+ <label class="form-label" for="cod_atividade">Cód. Atividade</label>
+ <input class="form-control @error('cod_atividade') is-invalid @enderror" type="text" name="cod_atividade" id="cod_atividade" value="{{ old('cod_atividade') }}" readonly>
+ </div>
+
+ <div class="mb-3 col-sm-5">
+ <label class="form-label" for="titulo_projeto">TÃtulo do Projeto</label>
+ <input class="form-control @error('titulo_projeto') is-invalid @enderror" type="text" name="titulo_projeto" id="titulo_projeto" value="{{ old('titulo_projeto') }}">
+ @error('titulo_projeto')
+ <div class="alert alert-danger">
+ <span>{{$message}}</span>
+ </div>
+ @enderror
+ </div>
+
+ <div class="mb-3 col-sm-5">
+ <label class="form-label" for="linha_grupo_pesquisa">Linha & Grupo de Pesquisa</label>
+ <input class="form-control @error('linha_grupo_pesquisa') is-invalid @enderror" type="text" name="linha_grupo_pesquisa" id="linha_grupo_pesquisa" value="{{ old('linha_grupo_pesquisa') }}">
+ @error('linha_grupo_pesquisa')
+ <div class="alert alert-danger">
+ <span>{{$message}}</span>
+ </div>
+ @enderror
+ </div>
+
+ <div class="mb-3 col-sm-4">
+ <label class="form-label" for="funcao">Função</label>
+ <select class="form-select @error('funcao') is-invalid @enderror" name="funcao" id="funcao" value="{{ old('funcao') }}">
+ <option value="0">Selecione uma Função</option>
+ @foreach($funcoesProjeto as $value => $funcao)
+ @if( $value == old('funcao') )
+ <option selected value="{{$value}}">{{$funcao}}</option>
+ @else
+ <option value="{{$value}}">{{$funcao}}</option>
+ @endif
+ @endforeach
+ </select>
+ @error('funcao')
+ <div class="alert alert-danger">
+ <span>{{$message}}</span>
+ </div>
+ @enderror
+ </div>
+
+ <div class="mb-3 col-sm-4">
+ <label class="form-label" for="ch_semanal">CH. Semanal</label>
+ <input class="form-control @error('ch_semanal') is-invalid @enderror" type="number" name="ch_semanal" id="ch_semanal" value="{{ old('ch_semanal') }}">
+ @error('ch_semanal')
+ <div class="alert alert-danger">
+ <span>{{$message}}</span>
+ </div>
+ @enderror
+ </div>
+ </div>
+
+ <div class="mt-1 text-end">
+ @include('components.buttons.btn-save', [
+ 'content' => 'Cadastrar'
+ ])
+ </div>
+
+ </form>
+ </div>
+
+ <div class="border rounded px-4 mt-4">
+
+ <table class="table table-hover" id="ensino_aulas-table-">
+ <thead>
+ <tr>
+ <!-- <th scole="col">#</th> -->
+ <th scope="col"> Cód </th>
+ <th scope="col"> TÃtulo do Projeto </th>
+ <th scope="col"> Linha & Grupo de Pesquisa </th>
+ <th scope="col"> Função </th>
+ <th scope="col"> CH Semanal </th>
+ <th scope="col"> Opções </th>
+ </tr>
+ </thead>
+
+ <tbody>
+ @foreach($pesquisasCoordenacao as $pesquisaCoordenacao)
+ <tr>
+ <td>{{ $pesquisaCoordenacao->cod_atividade }}</td>
+ <td>{{ $pesquisaCoordenacao->titulo_projeto }}</td>
+ <td>{{ $pesquisaCoordenacao->linha_grupo_pesquisa }}</td>
+ <td>{{ $pesquisaCoordenacao->funcaoAsString() }}</td>
+ <td>{{ $pesquisaCoordenacao->ch_semanal }}</td>
+ <td>
+ @include('components.buttons.btn-edit-task', [
+ 'btn_class' => 'btn-edit_pesquisa_coordenacao',
+ 'btn_id' => $pesquisaCoordenacao->id
+ ])
+
+ @include('components.buttons.btn-delete', [
+ 'id' => $pesquisaCoordenacao->id,
+ 'route' => route('pesquisa_coordenacao_delete', ['id' => $pesquisaCoordenacao->id])
+ ])
+ </td>
+ </tr>
+ @endforeach
+ </tbody>
+ </table>
+
+ </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/pad/components/templates/dimensao/pesquisa/coordenacao/form_update.blade.php b/resources/views/pad/components/templates/dimensao/pesquisa/coordenacao/form_update.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..4a1e1ff455247d2f32d4e92d3ec0bc4bf7cce682
--- /dev/null
+++ b/resources/views/pad/components/templates/dimensao/pesquisa/coordenacao/form_update.blade.php
@@ -0,0 +1,77 @@
+
+<div id="pesquisa_coordenacao">
+ <div>
+ <form action="{{route('pesquisa_coordenacao_update', ['id' => $model->id])}}" method="post" id="pesquisa_coordenacao-form" class="">
+ @csrf
+
+ <div class="row">
+
+ <input type="hidden" id="user_pad_id" name="user_pad_id" value="{{$model->user_pad_id}}">
+
+ <div class="mb-3 col-sm-2">
+ <label class="form-label" for="cod_atividade">Cód. Atividade</label>
+ <input class="form-control @error('cod_atividade') is-invalid @enderror" type="text" name="cod_atividade" id="cod_atividade" value="{{ $model->cod_atividade }}" readonly>
+ </div>
+
+ <div class="mb-3 col-sm-5">
+ <label class="form-label" for="titulo_projeto">TÃtulo do Projeto</label>
+ <input class="form-control @error('titulo_projeto') is-invalid @enderror" type="text" name="titulo_projeto" id="titulo_projeto" value="{{ $model->titulo_projeto }}">
+ @error('titulo_projeto')
+ <div class="alert alert-danger">
+ <span>{{$message}}</span>
+ </div>
+ @enderror
+ </div>
+
+ <div class="mb-3 col-sm-5">
+ <label class="form-label" for="linha_grupo_pesquisa">Linha & Grupo de Pesquisa</label>
+ <input class="form-control @error('linha_grupo_pesquisa') is-invalid @enderror" type="text" name="linha_grupo_pesquisa" id="linha_grupo_pesquisa" value="{{ $model->linha_grupo_pesquisa }}">
+ @error('linha_grupo_pesquisa')
+ <div class="alert alert-danger">
+ <span>{{$message}}</span>
+ </div>
+ @enderror
+ </div>
+
+ <div class="mb-3 col-sm-4">
+ <label class="form-label" for="funcao">Função</label>
+ <select class="form-select @error('funcao') is-invalid @enderror" name="funcao" id="funcao" value="{{ old('funcao') }}">
+ <option value="0">Selecione uma Função</option>
+ @foreach($funcoesProjeto as $value => $funcao)
+ @if( $value == $model->funcao )
+ <option selected value="{{$value}}">{{$funcao}}</option>
+ @else
+ <option value="{{$value}}">{{$funcao}}</option>
+ @endif
+ @endforeach
+ </select>
+ @error('funcao')
+ <div class="alert alert-danger">
+ <span>{{$message}}</span>
+ </div>
+ @enderror
+ </div>
+
+ <div class="mb-3 col-sm-4">
+ <label class="form-label" for="ch_semanal">CH. Semanal</label>
+ <input class="form-control @error('ch_semanal') is-invalid @enderror" type="number" name="ch_semanal" id="ch_semanal" value="{{ $model->ch_semanal }}">
+ @error('ch_semanal')
+ <div class="alert alert-danger">
+ <span>{{$message}}</span>
+ </div>
+ @enderror
+ </div>
+ </div>
+
+ <div class="mt-1 text-end">
+ @include('components.buttons.btn-close_modal')
+
+ @include('components.buttons.btn-save', [
+ 'content' => 'Cadastrar'
+ ])
+ </div>
+
+ </form>
+ </div>
+
+</div>
\ No newline at end of file
diff --git a/resources/views/pad/components/templates/dimensao/pesquisa/lideranca/form_create.blade.php b/resources/views/pad/components/templates/dimensao/pesquisa/lideranca/form_create.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/resources/views/pad/components/templates/dimensao/pesquisa/lideranca/form_update.blade.php b/resources/views/pad/components/templates/dimensao/pesquisa/lideranca/form_update.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/resources/views/pad/components/templates/dimensao/pesquisa/orientacao/form_create.blade.php b/resources/views/pad/components/templates/dimensao/pesquisa/orientacao/form_create.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/resources/views/pad/components/templates/dimensao/pesquisa/orientacao/form_update.blade.php b/resources/views/pad/components/templates/dimensao/pesquisa/orientacao/form_update.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/resources/views/pad/components/templates/table.blade.php b/resources/views/pad/components/templates/table.blade.php
index 59acf106f0087ddbd5cc4f91661f68dfff69db71..e755d4574be2494d1d32bb1d6161de1f0370b051 100644
--- a/resources/views/pad/components/templates/table.blade.php
+++ b/resources/views/pad/components/templates/table.blade.php
@@ -11,7 +11,12 @@
</thead>
<tbody>
-
+ <tr>
+ <!-- <th scole="col">#</th> -->
+ @foreach($colunas as $coluna)
+ <th scole="col">{{ $coluna }}</th>
+ @endforeach
+ </tr>
</tbody>
</table>
diff --git a/resources/views/pad/dimensao/ensino.blade.php b/resources/views/pad/dimensao/ensino.blade.php
index acfa853902109066cfde24d328c8f3fd6d531ba8..f4963ba81316437c09f4a08fcb1ab993dbe322a9 100644
--- a/resources/views/pad/dimensao/ensino.blade.php
+++ b/resources/views/pad/dimensao/ensino.blade.php
@@ -12,13 +12,13 @@
])
@endsection
@section('body')
- <div class="container">
+ <div class="container">
@include('pad.components.templates.dropdown-eixo', ['divs' => $divs])
@include('components.alerts')
- @include('pad.components.templates.dimensao.ensino.ensino_aulas', ['user_pad_id' => $user_pad_id])
+ @include('pad.components.templates.dimensao.ensino.aulas.form_create', ['user_pad_id' => $user_pad_id])
@include('pad.components.templates.dimensao.ensino.ensino_coordenacao_disciplina', ['user_pad_id' => $user_pad_id])
@@ -33,7 +33,8 @@
@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])
-
+
+ @include('components.modal', ['size' => 'modal-lg'])
</div>
@endsection
@@ -41,7 +42,8 @@
@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.aulas')
@include('pad.components.scripts.dimensao.ensino.ensino_orientacao')
@include('pad.components.scripts.dimensao.ensino.ensino_supervisao')
diff --git a/resources/views/pad/dimensao/pesquisa.blade.php b/resources/views/pad/dimensao/pesquisa.blade.php
index 28cb212e99d18b6bc284b7c1e13c274d03c052b1..b892994ab8daab363dd638a9cd5a535c779ef358 100644
--- a/resources/views/pad/dimensao/pesquisa.blade.php
+++ b/resources/views/pad/dimensao/pesquisa.blade.php
@@ -1 +1,38 @@
-pesquisa
\ No newline at end of file
+@extends('layouts.main')
+
+@section('title', 'Pesquisa')
+@section('header')
+ @include('layouts.header', [
+ 'user' => Auth::user(),
+ ])
+@endsection
+@section('nav')
+ @include('layouts.navigation', [
+ 'index_menu' => $index_menu,
+ ])
+@endsection
+@section('body')
+ <div class="container">
+
+ @include('pad.components.templates.dropdown-eixo', ['divs' => $divs])
+
+ @include('components.alerts')
+
+ @include('pad.components.templates.dimensao.pesquisa.coordenacao.form_create', ['user_pad_id' => $user_pad_id])
+
+ @include('pad.components.templates.dimensao.pesquisa.lideranca.form_create', ['user_pad_id' => $user_pad_id])
+
+ @include('pad.components.templates.dimensao.pesquisa.orientacao.form_create', ['user_pad_id' => $user_pad_id])
+
+ @include('components.modal', ['size' => 'modal-lg'])
+ </div>
+@endsection
+
+@section('scripts')
+
+ @include('pad.components.scripts.dropdown-eixo', ['divs' => $divs])
+ @include('pad.components.scripts.dimensao.pesquisa.general')
+
+ @include('pad.components.scripts.dimensao.pesquisa.coordenacao')
+
+@endsection
diff --git a/resources/views/unidade/create.blade.php b/resources/views/unidade/create.blade.php
index 86b5e3edbb55a527f6fd91beb76cea23fa3fb2fd..103975a6d6db3c317f2edb86a768c9f608c474ba 100644
--- a/resources/views/unidade/create.blade.php
+++ b/resources/views/unidade/create.blade.php
@@ -21,24 +21,32 @@
<form action="{{ route('unidade_store') }}" method="post">
@csrf
@method('POST')
- <div class="form-group">
- <label for="inputNameCurso">Nome da Unidade</label>
- <input type="text" class="form-control" name="name" value="{{ old('name') }}"
- placeholder="Insira o nome da Unidade">
- @error('name')
- <span class="text-danger"> {{ $message }} </span>
- @enderror
- </div>
- <div class="d-flex justify-content-between">
- @include('components.buttons.btn-cancel', [
- 'route' => route('unidade_index'),
- ])
- @include('components.buttons.btn-save', [
- 'content' => 'Cadastrar',
- 'btn_class' => 'btn btn-outline-success',
- 'i_class' => '',
- ])
+
+ <div class="row">
+
+ <div class="mb-3 col">
+ <div class="form-group">
+ <label for="name">Nome da Unidade</label>
+ <input type="text" class="form-control" id="name" name="name" value="{{ old('name') }}" placeholder="Unidade">
+ @error('name')
+ <span class="text-danger"> {{ $message }} </span>
+ @enderror
+ </div>
+ </div>
+
+ <div class="mt-1 text-end">
+ @include('components.buttons.btn-cancel', [
+ 'route' => route('unidade_index'),
+ 'content' => 'Cancelar'
+ ])
+
+ @include('components.buttons.btn-save', [
+ 'content' => 'Cadastrar',
+ ])
+ </div>
+
</div>
+
</form>
</div>
@endsection
diff --git a/resources/views/unidade/index.blade.php b/resources/views/unidade/index.blade.php
index 0795b2b2b0d992a0a00e45a3aa4d72abf62c3140..c005ce20cd1a905ef17225969b902b648ba0a403 100644
--- a/resources/views/unidade/index.blade.php
+++ b/resources/views/unidade/index.blade.php
@@ -16,37 +16,37 @@
<div class="d-flex justify-content-between align-items-center border-bottom">
<h2 class="">TODAS AS UNIDADES</h2>
@include('components.buttons.btn-create', [
+ 'id' => 'unidade_create',
'route' => route('unidade_create'),
- 'class' => '',
'content' => 'Nova Unidade',
- 'id' => '',
])
</div>
- <table class="table mt-5">
- <thead class="thead-dark">
- <tr>
- <th scope="col">#</th>
- <th scope="col">Name</th>
- <th scope="col">Opções</th>
- </tr>
- </thead>
- <tbody>
- @foreach ($unidades as $unidade)
+
+ <div class="table-responsive mt-5">
+ <table class="table table-hover table-striped">
+ <thead class="thead-dark">
<tr>
- <td scope="row">{{ $unidade->id }}</td>
- <td>{{ $unidade->name }}</td>
- <td>
- @include('components.buttons.btn-edit', [
- 'btn_class' => 'btn btn-warning',
- 'route' => route('unidade_edit', ['id' => $unidade->id]),
- ])
- @include('components.buttons.btn-soft-delete', [
- 'route' => route('unidade_delete', ['id' => $unidade->id]),
- 'modal_id' => $unidade->id,
- ])
- </td>
+ <th scope="col">Nome</th>
+ <th scope="col">Ações</th>
</tr>
- @endforeach
- </tbody>
- </table>
+ </thead>
+ <tbody>
+ @foreach ($unidades as $unidade)
+ <tr>
+ <td>{{ $unidade->name }}</td>
+ <td>
+ @include('components.buttons.btn-edit', [
+ 'route' => route('unidade_edit', ['id' => $unidade->id]),
+ ])
+
+ @include('components.buttons.btn-delete', [
+ 'id' => $unidade->id,
+ 'route' => route('unidade_delete', ['id' => $unidade->id]),
+ ])
+ </td>
+ </tr>
+ @endforeach
+ </tbody>
+ </table>
+ </div>
@endsection
diff --git a/resources/views/unidade/update.blade.php b/resources/views/unidade/update.blade.php
index ad07bff81f068e42c8a6ab8b582ceb73c10df831..9b18c04820fe2a5dd7a40897d80578738d386640 100644
--- a/resources/views/unidade/update.blade.php
+++ b/resources/views/unidade/update.blade.php
@@ -21,23 +21,32 @@
<form action="{{ route('unidade_update', ['id' => $unidade->id]) }}" method="post">
@csrf
@method('POST')
- <div class="form-group">
- <label for="inputNameCurso">Nome da Unidade</label>
- <input type="text" class="form-control" name="name" value="{{ $unidade->name }}">
- @error('name')
- <span class="text-danger"> {{ $message }} </span>
- @enderror
- </div>
- <div class="d-flex justify-content-between">
- @include('components.buttons.btn-cancel', [
- 'route' => route('unidade_index'),
- ])
- @include('components.buttons.btn-save', [
- 'content' => 'Atualizar',
- 'btn_class' => 'btn btn-outline-success',
- 'i_class' => '',
- ])
+
+ <div class="row">
+
+ <div class="mb-3 col">
+ <div class="form-group">
+ <label for="name">Nome da Unidade</label>
+ <input type="text" class="form-control" name="name" value="{{ $unidade->name }}" placeholder="Unidade">
+ @error('name')
+ <span class="text-danger"> {{ $message }} </span>
+ @enderror
+ </div>
+ </div>
+
+ <div class="mt-1 text-end">
+ @include('components.buttons.btn-cancel', [
+ 'route' => route('unidade_index'),
+ 'content' => 'Cancelar'
+ ])
+
+ @include('components.buttons.btn-save', [
+ 'content' => 'Cadastrar',
+ ])
+ </div>
+
</div>
+
</form>
</div>
@endsection
diff --git a/routes/web.php b/routes/web.php
index d1d7a270ef0c16aa02bf653d0ee8a997c39551a5..dc5ebd9655a0159a7d5a8b1377b881ab89f1f644 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -13,8 +13,8 @@ use App\Http\Controllers\PadController;
use App\Http\Controllers\Dimensao\Tabelas\Ensino\EnsinoAulaController;
use App\Http\Controllers\UserController;
use App\Http\Controllers\CoordenadorController;
+use App\Http\Controllers\Dimensao\Tabelas\Pesquisa\PesquisaCoordenacaoController;
use App\Http\Controllers\DiretorController;
-use App\Models\Disciplina;
use Illuminate\Support\Facades\Route;
/*
@@ -81,19 +81,6 @@ Route::prefix('/pad')->group(function () {
Route::delete('/delete/{id}', [PadController::class, 'delete'])->name('pad_delete');
});
-Route::prefix('/pad/professor')->group(function () {
- Route::get('/index', [PadController::class, 'index'])->name('pad_index');
- Route::get('/view/{id}', [PadController::class, 'view'])->name('pad_view');
- Route::get('/anexo', [PadController::class, 'anexo'])->name('pad_anexo');
-});
-
-Route::prefix('/pad/dimensao/')->group(function () {
- Route::get('/gestao/{user_pad_id}/{form_selected?}/{model_id?}', [GestaoController::class, 'index'])->name('dimensao_gestao');
- Route::get('/ensino/{user_pad_id}/{form_selected?}/{model_id?}', [EnsinoController::class, 'index'])->name('dimensao_ensino');
- Route::get('/pesquisa/{user_pad_id}/{form_selected?}/{model_id?}', [PesquisaController::class, 'index'])->name('dimensao_pesquisa');
- Route::get('/extensao/{user_pad_id}/{form_selected?}/{model_id?}', [ExtensaoController::class, 'index'])->name('dimensao_extensao');
-});
-
Route::prefix('/coordenador')->group(function () {
Route::get('/index', [CoordenadorController::class, 'index'])->name('coordenador_index');
Route::get('/create', [CoordenadorController::class, 'create'])->name('coordenador_create');
@@ -122,16 +109,41 @@ Route::prefix('/user')->group(function () {
/** json */
Route::get('/disciplina/{curso_id}', [DisciplinaController::class, 'getDisciplinaByCurso'])->name('get_disciplina_by_curso');
+/** PadProfessor */
+Route::prefix('/pad/professor')->group(function () {
+ Route::get('/index', [PadController::class, 'index'])->name('pad_index');
+ Route::get('/view/{id}', [PadController::class, 'view'])->name('pad_view');
+ Route::get('/anexo/{id}', [PadController::class, 'anexo'])->name('pad_anexo');
+});
+
+/** Dimensoes|Eixos */
+Route::prefix('/pad/dimensao/')->group(function () {
+ Route::get('/gestao/{user_pad_id}/{form_selected?}', [GestaoController::class, 'index'])->name('dimensao_gestao');
+ Route::get('/ensino/{user_pad_id}/{form_selected?}', [EnsinoController::class, 'index'])->name('dimensao_ensino');
+ Route::get('/pesquisa/{user_pad_id}/{form_selected?}', [PesquisaController::class, 'index'])->name('dimensao_pesquisa');
+ Route::get('/extensao/{user_pad_id}/{form_selected?}', [ExtensaoController::class, 'index'])->name('dimensao_extensao');
+});
+
/* 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');
+Route::prefix('/pad/dimensao/ensino/aulas')->group(function () {
+ Route::post('/create', [EnsinoAulaController::class, 'create'])->name('ensino_aula_create');
+ Route::post('/update/{id}', [EnsinoAulaController::class, 'update'])->name('ensino_aula_update');
+ Route::post('/validate', [EnsinoAulaController::class, 'ajaxValidation'])->name('ensino_aula_validate');
+ Route::delete('/delete/{id}', [EnsinoAulaController::class, 'delete'])->name('ensino_aula_delete');
+
+ Route::get('/edit/{id?}', [EnsinoAulaController::class, 'edit'])->name('view_ensino_aula_update');
+ Route::get('/aulas/search/{user_pad_id?}', [EnsinoAulaController::class, 'search'])->name('ensino_aula_search');
});
+/** PesquisaCoordenacaoController */
+Route::prefix('pad/dimensao/pesquisa/coordenacao')->group(function() {
+ Route::post('/create', [PesquisaCoordenacaoController::class, 'create'])->name('pesquisa_coordenacao_create');
+ Route::post('/update/{id}', [PesquisaCoordenacaoController::class, 'update'])->name('pesquisa_coordenacao_update');
+ Route::delete('/delete/{id}', [PesquisaCoordenacaoController::class, 'delete'])->name('pesquisa_coordenacao_delete');
-// EndPoints Ajax
-Route::get('/pad/dimensao/ensino_aulas/search/{user_pad_id?}', [EnsinoAulaController::class, 'search'])->name('ensino_aula_search');
+ Route::get('/edit/{id?}', [PesquisaCoordenacaoController::class, 'edit'])->name('pesquisa_coordenacao_edit');
+ Route::get('/search/{user_pad_id?}', [PesquisaCoordenacaoController::class, 'search'])->name('pesquisa_coordenacao_search');
+});
// return json
Route::get('/listar/unidade', [UnidadeController::class, 'getAll'])->name('listar_unidades');