From 8cfba9d1ef37bc790cc7df517696bd77823a02af Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Tue, 4 Dec 2018 17:03:22 +0100
Subject: [PATCH] FEAT Add dest user in history when document is send to maarch
Parapheur.
---
.../actions/sendToExternalSignatureBook.php | 10 +++++++---
modules/visa/class/MaarchParapheurController.php | 12 ++++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/apps/maarch_entreprise/actions/sendToExternalSignatureBook.php b/apps/maarch_entreprise/actions/sendToExternalSignatureBook.php
index 8db9f0bf084..a2a6caae2dd 100644
--- a/apps/maarch_entreprise/actions/sendToExternalSignatureBook.php
+++ b/apps/maarch_entreprise/actions/sendToExternalSignatureBook.php
@@ -132,8 +132,9 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col
require_once "modules/visa/class/class_modules_tools.php";
$circuit_visa = new visa();
- $db = new Database();
- $coll_id = $_SESSION['current_basket']['coll_id'];
+ $db = new Database();
+ $coll_id = $_SESSION['current_basket']['coll_id'];
+ $message = '';
foreach ($arr_id as $res_id) {
$result .= $res_id.'#';
@@ -180,6 +181,9 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col
'objectSent' => $objectSent,
'userId' => $_SESSION['user']['UserId']
]);
+
+ $processingUserInfo = MaarchParapheurController::getUserById(['config' => $config, 'id' => $processingUser]);
+ $message = ' (Ã ' . $processingUserInfo['firstname'] . ' ' . $processingUserInfo['lastname'] . ')';
}
}
@@ -213,7 +217,7 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col
$stmt = $db->query('SELECT status FROM res_letterbox WHERE res_id = ?', array($res_id));
$resource = $stmt->fetchObject();
- $message = '';
+
if ($resource->status == 'EVIS' || $resource->status == 'ESIG') {
$sequence = $circuit_visa->getCurrentStep($res_id, $coll_id, 'VISA_CIRCUIT');
$stepDetails = array();
diff --git a/modules/visa/class/MaarchParapheurController.php b/modules/visa/class/MaarchParapheurController.php
index 5903731b5f0..52d2cea7c2b 100755
--- a/modules/visa/class/MaarchParapheurController.php
+++ b/modules/visa/class/MaarchParapheurController.php
@@ -235,6 +235,18 @@ class MaarchParapheurController
return $response['status'];
}
+ public static function getUserById($aArgs)
+ {
+ $response = \SrcCore\models\CurlModel::exec([
+ 'url' => $aArgs['config']['data']['url'] . '/rest/users/'.$aArgs['id'],
+ 'user' => $aArgs['config']['data']['userId'],
+ 'password' => $aArgs['config']['data']['password'],
+ 'method' => 'GET'
+ ]);
+
+ return $response['user'];
+ }
+
public static function getHandwrittenDocument($aArgs)
{
$response = \SrcCore\models\CurlModel::exec([
--
GitLab