Merge pull request Evarisk#3853 from Evarisk/main

Main into Develop
evarisk-micka · Apr 24, 2024 · ee3c313 · ee3c313
2 parents 654e461 + a86bf83
commit ee3c313
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 19 deletions.
diff --git a/admin/ticket/ticket.php b/admin/ticket/ticket.php
@@ -216,7 +216,7 @@
 
 	ob_clean();
 
-	$QR = imagecreatefrompng('https://chart.googleapis.com/chart?cht=qr&chld=H|1&chs='.$size.'&chl='.urlencode($urlToEncode));
+	$QR = imagecreatefrompng('https://quickchart.io/qr?text=' .urlencode($urlToEncode. '&size='.$size )); // chart.googleapis.com n'existe plus
 
 	if (! is_dir($targetPath)) {
 		mkdir($targetPath, 0777, true);

diff --git a/changelog.md b/changelog.md
@@ -4,7 +4,60 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-#### [Unreleased](https://github.com/Evarisk/Digirisk/compare/9.14.1...HEAD)
+#### [Unreleased](https://github.com/Evarisk/Digirisk/compare/9.15.0...HEAD)
+
+- 10.0.0 [`#3852`](https://github.com/Evarisk/Digirisk/pull/3852)
+- #3812 #3849 [Img] fix: change picto [`#3850`](https://github.com/Evarisk/Digirisk/pull/3850)
+- #3841 [Mod] add: new version number 10.0.0 [`#3847`](https://github.com/Evarisk/Digirisk/pull/3847)
+- #3772 [RiskEnvironmental] add: environment project [`#3846`](https://github.com/Evarisk/Digirisk/pull/3846)
+- #3836 [Risk] fix: missing backtopage risk type [`#3848`](https://github.com/Evarisk/Digirisk/pull/3848)
+- #3843 [Risk] add: trad and picto for risk [`#3845`](https://github.com/Evarisk/Digirisk/pull/3845)
+- #3807 [ODT] fix: listings risk env [`#3844`](https://github.com/Evarisk/Digirisk/pull/3844)
+- #3812 [ODT] fix: change img for listing risk env [`#3842`](https://github.com/Evarisk/Digirisk/pull/3842)
+- fix api.googleapis.com  ticket.php  [`#3839`](https://github.com/Evarisk/Digirisk/pull/3839)
+- #3810 [Menu] add: environmental risks menu [`#3817`](https://github.com/Evarisk/Digirisk/pull/3817)
+- #3826 [Document] fix: fetch and sort riskassessment in projectdoc orque [`#3827`](https://github.com/Evarisk/Digirisk/pull/3827)
+- #3824 [Mod] fix: export riskassessment need risks permissions [`#3825`](https://github.com/Evarisk/Digirisk/pull/3825)
+- #3819 [Risk] fix: clean code after environmental integration [`#3821`](https://github.com/Evarisk/Digirisk/pull/3821)
+- #3652 [IMG] add: picto risks environmental [`#3809`](https://github.com/Evarisk/Digirisk/pull/3809)
+- #2962 [Document] add: conf to display riskassessment in color orque pdf [`#3796`](https://github.com/Evarisk/Digirisk/pull/3796)
+- #2738 [Documents] add: total tasks budget on model orque and change sort order [`#3795`](https://github.com/Evarisk/Digirisk/pull/3795)
+- #1963 [Risk] add: category on risks [`#3794`](https://github.com/Evarisk/Digirisk/pull/3794)
+- #2677 [RiskAssessmentDocument] add: multiselect recipient [`#3145`](https://github.com/Evarisk/Digirisk/pull/3145)
+- #3799 [Actions] add: chek on remove_file to avoid problems in gmao and other projects [`#3800`](https://github.com/Evarisk/Digirisk/pull/3800)
+- #3732 [DigiriskElement] fix: better hierarchy display [`#3797`](https://github.com/Evarisk/Digirisk/pull/3797)
+- #3807 [ODT] add: listings risk environmental action [`#3808`](https://github.com/Evarisk/Digirisk/pull/3808)
+- #3736 [ODT] add environnemental risk report [`#3780`](https://github.com/Evarisk/Digirisk/pull/3780)
+- #3652 [Json] add: update for use risk and risk environmental [`#3805`](https://github.com/Evarisk/Digirisk/pull/3805)
+- Main into develop [`#3790`](https://github.com/Evarisk/Digirisk/pull/3790)
+- #3772 [RiskEnrivonmental] fix: missing update menu [`518d781`](https://github.com/Evarisk/Digirisk/commit/518d781af2427e1b84520018d330fbbfb57f7a06)
+- 📖 Changelog [`6b16f46`](https://github.com/Evarisk/Digirisk/commit/6b16f46fe3effdfefdffe4a31386c379eae51899)
+- Update ticket.php [`08de779`](https://github.com/Evarisk/Digirisk/commit/08de7790756fe2cc5a7a5991d013b048791caac9)
+- Merge pull request #3837 from nicolas-eoxia/fix_risk_type [`3eda9aa`](https://github.com/Evarisk/Digirisk/commit/3eda9aa6569c80228d01c14aea6de994f71a0d96)
+- Merge pull request #3814 from nicolas-eoxia/fix_filter_type_risk [`89e1d23`](https://github.com/Evarisk/Digirisk/commit/89e1d2369add5aabb7d0aaa33280d8f65f8d4e27)
+- #3811 #3820 [ODT] add: move listingrisksenvironmental and fix triggers [`911d121`](https://github.com/Evarisk/Digirisk/commit/911d12136155cf62e7aa44ffe62e8b54fc0f1fdb)
+- #1966 [RiskEnvironmental] add: matrix update [`ea10fd7`](https://github.com/Evarisk/Digirisk/commit/ea10fd7b6ff9e6f8ca4cdfd926b9a81c0066d121)
+- #3770 [RiskEnvironmental] add: SQL/Class type field [`5a8f24a`](https://github.com/Evarisk/Digirisk/commit/5a8f24a5e82c7f541e1b673308cc09984f0e22a6)
+- #1963 [Risk] fix: category should be disabled by default [`f04d942`](https://github.com/Evarisk/Digirisk/commit/f04d942e6d7ffc8126c137c644b313c66c73bc0f)
+- #2749 [Documents] add: sort info by descending order of cotation [`d99850d`](https://github.com/Evarisk/Digirisk/commit/d99850dd16941f0f22631d392d0e266643876916)
+- #3813 [Risk] fix: sql parameters and trad [`49b2e42`](https://github.com/Evarisk/Digirisk/commit/49b2e42728d9b987dd7a2233adc00d034d469358)
+- #2677 [RiskAssessmentDocument] add: replace select recipient by multiselect [`c975cb2`](https://github.com/Evarisk/Digirisk/commit/c975cb2da450f0c9dd09ffa151ff2add9ba39e9e)
+- #3807 [ODT] fix: filter risk on type [`4936692`](https://github.com/Evarisk/Digirisk/commit/4936692a5fb84ff4cc5c6c2593962dcce27361f9)
+- #2677 [RiskAssessmentDocument] fix: good for use now [`20d9ecb`](https://github.com/Evarisk/Digirisk/commit/20d9ecbcb749a44c7ac224602e8e5d07630231bf)
+- #1963 [Risk] fix: CSS for multiselect array [`aaa054e`](https://github.com/Evarisk/Digirisk/commit/aaa054e2434a85f6e2df40e9b5feee7c87e95aa9)
+- 📖 Changelog [`56978db`](https://github.com/Evarisk/Digirisk/commit/56978db51d63e1962fdc68aa002c8f0b6c372063)
+- #2738 [Documents] add: total tasks budget on model orque [`82cd35f`](https://github.com/Evarisk/Digirisk/commit/82cd35f7a5038bc226eba30dabda4aab44c329aa)
+- #2962 [Document] fix: change conf name DIGIRISKDOLIBARR_PROJECTDOCUMENT_DISPLAY_RISKASSESSMENT_COLOR [`7fd6397`](https://github.com/Evarisk/Digirisk/commit/7fd6397d9c871da7cdccfcb3cbb83c5bb0571a78)
+- #3807 [ODT] fix: filter risk on type on accidentinvestigation [`dcf20a3`](https://github.com/Evarisk/Digirisk/commit/dcf20a3ed3cf3456cbbd551942dfd13dd59d6c81)
+- #2677 [RiskAssessementDocument] fix: getNomUrl [`0067dde`](https://github.com/Evarisk/Digirisk/commit/0067dde65fe82097fd20ce1d175ba621e999b49d)
+- #3799 [Hooks] fix: rework check on remove_file action [`4fe230e`](https://github.com/Evarisk/Digirisk/commit/4fe230e1ce7b8b6639d7fa4e85140f7ed9d04968)
+- #3736 [ODT] add: risk environnemetal assesment report with actions [`5268386`](https://github.com/Evarisk/Digirisk/commit/526838687658a0a83a34c42c3756c96e2f382b3d)
+- #3807 [ODT] fix: table and informations size [`44ca978`](https://github.com/Evarisk/Digirisk/commit/44ca978e6d312cb4fc8062a59e24d34c7397e363)
+- Update template_listingriskenvironmentalsaction.odt [`807d72b`](https://github.com/Evarisk/Digirisk/commit/807d72b5f3d90620b81ac8704844122f56db6607)
+
+#### [9.15.0](https://github.com/Evarisk/Digirisk/compare/9.14.1...9.15.0)
+
+> 8 April 2024
 
 - 9.15.0 [`#3789`](https://github.com/Evarisk/Digirisk/pull/3789)
 - #3751 [Mod] add: new version number 9.15.0 [`#3788`](https://github.com/Evarisk/Digirisk/pull/3788)
@@ -43,6 +96,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - #1133 [ODT] add: move for use single page instead [`cb61d32`](https://github.com/Evarisk/Digirisk/commit/cb61d32ff641534aab429a61a93a1551e243b7b0)
 - #3754 [Odt] fix: case and spacing [`39b8776`](https://github.com/Evarisk/Digirisk/commit/39b877621660fe5c6d3f03a23136f51cdc9f8c9d)
 - #1133 [ODT] add: improve fetchAll request for filter [`c119488`](https://github.com/Evarisk/Digirisk/commit/c11948838f99ae45803b393056bc7f3a86fff231)
+- 📖 Changelog [`ef028f1`](https://github.com/Evarisk/Digirisk/commit/ef028f15c8a0149d22c91efd6cea674ff6adde38)
 - #3691 [RiskList] add: improve css and also do shared risk [`5c0410b`](https://github.com/Evarisk/Digirisk/commit/5c0410b4368b131af1678b007e6c81097a7296c9)
 - #3740 #3742 [Admin] fix: remove $parameters / setmod action and unused objects [`d400523`](https://github.com/Evarisk/Digirisk/commit/d4005231eaadf4722d5a27c9251defb06a55b340)
 - #3694 [TemplateUpdateMask] add: template update mask [`4182e1b`](https://github.com/Evarisk/Digirisk/commit/4182e1b53ed26ed2ce760186c0b5387f8dcb24e8)

diff --git a/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php b/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php
@@ -81,16 +81,19 @@ 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 {
-			$json['RiskAssessmentDocument']['destinataireDUER'] = '';
-			$json['RiskAssessmentDocument']['telephone'] = '';
-			$json['RiskAssessmentDocument']['portable'] = '';
+		$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'] .= 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);
+			}
 		}
 
 		$json['RiskAssessmentDocument']['methodologie']       = $conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_METHOD;

diff --git a/core/modules/modDigiriskDolibarr.class.php b/core/modules/modDigiriskDolibarr.class.php
@@ -504,7 +504,7 @@ 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'],

diff --git a/core/tpl/digiriskdocuments/digiriskdolibarr_riskassessmentdocumentfields_view.tpl.php b/core/tpl/digiriskdocuments/digiriskdolibarr_riskassessmentdocumentfields_view.tpl.php
@@ -47,10 +47,10 @@
 	print '</td></tr>';
 
 	// Destinataire
-
+	$userRecipient = json_decode($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT);
 	print '<tr>';
 	print '<td class="titlefield"><label for="Recipient">' . $langs->trans("Recipient") . '</label></td><td colspan="2">';
-	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 '</td></tr>';
 
 	// Méthodologie
@@ -98,8 +98,13 @@
 	// Destinataire
 	print '<tr>';
 	print '<td class="titlefield">' . $langs->trans("Recipient") . '</td><td colspan="2">';
-	$user->fetch($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT);
-	print $user->lastname . ' ' . $user->firstname;
+	$recipients = json_decode($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT);
+	if (is_array($recipients) && !empty($recipients)) {
+        foreach ($recipients as $recipientId) {
+            $user->fetch($recipientId);
+            print $user->getNomUrl(1) . '<br>';
+        }
+    }
 	print '</td></tr>';
 
 	// Méthodologie

diff --git 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);