Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

feat: edcenso 2023 #292

Merged
merged 7 commits into from
May 7, 2023
Merged

feat: edcenso 2023 #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
63aae8f
edcenso_alias finalizado
paulones May 2, 2023
7a73083
trocado disciplines_fk por teaching matrixes
paulones May 2, 2023
83aa889
inserido colunas de notas em grade results
paulones May 3, 2023
31cca82
Merge remote-tracking branch 'origin/edcenso_2023' into edcenso_2023
paulones May 3, 2023
e2ecd5f
corrigido todos os validadores listados das escolas de búzios
paulones May 6, 2023
2ceb279
corrigido disposição dos textos do validador
paulones May 7, 2023
1ab4a08
Merge branch 'dev' into edcenso_2023
igorgoncalves May 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
179 changes: 87 additions & 92 deletions app/controllers/CensoController.php
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 23 additions & 9 deletions app/controllers/EnrollmentController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ public function actionSaveGrades()
// if ($hasFinalMediaCalculated) {
// $this->calculateFinalMedia();
// }
$this->calculateFinalMedia();
$this->calculateGradeResults();
echo json_encode(["valid" => true]);
}

Expand Down Expand Up @@ -418,10 +418,10 @@ public function actionGetGrades()

public function actionCalculateFinalMedia()
{
$this->calculateFinalMedia();
$this->calculateGradeResults();
}

private function calculateFinalMedia()
private function calculateGradeResults()
{
$criteria = new CDbCriteria();
$criteria->alias = "gu";
Expand Down Expand Up @@ -454,6 +454,12 @@ private function calculateFinalMedia()
$arr["grades"][$key] = $this->getUnidadeValues($gradeUnity, $studentEnrollment->id, $_POST["discipline"]);
}

$gradeResult = GradeResults::model()->find("enrollment_fk = :enrollment_fk and discipline_fk = :discipline_fk", ["enrollment_fk" => $studentEnrollment->id, "discipline_fk" => $_POST["discipline"]]);
if ($gradeResult == null) {
$gradeResult = new GradeResults();
$gradeResult->enrollment_fk = $studentEnrollment->id;
$gradeResult->discipline_fk = $_POST["discipline"];
}

//Cálculo da média final
$arr["finalMedia"] = "";
Expand All @@ -462,6 +468,8 @@ private function calculateFinalMedia()
$arr["semesterMedias"] = [];
$hasRF = false;
$rawUnitiesFilled = 0;
$recSemIndex = 0;
$gradeIndex = 0;
foreach ($arr["grades"] as $grade) {
switch ($grade["gradeUnityType"]) {
case "U":
Expand All @@ -470,13 +478,20 @@ private function calculateFinalMedia()
$rawUnitiesFilled++;
}
$sumsCount++;

$gradeResult["grade_" . ($gradeIndex + 1)] = $grade["unityGrade"] != "" ? $grade["unityGrade"] : null;
$gradeIndex++;
break;
case "UR":
if ($grade["unityGrade"] != "" || $grade["unityRecoverGrade"] != "") {
$sums += $grade["unityRecoverGrade"] > $grade["unityGrade"] ? $grade["unityRecoverGrade"] : $grade["unityGrade"];
$rawUnitiesFilled++;
}
$sumsCount++;

$gradeResult["grade_" . ($gradeIndex + 1)] = $grade["unityGrade"] != "" ? $grade["unityGrade"] : null;
$gradeResult["rec_bim_" . ($gradeIndex + 1)] = $grade["unityRecoverGrade"] != "" ? $grade["unityRecoverGrade"] : null;
$gradeIndex++;
break;
case "RS":
if ($sums > 0) {
Expand All @@ -488,6 +503,9 @@ private function calculateFinalMedia()
}
$sums = 0;
$sumsCount = 0;

$gradeResult["rec_sem_" . ($recSemIndex + 1)] = $grade["unityGrade"] != "" ? $grade["unityGrade"] : null;
$recSemIndex++;
break;
case "RF":
$hasRF = true;
Expand All @@ -498,6 +516,8 @@ private function calculateFinalMedia()
$finalMedia = array_sum($arr["semesterMedias"]) / count($arr["semesterMedias"]);
$finalRecoverMedia = ($finalMedia + $grade["unityGrade"]) / 2;
$finalMedia = number_format($finalMedia > $finalRecoverMedia ? $finalMedia : $finalRecoverMedia, 2);

$gradeResult["rec_final"] = $grade["unityGrade"] != "" ? $grade["unityGrade"] : null;
break;
}
}
Expand All @@ -509,12 +529,6 @@ private function calculateFinalMedia()
$finalMedia = number_format(array_sum($arr["semesterMedias"]) / count($arr["semesterMedias"]), 2);
}

