From 3e54aa530106376c8a885ec222c767b4ef7a492d Mon Sep 17 00:00:00 2001 From: alissonalbuquerque Date: Mon, 18 Jul 2022 12:07:30 -0300 Subject: [PATCH] =?UTF-8?q?Add=20atualiza=C3=A7=C3=B5es=20de=20projeto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/CampusController.php | 3 +- app/Http/Controllers/CursoController.php | 2 +- .../Controllers/Dimensao/EnsinoController.php | 31 ++- .../Dimensao/PesquisaController.php | 44 +++- .../Tabelas/Ensino/EnsinoAulaController.php | 52 ++++- .../PesquisaCoordenacaoController.php | 83 ++++++++ app/Models/Campus.php | 6 + app/Models/Tabelas/Constants.php | 51 ++++- app/Models/Tabelas/Ensino/EnsinoAula.php | 7 + .../Tabelas/Pesquisa/PesquisaCoordenacao.php | 49 +++++ .../Tabelas/Pesquisa/PesquisaLideranca.php | 35 +++ .../Tabelas/Pesquisa/PesquisaOrientacao.php | 35 +++ app/Models/Util/PadTables.php | 17 +- app/Queries/CampusQuery.php | 15 +- app/Queries/CursoQuery.php | 13 +- app/Queries/DisciplinaQuery.php | 18 +- app/Queries/PADQuery.php | 18 +- app/Queries/PlanejamentoQuery.php | 23 +- app/Queries/Query.php | 13 -- .../Tabelas/Ensino/EnsinoAulaQuery.php | 10 +- .../Pesquisa/PesquisaCoordenacaoQuery.php | 24 +++ .../Pesquisa/PesquisaLiderancaQuery.php | 24 +++ .../Pesquisa/PesquisaOrientacaoQuery.php | 24 +++ app/Queries/UnidadeQuery.php | 9 +- app/Queries/UserPadQuery.php | 3 +- app/Queries/UserQuery.php | 18 +- ...1525_create_pesquisa_coordenacao_table.php | 39 ++++ ...023304_create_pesquisa_lideranca_table.php | 39 ++++ ...24129_create_pesquisa_orientacao_table.php | 39 ++++ resources/views/campus/create.blade.php | 73 ++++--- resources/views/campus/index.blade.php | 11 +- resources/views/campus/update.blade.php | 75 ++++--- .../components/buttons/btn-cancel.blade.php | 13 +- .../buttons/btn-close_modal.blade.php | 7 + .../components/buttons/btn-create.blade.php | 10 +- .../components/buttons/btn-delete.blade.php | 13 +- .../buttons/btn-edit-task.blade.php | 12 ++ .../components/buttons/btn-edit.blade.php | 9 +- .../components/buttons/btn-save.blade.php | 20 +- .../buttons/btn-soft-delete.blade.php | 2 +- .../views/components/divs/errors.blade.php | 28 +++ .../views/components/frontend-libs.blade.php | 10 +- resources/views/components/modal.blade.php | 49 +++++ resources/views/coordenador/create.blade.php | 90 +++++--- resources/views/coordenador/index.blade.php | 8 +- resources/views/curso/create.blade.php | 73 ++++--- resources/views/curso/index.blade.php | 50 +---- resources/views/curso/update.blade.php | 71 ++++--- resources/views/diretor/create.blade.php | 116 ++++++---- resources/views/diretor/index.blade.php | 8 +- resources/views/diretor/update.blade.php | 1 + .../user-dashboard/dashboard_admin.blade.php | 14 +- resources/views/pad/admin/create.blade.php | 9 +- resources/views/pad/admin/edit.blade.php | 8 +- resources/views/pad/admin/index.blade.php | 6 +- .../scripts/ajaxValidation.blade.php | 52 +++++ .../scripts/cod_atividade.blade.php | 41 ++++ .../scripts/dimensao/ensino/aulas.blade.php | 20 ++ .../scripts/dimensao/ensino/ensino.blade.php | 37 ---- .../dimensao/ensino/ensino_aulas.blade.php | 200 ------------------ .../dimensao/ensino/show_modal.blade.php | 33 +++ .../dimensao/pesquisa/coordenacao.blade.php | 55 +++++ .../dimensao/pesquisa/general.blade.php | 3 + .../ensino/aulas/form_create.blade.php | 153 ++++++++++++++ .../form_update.blade.php} | 98 +++++---- .../coordenacao/form_create.blade.php | 118 +++++++++++ .../coordenacao/form_update.blade.php | 77 +++++++ .../pesquisa/lideranca/form_create.blade.php | 0 .../pesquisa/lideranca/form_update.blade.php | 0 .../pesquisa/orientacao/form_create.blade.php | 0 .../pesquisa/orientacao/form_update.blade.php | 0 .../pad/components/templates/table.blade.php | 7 +- resources/views/pad/dimensao/ensino.blade.php | 10 +- .../views/pad/dimensao/pesquisa.blade.php | 39 +++- resources/views/unidade/create.blade.php | 42 ++-- resources/views/unidade/index.blade.php | 54 ++--- resources/views/unidade/update.blade.php | 41 ++-- routes/web.php | 52 +++-- 78 files changed, 1927 insertions(+), 735 deletions(-) create mode 100644 app/Http/Controllers/Dimensao/Tabelas/Pesquisa/PesquisaCoordenacaoController.php create mode 100644 app/Models/Tabelas/Pesquisa/PesquisaCoordenacao.php create mode 100644 app/Models/Tabelas/Pesquisa/PesquisaLideranca.php create mode 100644 app/Models/Tabelas/Pesquisa/PesquisaOrientacao.php delete mode 100644 app/Queries/Query.php create mode 100644 app/Queries/Tabelas/Pesquisa/PesquisaCoordenacaoQuery.php create mode 100644 app/Queries/Tabelas/Pesquisa/PesquisaLiderancaQuery.php create mode 100644 app/Queries/Tabelas/Pesquisa/PesquisaOrientacaoQuery.php create mode 100644 database/migrations/2022_07_17_021525_create_pesquisa_coordenacao_table.php create mode 100644 database/migrations/2022_07_17_023304_create_pesquisa_lideranca_table.php create mode 100644 database/migrations/2022_07_17_024129_create_pesquisa_orientacao_table.php create mode 100644 resources/views/components/buttons/btn-close_modal.blade.php create mode 100644 resources/views/components/buttons/btn-edit-task.blade.php create mode 100644 resources/views/components/divs/errors.blade.php create mode 100644 resources/views/components/modal.blade.php create mode 100644 resources/views/pad/components/scripts/ajaxValidation.blade.php create mode 100644 resources/views/pad/components/scripts/cod_atividade.blade.php create mode 100644 resources/views/pad/components/scripts/dimensao/ensino/aulas.blade.php delete mode 100644 resources/views/pad/components/scripts/dimensao/ensino/ensino_aulas.blade.php create mode 100644 resources/views/pad/components/scripts/dimensao/ensino/show_modal.blade.php create mode 100644 resources/views/pad/components/scripts/dimensao/pesquisa/coordenacao.blade.php create mode 100644 resources/views/pad/components/scripts/dimensao/pesquisa/general.blade.php create mode 100644 resources/views/pad/components/templates/dimensao/ensino/aulas/form_create.blade.php rename resources/views/pad/components/templates/dimensao/ensino/{ensino_aulas.blade.php => aulas/form_update.blade.php} (56%) create mode 100644 resources/views/pad/components/templates/dimensao/pesquisa/coordenacao/form_create.blade.php create mode 100644 resources/views/pad/components/templates/dimensao/pesquisa/coordenacao/form_update.blade.php create mode 100644 resources/views/pad/components/templates/dimensao/pesquisa/lideranca/form_create.blade.php create mode 100644 resources/views/pad/components/templates/dimensao/pesquisa/lideranca/form_update.blade.php create mode 100644 resources/views/pad/components/templates/dimensao/pesquisa/orientacao/form_create.blade.php create mode 100644 resources/views/pad/components/templates/dimensao/pesquisa/orientacao/form_update.blade.php diff --git a/app/Http/Controllers/CampusController.php b/app/Http/Controllers/CampusController.php index 6f62b74..11b8a3b 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 374ac0a..7a52cf1 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 e9a8369..548741f 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 fb79a74..7f9fdf9 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 a7ef0f2..e91ed51 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 0000000..dc375cb --- /dev/null +++ b/app/Http/Controllers/Dimensao/Tabelas/Pesquisa/PesquisaCoordenacaoController.php @@ -0,0 +1,83 @@ +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 1ca5fea..28ab5c3 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 db52248..7b39dd8 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 fbf128d..60413cc 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 0000000..f9eb620 --- /dev/null +++ b/app/Models/Tabelas/Pesquisa/PesquisaCoordenacao.php @@ -0,0 +1,49 @@ +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 0000000..67a10e4 --- /dev/null +++ b/app/Models/Tabelas/Pesquisa/PesquisaLideranca.php @@ -0,0 +1,35 @@ +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 0000000..95083fc --- /dev/null +++ b/app/Models/Tabelas/Pesquisa/PesquisaOrientacao.php @@ -0,0 +1,35 @@ +dimensao); + } + + public function funcaoAsString() + { + return Constants::listFuncaoOrientador($this->funcao); + } + +} diff --git a/app/Models/Util/PadTables.php b/app/Models/Util/PadTables.php index 7dfa93f..3b9876f 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 177b1a5..f64d23d 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 2a783f2..48a8303 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 edcbc04..80fc59e 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 402e0b7..157e7dd 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 dee96b5..45441a7 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 97b46a0..0000000 --- a/app/Queries/Query.php +++ /dev/null @@ -1,13 +0,0 @@ -query; - } - -} - diff --git a/app/Queries/Tabelas/Ensino/EnsinoAulaQuery.php b/app/Queries/Tabelas/Ensino/EnsinoAulaQuery.php index 0b59738..89936cf 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 0000000..3d8e665 --- /dev/null +++ b/app/Queries/Tabelas/Pesquisa/PesquisaCoordenacaoQuery.php @@ -0,0 +1,24 @@ +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 0000000..760378f --- /dev/null +++ b/app/Queries/Tabelas/Pesquisa/PesquisaLiderancaQuery.php @@ -0,0 +1,24 @@ +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 0000000..07ca680 --- /dev/null +++ b/app/Queries/Tabelas/Pesquisa/PesquisaOrientacaoQuery.php @@ -0,0 +1,24 @@ +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 36fa199..7561c92 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 93058f8..fa474e5 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 85612fb..9e2795e 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 0000000..a13122f --- /dev/null +++ b/database/migrations/2022_07_17_021525_create_pesquisa_coordenacao_table.php @@ -0,0 +1,39 @@ +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 0000000..8863b97 --- /dev/null +++ b/database/migrations/2022_07_17_023304_create_pesquisa_lideranca_table.php @@ -0,0 +1,39 @@ +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 0000000..1a9bff5 --- /dev/null +++ b/database/migrations/2022_07_17_024129_create_pesquisa_orientacao_table.php @@ -0,0 +1,39 @@ +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 cd933d9..e344838 100644 --- a/resources/views/campus/create.blade.php +++ b/resources/views/campus/create.blade.php @@ -22,37 +22,50 @@
@csrf @method('POST') -
- - - @error('name') - {{ $message }} - @enderror -
-
- - - @error('unidade_id') - {{ $message }} - @enderror -
-
- @include('components.buttons.btn-cancel', [ - 'route' => route('campus_index'), - ]) - @include('components.buttons.btn-save', [ - 'content' => 'Cadastrar', - 'btn_class' => 'btn btn-outline-success', - 'i_class' => '', - ]) + +
+ +
+
+ + + @error('name') + {{ $message }} + @enderror +
+
+ +
+
+ + + @error('unidade_id') + {{ $message }} + @enderror +
+
+ +
+ @include('components.buttons.btn-cancel', [ + 'route' => route('campus_index'), + 'content' => 'Cancelar' + ]) + + @include('components.buttons.btn-save', [ + 'content' => 'Cadastrar' + ]) +
+
+ +
@endsection \ No newline at end of file diff --git a/resources/views/campus/index.blade.php b/resources/views/campus/index.blade.php index 4b8bba9..bc15df9 100644 --- a/resources/views/campus/index.blade.php +++ b/resources/views/campus/index.blade.php @@ -17,9 +17,9 @@

