Merge pull request #334 from LUCILE-DECROZANT-TRIQUENAUX-EIRL/hotfix-…

…275-datatable-date-sort Ref #275: fixed date columns sort for donation and receipts generation
LUCILE-DECROZANT-TRIQUENAUX-EIRL · Apr 15, 2024 · 8ea9e74 · 8ea9e74
2 parents ed72f49 + 75c1b02
commit 8ea9e74
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 13 deletions.
diff --git a/templates/Donation/list.html.twig b/templates/Donation/list.html.twig
@@ -54,7 +54,9 @@
  <td class="align-middle text-center">{{ donation.donator.firstName }}</td>
  <td class="align-middle text-center">{{ donation.payment.receipt.orderCode }}</td>
  <td class="align-middle text-center">{{ donation.amount }}&nbsp;€</td>
- <td class="align-middle text-center">{{ donation.donationDate ? donation.donationDate | date('d M. Y') : '' }}</td>
+ <td class="align-middle text-center" data-sort="{{ donation.donationDate ? donation.donationDate.format('c') : '' }}">
+ {{ donation.donationDate ? donation.donationDate | date('d M. Y') : '' }}
+ </td>
  <td class="align-middle text-center">{{ donation.donationOrigin ? donation.donationOrigin.label : ' - ' }}</td>
  <td class="align-middle column-action">
  <a

diff --git a/templates/Receipt/list.html.twig b/templates/Receipt/list.html.twig
@@ -53,11 +53,18 @@
  <td class="align-middle">
  {{ generatedAnnualReceipt.year }}
  </td>
- <td class="align-middle">
- {% if generatedAnnualReceipt.receiptsGenerationBase.generationDateEnd is not null %}
+ {% if generatedAnnualReceipt.receiptsGenerationBase.generationDateEnd is not null %}
+ <td
+ class="align-middle"
+ data-sort="{{ generatedAnnualReceipt.receiptsGenerationBase.generationDateStart.format('c') }}"
+ >
  {{ generatedAnnualReceipt.receiptsGenerationBase.generationDateStart | localizeddate('long', 'none') }}
  à {{ generatedAnnualReceipt.receiptsGenerationBase.generationDateStart | localizeddate('none', 'short') }}
- {% else %}
+ {% else %}
+ <td
+ class="align-middle"
+ data-sort=""
+ >
  <div
  data-file-id="{{ generatedAnnualReceipt.id }}"
  class="waiting-generation"
@@ -88,8 +95,10 @@
  </td>
  <td class="align-middle">
  {{ generatedAnnualReceipt.receiptsGenerationBase.generator.username }}
- (<span class="text-uppercase">{{ generatedAnnualReceipt.receiptsGenerationBase.generator.people.lastName }}</span>
- {{ generatedAnnualReceipt.receiptsGenerationBase.generator.people.firstName }})
+ {% if generatedAnnualReceipt.receiptsGenerationBase.generator.people is not null %}
+ (<span class="text-uppercase">{{ generatedAnnualReceipt.receiptsGenerationBase.generator.people.lastName }}</span>
+ {{ generatedAnnualReceipt.receiptsGenerationBase.generator.people.firstName }})
+ {% endif %}
  </td>
  <td class="align-middle column-action">
  {% if generatedAnnualReceipt.receiptsGenerationBase.generationDateEnd is not null %}
@@ -140,13 +149,24 @@
  <tbody class="d-none">
  {% for generatedBetweenTwoDatesReceipt in generatedBetweenTwoDatesReceipts %}
  <tr>
- <td class="align-middle">{{ generatedBetweenTwoDatesReceipt.dateFrom | localizeddate('long', 'none') }}</td>
- <td class="align-middle">{{ generatedBetweenTwoDatesReceipt.dateTo | localizeddate('long', 'none') }}</td>
- <td class="align-middle">
- {% if generatedBetweenTwoDatesReceipt.receiptsGenerationBase.generationDateEnd is not null %}
+ <td class="align-middle" data-sort="{{ generatedBetweenTwoDatesReceipt.dateFrom.format('c') }}">
+ {{ generatedBetweenTwoDatesReceipt.dateFrom | localizeddate('long', 'none') }}
+ </td>
+ <td class="align-middle" data-sort="{{ generatedBetweenTwoDatesReceipt.dateTo.format('c') }}">
+ {{ generatedBetweenTwoDatesReceipt.dateTo | localizeddate('long', 'none') }}
+ </td>
+ {% if generatedBetweenTwoDatesReceipt.receiptsGenerationBase.generationDateEnd is not null %}
+ <td
+ class="align-middle"
+ data-sort="{{ generatedBetweenTwoDatesReceipt.receiptsGenerationBase.generationDateStart.format('c') }}"
+ >
  {{ generatedBetweenTwoDatesReceipt.receiptsGenerationBase.generationDateStart | localizeddate('long', 'none') }}
  à {{ generatedBetweenTwoDatesReceipt.receiptsGenerationBase.generationDateStart | localizeddate('none', 'short') }}
- {% else %}
+ {% else %}
+ <td
+ class="align-middle"
+ data-sort=""
+ >
  <div
  data-file-id="{{ generatedBetweenTwoDatesReceipt.id }}"
  class="waiting-generation"
@@ -177,8 +197,10 @@
  </td>
  <td class="align-middle">
  {{ generatedBetweenTwoDatesReceipt.receiptsGenerationBase.generator.username }}
- (<span class="text-uppercase">{{ generatedBetweenTwoDatesReceipt.receiptsGenerationBase.generator.people.lastName }}</span>
- {{ generatedBetweenTwoDatesReceipt.receiptsGenerationBase.generator.people.firstName }})
+ {% if generatedBetweenTwoDatesReceipt.receiptsGenerationBase.generator.people is not null %}
+ (<span class="text-uppercase">{{ generatedBetweenTwoDatesReceipt.receiptsGenerationBase.generator.people.lastName }}</span>
+ {{ generatedBetweenTwoDatesReceipt.receiptsGenerationBase.generator.people.firstName }})
+ {% endif %}
  </td>
  <td class="align-middle column-action">
  {% if generatedBetweenTwoDatesReceipt.receiptsGenerationBase.generationDateEnd is not null %}