Merge pull request #633 from nvidela/bba_observaciones

correcciones
Desarrollo-CeSPI · Aug 26, 2020 · fd7ee79 · fd7ee79
2 parents 1666fcd + c65cb54
commit fd7ee79
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -21,7 +21,7 @@
 <table class="gridtable">
   <?php if (count($course_subject_students_first_q = $student->getCourseSubjectStudentsForBimesterFirstQuaterly($student_career_school_year)) > 0): ?>
     <tr>
-       <th class='th-subject-name'><?php echo __('Bimestrales')?> - 1°C</th>
+       <th class='th-subject-name'><?php echo __('Bimestrales')?> - 1°C </th>
        <th colspan="3"></th>
     </tr>
   <?php endif; ?>
@@ -31,7 +31,7 @@
       <td class='subject_name'><?php echo $course_subject_student->getCourseSubject()->getCareerSubject()->getSubject()->getName() ?></td>
       <td class="observation_mark_bimester"><?php echo $course_subject_student->getObservationForIsClosed(1) ?></td>
       <td class="observation_mark_bimester"><?php echo $course_subject_student->getObservationForIsClosed(2) ?></td>
-      <td class="observation_mark_bimester"><?php echo BaseCustomOptionsHolder::getInstance('ObservationFinalType')->getStringFor( $course_subject_student->getObservationFinal()) ?></td>
+      <td class="observation_mark_bimester"><?php echo (! is_null($course_subject_student->getObservationFinal()))? BaseCustomOptionsHolder::getInstance('ObservationFinalType')->getStringFor( $course_subject_student->getObservationFinal()) : '' ?></td>
     </tr>
   <?php endforeach; ?>
 </table>
@@ -49,7 +49,7 @@
       <td class='subject_name'><?php echo $course_subject_student->getCourseSubject()->getCareerSubject()->getSubject()->getName() ?></td>
       <td class="observation_mark_bimester"><?php echo $course_subject_student->getObservationForIsClosed(1) ?></td>
       <td class="observation_mark_bimester"><?php echo $course_subject_student->getObservationForIsClosed(2) ?></td>
-      <td class="observation_mark_bimester"><?php echo BaseCustomOptionsHolder::getInstance('ObservationFinalType')->getStringFor($course_subject_student->getObervationFinal()) ?></td>
+      <td class="observation_mark_bimester"><?php echo (!is_null($course_subject_student->getObservationFinal())) ?  BaseCustomOptionsHolder::getInstance('ObservationFinalType')->getStringFor($course_subject_student->getObservationFinal()) : '' ?></td>
     </tr>
   <?php endforeach; ?>
 </table>
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
@@ -30,7 +30,7 @@
 			<td class='subject_name'><?php echo $course_subject_student->getCourseSubject()->getCareerSubject()->getSubject()->getName() ?></td>
 			<td class="observation_mark_bimester"><?php echo $course_subject_student->getObservationForIsClosed(1) ?></td>
 			<td class="observation_mark_bimester"><?php echo $course_subject_student->getObservationForIsClosed(2) ?></td>
-                        <td class="observation_mark_bimester"><?php echo BaseCustomOptionsHolder::getInstance('ObservationFinalType')->getStringFor($course_subject_student->getObservationFinal()) ?></td>
+    <td class="observation_mark_bimester"><?php echo (!is_null($course_subject_student->getObservationFinal())) ?  BaseCustomOptionsHolder::getInstance('ObservationFinalType')->getStringFor($course_subject_student->getObservationFinal()):'' ?></td>
 
 		</tr>
 	<?php endforeach; ?>

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
@@ -31,7 +31,7 @@
       <td><?php echo $course_subject_student->getObservationForIsClosed(1) ?></td>
       <td><?php echo $course_subject_student->getObservationForIsClosed(2) ?></td>
       <td><?php echo $course_subject_student->getObservationForIsClosed(3) ?></td>
-      <td><?php echo BaseCustomOptionsHolder::getInstance('ObservationFinalType')->getStringFor($course_subject_student->getObservationFinal()) ?></td>
+      <td><?php echo (! is_null($course_subject_student->getObservationFinal())) ? BaseCustomOptionsHolder::getInstance('ObservationFinalType')->getStringFor($course_subject_student->getObservationFinal()): '' ?></td>
     </tr>
   <?php endforeach; ?>
 </table>
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
@@ -30,7 +30,7 @@
 	<td class="observation_mark_trimester"><?php echo $course_subject_student->getObservationForIsClosed(1) ?></td>
         <td class="observation_mark_trimester"><?php echo $course_subject_student->getObservationForIsClosed(2) ?></td>
         <td class="observation_mark_trimester"><?php echo $course_subject_student->getObservationForIsClosed(3)?></td>
-        <td class="observation_mark_trimester"><?php echo BaseCustomOptionsHolder::getInstance('ObservationFinalType')->getStringFor($course_subject_student->getObservationFinal()) ?></td>
+        <td class="observation_mark_trimester"><?php echo (!is_null($course_subject_student->getObservationFinal())) ? BaseCustomOptionsHolder::getInstance('ObservationFinalType')->getStringFor($course_subject_student->getObservationFinal()) : '' ?></td>
     </tr>
   <?php endforeach; ?>
 </table>