TODOS OS CAMPUS

@include('components.buttons.btn-create', [ 'route' => route('campus_create'), - 'class' => '', + 'class' => 'btn btn-success', 'content' => 'Novo Campus', - 'id' => '', + 'id' => 'campus_create', ]) @@ -41,11 +41,12 @@ {{ $camp->unidade }} @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]) ]) diff --git a/resources/views/campus/update.blade.php b/resources/views/campus/update.blade.php index bcf97f1..ef00f8d 100644 --- a/resources/views/campus/update.blade.php +++ b/resources/views/campus/update.blade.php @@ -21,37 +21,52 @@
@csrf @method('POST') -
- - - @error('name') - {{ $message }} - @enderror -
-
- - - @error('unidade_id') - {{ $message }} - @enderror -
-
- @include('components.buttons.btn-cancel', [ - 'route' => route('campus_index'), - ]) - @include('components.buttons.btn-save', [ - 'content' => 'Atualizar', - 'btn_class' => 'btn btn-outline-success', - 'i_class' => '', - ]) + +
+ +
+
+ + + @error('name') + {{ $message }} + @enderror +
+
+ +
+
+ + + @error('unidade_id') + {{ $message }} + @enderror +
+
+ +
+ @include('components.buttons.btn-cancel', [ + 'route' => route('campus_index'), + 'content' => 'Cancelar' + ]) + + @include('components.buttons.btn-save', [ + 'content' => 'Atualizar', + ]) +
+
+
@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 a694778..febb049 100644 --- a/resources/views/components/buttons/btn-cancel.blade.php +++ b/resources/views/components/buttons/btn-cancel.blade.php @@ -1,4 +1,11 @@ - - - Cancelar +{{-- + @include('components.buttons.btn-cancel', [ + 'route' => '', + 'content' => '' + ]) +--}} + + + + {{ $content }} 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 0000000..1dac803 --- /dev/null +++ b/resources/views/components/buttons/btn-close_modal.blade.php @@ -0,0 +1,7 @@ +{{-- + @include('components.buttons.btn-close_modal') +--}} + \ 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 f473460..3310d81 100644 --- a/resources/views/components/buttons/btn-create.blade.php +++ b/resources/views/components/buttons/btn-create.blade.php @@ -1,4 +1,12 @@ - +{{-- + @include('components.buttons.btn-create', [ + 'id' => '', + 'route' => '', + 'content' => '' + ]) +--}} + + {{$content}} diff --git a/resources/views/components/buttons/btn-delete.blade.php b/resources/views/components/buttons/btn-delete.blade.php index f8e601b..aaf0e1d 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('') + ]) + +--}} + - @@ -8,7 +17,7 @@
- +
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 0000000..c89faf7 --- /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' => '' + ]) +--}} + +
+ +
\ 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 140eb3c..3925926 100644 --- a/resources/views/components/buttons/btn-edit.blade.php +++ b/resources/views/components/buttons/btn-edit.blade.php @@ -1 +1,8 @@ - \ No newline at end of file +{{-- + @include('components.buttons.btn-edit', [ + 'route' => '' + ]) +--}} + + + \ 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 25e196f..095ceea 100644 --- a/resources/views/components/buttons/btn-save.blade.php +++ b/resources/views/components/buttons/btn-save.blade.php @@ -1,4 +1,18 @@ - diff --git a/resources/views/components/buttons/btn-soft-delete.blade.php b/resources/views/components/buttons/btn-soft-delete.blade.php index 4ffd03c..93af8b5 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 @@ diff --git a/resources/views/components/divs/errors.blade.php b/resources/views/components/divs/errors.blade.php new file mode 100644 index 0000000..2718377 --- /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) +
+ {{$message}} +
+ @enderror +@endif + +@if( !$errors->has($field) ) +
+ +
+@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 ce0c394..b6e1dd4 100644 --- a/resources/views/components/frontend-libs.blade.php +++ b/resources/views/components/frontend-libs.blade.php @@ -11,9 +11,9 @@ - - - - - \ No newline at end of file + + + + + diff --git a/resources/views/components/modal.blade.php b/resources/views/components/modal.blade.php new file mode 100644 index 0000000..82c2e83 --- /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 + + + + + \ No newline at end of file diff --git a/resources/views/coordenador/create.blade.php b/resources/views/coordenador/create.blade.php index 301e488..0e1578f 100644 --- a/resources/views/coordenador/create.blade.php +++ b/resources/views/coordenador/create.blade.php @@ -23,34 +23,62 @@
@csrf @method('POST') -
- - -
-
- - -
-
-
- - -
-
- - -
-
-
- - -
+ +
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+ + @include('components.buttons.btn-cancel', [ + 'route' => route('coordenador_index'), + 'content' => 'Cancelar' + ]) + + @include('components.buttons.btn-save', [ + 'content' => 'Cadastrar' + ]) +
+ -
- @include('components.buttons.btn-cancel', [ - 'route' => route('unidade_index'), - ]) - @include('components.buttons.btn-save') +
diff --git a/resources/views/coordenador/index.blade.php b/resources/views/coordenador/index.blade.php index 59bcf0a..74c4693 100644 --- a/resources/views/coordenador/index.blade.php +++ b/resources/views/coordenador/index.blade.php @@ -28,7 +28,7 @@ Nome - CPF + Documento Ações @@ -39,12 +39,12 @@ {{ $coordenador->document }} @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, ]) diff --git a/resources/views/curso/create.blade.php b/resources/views/curso/create.blade.php index 2a25e6a..7d35944 100644 --- a/resources/views/curso/create.blade.php +++ b/resources/views/curso/create.blade.php @@ -21,37 +21,50 @@
@csrf @method('POST') -
- - - @error('name') - {{ $message }} - @enderror -
-
- - - @error('campus_id') - {{ $message }} - @enderror -
-
- @include('components.buttons.btn-cancel', [ - 'route' => route('curso_index'), - ]) - @include('components.buttons.btn-save', [ - 'content' => 'Cadastrar', - 'btn_class' => 'btn btn-outline-success', - 'i_class' => '', - ]) + +
+ +
+
+ + + @error('name') + {{ $message }} + @enderror +
+
+ +
+
+ + + @error('campus_id') + {{ $message }} + @enderror +
+
+ +
+ @include('components.buttons.btn-cancel', [ + 'route' => route('curso_index'), + 'content' => 'Cancelar' + ]) + + @include('components.buttons.btn-save', [ + 'btn_class' => 'btn btn-outline-success', + 'content' => 'Cadastrar', + ]) +
+
+
@endsection diff --git a/resources/views/curso/index.blade.php b/resources/views/curso/index.blade.php index ebeef55..4b115c3 100644 --- a/resources/views/curso/index.blade.php +++ b/resources/views/curso/index.blade.php @@ -40,12 +40,12 @@ {{ $curso->campus }} @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, ]) @@ -54,48 +54,4 @@
- {{--
- @foreach ($campusWithCursos as $campusWithCurso) -
-
-
- -
-
- -
- -
-
- - - - - - - - - - @foreach ($campusWithCurso->cursos as $curso) - - - - - - @endforeach - -
#NameCampus
{{ $curso->id }}{{ $curso->name }}{{ $curso->campus }}
-
-
-
-
- @endforeach -
--}} - @endsection diff --git a/resources/views/curso/update.blade.php b/resources/views/curso/update.blade.php index c6560b7..dbf6d52 100644 --- a/resources/views/curso/update.blade.php +++ b/resources/views/curso/update.blade.php @@ -17,35 +17,58 @@

