From c1a5de3c9efa208ddc0b6a6aa1f3c48540dbbe34 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Tue, 10 Nov 2020 13:52:18 +0100
Subject: [PATCH] FIX #15317 TIME 0:30 wording in mergeController visa/avis
workflow
---
.../controllers/MergeController.php | 22 ++++++++++++++-----
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/app/contentManagement/controllers/MergeController.php b/src/app/contentManagement/controllers/MergeController.php
index d03f4bcb0e8..4447b19a892 100644
--- a/src/app/contentManagement/controllers/MergeController.php
+++ b/src/app/contentManagement/controllers/MergeController.php
@@ -216,15 +216,20 @@ class MergeController
$visas = '';
if (!empty($args['resId'])) {
$visaWorkflow = ListInstanceModel::get([
- 'select' => ['item_id'],
+ 'select' => ['item_id', 'process_date', 'requested_signature'],
'where' => ['difflist_type = ?', 'res_id = ?'],
'data' => ['VISA_CIRCUIT', $args['resId']],
'orderBy' => ['listinstance_id']
]);
foreach ($visaWorkflow as $value) {
- $labelledUser = UserModel::getLabelledUserById(['login' => $value['item_id']]);
+ $labelledUser = UserModel::getLabelledUserById(['login' => $value['item_id']]);
$primaryentity = UserModel::getPrimaryEntityByUserId(['userId' => $value['item_id']]);
- $visas .= "{$labelledUser} ({$primaryentity})\n";
+
+ $mode = $value['requested_signature'] ? _SIGNATORY : _VISA_USER_MIN;
+ if (!empty($value['process_date'])) {
+ $mode .= ', ' . TextFormatModel::formatDate($value['process_date']);
+ }
+ $visas .= "{$labelledUser} ({$primaryentity['entity_label']}) - {$mode}\n";
}
}
@@ -232,7 +237,7 @@ class MergeController
$opinions = '';
if (!empty($args['resId'])) {
$opinionWorkflow = ListInstanceModel::get([
- 'select' => ['item_id'],
+ 'select' => ['item_id', 'process_date'],
'where' => ['difflist_type = ?', 'res_id = ?'],
'data' => ['AVIS_CIRCUIT', $args['resId']],
'orderBy' => ['listinstance_id']
@@ -240,7 +245,12 @@ class MergeController
foreach ($opinionWorkflow as $value) {
$labelledUser = UserModel::getLabelledUserById(['login' => $value['item_id']]);
$primaryentity = UserModel::getPrimaryEntityByUserId(['userId' => $value['item_id']]);
- $opinions .= "{$labelledUser} ({$primaryentity})\n";
+
+ $processDate = null;
+ if (!empty($value['process_date'])) {
+ $processDate = ' - ' . TextFormatModel::formatDate($value['process_date']);
+ }
+ $opinions .= "{$labelledUser} ({$primaryentity['entity_label']}) {$processDate}\n";
}
}
@@ -257,7 +267,7 @@ class MergeController
if ($value['item_type'] == 'user_id') {
$labelledUser = UserModel::getLabelledUserById(['login' => $value['item_id']]);
$primaryentity = UserModel::getPrimaryEntityByUserId(['userId' => $value['item_id']]);
- $label = "{$labelledUser} ({$primaryentity})";
+ $label = "{$labelledUser} ({$primaryentity['entity_label']})";
} else {
$entity = EntityModel::getByEntityId(['entityId' => $value['item_id'], 'select' => ['entity_label']]);
$label = $entity['entity_label'];
--
GitLab