diff --git a/VERSION b/VERSION index 7f1cf82c8..5a5c1c174 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -3.6.5 +3.6.6 diff --git a/apps/backend/modules/report_card/templates/_course_subject_bimester_observations.php b/apps/backend/modules/report_card/templates/_course_subject_bimester_observations.php index 47948ce40..afb7900b5 100644 --- a/apps/backend/modules/report_card/templates/_course_subject_bimester_observations.php +++ b/apps/backend/modules/report_card/templates/_course_subject_bimester_observations.php @@ -21,7 +21,7 @@ getCourseSubjectStudentsForBimesterFirstQuaterly($student_career_school_year)) > 0): ?> - + @@ -31,7 +31,7 @@ - +
- 1°C - 1°C
getCourseSubject()->getCareerSubject()->getSubject()->getName() ?> getObservationForIsClosed(1) ?> getObservationForIsClosed(2) ?>getStringFor( $course_subject_student->getObservationFinal()) ?>getObservationFinal()))? BaseCustomOptionsHolder::getInstance('ObservationFinalType')->getStringFor( $course_subject_student->getObservationFinal()) : '' ?>
@@ -49,7 +49,7 @@ getCourseSubject()->getCareerSubject()->getSubject()->getName() ?> getObservationForIsClosed(1) ?> getObservationForIsClosed(2) ?> - getStringFor($course_subject_student->getObervationFinal()) ?> + getObservationFinal())) ? BaseCustomOptionsHolder::getInstance('ObservationFinalType')->getStringFor($course_subject_student->getObservationFinal()) : '' ?> diff --git a/apps/backend/modules/report_card/templates/_course_subject_quaterly_2_marks_observations.php b/apps/backend/modules/report_card/templates/_course_subject_quaterly_2_marks_observations.php index 2337064e9..abf763a7b 100644 --- a/apps/backend/modules/report_card/templates/_course_subject_quaterly_2_marks_observations.php +++ b/apps/backend/modules/report_card/templates/_course_subject_quaterly_2_marks_observations.php @@ -30,7 +30,7 @@ getCourseSubject()->getCareerSubject()->getSubject()->getName() ?> getObservationForIsClosed(1) ?> getObservationForIsClosed(2) ?> - getStringFor($course_subject_student->getObservationFinal()) ?> + getObservationFinal())) ? BaseCustomOptionsHolder::getInstance('ObservationFinalType')->getStringFor($course_subject_student->getObservationFinal()):'' ?> diff --git a/apps/backend/modules/report_card/templates/_course_subject_quaterly_observations.php b/apps/backend/modules/report_card/templates/_course_subject_quaterly_observations.php index 6346c3aa8..11223384e 100644 --- a/apps/backend/modules/report_card/templates/_course_subject_quaterly_observations.php +++ b/apps/backend/modules/report_card/templates/_course_subject_quaterly_observations.php @@ -31,7 +31,7 @@ getObservationForIsClosed(1) ?> getObservationForIsClosed(2) ?> getObservationForIsClosed(3) ?> - getStringFor($course_subject_student->getObservationFinal()) ?> + getObservationFinal())) ? BaseCustomOptionsHolder::getInstance('ObservationFinalType')->getStringFor($course_subject_student->getObservationFinal()): '' ?> diff --git a/apps/backend/modules/report_card/templates/_course_subject_trimester_observations.php b/apps/backend/modules/report_card/templates/_course_subject_trimester_observations.php index 7cfc8cb44..c98a5948a 100644 --- a/apps/backend/modules/report_card/templates/_course_subject_trimester_observations.php +++ b/apps/backend/modules/report_card/templates/_course_subject_trimester_observations.php @@ -30,7 +30,7 @@ getObservationForIsClosed(1) ?> getObservationForIsClosed(2) ?> getObservationForIsClosed(3)?> - getStringFor($course_subject_student->getObservationFinal()) ?> + getObservationFinal())) ? BaseCustomOptionsHolder::getInstance('ObservationFinalType')->getStringFor($course_subject_student->getObservationFinal()) : '' ?>