Insira os dados correspondentes nos campos exibidos abaixo

+
@csrf @method('POST') -
- - -
-
- - -
-
- @include('components.buttons.btn-cancel', [ - 'route' => route('curso_index'), - ]) - @include('components.buttons.btn-save', [ - 'content' => 'Atualizar', - 'btn_class' => 'btn btn-outline-success', - 'i_class' => '', - ]) + +
+ +
+
+ + + @error('name') + {{ $message }} + @enderror +
+
+ +
+
+ + + @error('campus_id') + {{ $message }} + @enderror +
+
+ +
+ @include('components.buttons.btn-cancel', [ + 'route' => route('curso_index'), + 'content' => 'Cancelar' + ]) + + @include('components.buttons.btn-save', [ + 'btn_class' => 'btn btn-outline-success', + 'content' => 'Atualizar', + ]) +
+
+
@endsection diff --git a/resources/views/diretor/create.blade.php b/resources/views/diretor/create.blade.php index 669f4c9..b398b9f 100644 --- a/resources/views/diretor/create.blade.php +++ b/resources/views/diretor/create.blade.php @@ -27,50 +27,63 @@ @csrf @method('POST') -
- - - {{-- --}} - @error('email') - {{ $message }} - @enderror -
-
- - - {{-- --}} - @error('name') - {{ $message }} - @enderror -
-
- - - {{-- --}} - @error('document') - {{ $message }} - @enderror -
+
-
- - - @error('unidade_id') - {{ $message }} - @enderror -
+
+
+ + + {{-- --}} + @error('email') + {{ $message }} + @enderror +
+
-
-
+
+
+ + + {{-- --}} + @error('name') + {{ $message }} + @enderror +
+
+ +
+
+ + + {{-- --}} + @error('document') + {{ $message }} + @enderror +
+
+ +
+
+ + + @error('unidade_id') + {{ $message }} + @enderror +
+
+ + +
@@ -79,12 +92,25 @@ {{ $message }} @enderror
+
-
-
- +
+ +
+ +
+ @include('components.buttons.btn-cancel', [ + 'route' => route('diretor_index'), + 'content' => 'Cancelar' + ]) + + @include('components.buttons.btn-save', [ + 'content' => 'Cadastrar' + ]) +
+
@endsection diff --git a/resources/views/diretor/index.blade.php b/resources/views/diretor/index.blade.php index 5a3764b..df4b0d8 100644 --- a/resources/views/diretor/index.blade.php +++ b/resources/views/diretor/index.blade.php @@ -28,7 +28,7 @@ Nome - CPF + Documento Ações @@ -40,12 +40,12 @@ {{ $diretor->document }} @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, ]) diff --git a/resources/views/diretor/update.blade.php b/resources/views/diretor/update.blade.php index 2557f5a..394014e 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) }}

