Download as
Browse Code »

Commit 8e908898911c7f47e3f62cfd5e90f5d73ff1b6dc

Authored by Paula Bonot
Committed by GitHub
2 parents 81177421 36213537
Exists in 2.8 and in 6 other branches 2.2, 2.3, 2.4, 2.5, 2.6, 2.7

Merge pull request #6697 from portabilis/issue-6679 

Desconsidera disciplina dispensada da turma antes de calcular situação da falta
Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
ieducar/modules/Avaliacao/Service/Boletim.php
  Diff comments   View file @8e90889
... ... @@ -1005,6 +1005,10 @@ class Avaliacao_Service_Boletim implements CoreExt_Configurable
1005 1005 $componentes = $this->getComponentes();
1006 1006  
1007 1007 $disciplinaDispensadaTurma = clsPmieducarTurma::getDisciplinaDispensada($classroomId);
  1008 +
  1009 + if (is_numeric($disciplinaDispensadaTurma)) {
  1010 + unset($componentes[$disciplinaDispensadaTurma]);
  1011 + }
1008 1012  
1009 1013 // Carrega faltas lançadas (persistidas)
1010 1014 $this->_loadFalta();
... ... @@ -1083,10 +1087,6 @@ class Avaliacao_Service_Boletim implements CoreExt_Configurable
1083 1087 $total += $componenteTotal;
1084 1088 }
1085 1089  
1086   - if (is_numeric($disciplinaDispensadaTurma)) {
1087   - unset($componentes[$disciplinaDispensadaTurma]);
1088   - unset($faltasComponentes[$disciplinaDispensadaTurma]);
1089   - }
1090 1090 if (0 == count($faltasComponentes) ||
1091 1091 count($faltasComponentes) != count($componentes)) {
1092 1092 $etapa = 1;
... ...