From d7ce97d6d7f3a54f48ee3923f13e211151283401 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Mon, 27 May 2019 10:52:43 +0200
Subject: [PATCH] FEAT #10620 TIME 0:20 Not for action
---
.../document/controllers/DocumentController.php | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/app/document/controllers/DocumentController.php b/src/app/document/controllers/DocumentController.php
index 5367354c0b..724d768052 100755
--- a/src/app/document/controllers/DocumentController.php
+++ b/src/app/document/controllers/DocumentController.php
@@ -279,9 +279,9 @@ class DocumentController
$workflow = WorkflowModel::getCurrentStep(['select' => ['id', 'mode'], 'documentId' => $args['id']]);
- $data = $request->getParams();
- if (!empty($data['signatures'])) {
- foreach ($data['signatures'] as $signature) {
+ $body = $request->getParsedBody();
+ if (!empty($body['signatures'])) {
+ foreach ($body['signatures'] as $signature) {
foreach (['encodedImage', 'width', 'positionX', 'positionY', 'page', 'type'] as $value) {
if (!isset($signature[$value])) {
return $response->withStatus(400)->withJson(['errors' => $value . ' is empty']);
@@ -324,7 +324,7 @@ class DocumentController
$pdf->SetAutoPageBreak(false, 0);
$pdf->SetMargins(0, 0, 0);
$pdf->SetAutoPageBreak(false, 0);
- foreach ($data['signatures'] as $signature) {
+ foreach ($body['signatures'] as $signature) {
if ($signature['page'] == $i) {
if ($signature['positionX'] == 0 && $signature['positionY'] == 0) {
$signWidth = $size['width']*2;
@@ -405,8 +405,12 @@ class DocumentController
]);
}
+ $set = ['process_date' => 'CURRENT_TIMESTAMP', 'status' => DocumentController::ACTIONS[$args['actionId']]];
+ if (!empty($body['note'])) {
+ $set['note'] = $body['note'];
+ }
WorkflowModel::update([
- 'set' => ['process_date' => 'CURRENT_TIMESTAMP', 'status' => DocumentController::ACTIONS[$args['actionId']]],
+ 'set' => $set,
'where' => ['id = ?'],
'data' => [$workflow['id']]
]);
--
GitLab