MALIO-DEV/SIRH
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 67 Wiki Activity

[#SIRH] Récap salaire: scinder la colonne Heures payés en 25% / 50%

Browse Source 
En-tête fusionné "Heures payés" (colspan=2) avec deux sous-colonnes 25% et
50% sous-jacentes. paid25Hours=base25Minutes, paid50Hours=base50Minutes
(bases seules, total inchangé vs l'ancienne colonne unique). buildRttPaymentMap
renvoie ['m25','m50'] par employé. Tableau passé à 20 colonnes (colspan ajustés).
PDF généré et validé sur données prod (A4 paysage, largeurs ~228mm).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Autin
2026-06-01 23:34:59 +02:00
parent 1486b770b1
commit c1ff46933a
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/salary-recap/print.html.twig
+7 -4
View File
@@ -117,7 +117,7 @@
<th rowspan="2" style="width: 8mm;">Frais<br>Kms</th>
<th rowspan="2" style="width: 8mm;">Heures<br>de<br>nuit</th>
<th rowspan="2" style="width: 8mm;">Panier<br>de<br>nuit</th>
<th rowspan="2" style="width: 10mm;">Heures<br>payés</th>
<th colspan="2" style="width: 14mm;">Heures<br>payés</th>
<th rowspan="2" style="width: 8mm;">Heures<br>férié</th>
<th rowspan="2" style="width: 8mm;">Heures<br>dim.</th>
<th rowspan="2" style="width: 8mm;">Prime</th>
@@ -127,6 +127,8 @@
<th rowspan="2" style="width: 20mm;">Observations</th>
</tr>
<tr>
<th style="width: 7mm;">25%</th>
<th style="width: 7mm;">50%</th>
<th style="width: 8mm;">Nbre</th>
<th style="width: 22mm;">Date</th>
<th style="width: 8mm;">Nbre</th>
@@ -141,7 +143,7 @@
{% for siteId, group in siteGroups %}
{% set siteColor = group.color ?? '#B3E5FC' %}
<tr class="site-header">
<td style="background: {{ siteColor }}; text-align: left;" colspan="19">
<td style="background: {{ siteColor }}; text-align: left;" colspan="20">
{{ group.name }}
</td>
</tr>
@@ -153,7 +155,8 @@
<td class="num">{{ row.mileageKm > 0 ? row.mileageKm : '' }}</td>
<td class="num">{{ row.nightHours > 0 ? row.nightHours : '' }}</td>
<td class="num">{{ row.nightBasketCount > 0 ? row.nightBasketCount : '' }}</td>
<td class="num">{{ row.paidHours > 0 ? row.paidHours : '' }}</td>
<td class="num">{{ row.paid25Hours > 0 ? row.paid25Hours : '' }}</td>
<td class="num">{{ row.paid50Hours > 0 ? row.paid50Hours : '' }}</td>
<td class="num">{{ row.holidayHours > 0 ? row.holidayHours : '' }}</td>
<td class="num">{{ row.sundayHours > 0 ? row.sundayHours : '' }}</td>
<td class="num">{{ row.bonusAmount > 0 ? row.bonusAmount ~ ' €' : '' }}</td>
@@ -169,7 +172,7 @@
</tr>
{% else %}
<tr>
<td colspan="19">Aucun employé.</td>
<td colspan="20">Aucun employé.</td>
</tr>
{% endfor %}
{% endfor %}