mahdahar/gdc_cmod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(report): normalize report footer layout for web and PDF

Browse Source 
Replace footer <pre class='small'> blocks with <div class='small footer-lines'> in report template.

Add explicit <br> line breaks for collected/received/validation/print metadata lines.

Add shared .footer-lines style in public/assets/report/pdf.css and public/assets/report/style.css (white-space: normal; line-height: 1.2).

Prevent <pre> whitespace behavior from distorting footer wrapping/spacing across print and browser views.
This commit is contained in:
mahdahar 2026-04-24 11:27:12 +07:00
parent ee40438b0e
commit 0a1c600b8a
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Views/report/template.php
View File

@ -83,10 +83,10 @@ $i = 1;
<?php if ($i == $npage): ?> <?php if ($i == $npage): ?>
Status : <?= esc($status) ?> Status : <?= esc($status) ?>
<?php endif; ?> <?php endif; ?>
<pre class='small'>Collected on <?= esc($collData) ?> <div class='small footer-lines'>Collected on <?= esc($collData) ?><br>
Received on <?= esc($recvData) ?> Received on <?= esc($recvData) ?><br>
Val1 By : <?= esc($val1User) ?> (<?= esc($val1Date) ?>) | Val2 By : <?= esc($val2User) ?> (<?= esc($val2Date) ?>) Val1 By : <?= esc($val1User) ?> (<?= esc($val1Date) ?>) | Val2 By : <?= esc($val2User) ?> (<?= esc($val2Date) ?>)<br>
Page <?= $i ?>/<?= $npage ?> Printed By : <?= esc($valBy) ?> <?= esc($date) ?></pre> Page <?= $i ?>/<?= $npage ?> Printed By : <?= esc($valBy) ?> <?= esc($date) ?></div>
</td> </td>
<td class='right'> <td class='right'>
<pre><b>&rdquo;This result is valid without signature.&rdquo;</b></pre> <pre><b>&rdquo;This result is valid without signature.&rdquo;</b></pre>
@ -128,10 +128,10 @@ endforeach;
<tr> <tr>
<td> <td>
Status : <?= esc($status) ?> Status : <?= esc($status) ?>
<pre class='small'>Collected on <?= esc($collData) ?> <div class='small footer-lines'>Collected on <?= esc($collData) ?><br>
Received on <?= esc($recvData) ?> Received on <?= esc($recvData) ?><br>
Val1 By : <?= esc($val1User) ?> (<?= esc($val1Date) ?>) | Val2 By : <?= esc($val2User) ?> (<?= esc($val2Date) ?>) Val1 By : <?= esc($val1User) ?> (<?= esc($val1Date) ?>) | Val2 By : <?= esc($val2User) ?> (<?= esc($val2Date) ?>)<br>
Page <?= $npage + 1 ?>/<?= $npage + 1 ?> Printed By : <?= esc($valBy) ?> <?= esc($date) ?></pre> Page <?= $npage + 1 ?>/<?= $npage + 1 ?> Printed By : <?= esc($valBy) ?> <?= esc($date) ?></div>
</td> </td>
<td class='right'> <td class='right'>
<pre><b>&rdquo;This result is valid without signature.&rdquo;</b></pre> <pre><b>&rdquo;This result is valid without signature.&rdquo;</b></pre>

1
public/assets/report/pdf.css
View File

@ -28,6 +28,7 @@ td.right { text-align: right; }
.img { width:200mm; margin-left:0.5cm } .img { width:200mm; margin-left:0.5cm }
.img-footer { margin-bottom:7.5mm } .img-footer { margin-bottom:7.5mm }
pre.small {font-size:6pt;} pre.small {font-size:6pt;}
.footer-lines { white-space: normal; line-height: 1.2; }
@media print { @media print {
@page { margin:0; size:210mm 297mm; } @page { margin:0; size:210mm 297mm; }

3
public/assets/report/style.css
View File

@ -28,4 +28,5 @@ td.right { text-align: right; }
.img { max-width: 100%; height: auto; } .img { max-width: 100%; height: auto; }
.img-footer { max-width: 100%; height: auto; max-height: 2.5cm; } .img-footer { max-width: 100%; height: auto; max-height: 2.5cm; }
pre.small {font-size:6pt;} pre.small {font-size:6pt;}
.footer-lines { white-space: normal; line-height: 1.2; }