Atualizar Perfil

diff --git a/resources/views/layouts/user-dashboard/dashboard_admin.blade.php b/resources/views/layouts/user-dashboard/dashboard_admin.blade.php index 5f600da..8e7bb2a 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">

Bem Vindo ao PAD

-
+ +
\ 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 5fb8722..72793a2 100644 --- a/resources/views/pad/admin/create.blade.php +++ b/resources/views/pad/admin/create.blade.php @@ -67,13 +67,18 @@
-
+
+ @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', ])
+
diff --git a/resources/views/pad/admin/edit.blade.php b/resources/views/pad/admin/edit.blade.php index 9a1fea9..b950e20 100644 --- a/resources/views/pad/admin/edit.blade.php +++ b/resources/views/pad/admin/edit.blade.php @@ -68,10 +68,14 @@
-
+
+ @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', ])
diff --git a/resources/views/pad/admin/index.blade.php b/resources/views/pad/admin/index.blade.php index aa9ffc0..4f52bcf 100644 --- a/resources/views/pad/admin/index.blade.php +++ b/resources/views/pad/admin/index.blade.php @@ -25,7 +25,7 @@
@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 @@ {{ $pad->getStatusAsText() }} @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]) ]) 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 0000000..5d140ea --- /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' => '', + ]) +--}} + + 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 0000000..b030cb9 --- /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' => '', + ]) +--}} + + \ 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 0000000..dcecf51 --- /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 9a50925..58033c0 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 @@ \ 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 2ecb924..0000000 --- a/resources/views/pad/components/scripts/dimensao/ensino/ensino_aulas.blade.php +++ /dev/null @@ -1,200 +0,0 @@ - \ 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 0000000..9f35e78 --- /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' => '', + ]) +--}} + + + \ 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 0000000..226155b --- /dev/null +++ b/resources/views/pad/components/scripts/dimensao/pesquisa/coordenacao.blade.php @@ -0,0 +1,55 @@ + \ 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 0000000..58033c0 --- /dev/null +++ b/resources/views/pad/components/scripts/dimensao/pesquisa/general.blade.php @@ -0,0 +1,3 @@ + \ 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 0000000..c51642c --- /dev/null +++ b/resources/views/pad/components/templates/dimensao/ensino/aulas/form_create.blade.php @@ -0,0 +1,153 @@ + +
+
+
+

