From 677ea004fe0cdec5897edf3ec6d80293c9378443 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Tue, 14 Jan 2020 18:31:39 +0100
Subject: [PATCH] FEAT #10633 TIME 0:30 migrate send signed doc
---
apps/maarch_entreprise/lang/en.php | 3 --
apps/maarch_entreprise/lang/fr.php | 6 ---
apps/maarch_entreprise/lang/nl.php | 2 -
core/xml/actions_pages.xml | 13 ------
migration/19.12/1912.sql | 3 +-
modules/visa/redirect_visa_entity.php | 27 -------------
modules/visa/send_signed_docs.php | 57 ---------------------------
src/core/lang/lang-en.php | 2 -
src/core/lang/lang-fr.php | 2 -
src/core/lang/lang-nl.php | 2 -
10 files changed, 1 insertion(+), 116 deletions(-)
delete mode 100755 modules/visa/redirect_visa_entity.php
delete mode 100755 modules/visa/send_signed_docs.php
diff --git a/apps/maarch_entreprise/lang/en.php b/apps/maarch_entreprise/lang/en.php
index f68e695f671..bfb5a716f48 100755
--- a/apps/maarch_entreprise/lang/en.php
+++ b/apps/maarch_entreprise/lang/en.php
@@ -3980,9 +3980,6 @@ if (!defined('_REJECTION_WORKFLOW_PREVIOUS')) {
if (!defined('_VISA_MAIL')) {
define('_VISA_MAIL', 'Aim the mail');
}
-if (!defined('_SEND_SIGNED_DOCS')) {
- define('_SEND_SIGNED_DOCS', 'Pass signed responses');
-}
if (!defined('_PREPARE_VISA')) {
define('_PREPARE_VISA', 'Prepare the visa flow');
}
diff --git a/apps/maarch_entreprise/lang/fr.php b/apps/maarch_entreprise/lang/fr.php
index ebd7f70b446..fe56b3b59f8 100755
--- a/apps/maarch_entreprise/lang/fr.php
+++ b/apps/maarch_entreprise/lang/fr.php
@@ -4043,12 +4043,6 @@ if (!defined('_VISA_MAIL')) {
if (!defined('_VISA_MAIL_DESC')) {
define('_VISA_MAIL_DESC', 'Ouvre la page du parapheur afin de pouvoir viser / signer le document.');
}
-if (!defined('_SEND_SIGNED_DOCS')) {
- define('_SEND_SIGNED_DOCS', 'Transmettre réponses signées');
-}
-if (!defined('_SEND_SIGNED_DOCS_DESC')) {
- define('_SEND_SIGNED_DOCS_DESC', 'Vérifie si les projets de réponse ont été signés.');
-}
if (!defined('_PREPARE_VISA')) {
define('_PREPARE_VISA', 'Préparer le circuit de visa');
}
diff --git a/apps/maarch_entreprise/lang/nl.php b/apps/maarch_entreprise/lang/nl.php
index 1d6f3507c3d..7ad8a731412 100755
--- a/apps/maarch_entreprise/lang/nl.php
+++ b/apps/maarch_entreprise/lang/nl.php
@@ -1292,8 +1292,6 @@ if (!defined('_REJECTION_WORKFLOW_PREVIOUS')) { define('_REJECTION_WORKFLOW_PREV
if (!defined('_REJECTION_WORKFLOW_PREVIOUS_DESC')) { define('_REJECTION_WORKFLOW_PREVIOUS_DESC', 'Reset de datum van de vorige goedkeurder die in het goedkeuringscircuit van het brief aanwezig is (process_date van de tabel listinstance).');}
if (!defined('_VISA_MAIL')) { define('_VISA_MAIL', 'De e-mail goedkeuren');}
if (!defined('_VISA_MAIL_DESC')) { define('_VISA_MAIL_DESC', 'Opent de pagina van de parafeerder om het document te kunnen goedkeuren / ondertekenen.');}
-if (!defined('_SEND_SIGNED_DOCS')) { define('_SEND_SIGNED_DOCS', 'Ondertekende antwoorden doorsturen');}
-if (!defined('_SEND_SIGNED_DOCS_DESC')) { define('_SEND_SIGNED_DOCS_DESC', 'Controleert of de antwoordprojecten ondertekend werden.');}
if (!defined('_PREPARE_VISA')) { define('_PREPARE_VISA', 'Het goedkeuringscircuit voorbereiden');}
if (!defined('_SEND_TO_VISA')) { define('_SEND_TO_VISA', 'Versturen voor goedkeuring');}
if (!defined('_SEND_TO_VISA_DESC')) { define('_SEND_TO_VISA_DESC', 'Controleert of er een goedkeuringscircuit is geconfigureerd EN of er één of meerdere antwoordprojecten aan het brief gekoppeld zijn.');}
diff --git a/core/xml/actions_pages.xml b/core/xml/actions_pages.xml
index 276973015fe..4decb275e3d 100755
--- a/core/xml/actions_pages.xml
+++ b/core/xml/actions_pages.xml
@@ -327,19 +327,6 @@ An action page is described in a ACTIONPAGE tag :
<COLLECTIONS>
<COLL_ID>letterbox_coll</COLL_ID>
</COLLECTIONS>
- </ACTIONPAGE>
- <ACTIONPAGE>
- <ID>send_signed_docs</ID>
- <LABEL>_SEND_SIGNED_DOCS</LABEL>
- <NAME>send_signed_docs</NAME>
- <DESC>_SEND_SIGNED_DOCS_DESC</DESC>
- <component>v1Action</component>
- <ORIGIN>module</ORIGIN>
- <MODULE>visa</MODULE>
- <FLAG_CREATE>false</FLAG_CREATE>
- <COLLECTIONS>
- <COLL_ID>letterbox_coll</COLL_ID>
- </COLLECTIONS>
</ACTIONPAGE>
<ACTIONPAGE>
<ID>send_docs_to_recommendation</ID>
diff --git a/migration/19.12/1912.sql b/migration/19.12/1912.sql
index 7f81a689590..2465c7d6faf 100644
--- a/migration/19.12/1912.sql
+++ b/migration/19.12/1912.sql
@@ -90,10 +90,9 @@ UPDATE actions SET component = 'redirectInitiatorEntityAction' WHERE action_page
UPDATE actions SET component = 'rejectVisaBackToPreviousAction' WHERE action_page = 'rejection_visa_previous';
UPDATE actions SET component = 'rejectVisaBackToRedactorAction' WHERE action_page = 'rejection_visa_redactor';
UPDATE actions SET component = 'interruptVisaAction' WHERE action_page = 'interrupt_visa';
-UPDATE actions SET component = 'sendSignatureBookAction' WHERE action_page = 'send_to_visa';
+UPDATE actions SET component = 'sendSignatureBookAction' WHERE action_page IN ('send_to_visa', 'send_signed_docs');
UPDATE actions SET component = 'continueCircuitAction' WHERE action_page = 'visa_workflow';
-
/* FOLDERS */
DO $$ BEGIN
IF (SELECT count(attname) FROM pg_attribute WHERE attrelid = (SELECT oid FROM pg_class WHERE relname = 'folders') AND attname = 'folders_system_id') THEN
diff --git a/modules/visa/redirect_visa_entity.php b/modules/visa/redirect_visa_entity.php
deleted file mode 100755
index db69f7fc842..00000000000
--- a/modules/visa/redirect_visa_entity.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-$confirm = true;
-$etapes = ['empty_error'];
-
-function manage_empty_error($arr_id, $history, $id_action, $label_action, $status)
-{
- $db = new Database();
- $_SESSION['action_error'] = '';
- $res_id = $arr_id[0];
-
- $stmt = $db->query('SELECT initiator FROM res_letterbox WHERE res_id = ?', [$res_id]);
- $resInitiator = $stmt->fetch();
- $resListModel = [];
-
- $stmt = $db->query("SELECT entity_label FROM entities WHERE entity_id = ?", [$resInitiator['initiator']]);
- $resEntity = $stmt->fetch();
- $stmt = $db->query("SELECT lastname, firstname FROM users WHERE user_id = ?", [$resListModel['item_id']]);
- $resUsers = $stmt->fetch();
- $_SESSION['process']['diff_list']['dest']['users'][0]['user_id'] = $resListModel['item_id'];
- $_SESSION['process']['diff_list']['dest']['users'][0]['lastname'] = $resUsers['lastname'];
- $_SESSION['process']['diff_list']['dest']['users'][0]['firstname'] = $resUsers['firstname'];
- $_SESSION['process']['diff_list']['dest']['users'][0]['entity_id'] = $resInitiator['initiator'];
- $_SESSION['process']['diff_list']['dest']['users'][0]['entity_label'] = $resEntity['entity_label'];
-
- return array('result' => $res_id . '#', 'history_msg' => '');
-}
diff --git a/modules/visa/send_signed_docs.php b/modules/visa/send_signed_docs.php
deleted file mode 100755
index 0ca1be3541b..00000000000
--- a/modules/visa/send_signed_docs.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
-* Copyright Maarch since 2008 under licence GPLv3.
-* See LICENCE.txt file at the root folder for more details.
-* This file is part of Maarch software.
-
-* @brief send_signed_docs
-* @author dev <dev@maarch.org>
-* @ingroup visa
-*/
-
-require_once 'core' . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR . 'class_db.php';
-
-function checkAllSigned($id)
-{
- $db = new Database();
- $stmt = $db->query("SELECT status from res_attachments where attachment_type= ? and res_id_master = ?", array('response_project', $id));
- while ($line = $stmt->fetchObject()) {
- if ($line->status == 'TRA' || $line->status == 'A_TRA' ) {
- return false;
- }
- }
- return true;
-}
-
-require_once 'modules/visa/class/class_modules_tools.php';
-$visa = new visa();
-$warnMsg = '';
-
-if ($visa->currentUserSignRequired($_SESSION['doc_id']) == 'true') {
- $confirm = true;
- $warnMsg = _NO_USER_SIGNED_DOC;
-} else {
- $confirm = false;
-}
-$etapes = ['empty_error'];
-
-/**
-* $etapes array Contains only one etap, the status modification
-*/
- $etapes = array('empty_error');
-
-function manage_empty_error($arr_id, $history, $id_action, $label_action, $status)
-{
- $_SESSION['action_error'] = '';
- $result = '';
- $new_result = '';
- for ($i=0; $i<count($arr_id); $i++) {
- if (checkAllSigned($arr_id[$i])) {
- $new_result .= $arr_id[$i].',';
- }
- $result .= $arr_id[$i].'#';
- }
- $new_result = substr($new_result, 0, -1);
-
- return array('result' => $result, 'history_msg' => '', 'newResultId' => $new_result, 'action_status' => $status);
-}
diff --git a/src/core/lang/lang-en.php b/src/core/lang/lang-en.php
index fa70aef13c3..a508e660446 100755
--- a/src/core/lang/lang-en.php
+++ b/src/core/lang/lang-en.php
@@ -244,8 +244,6 @@ define('_CLOSE_MAIL_AND_INDEX', 'Close a mail and launch the indexation');
define('_CLOSE_MAIL_AND_INDEX_DESC', 'Allows you to update the closing date of a mail AND opens the indexing page to save a new mail.');
define('_CLOSE_MAIL_WITH_ATTACHMENT', 'Closing with attachment');
define('_CLOSE_MAIL_WITH_ATTACHMENT_DESC', 'Allows you to update the closing date of a mail with MANDATORY presence of attachment (s) / note (s).');
-define('_SEND_SIGNED_DOCS', 'Pass signed responses');
-define('_SEND_SIGNED_DOCS_DESC', 'Check if response project are signed.');
define('_SEND_TO_VISA', 'send for visa');
define('_SEND_TO_VISA_DESC', 'Check if visa circuit is setup AND if one or several responses project are linked to mail.');
define('_REJECTION_WORKFLOW_PREVIOUS', 'Visa rejection - back to the previous author');
diff --git a/src/core/lang/lang-fr.php b/src/core/lang/lang-fr.php
index 2d9105449b2..254dfb20d87 100755
--- a/src/core/lang/lang-fr.php
+++ b/src/core/lang/lang-fr.php
@@ -244,8 +244,6 @@ define('_CLOSE_MAIL_AND_INDEX', 'Clôturer un courrier et lancer l\'indexation')
define('_CLOSE_MAIL_AND_INDEX_DESC', 'Permet de mettre à jour la date de clôture d\'un courrier ET ouvre la page d\'indexation afin d\'enregistrer un nouveau courrier.');
define('_CLOSE_MAIL_WITH_ATTACHMENT', 'Clôturer un courrier avec pièce jointe');
define('_CLOSE_MAIL_WITH_ATTACHMENT_DESC', 'Permet de mettre à jour la date de clôture d\'un courrier avec présence OBLIGATOIRE de pièce(s) jointe(s) / annotation(s).');
-define('_SEND_SIGNED_DOCS', 'Transmettre réponses signées');
-define('_SEND_SIGNED_DOCS_DESC', 'Vérifie si les projets de réponse ont été signés.');
define('_SEND_TO_VISA', 'Envoyer pour visa');
define('_SEND_TO_VISA_DESC', 'Contrôle si un circuit de visa est configuré ET si un ou plusieurs projets de réponses sont associés au courrier.');
define('_REJECTION_WORKFLOW_PREVIOUS', 'Refuser le visa - retour au précédent viseur');
diff --git a/src/core/lang/lang-nl.php b/src/core/lang/lang-nl.php
index 20bb6bd103f..0dffe5bfd6b 100755
--- a/src/core/lang/lang-nl.php
+++ b/src/core/lang/lang-nl.php
@@ -243,8 +243,6 @@ define('_CLOSE_MAIL_AND_INDEX', 'Een brief afsluiten en de indexering starten');
define('_CLOSE_MAIL_AND_INDEX_DESC', 'Om de afsluitingsdatum van een brief bij te werken EN de indexeringspagina te openen om een nieuw brief te bewaren.');
define('_CLOSE_MAIL_WITH_ATTACHMENT', 'Een brief met een bijlage afsluiten');
define('_CLOSE_MAIL_WITH_ATTACHMENT_DESC', 'Om de afsluitingsdatum van een brief bij te werken met VERPLICHTE aanwezigheid van bijlage(n) / opmerking(en).');
-define('_SEND_SIGNED_DOCS', 'Ondertekende antwoorden doorsturen');
-define('_SEND_SIGNED_DOCS_DESC', 'Controleert of de antwoordprojecten ondertekend werden.');
define('_SEND_TO_VISA', 'Versturen voor goedkeuring');
define('_SEND_TO_VISA_DESC', 'Controleert of er een goedkeuringscircuit is geconfigureerd EN of er één of meerdere antwoordprojecten aan het brief gekoppeld zijn.');
define('_REJECTION_WORKFLOW_PREVIOUS', 'De goedkeuring weigeren - terug naar de vorige goedkeurder');
--
GitLab