Merge pull request #228 from Evarisk/7.7.6

7.7.6
Evarisk · Nov 14, 2022 · 7af7189 · 7af7189
2 parents 8f3bb94 + 6f3a301
commit 7af7189
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/digirisk.config.json b/digirisk.config.json
@@ -1,7 +1,7 @@
 {
 	"name": "Digirisk",
 	"slug": "digirisk",
-	"version": "7.7.5",
+	"version": "7.7.6",
 	"description": "L'application Digirisk",
 	"insert_scripts_pages_js": [
       "digirisk-welcome",

diff --git a/digirisk.php b/digirisk.php
@@ -3,7 +3,7 @@
  * Plugin Name: Digirisk
  * Plugin URI:  http://www.evarisk.com/document-unique-logiciel
  * Description: Avec le plugin Digirisk vous pourrez réaliser, de façon simple et intuitive, le ou les documents uniques de vos entreprises et gérer toutes les données liées à la sécurité de votre personnel.
- * Version:     7.7.5
+ * Version:     7.7.6
  * Author:      Evarisk
  * Author URI:  http://www.evarisk.com
  * License:     AGPLv3

diff --git a/modules/export_import/class/export.class.php b/modules/export_import/class/export.class.php
@@ -70,7 +70,7 @@ public function exec() {
 	 * @return array
 	 */
 	public function exec_tree() {
-		$data_to_export = $this->export_groupments(0,false);
+		$data_to_export['digiriskelements'] = $this->export_groupments(0,false);
 		return $this->generate_zip( $data_to_export, 'arborescence');
 	}
 
@@ -83,7 +83,7 @@ public function exec_tree() {
 	 * @return array
 	 */
 	public function exec_risks() {
-		$data_to_export = $this->export_all_risks();
+		$data_to_export['risks'] = $this->export_all_risks();
 		return $this->generate_zip( $data_to_export, 'risques');
 	}
 
@@ -96,7 +96,7 @@ public function exec_risks() {
 	 * @return array
 	 */
 	public function exec_risksigns() {
-		$data_to_export = $this->export_all_risksigns();
+		$data_to_export['risksigns'] = $this->export_all_risksigns();
 		return $this->generate_zip( $data_to_export, 'signalisations');
 	}
 
@@ -109,9 +109,9 @@ public function exec_risksigns() {
 	 * @return array
 	 */
 	public function exec_global() {
-		$data_to_export = $this->export_groupments(0,false);
-		$data_to_export[] = $this->export_all_risks();
-		$data_to_export[] = $this->export_all_risksigns();
+		$data_to_export['digiriskelements'] = $this->export_groupments(0,false);
+		$data_to_export['risks'] = $this->export_all_risks();
+		$data_to_export['risksigns'] = $this->export_all_risksigns();
 		return $this->generate_zip( $data_to_export, 'global');
 	}
 
@@ -228,7 +228,13 @@ public function export_groupments( $parent_id = 0 , $risk = true) {
 					'list_group'    => $this->export_groupments( $element->data['id'], $risk),
 				);
 
-				$list_data_exported[] = $groupment_data_to_export;
+				if (($element->data['status'] == 'inherit' || $element->data['status'] == 'draft') && $element->data['parent_id'] == 0) {
+					$key = 'digiriskelements_archived';
+				} else {
+					$key = 'digiriskelements';
+				}
+
+				$list_data_exported[$key][] = $groupment_data_to_export;
 			}
 		}
 

diff --git a/readme.txt b/readme.txt
@@ -3,8 +3,8 @@ Contributors: Evarisk
 Tags: Evaluation des risques, document unique, risques professionnels, audit risques, risques humains, digirisk, digi risk, evarisk, eva risk, risk, risks, risque, risques
 Donate link: http://www.evarisk.com/document-unique-logiciel
 Requires at least: 4.4
-Tested up to: 6.0.0
-Stable tag: 7.7.5
+Tested up to: 6.0.2
+Stable tag: 7.7.6
 License: AGPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -77,6 +77,10 @@ Lors de l'installation de l'extension Digirisk si vous aviez déjà installé la
 
 * Veillez à bien sauvegarder vos données avant d'effectuer une mise à jour du plugin
 
+= Version 7.7.6 =
+
+- Add : Archive GP/UT sur l'exportation + indexation du tableau pour construire l'export.
+
 = Version 7.7.5 =
 
 - Add : Exportation global de Digirisk WP vers Digirisk Dolibarr.