Ensino - Aulas

+
+
+ + @csrf + +
+ + + +
+ + +
+ +
+ + + + @include('components.divs.errors', [ + 'form' => 'ensino_aulas_form_create', + 'field' => 'componente_curricular', + ]) +
+ +
+ + + + @include('components.divs.errors', [ + 'form' => 'ensino_aulas_form_create', + 'field' => 'curso' + ]) +
+ +
+ + + + @include('components.divs.errors', [ + 'form' => 'ensino_aulas_form_create', + 'field' => 'nivel' + ]) +
+ +
+ + + + @include('components.divs.errors', [ + 'form' => 'ensino_aulas_form_create', + 'field' => 'modalidade' + ]) +
+ +
+ + + + @include('components.divs.errors', [ + 'form' => 'ensino_aulas_form_create', + 'field' => 'ch_semanal' + ]) +
+ +
+ + + + @include('components.divs.errors', [ + 'form' => 'ensino_aulas_form_create', + 'field' => 'ch_total' + ]) +
+
+ +
+ @include('components.buttons.btn-save', [ + 'content' => 'Cadastrar', + 'id' => 'btn-submit_ensino_aulas' + ]) +
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + @foreach($ensinoAulas as $ensinoAula) + + + + + + + + + + + @endforeach + +
Cód Componente Curricular Curso Nível Modalidade CH Semanal CH Total Opções
{{ $ensinoAula->cod_atividade }}{{ $ensinoAula->componente_curricular }}{{ $ensinoAula->curso }}{{ $ensinoAula->nivelAsString() }}{{ $ensinoAula->modalidadeAsString() }}{{ $ensinoAula->ch_semanal }}{{ $ensinoAula->ch_total }} + @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]) + ]) +
+ +
+
\ 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 f0f4c7e..f6b2d02 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 @@

