Download as
Browse Code »

Commit 20d895c98e2d49630a7db9fc272920c4c34e4ec1

Authored by Everton Muniz
Committed by GitHub
2 parents 4e93716c 7199322b
Exists in 2.8 and in 6 other branches 2.2, 2.3, 2.4, 2.5, 2.6, 2.7

Merge pull request #6755 from portabilis/issue-6754 

Trata casos em que a disciplina não é encontrada no cálculo de disciplinas aglutinadas
Showing 1 changed file with 5 additions and 1 deletions   Show diff stats
ieducar/modules/Avaliacao/Service/Boletim.php
  Diff comments   View file @20d895c
... ... @@ -1005,7 +1005,7 @@ class Avaliacao_Service_Boletim implements CoreExt_Configurable
1005 1005 $componentes = $this->getComponentes();
1006 1006  
1007 1007 $disciplinaDispensadaTurma = clsPmieducarTurma::getDisciplinaDispensada($classroomId);
1008   -
  1008 +
1009 1009 if (is_numeric($disciplinaDispensadaTurma)) {
1010 1010 unset($componentes[$disciplinaDispensadaTurma]);
1011 1011 }
... ... @@ -1139,6 +1139,10 @@ class Avaliacao_Service_Boletim implements CoreExt_Configurable
1139 1139  
1140 1140 $somaEtapaNotas = [];
1141 1141 foreach ($codigos as $codigo) {
  1142 + if (!isset($notasComponentes[$codigo])) {
  1143 + continue;
  1144 + }
  1145 +
1142 1146 $etapaNotas = CoreExt_Entity::entityFilterAttr($notasComponentes[$codigo], 'etapa', 'nota');
1143 1147 foreach ($etapaNotas as $etapa => $nota) {
1144 1148 $somaEtapaNotas[$etapa] = ($somaEtapaNotas[$etapa] ?? 0) + $nota;
... ...