Skip to content

GitLab

"app/vscode:/vscode.git/clone" did not exist on "000d3c23a262ef72cd28dd8d60e25f822dec444d"
Commit 6b39fce8 authored by PedroLopesUPE's avatar PedroLopesUPE
Browse files

Merge branch 'main' into dev-joao-pdf_generator

parents ef3eabf0 d74abdbc
Show whitespace changes
Inline Side-by-side
app/Http/Controllers/PadController.php
View file @ 6b39fce8
......@@ -321,16 +321,20 @@ class PadController extends Controller
$userPad = $professor->userPads()->where('pad_id', '=', $pad->id)->first();
$avaliacoes = $this->get_avaliacoes($userPad, $avaliador_pad);
$avaliacoes_ensino = $avaliacoes['ensino']->get();
$avaliacoes_pesquisa = $avaliacoes['pesquisa']->get();
$avaliacoes_extensao = $avaliacoes['extensao']->get();
$avaliacoes_gestao = $avaliacoes['gestao']->get();
if( $avaliacoes_ensino->all() != null ||
$avaliacoes_pesquisa->all() != null ||
$avaliacoes_extensao->all() != null ||
$avaliacoes_gestao->all() != null){
$avaliacoes_ensino = !empty($avaliacoes['ensino']) ? $avaliacoes['ensino']->get() : null;
$avaliacoes_pesquisa = !empty($avaliacoes['pesquisa']) ? $avaliacoes['pesquisa']->get() : null;
$avaliacoes_extensao = !empty($avaliacoes['extensao']) ? $avaliacoes['extensao']->get() : null;
$avaliacoes_gestao = !empty($avaliacoes['gestao']) ? $avaliacoes['gestao']->get() : null;
$avaliacoes_ensino_all = $avaliacoes_ensino? $avaliacoes_ensino->all() : null;
$avaliacoes_pesquisa_all = $avaliacoes_pesquisa? $avaliacoes_pesquisa->all() : null;
$avaliacoes_extensao_all = $avaliacoes_extensao? $avaliacoes_extensao->all() : null;
$avaliacoes_gestao_all = $avaliacoes_gestao? $avaliacoes_gestao->all() : null;
if($avaliacoes_ensino_all || $avaliacoes_pesquisa_all || $avaliacoes_extensao_all || $avaliacoes_gestao_all) {
$professor->status = "Enviado";
}
......@@ -584,27 +588,36 @@ class PadController extends Controller
private function get_carga_horaria_total($avaliacoes)
{
//
$ch = 0;
$avaliacoes_ensino = $avaliacoes['ensino']->get();
$avaliacoes_pesquisa = $avaliacoes['pesquisa']->get();
$avaliacoes_extensao = $avaliacoes['extensao']->get();
$avaliacoes_gestao = $avaliacoes['gestao']->get();
$avaliacoes_ensino = !empty($avaliacoes['ensino']) ? $avaliacoes['ensino']->get() : null;
$avaliacoes_pesquisa = !empty($avaliacoes['pesquisa']) ? $avaliacoes['pesquisa']->get() : null;
$avaliacoes_extensao = !empty($avaliacoes['extensao']) ? $avaliacoes['extensao']->get() : null;
$avaliacoes_gestao = !empty($avaliacoes['gestao']) ? $avaliacoes['gestao']->get() : null;
if($avaliacoes_ensino) {
for ($i = 0; $i < count($avaliacoes_ensino->all()); $i++){
$ch += $avaliacoes_ensino[$i]->tarefa()->first()->ch_semanal;
}
}
if($avaliacoes_pesquisa) {
for ($i = 0; $i < count($avaliacoes_pesquisa->all()); $i++){
$ch += $avaliacoes_pesquisa[$i]->tarefa()->first()->ch_semanal;
}
}
if($avaliacoes_extensao) {
for ($i = 0; $i < count($avaliacoes_extensao->all()); $i++){
$ch += $avaliacoes_extensao[$i]->tarefa()->first()->ch_semanal;
}
}
if($avaliacoes_gestao) {
for ($i = 0; $i < count($avaliacoes_gestao->all()); $i++){
$ch += $avaliacoes_gestao[$i]->tarefa()->first()->ch_semanal;
}
}
return $ch;
}
......
resources/views/pad/avaliacao/tarefas_ensino.blade.php
View file @ 6b39fce8
......@@ -171,11 +171,11 @@
<div class="modal-body">
<div class="form-group">
<label for="hora_reajuste">Hora de reajuste:</label>
<input class="form-control" type="number" name="hora_reajuste" id="hora_reajuste"><br>
<input class="form-control" type="number" name="hora_reajuste" id="hora_reajuste" required><br>
</div>
<div class="form-group">
<label for="descricao">Descrição:</label>
<input class="form-control" type="textarea" name="descricao" id="descricao">
<input class="form-control" type="textarea" name="descricao" id="descricao" required>
</div>
</div>
<div class="modal-footer">
......
resources/views/pad/avaliacao/tarefas_extensao.blade.php
View file @ 6b39fce8
......@@ -173,11 +173,11 @@
<div class="modal-body">
<div class="form-group">
<label for="hora_reajuste">Hora de reajuste:</label>
<input class="form-control" type="number" name="hora_reajuste" id="hora_reajuste"><br>
<input class="form-control" type="number" name="hora_reajuste" id="hora_reajuste" required><br>
</div>
<div class="form-group">
<label for="descricao">Descrição:</label>
<input class="form-control" type="textarea" name="descricao" id="descricao">
<input class="form-control" type="textarea" name="descricao" id="descricao" required>
</div>
</div>
<div class="modal-footer">
......
resources/views/pad/avaliacao/tarefas_gestao.blade.php
View file @ 6b39fce8
......@@ -173,11 +173,11 @@
<div class="modal-body">
<div class="form-group">
<label for="hora_reajuste">Hora de reajuste:</label>
<input class="form-control" type="number" name="hora_reajuste" id="hora_reajuste"><br>
<input class="form-control" type="number" name="hora_reajuste" id="hora_reajuste" required><br>
</div>
<div class="form-group">
<label for="descricao">Descrição:</label>
<input class="form-control" type="textarea" name="descricao" id="descricao">
<input class="form-control" type="textarea" name="descricao" id="descricao" required>
</div>
</div>
<div class="modal-footer">
......
resources/views/pad/avaliacao/tarefas_pesquisa.blade.php
View file @ 6b39fce8
......@@ -173,11 +173,11 @@
<div class="modal-body">
<div class="form-group">
<label for="hora_reajuste">Hora de reajuste:</label>
<input class="form-control" type="number" name="hora_reajuste" id="hora_reajuste"><br>
<input class="form-control" type="number" name="hora_reajuste" id="hora_reajuste" required><br>
</div>
<div class="form-group">
<label for="descricao">Descrição:</label>
<input class="form-control" type="textarea" name="descricao" id="descricao">
<input class="form-control" type="textarea" name="descricao" id="descricao" required>
</div>
</div>
<div class="modal-footer">
......
scripts/pad_prod.sql
View file @ 6b39fce8
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment