diff --git a/CHANGELOG.md b/CHANGELOG.md index afd1590ce..21625f705 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,41 @@ -## [Versão 3.78.152] +## [Versão 3.80.161] +- Refatoradas variáveis para utilizar o post, através de uma função do Yii. +- Modificada a ordem dos parâmetros da função getSchedulesFromMajorStage. +- +## [Versão 3.80.160] +- Correção na opção da data máxima da função renderDatePickerFinal. + +## [Versão 3.80.159] +- Método actionValidate do CensoController refatorado, implementando váriaveis. +- Processar instrutores, garantindo que cada instrutor seja validado apenas uma vez. + +## [Versão 3.80.158] +- Alterado o botão Cancelar Matrícula por Excluir Matricula. + +## [Versão 3.80.157] +- Inserido opção de situação de matrícula "AVANÇADO" no campo "Situação de Matrícula" +- Adequado o sistema para o Educacenso 2024 + +## [Versão 3.79.157] +- Corrigida ficha de matricula do aluno ao imprimir. + +## [Versão 3.79.156] +- Realizadas correções no módulo Sagres para evitar a contagem de CPFs de estudantes, evitando duplicações. + +## [Versão 3.79.156] +- Permitido com que se adicione ou remova aulas no quadro de horário, mesmo quando houver preenchimento de frequência ou quadro de horário + +## [Versão 3.79.155] +- Efetuadas correções para o chaveamento do professor com o seu usuário + +## [Versão 3.79.154] +- Adicionada uma regra de validação para mostrar um erro caso tente cadastrar uma certidão inválida. + +## [Versão 3.79.153] +## [Versão 3.79.152] - Realizadas correções no módulo Sagres para evitar a contagem de CPFs de estudantes duplicados. -## [Versão 3.78.151] +## [Versão 3.79.151] - Realizadas correções no módulo Sagres para evitar a contagem de CPFs de estudantes, evitando duplicações. ## [Versão 3.79.150] diff --git a/app/components/DatePickerWidget.php b/app/components/DatePickerWidget.php index 62a60c138..ac38cf626 100644 --- a/app/components/DatePickerWidget.php +++ b/app/components/DatePickerWidget.php @@ -41,6 +41,7 @@ public static function renderDatePicker($model, $attribute) public static function renderDatePickerFinal($model, $attribute) { + $year = (date('Y') + 1); return [ 'model' => $model, 'attribute' => $attribute, @@ -48,9 +49,9 @@ public static function renderDatePickerFinal($model, $attribute) 'dateFormat' => 'dd/mm/yy', 'changeYear' => true, 'changeMonth' => true, - 'yearRange' => '1930:' . date('Y'), + 'yearRange' => '1930:'. $year, 'showOn' => 'focus', - 'maxDate' => 0, + 'maxDate' => '31/12/'. ($year +1), 'monthNamesShort' => [ 'Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro' diff --git a/app/controllers/CensoController.php b/app/controllers/CensoController.php index 18048b678..793d2d32d 100755 --- a/app/controllers/CensoController.php +++ b/app/controllers/CensoController.php @@ -378,7 +378,8 @@ public function validateSchoolStructure($collumn, $school) $collumn["water_supply_artesian_well"], $collumn["water_supply_well"], $collumn["water_supply_river"], - $collumn["water_supply_inexistent"]); + $collumn["water_supply_inexistent"], + $collumn["water_supply_car"]); $result = $ssv->supply($water_supplys); if (!$result["status"]) array_push($log, array("Suprimento de Agua" => $result["erro"])); @@ -449,6 +450,7 @@ public function validateSchoolStructure($collumn, $school) $collumn["dependencies_yardzao"], $collumn["dependencies_vivarium"], $collumn["dependencies_vocational_education_workshop"], + $collumn["dependencies_garden_planting_agricultural"], $collumn["dependencies_none"]); $result = $ssv->supply($dependencies); if (!$result["status"]) array_push($log, array("Dependencias" => $result["erro"])); @@ -458,6 +460,7 @@ public function validateSchoolStructure($collumn, $school) $collumn["acessability_tactile_floor"], $collumn["acessability_doors_80cm"], $collumn["acessability_ramps"], + $collumn["acessability_light_signaling"], $collumn["acessability_sound_signaling"], $collumn["acessability_tactile_singnaling"], $collumn["acessability_visual_signaling"], @@ -486,6 +489,7 @@ public function validateSchoolStructure($collumn, $school) $collumn["equipments_toys_early"], $collumn["equipments_scientific_materials"], $collumn["equipments_equipment_amplification"], + $collumn["equipments_garden_planting_agricultural"], $collumn["equipments_musical_instruments"], $collumn["equipments_educational_games"], $collumn["equipments_material_cultural"], @@ -493,6 +497,8 @@ public function validateSchoolStructure($collumn, $school) $collumn["equipments_material_teachingindian"], $collumn["equipments_material_teachingethnic"], $collumn["equipments_material_teachingrural"], + $collumn["equipments_material_teachingquilombola"], + $collumn["equipments_material_teachingspecial"], $collumn["instruments_inexistent"]); $result = $ssv->atLeastOne($instruments); if (!$result["status"]) array_push($log, array("Instrumentos, materiais socioculturais e/ou pedagogicos em uso na escola para o desenvolvimento de atividades de ensino aprendizagem" => $result["erro"])); @@ -648,8 +654,8 @@ public function validateClassroom($column, $school) if (!$result['status']) array_push($log, array('stage' => $result['erro'])); //campo 39 - $result = $crv->isValidProfessionalEducation($column['course'], $column['edcenso_stage_vs_modality_fk']); - if (!$result['status']) array_push($log, array('course' => $result['erro'])); + $result = $crv->isValidProfessionalEducation($column['modality'], $column['course'], $column['edcenso_stage_vs_modality_fk']); + if ( !$result['status']) array_push($log, array('course' => $result['erro'])); //campos 40 a 65 // $disciplinesArray = array($column['discipline_chemistry'], $column['discipline_physics'], $column['discipline_mathematics'], $column['discipline_biology'], $column['discipline_science'], @@ -1454,26 +1460,35 @@ public function actionValidate() $log['school']['validate']['identification'] = $this->validateSchool($schoolcolumn, $managerIdentificationColumn); $log['school']['validate']['structure'] = $this->validateSchoolStructure($schoolstructurecolumn, $schoolcolumn); $classrooms = Classroom::model()->findAllByAttributes(["school_inep_fk" => yii::app()->user->school, "school_year" => Yii::app()->user->year]); + + $processedInstructors = []; foreach ($classrooms as $iclass => $classroom) { $log['classroom'][$iclass]['info'] = $classroom->attributes; $log['classroom'][$iclass]['validate']['identification'] = $this->validateClassroom($classroom, $schoolcolumn, $schoolstructure); foreach ($classroom->instructorTeachingDatas as $iteaching => $teachingData) { - $log['instructor'][$teachingData->instructor_fk]['info'] = $teachingData->instructorFk->attributes; - $log['instructor'][$teachingData->instructor_fk]['validate']['identification'][$iteaching] = $this->validateInstructor($teachingData->instructorFk->attributes, $teachingData->instructorFk->documents->attributes); - $log['instructor'][$teachingData->instructor_fk]['validate']['documents'][$iteaching] = $this->validateInstructorDocuments($teachingData->instructorFk->documents->attributes); - $log['instructor'][$teachingData->instructor_fk]['validate']['variabledata'][$iteaching]['id'] = $teachingData->classroomIdFk->id; - $log['instructor'][$teachingData->instructor_fk]['validate']['variabledata'][$iteaching]['turma'] = $teachingData->classroomIdFk->name; - $log['instructor'][$teachingData->instructor_fk]['validate']['variabledata'][$iteaching]['errors'] = $this->validateInstructorData($teachingData->attributes); + $instructorId = $teachingData->instructor_fk; + if (in_array($instructorId, $processedInstructors)) { + continue; + } + $processedInstructors[] = $instructorId; + $log['instructor'][$instructorId]['info'] = $teachingData->instructorFk->attributes; + $log['instructor'][$instructorId]['validate']['identification'][$iteaching] = $this->validateInstructor($teachingData->instructorFk->attributes, $teachingData->instructorFk->documents->attributes); + $log['instructor'][$instructorId]['validate']['documents'][$iteaching] = $this->validateInstructorDocuments($teachingData->instructorFk->documents->attributes); + $log['instructor'][$instructorId]['validate']['variabledata'][$iteaching]['id'] = $teachingData->classroomIdFk->id; + $log['instructor'][$instructorId]['validate']['variabledata'][$iteaching]['turma'] = $teachingData->classroomIdFk->name; + $log['instructor'][$instructorId]['validate']['variabledata'][$iteaching]['errors'] = $this->validateInstructorData($teachingData->attributes); } foreach ($classroom->studentEnrollments as $ienrollment => $enrollment) { - $log['student'][$enrollment->student_fk]['info'] = $enrollment->studentFk->attributes; - $log['student'][$enrollment->student_fk]['validate']['identification'][$ienrollment] = $this->validateStudentIdentification($enrollment->studentFk->attributes, $enrollment->studentFk->documentsFk->attributes, $enrollment->classroomFk->attributes); - @$log['student'][$enrollment->student_fk]['validate']['documents'][$ienrollment] = $this->validateStudentDocumentsAddress($enrollment->studentFk->documentsFk->attributes, $enrollment->studentFk->attributes); - $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); + $studentId = $enrollment->student_fk; + $log['student'][$studentId]['info'] = $enrollment->studentFk->attributes; + $log['student'][$studentId]['validate']['identification'][$ienrollment] = $this->validateStudentIdentification($enrollment->studentFk->attributes, $enrollment->studentFk->documentsFk->attributes, $enrollment->classroomFk->attributes); + @$log['student'][$studentId]['validate']['documents'][$ienrollment] = $this->validateStudentDocumentsAddress($enrollment->studentFk->documentsFk->attributes, $enrollment->studentFk->attributes); + $log['student'][$studentId]['validate']['enrollment'][$ienrollment]['id'] = $enrollment->id; + $log['student'][$studentId]['validate']['enrollment'][$ienrollment]['turma'] = $enrollment->classroomFk->name; + $log['student'][$studentId]['validate']['enrollment'][$ienrollment]['errors'] = $this->validateEnrollment($enrollment->attributes); } } + $this->render('validate', ['log' => $log]); } diff --git a/app/controllers/ClassesController.php b/app/controllers/ClassesController.php index f564838e6..6ce7acbf6 100755 --- a/app/controllers/ClassesController.php +++ b/app/controllers/ClassesController.php @@ -106,11 +106,11 @@ public function actionClassContents() */ public function actionGetClassContents() { - $classroomId = $_POST["classroom"]; + $classroomId = Yii::app()->request->getPost('classroom'); $isMinorEducation = TagUtils::isStageMinorEducation(Classroom::model()->findByPk($classroomId)->edcenso_stage_vs_modality_fk); - $month = $_POST["month"]; - $year = $_POST["year"]; - $disciplineId = $_POST["discipline"]; + $month = Yii::app()->request->getPost('month'); + $year = Yii::app()->request->getPost('year'); + $disciplineId = Yii::app()->request->getPost('discipline'); $students = $this->getStudentsByClassroom($classroomId); @@ -188,15 +188,7 @@ public function actionGetClassContents() } } - - /** - * Summary of getSchedulesFromMajorStage - * @param integer $classroomId - * @param integer $month - * @param integer $disciplineId - * @return Schedule[] - */ - private function getSchedulesFromMajorStage($classroomId, $month, $disciplineId, $year) + private function getSchedulesFromMajorStage($classroomId, $month, $year, $disciplineId) { return Schedule::model()->findAll( "classroom_fk = :classroom_fk and month = :month and year = :year and discipline_fk = :discipline_fk and unavailable = 0 order by day, schedule", @@ -280,7 +272,6 @@ private function updateStudentAnottations($schedule, $students) { $studentArray = []; foreach ($students as $student) { - $studentData = [ "id" => $student["id"], "name" => $student["name"], diff --git a/app/extensions/Validator/ClassroomValidation.php b/app/extensions/Validator/ClassroomValidation.php index f27ff85c6..12fef9abd 100755 --- a/app/extensions/Validator/ClassroomValidation.php +++ b/app/extensions/Validator/ClassroomValidation.php @@ -413,18 +413,18 @@ function isValidStage($stage, $complementaryActivity, $mediation, $modality, $di } //campo 39 - function isValidProfessionalEducation($professionalEducation, $stage) + function isValidProfessionalEducation($modality, $professionalEducation, $stage) { - $emptyProfessionalEducation = $this->isEmpty($professionalEducation); + // $emptyProfessionalEducation = $this->isEmpty($professionalEducation); - if (strlen($professionalEducation) > 8) { - return array('status' => false, 'erro' => 'O campo deve ter no maximo 8 caracteres'); - } + // if (strlen($professionalEducation) > 8) { + // return array('status' => false, 'erro' => 'O campo deve ter no maximo 8 caracteres'); + // } - if ($emptyProfessionalEducation['status'] && in_array($stage, array(30, 31, 32, 33, 34, 39, 40, 64, 74))) { - return array('status' => false, 'erro' => $this->replaceCodeModalities('O campo deve ser preenchido quando a etapa for 30, 31, 32, 33, 34, 39, 40, 64 ou 74')); - } - if (!$emptyProfessionalEducation['status'] && !in_array($stage, array(30, 31, 32, 33, 34, 39, 40, 64, 74))) { + // if ($emptyProfessionalEducation['status'] && in_array($stage, array(30, 31, 32, 33, 34, 39, 40, 64, 74))) { + // return array('status' => false, 'erro' => $this->replaceCodeModalities('O campo deve ser preenchido quando a etapa for 30, 31, 32, 33, 34, 39, 40, 64 ou 74')); + // } + if ($modality == 4 && !in_array($stage, array(30, 31, 32, 33, 34, 39, 40, 73, 74, 64, 67, 68))) { return array('status' => false, 'erro' => $this->replaceCodeModalities('O campo nao pode ser preenchido quando a etapa for 30, 31, 32, 33, 34, 39, 40, 64 ou 74')); } @@ -576,4 +576,4 @@ public function containsStudents($studentsEnrollment) { } } -?> \ No newline at end of file +?> diff --git a/app/extensions/Validator/SchoolIdentificationValidation.php b/app/extensions/Validator/SchoolIdentificationValidation.php index 7bd5c178a..6e5b6c625 100755 --- a/app/extensions/Validator/SchoolIdentificationValidation.php +++ b/app/extensions/Validator/SchoolIdentificationValidation.php @@ -399,7 +399,7 @@ public function checkPhoneNumbers($ddd, $phoneNumber, $otherPhoneNumber) //campo 26 public function isEmailValid($email) { - if (strlen($email) > 50) { + if (strlen($email) > 100) { return array("status" => false, "erro" => "Email com tamanho invalido"); } diff --git a/app/extensions/Validator/SchoolStructureValidation.php b/app/extensions/Validator/SchoolStructureValidation.php index a8a33d782..e5b01f6f9 100755 --- a/app/extensions/Validator/SchoolStructureValidation.php +++ b/app/extensions/Validator/SchoolStructureValidation.php @@ -98,7 +98,7 @@ public function supply($supply_locations) for ($i = 0; $i < ($len - 1); $i++) { //primeiros campos if ($supply_locations[$i] == "1") { return array("status" => false, - "erro" => "Já que ultimo campo 1 não pode haver outros campos marcados como 1"); + "erro" => "Quando o campo de inexistência é marcado, nenhum outro deve estar."); } } } diff --git a/app/libraries/Educacenso/Register10.php b/app/libraries/Educacenso/Register10.php index 3855d9460..1dc79143b 100644 --- a/app/libraries/Educacenso/Register10.php +++ b/app/libraries/Educacenso/Register10.php @@ -42,6 +42,7 @@ public static function export($year) $attributes['water_supply_artesian_well'] = '0'; $attributes['water_supply_well'] = '0'; $attributes['water_supply_river'] = '0'; + $attributes['water_supply_car'] = '0'; } if ($attributes['energy_supply_inexistent'] == '1') { @@ -70,6 +71,7 @@ public static function export($year) $attributes['acessability_tactile_floor'] = '0'; $attributes['acessability_doors_80cm'] = '0'; $attributes['acessability_ramps'] = '0'; + $attributes['acessability_light_signaling'] = '0'; $attributes['acessability_sound_signaling'] = '0'; $attributes['acessability_tactile_singnaling'] = '0'; $attributes['acessability_visual_signaling'] = '0'; @@ -132,6 +134,9 @@ public static function export($year) $attributes['internet_access_broadband'] = ''; } + if ($attributes['workers_garden_planting_agricultural'] == '0') { + $attributes['workers_garden_planting_agricultural'] = null; + } if ($attributes['workers_administrative_assistant'] == '0') { $attributes['workers_administrative_assistant'] = null; } @@ -171,6 +176,9 @@ public static function export($year) if ($attributes['workers_monitors'] == '0') { $attributes['workers_monitors'] = null; } + if ($attributes['workers_braille'] == '0') { + $attributes['workers_braille'] = null; + } $attributes['native_education'] = 0; if ($attributes['native_education'] != 1) { @@ -208,18 +216,19 @@ public static function export($year) $edcensoAliases = EdcensoAlias::model()->findAll('year = :year and register = 10 order by corder', [":year" => $year]); foreach ($edcensoAliases as $edcensoAlias) { - if ($edcensoAlias->corder == 43) { + if ($edcensoAlias->corder == 44) { $register[$edcensoAlias->corder] = $attributes["dependencies_prysical_disability_bathroom"] == 1 || $attributes["dependencies_child_bathroom"] == 1 || $attributes["dependencies_bathroom_workes"] == 1 || $attributes["dependencies_bathroom_with_shower"] == 1 ? 1 : 0; - } else if ($edcensoAlias->corder == 133) { + } else if ($edcensoAlias->corder == 138) { $register[$edcensoAlias->corder] = null; - if ($attributes["workers_administrative_assistant"] == null && $attributes["workers_service_assistant"] == null && $attributes["workers_librarian"] == null + if ($attributes["workers_garden_planting_agricultural"] == null && $attributes["workers_administrative_assistant"] == null + && $attributes["workers_service_assistant"] == null && $attributes["workers_librarian"] == null && $attributes["workers_firefighter"] == null && $attributes["workers_coordinator_shift"] == null && $attributes["workers_speech_therapist"] == null && $attributes["workers_nutritionist"] == null && $attributes["workers_psychologist"] == null && $attributes["workers_cooker"] == null && $attributes["workers_support_professionals"] == null && $attributes["workers_school_secretary"] == null && $attributes["workers_security_guards"] == null - && $attributes["workers_monitors"] == null) { + && $attributes["workers_monitors"] == null && $attributes["workers_braille"] == null) { $register[$edcensoAlias->corder] = 1; } } else { diff --git a/app/libraries/Educacenso/Register20.php b/app/libraries/Educacenso/Register20.php index e7dfa8783..280c207db 100644 --- a/app/libraries/Educacenso/Register20.php +++ b/app/libraries/Educacenso/Register20.php @@ -68,8 +68,7 @@ public static function export($year) $classrooms = Classroom::model()->findAllByAttributes(['school_inep_fk' => yii::app()->user->school, 'school_year' => Yii::app()->user->year]); foreach ($classrooms as $iclass => $attributes) { -// COMENTÁRIO TEMPORÁRIO PARA CONSEGUIR INTEGRAR OS DADOS DE BOQUIM -// if (count($attributes->instructorTeachingDatas) >= 1 && count($attributes->studentEnrollments) >= 1) { + if (count($attributes->instructorTeachingDatas) >= 1 && count($attributes->studentEnrollments) >= 1) { $register = []; @@ -239,7 +238,7 @@ public static function export($year) } array_push($registers, implode('|', $register)); -// } + } } return $registers; diff --git a/app/libraries/Educacenso/Register50.php b/app/libraries/Educacenso/Register50.php index 69fddbc2b..3cb955212 100644 --- a/app/libraries/Educacenso/Register50.php +++ b/app/libraries/Educacenso/Register50.php @@ -72,7 +72,7 @@ public static function export($year) } } - if ($classroom->pedagogical_mediation_type == "1" && ($teaching['role'] != '1' && $teaching['role'] != '2' && $teaching['role'] != '3' && $teaching['role'] != '4')) { + if ($classroom->pedagogical_mediation_type == "1" && ($teaching['role'] != '1' && $teaching['role'] != '2' && $teaching['role'] != '3' && $teaching['role'] != '4' && $teaching['role'] != '7' && $teaching['role'] != '8')) { $teaching['role'] = "1"; } else if ($classroom->pedagogical_mediation_type == "3" && ($teaching['role'] != '4' && $teaching['role'] != '5')) { $teaching['role'] = "4"; diff --git a/app/libraries/Educacenso/Register60.php b/app/libraries/Educacenso/Register60.php index 0c5b6f651..c0a1c92b4 100644 --- a/app/libraries/Educacenso/Register60.php +++ b/app/libraries/Educacenso/Register60.php @@ -11,8 +11,7 @@ public static function export($year) $students = []; foreach ($classrooms as $iclass => $classroom) { -// COMENTÁRIO TEMPORÁRIO PARA CONSEGUIR MIGRAR OS DADOS DE BOQUIM -// if (count($classroom->instructorTeachingDatas) >= 1) { + if (count($classroom->instructorTeachingDatas) >= 1) { foreach ($classroom->studentEnrollments as $ienrollment => $enrollment) { if (!isset($students[$enrollment->student_fk])) { $enrollment->studentFk->school_inep_id_fk = $school->inep_id; @@ -24,7 +23,7 @@ public static function export($year) $enrollment->school_inep_id_fk = $school->inep_id; $students[$enrollment->student_fk]['enrollments'][$ienrollment][] = $enrollment->attributes; } -// } + } } foreach ($students as $student) { diff --git a/app/messages/pt_br/default.php b/app/messages/pt_br/default.php index e369397eb..e398cbab0 100644 --- a/app/messages/pt_br/default.php +++ b/app/messages/pt_br/default.php @@ -127,6 +127,7 @@ 'Water Supply Artesian Well' => 'Poço Artesiano', 'Water Supply Well' => 'Cacimba / Cisterna / Poço', 'Water Supply River' => 'Fonte / Rio / Igarapé / Córrego', + 'Water Supply Car' => 'Carro-Pipa', 'Water Supply Inexistent' => 'Inexistente', 'Energy Supply Public' => 'Rede Pública', 'Energy Supply Generator' => 'Gerador movido a combustível fóssil', @@ -168,11 +169,12 @@ 'Dependencies Uncovered Patio' => 'Pátio Descoberto', 'Dependencies Student Accomodation' => 'Alojamento de Alunos', 'Dependencies Instructor Accomodation' => 'Alojamento de Professores', - 'Dependencies Green Area' => 'Área Verde', + 'Dependencies Green Area' => 'Área de Vegetação ou Gramado', 'Dependencies Laundry' => 'Lavanderia', 'Dependencies Professional Specific Lab' => 'Laboratório Específico para a Educação Profissional', 'Dependencies Vocational Education Workshop' => 'Salas de Oficinas da Educação Profissional', 'Dependencies Recording And Editing Studio' => 'Estúdio de gravação e edição', + 'Dependencies Garden Planting Agricultural' => 'Área de horta, plantio e/ou produção agrícola', 'Dependencies None' => 'Nenhuma das Relacionadas', 'Classroom Count' => 'Nº de Salas de Aula', 'Used Classroom Count' => 'Nº de Salas de Aula em Uso', @@ -233,7 +235,7 @@ 'Sociocultural Didactic Material None' => 'Não Utiliza', 'Sociocultural Didactic Material Quilombola' => 'Quilombola', 'Sociocultural Didactic Material Native' => 'Indígena', - 'Native Education' => 'Educação Indígena', + 'Native Education' => 'Escola Indígena', 'Native Education Language Native' => 'Língua Indígena', 'Native Education Language Portuguese' => 'Língua Portuguesa', 'Edcenso Native Languages Fk' => 'Língua Indígena', @@ -268,6 +270,7 @@ 'Tactile Floor' => 'Pisos Táteis', 'Doors 80' => 'Portas com no Mínimo 80 cm', 'Ramps' => 'Rampas', + 'Light Signaling' => 'Sinalização Luminosa', 'Sound Signaling' => 'Sinalização Sonora', 'Tactile Signaling' => 'Sinalização Tátil', 'Visual Signaling' => 'Sinalização Visual', @@ -280,6 +283,7 @@ 'Toys Early' => 'Brinquedos para Educação Infantil', 'Scientific Materials' => 'Materiais Científicos', 'Equipment Amplification' => 'Equipamento para Amplifiacção e Difusão de Som', + 'Garden Planting Agricultural Activities' => 'Atividades em Área de Horta, Plantio e/ou Produção Agrícola', 'Musical Instruments' => 'Instrumentos Musicais', 'Educational Games' => 'Jogos Educativos', 'Equipments Material Cultural' => 'Material para Atividades Culturais', @@ -288,6 +292,8 @@ 'Material Teaching Indian' => 'Materiais Pedagógicos para Educação Indígena', 'Material Teaching Ethinic' => 'Materiais Pedagógicos para Educação das Relações Étinicos Raciais', 'Material Teaching Rural' => 'Materiais Pedagógicos para Educação do Campo', + 'Material Teaching Quilombola' => 'Materiais Pedagógicos para a Educação Escolar Quilombola', + 'Material Teaching Special' => 'Materiais Pedagógicos para a Educação Especial', 'Telecommunications' => 'Telecomunicações', 'Internet Access Administrative' => 'Para Uso Administrativo', 'Internet Access Educative' => 'Para Uso nos Processos de Ensino', @@ -302,6 +308,7 @@ 'Internet Access Cable' => 'A Cabo', 'Internet Access Wireless' => 'Wireless', 'Internet Access Inexistent' => 'Inexistente', + 'Garden Planting Agricultural' => 'Nº de Técnicos em Horta/Plantio/Agricultura', 'Administrative Assistant' => 'Nº de Auxiliares Administrativos', 'Service Assistant' => 'Nº de Auxiliares de Serviços Gerais', 'Librarian' => 'Nº de Bibliotecários', @@ -315,6 +322,7 @@ 'School Secretary' => 'Nº de Secretário(a)s', 'Security Gaurds' => 'Nº de Seguranças', 'Monitors' => 'Nº de Monitores', + 'Braille' => 'Nº de Assistentes ou Revisores em Braille', 'Organization of Education' => 'Organização do Ensino', 'Series Year' => 'Séries Anuais', 'Semester Periods' => 'Peródos Semestrais', diff --git a/app/migrations/2024-05-21-update-classroom-modality-set-100/2024-05-21-update-classroom-modality-set-100.sql b/app/migrations/2024-05-21-update-classroom-modality-set-100/2024-05-21-update-classroom-modality-set-100.sql new file mode 100644 index 000000000..356dff7dc --- /dev/null +++ b/app/migrations/2024-05-21-update-classroom-modality-set-100/2024-05-21-update-classroom-modality-set-100.sql @@ -0,0 +1,3 @@ +UPDATE classroom +SET modality = '100' +WHERE modality = '4'; diff --git a/app/migrations/2024-05-27_edcenso_2024/edcenso_alias b/app/migrations/2024-05-27_edcenso_2024/edcenso_alias new file mode 100644 index 000000000..356d57e82 --- /dev/null +++ b/app/migrations/2024-05-27_edcenso_2024/edcenso_alias @@ -0,0 +1,65 @@ + +-- NÃO RODAR ISSO AQUI EM BOQUIM, POIS JÁ FOI FEITO ANTERIORMENTE +INSERT INTO edcenso_alias (register,corder,attr,cdesc,`default`,stable,year) +SELECT register,corder,attr,cdesc,`default`,stable,'2024' FROM edcenso_alias +WHERE year = 2023; +-- + +update edcenso_alias set corder = (corder + 1) where corder >= 22 and register = 10 and year = 2024; + +insert into edcenso_alias values +(10, 22, 'water_supply_car', 'Carro-pipa', null, null, 2024); + +update edcenso_alias set corder = (corder + 1) where corder >= 78 and register = 10 and year = 2024; + +insert into edcenso_alias values +(10, 78, 'dependencies_garden_planting_agricultural', 'Área de horta, plantio e/ou produção agrícola', null, null, 2024); + +update edcenso_alias set corder = (corder + 1) where corder >= 85 and register = 10 and year = 2024; + +insert into edcenso_alias values +(10, 85, 'acessability_light_signaling', 'Sinalização/alarme luminoso', null, null, 2024); + +update edcenso_alias set corder = (corder + 1) where corder >= 120 and register = 10 and year = 2024; + +insert into edcenso_alias values +(10, 120, 'workers_garden_planting_agricultural', 'Agrônomos(as), horticultores(as), técnicos ou monitores(as) responsáveis pela gestão da área de horta, plantio e/ou produção agrícola', null, null, 2024); + +update edcenso_alias set corder = (corder + 1) where corder >= 137 and register = 10 and year = 2024; + +insert into edcenso_alias values +(10, 137, 'workers_braille', 'Revisor de texto Braille, assistente vidente (assistente de revisão do texto em Braille)', null, null, 2024); + +update edcenso_alias set corder = (corder + 1) where corder >= 144 and register = 10 and year = 2024; + +insert into edcenso_alias values +(10, 144, 'equipments_garden_planting_agricultural', 'Equipamentos e instrumentos para atividades em área de horta, plantio e/ou produção agrícola', null, null, 2024); + +update edcenso_alias set corder = (corder + 2) where corder >= 154 and register = 10 and year = 2024; + +insert into edcenso_alias values +(10, 154, 'equipments_material_teachingquilombola', 'Materiais pedagógicos para a educação escolar quilombola', null, null, 2024); + +insert into edcenso_alias values +(10, 155, 'equipments_material_teachingspecial', 'Materiais pedagógicos para a educação especial', null, null, 2024); + +insert into edcenso_alias values +(10, 180, '', 'A escola desenvolve ações na área de educação ambiental?', 0, null, 2024); + +insert into edcenso_alias values +(10, 181, '', 'Como conteúdo dos componentes/campos de experiências presentes no currículo', null, null, 2024); + +insert into edcenso_alias values +(10, 182, '', 'Como um componente curricular especial, específico, flexível ou eletivo', null, null, 2024); + +insert into edcenso_alias values +(10, 183, '', 'Como um eixo estruturante do currículo', null, null, 2024); + +insert into edcenso_alias values +(10, 184, '', 'Em eventos', null, null, 2024); + +insert into edcenso_alias values +(10, 185, '', 'Em projetos transversais ou interdisciplinares', null, null, 2024); + +insert into edcenso_alias values +(10, 186, '', 'Nenhuma das opções listadas', null, null, 2024); diff --git a/app/migrations/2024-05-27_edcenso_2024/other_tables b/app/migrations/2024-05-27_edcenso_2024/other_tables new file mode 100644 index 000000000..e3df80217 --- /dev/null +++ b/app/migrations/2024-05-27_edcenso_2024/other_tables @@ -0,0 +1,23 @@ +ALTER TABLE `school_structure` +ADD `water_supply_car` tinyint(1) NULL AFTER `water_supply_river`; + +ALTER TABLE `school_structure` +ADD `dependencies_garden_planting_agricultural` tinyint(1) NULL AFTER `dependencies_recording_and_editing_studio`; + +ALTER TABLE `school_structure` +ADD `acessability_light_signaling` tinyint(1) NULL AFTER `acessability_ramps`; + +ALTER TABLE `school_structure` +ADD `workers_garden_planting_agricultural` smallint(6) NULL AFTER `bandwidth`; + +ALTER TABLE `school_structure` +ADD `workers_braille` smallint(6) NULL AFTER `workers_monitors`; + +ALTER TABLE `school_structure` +ADD `equipments_garden_planting_agricultural` tinyint(1) NULL AFTER `equipments_equipment_amplification`; + +ALTER TABLE `school_structure` +ADD `equipments_material_teachingquilombola` tinyint(1) NULL AFTER `equipments_material_teachingrural`; + +ALTER TABLE `school_structure` +ADD `equipments_material_teachingspecial` tinyint(1) NULL AFTER `equipments_material_teachingquilombola`; \ No newline at end of file diff --git a/app/models/SchoolStructure.php b/app/models/SchoolStructure.php index 7ae27da52..dab8a4aab 100755 --- a/app/models/SchoolStructure.php +++ b/app/models/SchoolStructure.php @@ -28,6 +28,7 @@ * @property integer $water_supply_artesian_well * @property integer $water_supply_well * @property integer $water_supply_river + * @property integer $water_supply_car * @property integer $water_supply_inexistent * @property integer $energy_supply_public * @property integer $energy_supply_generator @@ -76,6 +77,7 @@ * @property integer $dependencies_professional_specific_lab * @property integer $dependencies_vocational_education_workshop * @property integer $dependencies_recording_and_editing_studio + * @property integer $dependencies_garden_planting_agricultural * @property integer $dependencies_none * @property integer $classroom_count * @property integer $used_classroom_count @@ -171,6 +173,7 @@ public function rules() water_supply_artesian_well, water_supply_well, water_supply_river, + water_supply_car, water_supply_inexistent, energy_supply_public, energy_supply_generator, @@ -219,6 +222,7 @@ public function rules() dependencies_professional_specific_lab, dependencies_vocational_education_workshop, dependencies_recording_and_editing_studio, + dependencies_garden_planting_agricultural, dependencies_none, classroom_count, used_classroom_count, @@ -286,6 +290,7 @@ classroom_count, acessability_tactile_floor, acessability_doors_80cm, acessability_ramps, + acessability_light_signaling, acessability_sound_signaling, acessability_tactile_singnaling, acessability_visual_signaling, @@ -299,6 +304,7 @@ classroom_count, equipments_toys_early, equipments_scientific_materials, equipments_equipment_amplification, + equipments_garden_planting_agricultural, equipments_musical_instruments, equipments_educational_games, equipments_material_cultural, @@ -307,6 +313,8 @@ classroom_count, equipments_material_teachingindian, equipments_material_teachingethnic, equipments_material_teachingrural, + equipments_material_teachingquilombola, + equipments_material_teachingspecial, internet_access_administrative, internet_access_educative_process, internet_access_student, @@ -318,6 +326,7 @@ classroom_count, internet_access_local_cable, internet_access_local_wireless, internet_access_local_inexistet, + workers_garden_planting_agricultural, workers_administrative_assistant, workers_service_assistant, workers_librarian, @@ -331,6 +340,7 @@ classroom_count, workers_school_secretary, workers_security_guards, workers_monitors, + workers_braille, org_teaching_series_year, org_teaching_semester_periods, org_teaching_elementary_cycle, @@ -371,7 +381,7 @@ classroom_count, ), // The following rule is used by search(). // @todo Please remove those attributes that should not be searched. - array('register_type, school_inep_id_fk, operation_location_building, operation_location_temple, operation_location_businness_room, operation_location_instructor_house, operation_location_other_school_room, operation_location_barracks, operation_location_socioeducative_unity, operation_location_prison_unity, operation_location_other, building_occupation_situation, shared_building_with_school, shared_school_inep_id_1, shared_school_inep_id_2, shared_school_inep_id_3, shared_school_inep_id_4, shared_school_inep_id_5, shared_school_inep_id_6, consumed_water_type, water_supply_public, water_supply_artesian_well, water_supply_well, water_supply_river, water_supply_inexistent, energy_supply_public, energy_supply_generator, energy_supply_other, energy_supply_inexistent, sewage_public, sewage_fossa, sewage_inexistent, garbage_destination_collect, garbage_destination_burn, garbage_destination_throw_away, garbage_destination_recycle, garbage_destination_bury, garbage_destination_other, dependencies_principal_room, dependencies_instructors_room, dependencies_secretary_room, dependencies_info_lab, dependencies_science_lab, dependencies_aee_room, dependencies_indoor_sports_court, dependencies_outdoor_sports_court, dependencies_kitchen, dependencies_library, dependencies_reading_room, dependencies_playground, dependencies_nursery, dependencies_outside_bathroom, dependencies_inside_bathroom, dependencies_child_bathroom, dependencies_prysical_disability_bathroom, dependencies_physical_disability_support, dependencies_bathroom_with_shower, dependencies_refectory, dependencies_storeroom, dependencies_warehouse, dependencies_auditorium, dependencies_covered_patio, dependencies_uncovered_patio, dependencies_student_accomodation, dependencies_instructor_accomodation, dependencies_green_area, dependencies_laundry, dependencies_professional_specific_lab, dependencies_vocational_education_workshop, dependencies_recording_and_editing_studio, dependencies_none, classroom_count, used_classroom_count, instruments_inexistent, equipments_material_professional_education, equipments_tv, equipments_vcr, equipments_dvd, equipments_satellite_dish, equipments_copier, equipments_overhead_projector, equipments_printer, equipments_stereo_system, equipments_data_show, equipments_fax, equipments_camera, equipments_computer, equipments_multifunctional_printer, equipments_inexistent, administrative_computers_count, student_computers_count, internet_access, bandwidth, employees_count, feeding, aee, complementary_activities, modalities_regular, modalities_especial, modalities_eja, modalities_professional, basic_education_cycle_organized, different_location, sociocultural_didactic_material_none, sociocultural_didactic_material_quilombola, sociocultural_didactic_material_native, native_education, native_education_language_native, native_education_language_portuguese, edcenso_native_languages_fk, brazil_literate, open_weekend, pedagogical_formation_by_alternance', 'safe', 'on' => 'search'), + array('register_type, school_inep_id_fk, operation_location_building, operation_location_temple, operation_location_businness_room, operation_location_instructor_house, operation_location_other_school_room, operation_location_barracks, operation_location_socioeducative_unity, operation_location_prison_unity, operation_location_other, building_occupation_situation, shared_building_with_school, shared_school_inep_id_1, shared_school_inep_id_2, shared_school_inep_id_3, shared_school_inep_id_4, shared_school_inep_id_5, shared_school_inep_id_6, consumed_water_type, water_supply_public, water_supply_artesian_well, water_supply_well, water_supply_river, water_supply_car, water_supply_inexistent, energy_supply_public, energy_supply_generator, energy_supply_other, energy_supply_inexistent, sewage_public, sewage_fossa, sewage_inexistent, garbage_destination_collect, garbage_destination_burn, garbage_destination_throw_away, garbage_destination_recycle, garbage_destination_bury, garbage_destination_other, dependencies_principal_room, dependencies_instructors_room, dependencies_secretary_room, dependencies_info_lab, dependencies_science_lab, dependencies_aee_room, dependencies_indoor_sports_court, dependencies_outdoor_sports_court, dependencies_kitchen, dependencies_library, dependencies_reading_room, dependencies_playground, dependencies_nursery, dependencies_outside_bathroom, dependencies_inside_bathroom, dependencies_child_bathroom, dependencies_prysical_disability_bathroom, dependencies_physical_disability_support, dependencies_bathroom_with_shower, dependencies_refectory, dependencies_storeroom, dependencies_warehouse, dependencies_auditorium, dependencies_covered_patio, dependencies_uncovered_patio, dependencies_student_accomodation, dependencies_instructor_accomodation, dependencies_green_area, dependencies_laundry, dependencies_professional_specific_lab, dependencies_vocational_education_workshop, dependencies_recording_and_editing_studio, dependencies_garden_planting_agricultural, dependencies_none, classroom_count, used_classroom_count, instruments_inexistent, equipments_material_professional_education, equipments_tv, equipments_vcr, equipments_dvd, equipments_satellite_dish, equipments_copier, equipments_overhead_projector, equipments_printer, equipments_stereo_system, equipments_data_show, equipments_fax, equipments_camera, equipments_computer, equipments_multifunctional_printer, equipments_inexistent, administrative_computers_count, student_computers_count, internet_access, bandwidth, employees_count, feeding, aee, complementary_activities, modalities_regular, modalities_especial, modalities_eja, modalities_professional, basic_education_cycle_organized, different_location, sociocultural_didactic_material_none, sociocultural_didactic_material_quilombola, sociocultural_didactic_material_native, native_education, native_education_language_native, native_education_language_portuguese, edcenso_native_languages_fk, brazil_literate, open_weekend, pedagogical_formation_by_alternance', 'safe', 'on' => 'search'), ); } @@ -415,6 +425,7 @@ public function attributeLabels() 'water_supply_artesian_well' => Yii::t('default', 'Water Supply Artesian Well'), 'water_supply_well' => Yii::t('default', 'Water Supply Well'), 'water_supply_river' => Yii::t('default', 'Water Supply River'), + 'water_supply_car' => Yii::t('default', 'Water Supply Car'), 'water_supply_inexistent' => Yii::t('default', 'Water Supply Inexistent'), 'energy_supply_public' => Yii::t('default', 'Energy Supply Public'), 'energy_supply_generator' => Yii::t('default', 'Energy Supply Generator'), @@ -461,6 +472,7 @@ public function attributeLabels() 'dependencies_professional_specific_lab' => Yii::t('default', 'Dependencies Professional Specific Lab'), 'dependencies_vocational_education_workshop' => Yii::t('default', 'Dependencies Vocational Education Workshop'), 'dependencies_recording_and_editing_studio' => Yii::t('default', 'Dependencies Recording And Editing Studio'), + 'dependencies_garden_planting_agricultural' => Yii::t('default', 'Dependencies Garden Planting Agricultural'), 'dependencies_none' => Yii::t('default', 'Dependencies None'), 'classroom_count' => Yii::t('default', 'Classroom Count'), 'used_classroom_count' => Yii::t('default', 'Used Classroom Count'), @@ -531,6 +543,7 @@ public function attributeLabels() 'acessability_tactile_floor' => Yii::t('default', 'Tactile Floor'), 'acessability_doors_80cm' => Yii::t('default', 'Doors 80'), 'acessability_ramps' => Yii::t('default', 'Ramps'), + 'acessability_light_signaling' => Yii::t('default', 'Light Signaling'), 'acessability_sound_signaling' => Yii::t('default', 'Sound Signaling'), 'acessability_tactile_singnaling' => Yii::t('default', 'Tactile Signaling'), 'acessability_visual_signaling' => Yii::t('default', 'Visual Signaling'), @@ -544,6 +557,7 @@ public function attributeLabels() 'equipments_toys_early' => Yii::t('default', 'Toys Early'), 'equipments_scientific_materials' => Yii::t('default', 'Scientific Materials'), 'equipments_equipment_amplification' => Yii::t('default', 'Equipment Amplification'), + 'equipments_garden_planting_agricultural' => Yii::t('default', 'Garden Planting Agricultural Activities'), 'equipments_musical_instruments' => Yii::t('default', 'Musical Instruments'), 'equipments_educational_games' => Yii::t('default', 'Educational Games'), 'equipments_material_cultural' => Yii::t('default', 'Equipments Material Cultural'), @@ -552,6 +566,8 @@ public function attributeLabels() 'equipments_material_teachingindian' => Yii::t('default', 'Material Teaching Indian'), 'equipments_material_teachingethnic' => Yii::t('default', 'Material Teaching Ethinic'), 'equipments_material_teachingrural' => Yii::t('default', 'Material Teaching Rural'), + 'equipments_material_teachingquilombola' => Yii::t('default', 'Material Teaching Quilombola'), + 'equipments_material_teachingspecial' => Yii::t('default', 'Material Teaching Special'), 'internet_access_administrative' => Yii::t('default', 'Internet Access Administrative'), 'internet_access_educative_process' => Yii::t('default', 'Internet Access Educative'), 'internet_access_student' => Yii::t('default', 'Internet Access Student'), @@ -563,6 +579,7 @@ public function attributeLabels() 'internet_access_local_cable' => Yii::t('default', 'Internet Access Cable'), 'internet_access_local_wireless' => Yii::t('default', 'Internet Access Wireless'), 'internet_access_local_inexistet' => Yii::t('default', 'Internet Access Inexistent'), + 'workers_garden_planting_agricultural' => Yii::t('default', 'Garden Planting Agricultural'), 'workers_administrative_assistant' => Yii::t('default', 'Administrative Assistant'), 'workers_service_assistant' => Yii::t('default', 'Service Assistant'), 'workers_librarian' => Yii::t('default', 'Librarian'), @@ -576,6 +593,7 @@ public function attributeLabels() 'workers_school_secretary' => Yii::t('default', 'School Secretary'), 'workers_security_guards' => Yii::t('default', 'Security Gaurds'), 'workers_monitors' => Yii::t('default', 'Monitors'), + 'workers_braille' => Yii::t('default', 'Braille'), 'org_teaching_series_year' => Yii::t('default', 'Series Year'), 'org_teaching_semester_periods' => Yii::t('default', 'Semester Periods'), 'org_teaching_elementary_cycle' => Yii::t('default', 'Elementary Cycle'), @@ -690,6 +708,7 @@ public function search() $criteria->compare('dependencies_professional_specific_lab', $this->dependencies_professional_specific_lab); $criteria->compare('dependencies_vocational_education_workshop', $this->dependencies_vocational_education_workshop); $criteria->compare('dependencies_recording_and_editing_studio', $this->dependencies_recording_and_editing_studio); + $criteria->compare('dependencies_garden_planting_agricultural', $this->dependencies_garden_planting_agricultural); $criteria->compare('dependencies_none', $this->dependencies_none); $criteria->compare('classroom_count', $this->classroom_count); $criteria->compare('used_classroom_count', $this->used_classroom_count); diff --git a/app/models/StudentEnrollment.php b/app/models/StudentEnrollment.php index 7291102f0..fb16a29c8 100755 --- a/app/models/StudentEnrollment.php +++ b/app/models/StudentEnrollment.php @@ -81,6 +81,7 @@ class StudentEnrollment extends AltActiveRecord public const STATUS_CONCLUDED = "CONCLUINTE"; public const STATUS_INDETERMINED = "INDETERMINADO"; public const STATUS_DEATH = "OBITO"; + public const STATUS_ADVANCED = "AVANÇADO"; public $school_year; public $sedsp_sync; @@ -590,6 +591,7 @@ public static function getListStatus(){ "9" => StudentEnrollment::STATUS_CONCLUDED, "10" => StudentEnrollment::STATUS_INDETERMINED, "11" => StudentEnrollment::STATUS_DEATH, + "12" => StudentEnrollment::STATUS_ADVANCED ]; return $status; @@ -609,6 +611,7 @@ public function getCurrentStatus(){ "9" => StudentEnrollment::STATUS_CONCLUDED, "10" => StudentEnrollment::STATUS_INDETERMINED, "11" => StudentEnrollment::STATUS_DEATH, + "12" => StudentEnrollment::STATUS_ADVANCED ]; return $status[$this->status]; @@ -636,6 +639,7 @@ public static function getStatusId($status){ StudentEnrollment::STATUS_CONCLUDED => "9" , StudentEnrollment::STATUS_INDETERMINED => "10" , StudentEnrollment::STATUS_DEATH => "11" , + StudentEnrollment::STATUS_ADVANCED => "12" ]; return $statusList[$status]; diff --git a/app/modules/dashboard/controllers/DefaultController.php b/app/modules/dashboard/controllers/DefaultController.php index 476ebdd80..4f5b5e0a3 100644 --- a/app/modules/dashboard/controllers/DefaultController.php +++ b/app/modules/dashboard/controllers/DefaultController.php @@ -5,11 +5,11 @@ class DefaultController extends Controller public function actionIndex() { $getToken = new GetToken(); - $token = $getToken->exec('edacd1e1-74e0-4637-a2b8-780b9c244de0','22d50e93-debe-451b-9501-fed42c92df5e'); + $token = $getToken->exec('edacd1e1-74e0-4637-a2b8-780b9c244de0','d89e1bae-dbc9-45fe-afb6-ab0d067603cc'); $this->render('index', array( 'token' => $token, 'embedUrl' =>'https://app.powerbi.com/reportEmbed', - 'reportId' => '22d50e93-debe-451b-9501-fed42c92df5e' + 'reportId' => 'd89e1bae-dbc9-45fe-afb6-ab0d067603cc' )); } -} \ No newline at end of file +} diff --git a/app/modules/dashboard/services/DashboardService.php b/app/modules/dashboard/services/DashboardService.php index 93b2d2ef5..32a57eed9 100644 --- a/app/modules/dashboard/services/DashboardService.php +++ b/app/modules/dashboard/services/DashboardService.php @@ -3,9 +3,9 @@ class DashboardService { public function getAccessToken() { $url = 'https://login.microsoftonline.com/common/oauth2/token'; - $username = 'ti.pauloh@ipti.org.br'; - $pss = '81260235Ph.'; - $clientId = 'fdc41ef1-199b-475a-adfd-408fb1a53937'; + $username = getenv('USER_NAME_POWER_BI'); + $pss = getenv('PSS_POWER_BI'); + $clientId = getenv('CLIENT_ID_POWER_BI'); $headers = array( 'Content-Type: application/x-www-form-urlencoded' diff --git a/app/modules/dashboard/views/default/index.php b/app/modules/dashboard/views/default/index.php index 2cc1f74b4..da62e1bb4 100644 --- a/app/modules/dashboard/views/default/index.php +++ b/app/modules/dashboard/views/default/index.php @@ -33,11 +33,47 @@ tokenType: models.TokenType.Embed, accessToken: embedToken, embedUrl: '', - id: '' - }; - // Get a reference to the embedded dashboard HTML element - const reportContainer = $('#reportContainer')[0]; - // Embed the dashboard and display it within the div container. + id: '', + settings: { + panes: { + filters: { + visible: false // Hide the filter pane + }, + pageNavigation: { + visible: true + } + }, + bars: { + statusBar: { + visible: true + } + } + } + }; + const reportContainer = document.getElementById('reportContainer'); + const report = powerbi.embed(reportContainer, config); + + const currentHost = window.location.hostname; + + const filter = { + $schema: "http://powerbi.com/product/schema#basic", + target: { + table: "Accumulated_Data", + column: "Database_name" + }, + operator: "In", + values: [currentHost] + }; + // Embed the dashboard and display it within the div container. powerbi.embed(reportContainer, config); + report.on('loaded', function() { + report.updateFilters(models.FiltersOperations.Add, [filter]) + .then(function() { + console.log('Filter applied'); + }) + .catch(function(errors) { + console.error('Error applying filter:', errors); + }); }); - \ No newline at end of file +}) + diff --git a/app/repository/ReportsRepository.php b/app/repository/ReportsRepository.php index e1d62eaab..08ef71926 100644 --- a/app/repository/ReportsRepository.php +++ b/app/repository/ReportsRepository.php @@ -183,6 +183,7 @@ public function getNumberOfStudentsEnrolledPerPeriodAllSchools(CHttpRequest $req WHEN 9 THEN 'Concluinte' WHEN 10 THEN 'Indeterminado' WHEN 11 THEN 'Obito' + WHEN 12 THEN 'Avançado' ELSE '' END AS status_descricao FROM @@ -232,6 +233,7 @@ public function getNumberOfStudentsEnrolledPerPeriodPerSchool(CHttpRequest $requ WHEN 9 THEN 'Concluinte' WHEN 10 THEN 'Indeterminado' WHEN 11 THEN 'Obito' + WHEN 12 THEN 'Avançado' ELSE '' END AS status_descricao FROM @@ -282,6 +284,7 @@ public function getNumberOfStudentsEnrolledPerPeriodPerClassroom(CHttpRequest $r WHEN 9 THEN 'Concluinte' WHEN 10 THEN 'Indeterminado' WHEN 11 THEN 'Obito' + WHEN 12 THEN 'Avançado' ELSE '' END AS status_descricao FROM diff --git a/config.php b/config.php index 16693f16c..c4dbf5cb3 100644 --- a/config.php +++ b/config.php @@ -4,7 +4,7 @@ $debug = getenv("YII_DEBUG"); defined('YII_DEBUG') or define('YII_DEBUG', $debug); -define("TAG_VERSION", '3.79.152'); +define("TAG_VERSION", '3.80.161'); define("YII_VERSION", Yii::getVersion()); define("BOARD_MSG", '
Novas atualizações no TAG. Confira clicando aqui.
'); diff --git a/themes/default/views/classroom/_form.php b/themes/default/views/classroom/_form.php index 2284624b5..2def925cd 100755 --- a/themes/default/views/classroom/_form.php +++ b/themes/default/views/classroom/_form.php @@ -167,8 +167,9 @@ '1' => 'Ensino Regular', '2' => 'Educação Especial - Modalidade Substitutiva', '3' => 'Educação de Jovens e Adultos (EJA)', - '4' => 'Não se aplica', - '5' => 'Atendimento Educacional Especializado' + '4' => 'Educação Profissional', + '5' => 'Atendimento Educacional Especializado', + '100' => 'Não se aplica' ), array('prompt' => 'Selecione a Modalidade', 'class' => 'select-search-off t-field-select__input', 'style' => 'width: 100%')); ?> error($modelClassroom, 'modality'); ?> diff --git a/themes/default/views/forms/StudentFileForm.php b/themes/default/views/forms/StudentFileForm.php index e4cf6f553..d80997690 100755 --- a/themes/default/views/forms/StudentFileForm.php +++ b/themes/default/views/forms/StudentFileForm.php @@ -14,22 +14,16 @@ ?> -
- renderPartial('head'); - $data = StudentEnrollment::getFileInformation($enrollment->id); - $birth_uf = $enrollment->studentFk->edcensoUfFk->acronym; - ?> -
-
+ '; - }*/ + $this->renderPartial('head'); + $data = StudentEnrollment::getFileInformation($enrollment->id); + $birth_uf = $enrollment->studentFk->edcensoUfFk->acronym; ?> +
+
+
@@ -39,6 +33,9 @@


