From 7e803e020e38f6629ee1ead537471b9e740c4a33 Mon Sep 17 00:00:00 2001
From: Vinciane <vinciane.bizet@maarch.org>
Date: Mon, 11 Mar 2019 16:33:38 +0100
Subject: [PATCH] FIX #9511 Fix count generated or sended AR
---
.../AcknowledgementReceiptController.php | 30 +++++++------------
1 file changed, 10 insertions(+), 20 deletions(-)
diff --git a/src/app/acknowledgementReceipt/controllers/AcknowledgementReceiptController.php b/src/app/acknowledgementReceipt/controllers/AcknowledgementReceiptController.php
index 4b976ad3649..01ddc84bd27 100644
--- a/src/app/acknowledgementReceipt/controllers/AcknowledgementReceiptController.php
+++ b/src/app/acknowledgementReceipt/controllers/AcknowledgementReceiptController.php
@@ -226,34 +226,24 @@ class AcknowledgementReceiptController
]);
if (!empty($acknowledgements)) {
- $sendedEmail = 0;
- $sendedPaper = 0;
- $generatedPaper = 0;
- $generatedEmail = 0;
+ $sended = 0;
+ $generated = 0;
foreach ($acknowledgements as $acknowledgement) {
- if ($acknowledgement['format'] == 'html') {
- if (!empty($acknowledgement['creation_date']) && !empty($acknowledgement['send_date'])) {
- $sendedEmail += 1;
- } elseif (!empty($acknowledgement['creation_date']) && empty($acknowledgement['send_date'])) {
- $generatedEmail += 1;
- }
- } elseif ($acknowledgement['format'] == 'pdf') {
- if (!empty($acknowledgement['creation_date']) && !empty($acknowledgement['send_date'])) {
- $sendedPaper += 1;
- } elseif (!empty($acknowledgement['creation_date']) && empty($acknowledgement['send_date'])) {
- $generatedPaper += 1;
- }
+ if (!empty($acknowledgement['creation_date']) && !empty($acknowledgement['send_date'])) {
+ $sended += 1;
+ } elseif (!empty($acknowledgement['creation_date']) && empty($acknowledgement['send_date'])) {
+ $generated += 1;
}
}
- if ($sendedEmail + $sendedPaper == sizeof($acknowledgements)) {
- $alreadySend['number'] += 1;
+ if ($sended > 0) {
+ $alreadySend['number'] += $sended;
$alreadySend['list'][] = ['resId' => $resId, 'alt_identifier' => $ext['alt_identifier']];
}
- if ($generatedEmail + $generatedPaper > 0) {
- $alreadyGenerated['number'] += 1;
+ if ($generated > 0) {
+ $alreadyGenerated['number'] += $generated;
$alreadyGenerated['list'][] = ['resId' => $resId, 'alt_identifier' => $ext['alt_identifier']];
}
}
--
GitLab