Ensino - Aulas

-
+ @csrf
- -
- +
- - @error('componente_curricular') -
- {{$message}} -
- @enderror + + + @include('components.divs.errors', [ + 'form' => 'ensino_aulas_form_update', + 'field' => 'componente_curricular', + ]) +
- - @error('curso') -
- {{$message}} -
- @enderror + + + @include('components.divs.errors', [ + 'form' => 'ensino_aulas_form_update', + 'field' => 'curso', + ])
@@ -41,69 +40,76 @@ - @error('nivel') -
- {{$message}} -
- @enderror + + @include('components.divs.errors', [ + 'form' => 'ensino_aulas_form_update', + 'field' => 'nivel', + ])
- @foreach($modalidades as $value => $modalidade) - @if( $value == old('modalidade') ) + @if( $value == $model->modalidade ) @else @endif @endforeach - @error('modalidade') -
- {{$message}} -
- @enderror + + @include('components.divs.errors', [ + 'form' => 'ensino_aulas_form_update', + 'field' => 'modalidade', + ])
- - @error('ch_semanal') -
- {{$message}} -
- @enderror + + + @include('components.divs.errors', [ + 'form' => 'ensino_aulas_form_update', + 'field' => 'ch_semanal', + ])
- - @error('ch_total') -
- {{$message}} -
- @enderror + + + @include('components.divs.errors', [ + 'form' => 'ensino_aulas_form_update', + 'field' => 'ch_total', + ])
- +
+ + + +
-
- @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']]) -
+
-
\ 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 0000000..bd0c4ca --- /dev/null +++ b/resources/views/pad/components/templates/dimensao/pesquisa/coordenacao/form_create.blade.php @@ -0,0 +1,118 @@ + +
+
+
+

