From 333472f2c35dcfaad46235985d445ea8e619ad76 Mon Sep 17 00:00:00 2001
From: Mathieu <mpmathieu.pnr@gmail.com>
Date: Tue, 30 Nov 2021 17:44:19 +0100
Subject: [PATCH] FIX #18739 TIME 21:00 fix signature date on csv export
---
src/app/resource/controllers/ExportController.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/app/resource/controllers/ExportController.php b/src/app/resource/controllers/ExportController.php
index 161f55ebc25..cf81b693cf2 100755
--- a/src/app/resource/controllers/ExportController.php
+++ b/src/app/resource/controllers/ExportController.php
@@ -636,8 +636,8 @@ class ExportController
foreach ($args['chunkedResIds'] as $resIds) {
$attachments = AttachmentModel::get([
- 'select' => ['creation_date', 'res_id'],
- 'where' => ['res_id in (?)', 'attachment_type = ?', 'status = ?'],
+ 'select' => ['creation_date', 'res_id_master'],
+ 'where' => ['res_id_master in (?)', 'attachment_type = ?', 'status = ?'],
'data' => [$resIds, 'signed_response', 'TRA'],
'order_by' => ['res_id']
]);
@@ -645,11 +645,11 @@ class ExportController
foreach ($attachments as $attachment) {
$date = new \DateTime($attachment['creation_date']);
if (!empty($aSignatureDates[$attachment['res_id']])) {
- $aSignatureDates[$attachment['res_id']] .= "\n";
+ $aSignatureDates[$attachment['res_id_master']] .= "\n";
} else {
- $aSignatureDates[$attachment['res_id']] = '';
+ $aSignatureDates[$attachment['res_id_master']] = '';
}
- $aSignatureDates[$attachment['res_id']] .= $date->format('d-m-Y H:i');
+ $aSignatureDates[$attachment['res_id_master']] .= $date->format('d-m-Y H:i');
}
}
--
GitLab