Merge pull request #702 from nvidela/boletines_graduada

modificaciones en boletines graduada
Desarrollo-CeSPI · May 11, 2022 · 54fb819 · 54fb819
2 parents 14e9b61 + 731c34a
commit 54fb819
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-3.9.17
+3.9.18
 
diff --git a/flavors/anexa/modules/report_card/templates/indexSuccess.php b/flavors/anexa/modules/report_card/templates/indexSuccess.php
@@ -24,9 +24,10 @@
 		<div><a href="<?php echo url_for('@export_report_cards?sf_format=pdf') ?>"><?php echo __('Export') ?></a></div>
 		<div><a href="<?php echo url_for($back_url) ?>"><?php echo __('Go back') ?></a></div>
 	</div>
-
+<?php $count_students = 0; ?>
 <?php foreach ($students as $student): ?>
-	<?php $student_career_school_year = StudentCareerSchoolYearPeer::getCurrentForStudentAndCareerSchoolYear($student, $division->getCareerSchoolYear()) ?>
+	<?php $count_students ++; ?>
+        <?php $student_career_school_year = StudentCareerSchoolYearPeer::getCurrentForStudentAndCareerSchoolYear($student, $division->getCareerSchoolYear()) ?>
 	<div class="report-wrapper">
 		<?php include_partial('header', array('student' => $student, 'division' => $division, 'career_id' => $career_id, 'school_year' => $student_career_school_year->getSchoolYear(), 'student_career' => CareerStudentPeer::retrieveByCareerAndStudent($career_id, $student->getId()))); ?>
 		<div class="report-content">
@@ -76,6 +77,8 @@
 
 	</div>
 	<div style="clear:both;"></div>
-	<div style="page-break-before: always;"></div>
-
-<?php endforeach; ?>
+	<?php if($count_students == 2): ?>
+            <?php $count_students = 0; ?>
+            <div style="page-break-before: always;"></div>
+        <?php endif; ?>
+<?php endforeach; ?>
diff --git a/flavors/anexa/web/css/print-report-card.css b/flavors/anexa/web/css/print-report-card.css
@@ -19,7 +19,7 @@ body {
 {
   text-align:left;
   width:900px;
-  margin:30px auto;
+  margin:40px auto;
 }
 
 .report-header
@@ -250,7 +250,7 @@ table.lefttable tr {
   float:right;
   margin-top:10px;
   margin-left:5px;
-  padding:0px 15px;
+  padding:0px 10px;
   height:126px;
 }
 
@@ -259,7 +259,7 @@ table.lefttable tr {
   float:right;
   margin-top:10px;
   margin-left:5px;
-  padding:0px 15px;
+  padding:0px 10px;
   height:126px;
 }
 
@@ -276,8 +276,9 @@ table.lefttable tr {
   border:1px solid #ccc;
   float:left;
   margin-top:10px;
-  padding:0px 15px;
-  height:150px;
+  margin-bottom:10px;
+  padding:0px 10px;
+  height:100px;
   width:869px;
 }
 
@@ -347,4 +348,4 @@ table.gridtable_bordered tr {
     padding:5px;
     background:#f2f2f2;
     border-bottom:1px solid #ccc;
-}
+}