Pesquisa - Coordenação

+
+
+ @csrf + +
+ + + +
+ + +
+ +
+ + + @error('titulo_projeto') +
+ {{$message}} +
+ @enderror +
+ +
+ + + @error('linha_grupo_pesquisa') +
+ {{$message}} +
+ @enderror +
+ +
+ + + @error('funcao') +
+ {{$message}} +
+ @enderror +
+ +
+ + + @error('ch_semanal') +
+ {{$message}} +
+ @enderror +
+
+ +
+ @include('components.buttons.btn-save', [ + 'content' => 'Cadastrar' + ]) +
+ +
+
+ +
+ + + + + + + + + + + + + + + + @foreach($pesquisasCoordenacao as $pesquisaCoordenacao) + + + + + + + + + @endforeach + +
Cód Título do Projeto Linha & Grupo de Pesquisa Função CH Semanal Opções
{{ $pesquisaCoordenacao->cod_atividade }}{{ $pesquisaCoordenacao->titulo_projeto }}{{ $pesquisaCoordenacao->linha_grupo_pesquisa }}{{ $pesquisaCoordenacao->funcaoAsString() }}{{ $pesquisaCoordenacao->ch_semanal }} + @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]) + ]) +
+ +
+
\ 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 0000000..4a1e1ff --- /dev/null +++ b/resources/views/pad/components/templates/dimensao/pesquisa/coordenacao/form_update.blade.php @@ -0,0 +1,77 @@ + +
+
+
+ @csrf + +
+ + + +
+ + +
+ +
+ + + @error('titulo_projeto') +
+ {{$message}} +
+ @enderror +
+ +
+ + + @error('linha_grupo_pesquisa') +
+ {{$message}} +
+ @enderror +
+ +
+ + + @error('funcao') +
+ {{$message}} +
+ @enderror +
+ +
+ + + @error('ch_semanal') +
+ {{$message}} +
+ @enderror +
+
+ +
+ @include('components.buttons.btn-close_modal') + + @include('components.buttons.btn-save', [ + 'content' => 'Cadastrar' + ]) +
+ +
+
+ +
\ 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 0000000..e69de29 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 0000000..e69de29 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 0000000..e69de29 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 0000000..e69de29 diff --git a/resources/views/pad/components/templates/table.blade.php b/resources/views/pad/components/templates/table.blade.php index 59acf10..e755d45 100644 --- a/resources/views/pad/components/templates/table.blade.php +++ b/resources/views/pad/components/templates/table.blade.php @@ -11,7 +11,12 @@ - + + + @foreach($colunas as $coluna) + {{ $coluna }} + @endforeach + diff --git a/resources/views/pad/dimensao/ensino.blade.php b/resources/views/pad/dimensao/ensino.blade.php index acfa853..f4963ba 100644 --- a/resources/views/pad/dimensao/ensino.blade.php +++ b/resources/views/pad/dimensao/ensino.blade.php @@ -12,13 +12,13 @@ ]) @endsection @section('body') -
+
@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'])
@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 28cb212..b892994 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') +
+ + @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']) +
+@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 86b5e3e..103975a 100644 --- a/resources/views/unidade/create.blade.php +++ b/resources/views/unidade/create.blade.php @@ -21,24 +21,32 @@
@csrf @method('POST') -
- - - @error('name') - {{ $message }} - @enderror -
-
- @include('components.buttons.btn-cancel', [ - 'route' => route('unidade_index'), - ]) - @include('components.buttons.btn-save', [ - 'content' => 'Cadastrar', - 'btn_class' => 'btn btn-outline-success', - 'i_class' => '', - ]) + +
+ +
+
+ + + @error('name') + {{ $message }} + @enderror +
+
+ +
+ @include('components.buttons.btn-cancel', [ + 'route' => route('unidade_index'), + 'content' => 'Cancelar' + ]) + + @include('components.buttons.btn-save', [ + 'content' => 'Cadastrar', + ]) +
+
+
@endsection diff --git a/resources/views/unidade/index.blade.php b/resources/views/unidade/index.blade.php index 0795b2b..c005ce2 100644 --- a/resources/views/unidade/index.blade.php +++ b/resources/views/unidade/index.blade.php @@ -16,37 +16,37 @@