F O T O
3 x 4
+ + + O(A) ALUNO(A) REQUER SUA MATRÍCULA '; ?> NO_________ANO - '; } else { @@ -123,10 +119,6 @@
- - - -
@@ -147,7 +139,7 @@
BLOCO 1 - IDENTIFICAÇÃO E CADASTRO
03 - Naturalidade:
País:
- +
UF:        Município:  / @@ -198,7 +190,7 @@
-
08 - Certidão Civil de
+
09 - Certidão Civil de

Nº:
Livro:
@@ -210,7 +202,7 @@
-
09 - Certidão Civil: +
10 - Certidão Civil:

Nº:
@@ -221,20 +213,20 @@
- 10 - RG: + 11 - RG:
- 11 - CPF: + 12 - CPF:
- 12 - CNS: + 13 - CNS:
- 13 - Nome do responsável e parentesco: + 14 - Nome do responsável e parentesco:
RG: @@ -249,31 +241,28 @@
-
14 - Grau de escolaridade do responsável: +
15 - Grau de escolaridade do responsável:
- +
-
15 - Profissão do responsável: +
16 - Profissão do responsável:
- - - - +
+
CARACTERIZAÇÃO
-
16 - Matrícula do aluno:
+
17 - Matrícula do aluno:

Ano letivo: classroomFk->school_year ?>
Série: edcensoStageVsModalityFk->name ?>
@@ -289,7 +278,7 @@
-
17 - Documentos(s) que habilita(m) matrícula no segmento: +
18 - Documentos(s) que habilita(m) matrícula no segmento:
@@ -300,13 +289,13 @@
-
18 - Data de ingresso nesta escola: +
19 - Data de ingresso nesta escola:
-
19 - Situação do aluno na série/etapa: +
20 - Situação do aluno na série/etapa:
-
20 - Situação do Aluno no ano Anterior:
-
-
- previous_stage_situation == 0) ? '☑' : '☐' ?> Não Frequentou -
previous_stage_situation == 1) ? '☑' : '☐' ?> Reprovado -
-
- previous_stage_situation == 2) ? '☑' : '☐' ?> Afastado por transferência -
previous_stage_situation == 4) ? '☑' : '☐' ?> Matrícula final em Educação Infantil -
-
- previous_stage_situation == 3) ? '☑' : '☐' ?> Afastado por abandono -
previous_stage_situation == 5) ? '☑' : '☐' ?> Promovido +
21 - Situação do Aluno no ano Anterior: +
+
+ previous_stage_situation == 0) ? '☑' : '☐' ?> Não Frequentou +
previous_stage_situation == 1) ? '☑' : '☐' ?> Reprovado +
+
+ previous_stage_situation == 2) ? '☑' : '☐' ?> Afastado por transferência +
previous_stage_situation == 4) ? '☑' : '☐' ?> Matrícula final em Educação Infantil +
+
+ previous_stage_situation == 3) ? '☑' : '☐' ?> Afastado por abandono +
previous_stage_situation == 5) ? '☑' : '☐' ?> Promovido +
- - - -
21 - Portador de Necessidades Especiais?
-
-
Sim
-
Não
-
Tipo: - -
- - - - -
22 - Participa do Programa Bolsa Família?
- -
Bolsa Família
-
☐ PETI
-
☐ Pro Jovem
-
-
Outro: ____________________________________________________
+
Sim
+
Não
+
Tipo: + +
+ + + + +
23 - Participa do Programa Bolsa Família?
+ +
Bolsa Família
+
☐ PETI
+
☐ Pro Jovem
+
+
Outro: ____________________________________________________
- - - - -
23 - Utiliza transporte escolar? - - public_transport == '0') ? 'Não' : 'Sim' ?> - -
- - - - -
24 - Restrição alimentar ou alergia a: - + + + +
24 - Utiliza transporte escolar? + + public_transport == '0') ? 'Não' : 'Sim' ?> + +
+ + + + +
25 - Restrição alimentar ou alergia a: + -
- - - - -
24 - Portador de algum tipo de transtorno?
-
-
-
Transtorno do déficit de atenção com hiperatividade (TDAH)
-
Transtorno depressivo (depressão)
-
Transtorno bipolar (TAB)
-
Transtorno obsessivo compulsivo (TOC)
-
Transtorno de ansiedade generalizada (TAG)
-
Distúrbio desafiador e de oposição (TOD)
-
Transtorno de conduta não especificado
-
Outros transtornos de conduta:
-
- - - - -
25 - Autorização do Termo de Consentimento da Imagem?
-
-
Sim
-
Não
- - - + echo $result; + ?> +
+ + + + +
26 - Portador de algum tipo de transtorno? +
+
Transtorno do déficit de atenção com hiperatividade (TDAH)
+
Transtorno depressivo (depressão)
+
Transtorno bipolar (TAB)
+
Transtorno obsessivo compulsivo (TOC)
+
Transtorno de ansiedade generalizada (TAG)
+
Distúrbio desafiador e de oposição (TOD)
+
Transtorno de conduta não especificado
+
Outros transtornos de conduta:
+
+ + + + +
27 - Autorização do Termo de Consentimento da Imagem?
+
+
Sim
+
Não
+ + + +
-