$gradeResult = GradeResults::model()->find("enrollment_fk = :enrollment_fk and discipline_fk = :discipline_fk", ["enrollment_fk" => $studentEnrollment->id, "discipline_fk" => $_POST["discipline"]]);
if ($gradeResult == null) {
$gradeResult = new GradeResults();
$gradeResult->enrollment_fk = $studentEnrollment->id;
$gradeResult->discipline_fk = $_POST["discipline"];
}
$gradeResult->final_media = $finalMedia;
$gradeResult->save();
}
Expand Down
108 changes: 33 additions & 75 deletions app/controllers/ReportsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function beforeAction($action)

public function actionQuarterlyReport()
{
if(isset($_POST['student']) && isset($_POST['quartely_report_classroom_student']) && isset($_POST['model_quartely'])) {
if (isset($_POST['student']) && isset($_POST['quartely_report_classroom_student']) && isset($_POST['model_quartely'])) {
$student_id = $_POST['student'];
$classroom_id = $_POST['quartely_report_classroom_student'];
$model = $_POST['model_quartely'];
Expand Down Expand Up @@ -75,23 +75,23 @@ public function actionQuarterlyReport()
"school" => $school,
"current_year" => $current_year
));
}else if ($model == 2) { // 2º ANO
} else if ($model == 2) { // 2º ANO
$this->render('buzios/quarterly/QuarterlyReportSecondYear', array(
"student_identification" => $student_identification,
"student_enrollment" => $student_enrollment,
"classroom" => $classroom,
"school" => $school,
"current_year" => $current_year
));
}else if ($model == 3) { // 3º ANO
} else if ($model == 3) { // 3º ANO
$this->render('buzios/quarterly/QuarterlyReportThreeYear', array(
"student_identification" => $student_identification,
"student_enrollment" => $student_enrollment,
"classroom" => $classroom,
"school" => $school,
"current_year" => $current_year
));
}else if ($model == 4) { // CRECHE II
} else if ($model == 4) { // CRECHE II
$this->render('buzios/quarterly/QuarterlyReportNurseryrII', array(
"student_identification" => $student_identification,
"student_enrollment" => $student_enrollment,
Expand All @@ -101,7 +101,7 @@ public function actionQuarterlyReport()
"current_year" => $current_year,
"dateFormatCorrect" => $dateFormatCorrect
));
}else if ($model == 5) { // CRECHE III
} else if ($model == 5) { // CRECHE III
$this->render('buzios/quarterly/QuarterlyReportNurseryrIII', array(
"student_identification" => $student_identification,
"student_enrollment" => $student_enrollment,
Expand All @@ -111,7 +111,7 @@ public function actionQuarterlyReport()
"current_year" => $current_year,
"dateFormatCorrect" => $dateFormatCorrect
));
}else if ($model == 6) { // CRECHE IV
} else if ($model == 6) { // CRECHE IV
$this->render('buzios/quarterly/QuarterlyReportNurseryrIV', array(
"student_identification" => $student_identification,
"student_enrollment" => $student_enrollment,
Expand All @@ -121,7 +121,7 @@ public function actionQuarterlyReport()
"current_year" => $current_year,
"dateFormatCorrect" => $dateFormatCorrect
));
}else if ($model == 7) { // PRÉ I
} else if ($model == 7) { // PRÉ I
$this->render('buzios/quarterly/QuarterlyReportPreI', array(
"student_identification" => $student_identification,
"student_enrollment" => $student_enrollment,
Expand All @@ -131,7 +131,7 @@ public function actionQuarterlyReport()
"current_year" => $current_year,
"dateFormatCorrect" => $dateFormatCorrect
));
}else if ($model == 8) { // PRÉ II
} else if ($model == 8) { // PRÉ II
$this->render('buzios/quarterly/QuarterlyReportPreII', array(
"student_identification" => $student_identification,
"student_enrollment" => $student_enrollment,
Expand All @@ -149,7 +149,7 @@ public function actionQuarterlyReport()

public function actionGetStudentClassrooms($id)
{
$classroom = Classroom::model()->findByPk($id);
$classroom = Classroom::model()->findByPk($id);
$enrollments = $classroom->studentEnrollments;
foreach ($enrollments as $enrollment) {
echo "<option value='" . $enrollment->studentFk->id . "'>" . htmlspecialchars($enrollment->studentFk->name, ENT_QUOTES, 'UTF-8') . "</option>";
Expand Down Expand Up @@ -1130,36 +1130,40 @@ public function actionGenerateElectronicDiaryReport()
")->bindParam(":classroom", $_POST["classroom"])->queryAll();

foreach ($disciplines as $discipline) {
$arr["disciplineName"] = $discipline["name"];

$arr["grades"] = [];
$rawUnitiesCount = 0;
foreach ($gradeUnitiesByClassroom as $gradeUnity) {
$rawUnitiesCount = $gradeUnity->type == "UR" || $gradeUnity->type == "U" ? $rawUnitiesCount + 1 : $rawUnitiesCount;
array_push($arr["grades"], $gradeUnity->type == "UR"
? ["unityId" => $gradeUnity->id, "unityGrade" => "", "unityRecoverGrade" => "", "gradeUnityType" => $gradeUnity->type]
: ["unityId" => $gradeUnity->id, "unityGrade" => "", "gradeUnityType" => $gradeUnity->type]);
}
$arr["disciplineName"] = $discipline["name"];

//Trazer notas das unidades
$criteria->select = "distinct gu.id, gu.*";
$criteria->join = "join grade_unity_modality gum on gum.grade_unity_fk = gu.id";
$criteria->join .= " join grade g on g.grade_unity_modality_fk = gum.id";
$criteria->condition = "g.discipline_fk = :discipline_fk and enrollment_fk = :enrollment_fk";
$criteria->params = array(":discipline_fk" => $discipline["id"], ":enrollment_fk" => $_POST["student"]);
$criteria->order = "gu.id";

$gradeUnitiesByDiscipline = GradeUnity::model()->findAll($criteria);

foreach ($gradeUnitiesByDiscipline as $gradeUnity) {
$key = array_search($gradeUnity->id, array_column($arr["grades"], 'unityId'));
$arr["grades"][$key] = $this->getUnidadeValues($gradeUnity, $_POST['student'], $discipline["id"]);
$gradeResult = GradeResults::model()->find("enrollment_fk = :enrollment_fk and discipline_fk = :discipline_fk", ["enrollment_fk" => $_POST["student"], "discipline_fk" => $discipline["id"]]);
$recSemIndex = 0;
$gradeIndex = 0;
foreach ($arr["grades"] as &$grade) {
switch ($grade["gradeUnityType"]) {
case "U":
$grade["unityGrade"] = $gradeResult["grade_" . ($gradeIndex + 1)] != null ? $gradeResult["grade_" . ($gradeIndex + 1)] : "";
$gradeIndex++;
break;
case "UR":
$grade["unityGrade"] = $gradeResult["grade_" . ($gradeIndex + 1)] != null ? $gradeResult["grade_" . ($gradeIndex + 1)] : "";
$grade["unityRecoverGrade"] = $gradeResult["rec_bim_" . ($gradeIndex + 1)] != null ? $gradeResult["rec_bim_" . ($gradeIndex + 1)] : "";
$gradeIndex++;
break;
case "RS":
$grade["unityGrade"] = $gradeResult["rec_sem_" . ($recSemIndex + 1)] != null ? $gradeResult["rec_sem_" . ($recSemIndex + 1)] : "";
$recSemIndex++;
break;
case "RF":
$grade["unityGrade"] = $gradeResult["rec_final"] != null ? $gradeResult["rec_final"] : "";
break;
}
}



$gradeResult = GradeResults::model()->find("enrollment_fk = :enrollment_fk and discipline_fk = :discipline_fk", ["enrollment_fk" => $_POST["student"], "discipline_fk" => $discipline["id"]]);
$arr["finalMedia"] = $gradeResult != null ? $gradeResult->final_media : "";

array_push($result["rows"], $arr);
}
$result["valid"] = true;
Expand All @@ -1170,52 +1174,6 @@ public function actionGenerateElectronicDiaryReport()
echo json_encode($result);
}

private function getUnidadeValues($gradeUnity, $enrollment_id, $discipline)
{
$unityGrade = "";
$unityRecoverGrade = "";
$turnedEmptyToZero = false;
$weightsSum = 0;
$commonModalitiesCount = 0;
foreach ($gradeUnity->gradeUnityModalities as $gradeUnityModality) {
if ($gradeUnityModality->type == "C") {
$commonModalitiesCount++;
$weightsSum += $gradeUnityModality->weight;
}

$student_grades = array_filter(
$gradeUnityModality->grades,
function($grade)use($enrollment_id, $discipline){
return $grade->enrollment_fk === $enrollment_id && $grade->discipline_fk === $discipline;
}
);

foreach ($student_grades as $grade) {
if ($gradeUnityModality->type == "C") {
if (!$turnedEmptyToZero) {
$unityGrade = 0;
$turnedEmptyToZero = true;
}
$unityGrade += $gradeUnity->gradeCalculationFk->name === "Peso"
? $grade->grade * $gradeUnityModality->weight
: $grade->grade;
} else {
$unityRecoverGrade = (int)$grade->grade;
}
}
}
if ($unityGrade !== "") {
if ($gradeUnity->gradeCalculationFk->name === "Média") {
$unityGrade = number_format($unityGrade / $commonModalitiesCount, 2);
} else if ($gradeUnity->gradeCalculationFk->name === "Peso") {
$unityGrade = number_format($unityGrade / $weightsSum, 2);
}
}
return $gradeUnity->type == "UR"
? ["unityId" => $gradeUnity->id, "unityGrade" => $unityGrade, "unityRecoverGrade" => $unityRecoverGrade, "gradeUnityType" => $gradeUnity->type]
: ["unityId" => $gradeUnity->id, "unityGrade" => $unityGrade, "gradeUnityType" => $gradeUnity->type];
}

public function actionOutOfTownStudentsReport()
{
$sql = "SELECT DISTINCT su.name, su.inep_id, su.birthday, std.address,
Expand Down
Loading