Demark later changes in values by StuRa financers in generated PDF files

Author: jbtronics

src/Entity/FieldChanges.php

@@ -59,6 +59,16 @@ public function getMostRecentChangedField(): ?string
         return $this->lastChangedField;
     }
 
+    /**
+     * Check if the given field was ever changed
+     * @param  string  $field
+     * @return bool
+     */
+    public function wasChanged(string $field): bool
+    {
+        return isset($this->changedFields[$field]);
+    }
+
     /**
      * Returns the date of the most recent change, or null if no field was ever changed
      * @return \DateTimeImmutable|null

src/Entity/PaymentOrder.php

@@ -348,6 +348,17 @@ public function setSupportingFundingId(?string $supporting_funding_id): PaymentO
         return $this;
     }
 
+    public function getSupportingFundingDate(): ?DateTime
+    {
+        return $this->supporting_funding_date;
+    }
+
+    public function setSupportingFundingDate(?DateTime $supporting_funding_date): PaymentOrder
+    {
+        $this->supporting_funding_date = $supporting_funding_date;
+        return $this;
+    }
+
     public function getSupportingAmount(): ?int
     {
         return $this->supporting_amount;

templates/macros/field_changes.macro.twig

@@ -0,0 +1,6 @@
+{% macro field(field_changes, field, symbol = "‡") %}
+    {# @var \App\Entity\FieldChanges field_changes #}
+    {% if field_changes.wasChanged(field) %}
+        <b>{{ symbol }}</b>
+    {% endif %}
+{% endmacro %}

templates/pdf/payment_order/payment_order.html.twig

@@ -1,6 +1,9 @@
 {% extends "pdf/form.html.twig" %}
 {% import "pdf/payment_order/confirmations.macro.twig" as confirmations %}
 
+{% import "macros/field_changes.macro.twig" as fc %}
+{% set changes = paymentOrder.fieldChanges %}
+
 {# @var paymentOrder \App\Entity\PaymentOrder #}
 
 {% macro valOrNull(value) %}
@@ -34,63 +37,68 @@
     <table class="table-form">
         <tr>
             <td>Name Auftraggeber:</td>
-            <td>{{ paymentOrder.submitterName }}</td>
+            <td>{{ fc.field(changes, "submitter_name") }}{{ paymentOrder.submitterName }}</td>
         </tr>
         <tr>
             <td>Struktur:</td>
-            <td>{{ paymentOrder.department.name }}</td>
+            <td>{{ fc.field(changes, "department") }}{{ paymentOrder.department.name }}</td>
         </tr>
 
         <tr class="spacer"><td></td><td></td></tr>
 
         <tr>
             <td>Projektbezeichnung:</td>
-            <td>{{ paymentOrder.projectName }}</td>
+            <td>{{ fc.field(changes, "project_name") }}{{ paymentOrder.projectName }}</td>
         </tr>
 
         <tr class="spacer"><td></td><td></td></tr>
 
         <tr>
             <td>Mittelfreigabe / Finanzantrag:</td>
-            <td>{{ _self.valOrNull(paymentOrder.fundingId) }} {% if paymentOrder.resolutionDate %}({{ paymentOrder.resolutionDate | format_date }}){% endif %}</td>
+            <td>{{ fc.field(changes, "funding_id") }}{{ _self.valOrNull(paymentOrder.fundingId) }}
+                {% if paymentOrder.resolutionDate %}({{ fc.field(changes, "resolution_date") }}{{ paymentOrder.resolutionDate | format_date }}){% endif %}
+            </td>
         </tr>
         <tr>
             <td>Gesamtbetrag:</td>
-            <td>{{ (paymentOrder.amount/100) | format_currency("EUR") }}</td>
+            <td>{{ fc.field(changes, "amount") }}{{ (paymentOrder.amount/100) | format_currency("EUR") }}</td>
         </tr>
         <tr>
             <td>Unterstützende Mittelfreigabe:</td>
-            <td>{{ _self.valOrNull(paymentOrder.supportingFundingId) }} (TODO Beschlussdatum)</td>
+            <td>{{ fc.field(changes, "supporting_funding_id") }}{{ _self.valOrNull(paymentOrder.supportingFundingId) }}
+                {% if paymentOrder.supportingFundingDate %}({{ fc.field(changes,"supporting_funding_date") }}{{ paymentOrder.supportingFundingDate }}){% endif %}
+            </td>
         </tr>
         <tr>
             <td>Unterstützter Betrag:</td>
-            <td>{% if paymentOrder.supportingAmount %}{{ (paymentOrder.supportingAmount / 100) | format_currency("EUR") }}{% else %}-{% endif %}</td>
+            <td>{{ fc.field(changes, "supporting_amount") }}{% if paymentOrder.supportingAmount %}{{ (paymentOrder.supportingAmount / 100) | format_currency("EUR") }}{% else %}-{% endif %}</td>
         </tr>
 
         <tr class="spacer"><td></td><td></td></tr>
 
         <tr>
             <td>Zahlungsempfänger*in:</td>
-            <td>{{ paymentOrder.bankInfo.accountOwner }}</td>
+            <td>{{ fc.field(changes, "bank_info.account_owner") }}{{ paymentOrder.bankInfo.accountOwner }}</td>
         </tr>
         <tr>
             <td>Anschrift:</td>
-            <td>{{ paymentOrder.bankInfo.address }}</td>
+            <td>{{ fc.field(changes, "bank_info.street") }}{{ fc.field(changes, "bank_info.zip_code") }}{{ fc.field(changes, "bank_info.city") }}
+                {{ paymentOrder.bankInfo.address }}</td>
         </tr>
 
         <tr class="spacer"><td></td><td></td></tr>
 
         <tr>
             <td>IBAN:</td>
-            <td>{{ paymentOrder.bankInfo.ibanFormatted }}
+            <td>{{ fc.field(changes, "bank_info.iban") }}{{ paymentOrder.bankInfo.ibanFormatted }}
                 {% if paymentOrder.bankInfo.bic is not empty %}
-                    (BIC: {{ paymentOrder.bankInfo.bic }})
+                    (BIC: {{ fc.field(changes, "bank_info.bic") }}{{ paymentOrder.bankInfo.bic }})
                 {% endif %}
             </td>
         </tr>
         <tr>
             <td>Verwendungszweck:</td>
-            <td>{{ paymentOrder.bankInfo.reference }}</td>
+            <td>{{ fc.field(changes, "bank_info.reference") }}{{ paymentOrder.bankInfo.reference }}</td>
         </tr>
     </table>
 
@@ -112,8 +120,10 @@
 {% endblock %}
 
 {% block footer %}
-    <p style="margin: 0;">
-        Fettgedruckte Werte weisen darauf hin, dass dieses Feld von den StuRa-Finanzer*innen bearbeitet wurde.<br>
-        Die letzte Änderung erfolgte <i>TODO Datum</i> durch <i>TOOD Finanzername</i>.
-    </p>
+    {% if paymentOrder.fieldChanges.mostRecentChangedField is not null %}
+        <p style="margin: 0;">
+            Werte mit einem <b>‡</b> am Anfang weisen darauf hin, dass dieses Feld von den StuRa-Finanzer*innen bearbeitet wurde.<br>
+            Die letzte Änderung erfolgte <i>{{ paymentOrder.fieldChanges.mostRecentChangeDate | format_datetime("short") }}</i> durch <i>{{ paymentOrder.fieldChanges.mostRecentChangeUser }}</i>.
+        </p>
+    {% endif %}
 {% endblock %}