TODAS AS UNIDADES

@include('components.buttons.btn-create', [ + 'id' => 'unidade_create', 'route' => route('unidade_create'), - 'class' => '', 'content' => 'Nova Unidade', - 'id' => '', ])
- - - - - - - - - - @foreach ($unidades as $unidade) + +
+
#NameOpções
+ - - - + + - @endforeach - -
{{ $unidade->id }}{{ $unidade->name }} - @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, - ]) - NomeAções
+ + + @foreach ($unidades as $unidade) + + {{ $unidade->name }} + + @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]), + ]) + + + @endforeach + + +
@endsection diff --git a/resources/views/unidade/update.blade.php b/resources/views/unidade/update.blade.php index ad07bff..9b18c04 100644 --- a/resources/views/unidade/update.blade.php +++ b/resources/views/unidade/update.blade.php @@ -21,23 +21,32 @@
@csrf @method('POST') -
- - - @error('name') - {{ $message }} - @enderror -
-
- @include('components.buttons.btn-cancel', [ - 'route' => route('unidade_index'), - ]) - @include('components.buttons.btn-save', [ - 'content' => 'Atualizar', - 'btn_class' => 'btn btn-outline-success', - 'i_class' => '', - ]) + +
+ +
+
+ + + @error('name') + {{ $message }} + @enderror +
+
+ +
+ @include('components.buttons.btn-cancel', [ + 'route' => route('unidade_index'), + 'content' => 'Cancelar' + ]) + + @include('components.buttons.btn-save', [ + 'content' => 'Cadastrar', + ]) +
+
+
@endsection diff --git a/routes/web.php b/routes/web.php index d1d7a27..dc5ebd9 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'); -- GitLab