Skip to content

Commit

Permalink
Merge pull request #109 from ipti/dev
Browse files Browse the repository at this point in the history
hotfix turma multi
  • Loading branch information
ruancelisantos authored Jul 9, 2022
2 parents 5d88d89 + 98922cf commit aee36f5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/controllers/CensoController.php
Original file line number Diff line number Diff line change
Expand Up @@ -1383,7 +1383,7 @@ public function validateEnrollment($collumn)
$result = $sev->studentEntryForm($collumn['student_entry_form'], $administrative_dependence, $edcenso_svm);
if (!$result["status"]) array_push($log, array("student_entry_form" => $result["erro"]));

$result = $sev->isValidMultiClassroom($edcenso_svm, $collumn["edcenso_stage_vs_modality"]);
$result = $sev->isValidMultiClassroom($edcenso_svm, $collumn["edcenso_stage_vs_modality_fk"]);
if (!$result["status"]) array_push($log, array("Etapa de Ensino" => $result["erro"]));

$aeeTypes = array($collumn['aee_cognitive_functions'],
Expand Down Expand Up @@ -1436,7 +1436,7 @@ public function actionValidate()
}
$log['student'][$enrollment->student_fk]['validate']['enrollment'][$ienrollment]['id'] = $enrollment->id;
$log['student'][$enrollment->student_fk]['validate']['enrollment'][$ienrollment]['turma'] = $enrollment->classroomFk->name;
$log['student'][$enrollment->student_fk]['validate']['enrollment'][$ienrollment]['errors'] = $this->validateEnrollment($enrollment->attributes, $enrollment->studentFk->attributes);
$log['student'][$enrollment->student_fk]['validate']['enrollment'][$ienrollment]['errors'] = $this->validateEnrollment($enrollment->attributes);
}
}
$this->render('validate', ['log' => $log]);
Expand Down

0 comments on commit aee36f5

Please # to comment.