From c975cb2da450f0c9dd09ffa151ff2add9ba39e9e Mon Sep 17 00:00:00 2001 From: evarisk-micka Date: Fri, 17 Mar 2023 10:29:37 +0100 Subject: [PATCH 1/3] #2677 [RiskAssessmentDocument] add: replace select recipient by multiselect --- .../riskassessmentdocument.class.php | 17 ++++++++++------- core/modules/modDigiriskDolibarr.class.php | 1 + ...rr_riskassessmentdocumentfields_view.tpl.php | 11 +++++++---- .../digiriskstandard_riskassessmentdocument.php | 4 ++-- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php b/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php index cd2c109b5..f580d3a16 100644 --- a/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php +++ b/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php @@ -81,13 +81,16 @@ public function RiskAssessmentDocumentFillJSON() $json['RiskAssessmentDocument']['emetteurDUER'] = $user->lastname . ' ' . $user->firstname; $json['RiskAssessmentDocument']['dateGeneration'] = dol_print_date($now, '%d/%m/%Y %H:%M:%S', 'tzuser'); - if ($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT > 0) { - $user->fetch($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT); - - $json['RiskAssessmentDocument']['destinataireDUER'] = $user->lastname . ' ' . $user->firstname; - $json['RiskAssessmentDocument']['telephone'] = $user->office_phone; - $json['RiskAssessmentDocument']['portable'] = $user->user_mobile; - }else { + $userRecipient = json_decode($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT); + if (is_array($userRecipient) && !empty($userRecipient)) { + foreach ($userRecipient as $recipientId) { + $user->fetch($recipientId); + + $json['RiskAssessmentDocument']['destinataireDUER'] .= $user->lastname . ' ' . $user->firstname . ' - '; + $json['RiskAssessmentDocument']['telephone'] .= $user->office_phone . ' - '; + $json['RiskAssessmentDocument']['portable'] .= $user->user_mobile . ' - '; + } + } else { $json['RiskAssessmentDocument']['destinataireDUER'] = ''; $json['RiskAssessmentDocument']['telephone'] = ''; $json['RiskAssessmentDocument']['portable'] = ''; diff --git a/core/modules/modDigiriskDolibarr.class.php b/core/modules/modDigiriskDolibarr.class.php index 5a94ab0db..7aaf160b9 100644 --- a/core/modules/modDigiriskDolibarr.class.php +++ b/core/modules/modDigiriskDolibarr.class.php @@ -507,6 +507,7 @@ public function __construct($db) $i++ => ['DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_METHOD', 'chaine', $langs->transnoentities('RiskAssessmentDocumentMethod'), '', 0, 'current'], $i++ => ['DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_SOURCES', 'chaine', $langs->transnoentities('RiskAssessmentDocumentSources'), '', 0, 'current'], $i++ => ['DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_IMPORTANT_NOTES', 'chaine', $langs->transnoentities('RiskAssessmentDocumentImportantNote'), '', 0, 'current'], + 12 => array('DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT', 'chaine', '0', '', 0, 'current'), $i++ => ['DIGIRISKDOLIBARR_MAIN_AGENDA_ACTIONAUTO_RISKASSESSMENTDOCUMENT_GENERATE', 'integer', 1, '', 0, 'current'], $i++ => ['DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_ADDON','chaine', 'mod_riskassessmentdocument_standard', '', 0, 'current'], diff --git a/core/tpl/digiriskdocuments/digiriskdolibarr_riskassessmentdocumentfields_view.tpl.php b/core/tpl/digiriskdocuments/digiriskdolibarr_riskassessmentdocumentfields_view.tpl.php index 0af660c57..0dd459cf3 100644 --- a/core/tpl/digiriskdocuments/digiriskdolibarr_riskassessmentdocumentfields_view.tpl.php +++ b/core/tpl/digiriskdocuments/digiriskdolibarr_riskassessmentdocumentfields_view.tpl.php @@ -47,10 +47,10 @@ print ''; // Destinataire - + $userRecipient = json_decode($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT); print ''; print ''; - print $form->select_dolusers($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT, 'Recipient', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 0); + print $form->select_dolusers($userRecipient, 'Recipient', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 0, true); print ''; // Méthodologie @@ -98,8 +98,11 @@ // Destinataire print ''; print '' . $langs->trans("Recipient") . ''; - $user->fetch($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT); - print $user->lastname . ' ' . $user->firstname; + $recipients = json_decode($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT); + foreach ($recipients as $recipientId) { + $user->fetch($recipientId); + print $user->lastname . ' ' . $user->firstname . '
'; + } print ''; // Méthodologie diff --git a/view/digiriskstandard/digiriskstandard_riskassessmentdocument.php b/view/digiriskstandard/digiriskstandard_riskassessmentdocument.php index 356babd50..fd246d03c 100644 --- a/view/digiriskstandard/digiriskstandard_riskassessmentdocument.php +++ b/view/digiriskstandard/digiriskstandard_riskassessmentdocument.php @@ -95,7 +95,7 @@ if (($action == 'update' && ! GETPOST("cancel", 'alpha')) || ($action == 'updateedit') && $permissiontoadd) { $auditStartDate = GETPOST('AuditStartDate', 'none'); $auditEndDate = GETPOST('AuditEndDate', 'none'); - $recipent = GETPOST('Recipient', 'alpha'); + $recipient = GETPOST('Recipient', 'array'); $method = GETPOST('Method', 'none'); $sources = GETPOST('Sources', 'none'); $importantNote = GETPOST('ImportantNote', 'none'); @@ -120,7 +120,7 @@ } } - dolibarr_set_const($db, "DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT", $recipent, 'integer', 0, '', $conf->entity); + dolibarr_set_const($db, "DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT", json_encode($recipient), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_METHOD", $method, 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_SOURCES", $sources, 'chaine', 0, '', $conf->entity); From 20d9ecbcb749a44c7ac224602e8e5d07630231bf Mon Sep 17 00:00:00 2001 From: evarisk-micka Date: Wed, 20 Sep 2023 14:44:17 +0200 Subject: [PATCH 2/3] #2677 [RiskAssessmentDocument] fix: good for use now --- .../riskassessmentdocument.class.php | 14 +++++++------- core/modules/modDigiriskDolibarr.class.php | 3 +-- ...ibarr_riskassessmentdocumentfields_view.tpl.php | 10 ++++++---- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php b/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php index f580d3a16..c412401d1 100644 --- a/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php +++ b/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php @@ -82,18 +82,18 @@ public function RiskAssessmentDocumentFillJSON() $json['RiskAssessmentDocument']['dateGeneration'] = dol_print_date($now, '%d/%m/%Y %H:%M:%S', 'tzuser'); $userRecipient = json_decode($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT); + + $json['RiskAssessmentDocument']['destinataireDUER'] = ''; + $json['RiskAssessmentDocument']['telephone'] = ''; + $json['RiskAssessmentDocument']['portable'] = ''; if (is_array($userRecipient) && !empty($userRecipient)) { foreach ($userRecipient as $recipientId) { $user->fetch($recipientId); - $json['RiskAssessmentDocument']['destinataireDUER'] .= $user->lastname . ' ' . $user->firstname . ' - '; - $json['RiskAssessmentDocument']['telephone'] .= $user->office_phone . ' - '; - $json['RiskAssessmentDocument']['portable'] .= $user->user_mobile . ' - '; + $json['RiskAssessmentDocument']['destinataireDUER'] .= $user->lastname . ' ' . $user->firstname . chr(0x0A); + $json['RiskAssessmentDocument']['telephone'] .= $user->office_phone . chr(0x0A); + $json['RiskAssessmentDocument']['portable'] .= $user->user_mobile . chr(0x0A); } - } else { - $json['RiskAssessmentDocument']['destinataireDUER'] = ''; - $json['RiskAssessmentDocument']['telephone'] = ''; - $json['RiskAssessmentDocument']['portable'] = ''; } $json['RiskAssessmentDocument']['methodologie'] = $conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_METHOD; diff --git a/core/modules/modDigiriskDolibarr.class.php b/core/modules/modDigiriskDolibarr.class.php index 7aaf160b9..1c4e04cc4 100644 --- a/core/modules/modDigiriskDolibarr.class.php +++ b/core/modules/modDigiriskDolibarr.class.php @@ -503,11 +503,10 @@ public function __construct($db) // CONST RISK ASSESSMENTDOCUMENT $i++ => ['DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_AUDIT_START_DATE', 'date', '', '', 0, 'current'], $i++ => ['DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_AUDIT_END_DATE', 'date', '', '', 0, 'current'], - $i++ => ['DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT', 'integer', 0, '', 0, 'current'], + $i++ => ['DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT', 'chaine', '', '', 0, 'current'], $i++ => ['DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_METHOD', 'chaine', $langs->transnoentities('RiskAssessmentDocumentMethod'), '', 0, 'current'], $i++ => ['DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_SOURCES', 'chaine', $langs->transnoentities('RiskAssessmentDocumentSources'), '', 0, 'current'], $i++ => ['DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_IMPORTANT_NOTES', 'chaine', $langs->transnoentities('RiskAssessmentDocumentImportantNote'), '', 0, 'current'], - 12 => array('DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT', 'chaine', '0', '', 0, 'current'), $i++ => ['DIGIRISKDOLIBARR_MAIN_AGENDA_ACTIONAUTO_RISKASSESSMENTDOCUMENT_GENERATE', 'integer', 1, '', 0, 'current'], $i++ => ['DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_ADDON','chaine', 'mod_riskassessmentdocument_standard', '', 0, 'current'], diff --git a/core/tpl/digiriskdocuments/digiriskdolibarr_riskassessmentdocumentfields_view.tpl.php b/core/tpl/digiriskdocuments/digiriskdolibarr_riskassessmentdocumentfields_view.tpl.php index 0dd459cf3..6db733912 100644 --- a/core/tpl/digiriskdocuments/digiriskdolibarr_riskassessmentdocumentfields_view.tpl.php +++ b/core/tpl/digiriskdocuments/digiriskdolibarr_riskassessmentdocumentfields_view.tpl.php @@ -99,10 +99,12 @@ print ''; print '' . $langs->trans("Recipient") . ''; $recipients = json_decode($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT); - foreach ($recipients as $recipientId) { - $user->fetch($recipientId); - print $user->lastname . ' ' . $user->firstname . '
'; - } + if (is_array($recipients) && !empty($recipients)) { + foreach ($recipients as $recipientId) { + $user->fetch($recipientId); + print $user->lastname . ' ' . $user->firstname . '
'; + } + } print ''; // Méthodologie From 0067dde65fe82097fd20ce1d175ba621e999b49d Mon Sep 17 00:00:00 2001 From: Nicolas Domenech Date: Fri, 12 Apr 2024 16:22:01 +0200 Subject: [PATCH 3/3] #2677 [RiskAssessementDocument] fix: getNomUrl --- .../digiriskdolibarrdocuments/riskassessmentdocument.class.php | 2 +- .../digiriskdolibarr_riskassessmentdocumentfields_view.tpl.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php b/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php index c412401d1..c4360a3db 100644 --- a/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php +++ b/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php @@ -90,7 +90,7 @@ public function RiskAssessmentDocumentFillJSON() foreach ($userRecipient as $recipientId) { $user->fetch($recipientId); - $json['RiskAssessmentDocument']['destinataireDUER'] .= $user->lastname . ' ' . $user->firstname . chr(0x0A); + $json['RiskAssessmentDocument']['destinataireDUER'] .= dol_strtoupper($user->lastname) . ' ' . ucfirst($user->firstname) . chr(0x0A); $json['RiskAssessmentDocument']['telephone'] .= $user->office_phone . chr(0x0A); $json['RiskAssessmentDocument']['portable'] .= $user->user_mobile . chr(0x0A); } diff --git a/core/tpl/digiriskdocuments/digiriskdolibarr_riskassessmentdocumentfields_view.tpl.php b/core/tpl/digiriskdocuments/digiriskdolibarr_riskassessmentdocumentfields_view.tpl.php index 6db733912..b7d7ea0e9 100644 --- a/core/tpl/digiriskdocuments/digiriskdolibarr_riskassessmentdocumentfields_view.tpl.php +++ b/core/tpl/digiriskdocuments/digiriskdolibarr_riskassessmentdocumentfields_view.tpl.php @@ -102,7 +102,7 @@ if (is_array($recipients) && !empty($recipients)) { foreach ($recipients as $recipientId) { $user->fetch($recipientId); - print $user->lastname . ' ' . $user->firstname . '
'; + print $user->getNomUrl(1) . '
'; } } print '';