Merge pull request #1815 from Evarisk/develop

1.12.0
Evarisk · Jun 3, 2024 · 14de047 · 14de047
2 parents 12bea38 + 49f0c86
commit 14de047
Show file tree

Hide file tree

Showing 20 changed files with 133 additions and 138 deletions.
diff --git a/README.md b/README.md
@@ -3,18 +3,18 @@
 ## Informations
 
 - Numéro du module : 436301
-- Dernière mise à jour : 07/03/2023
+- Dernière mise à jour : 03/06/2023
 - Éditeur : [Evarisk](https://evarisk.com)
 - Thème : Eldy Menu
 - Licence : GPLv3
 - Disponible sur : Windows - MacOS - Linux
 
 ### Version
 
-- Version : 1.11.0
+- Version : 1.12.0
 - PHP : 7.4.33
-- Compatibilité : Dolibarr 17.0.0 - 18.0.5
-- Saturne Framework : 1.3.0
+- Compatibilité : Dolibarr 17.0.0 - 19.0.2
+- Saturne Framework : 1.5.0
 
 ## Liens
 

diff --git a/class/answer.class.php b/class/answer.class.php
@@ -190,12 +190,12 @@ class Answer extends SaturneObject
     /**
      * @var int User ID.
      */
-    public int $fk_user_creat;
+    public $fk_user_creat;
 
     /**
      * @var int|null User ID.
      */
-    public ?int $fk_user_modif;
+    public $fk_user_modif;
 
     /**
      * Constructor.

diff --git a/class/control.class.php b/class/control.class.php
@@ -218,12 +218,12 @@ class Control extends SaturneObject
     /**
      * @var int User ID.
      */
-    public int $fk_user_creat;
+    public $fk_user_creat;
 
     /**
      * @var int|null User ID.
      */
-    public ?int $fk_user_modif;
+    public $fk_user_modif;
 
     /**
      * @var int Sheet ID.
@@ -1236,12 +1236,12 @@ class ControlLine extends SaturneObject
     /**
      * @var int User ID
      */
-    public int $fk_user_creat;
+    public $fk_user_creat;
 
     /**
      * @var int|null User ID
      */
-    public ?int $fk_user_modif;
+    public $fk_user_modif;
 
     /**
      * @var int Control ID

diff --git a/class/question.class.php b/class/question.class.php
@@ -211,12 +211,12 @@ class Question extends SaturneObject
     /**
      * @var int User ID.
      */
-    public int $fk_user_creat;
+    public $fk_user_creat;
 
     /**
      * @var int|null User ID.
      */
-    public ?int $fk_user_modif;
+    public $fk_user_modif;
 
     /**
      * Constructor.

diff --git a/class/sheet.class.php b/class/sheet.class.php
@@ -205,12 +205,12 @@ class Sheet extends SaturneObject
     /**
      * @var int User ID.
      */
-    public int $fk_user_creat;
+    public $fk_user_creat;
 
     /**
      * @var int|null User ID.
      */
-    public ?int $fk_user_modif;
+    public $fk_user_modif;
 
     /**
      * Constructor.
@@ -276,74 +276,79 @@ public function LibStatut(int $status, int $mode = 0): string
         return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
     }
 
-	/**
-	 * Clone an object into another one
-	 *
-	 * @param User $user User that creates
-	 * @param int $fromid Id of object to clone
-	 * @param $options
-	 * @return    mixed                New object created, <0 if KO
-	 * @throws Exception
-	 */
-	public function createFromClone(User $user, $fromid)
-	{
-		global $conf, $langs;
-		$error = 0;
+    /**
+     * Clone an object into another one
+     *
+     * @param   User      $user   User that creates
+     * @param   int       $fromID ID of object to clone
+     * @return  mixed             New object created, <0 if KO
+     * @throws  Exception
+     */
+    public function createFromClone(User $user, int $fromID): int
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$question = new Question($this->db);
+        $error = 0;
 
-		dol_syslog(__METHOD__, LOG_DEBUG);
+        $object = new self($this->db);
+        $this->db->begin();
 
-		$object = new self($this->db);
-		$this->db->begin();
+        // Load source object
+        $object->fetchCommon($fromID);
 
-		// Load source object
-		$result = $object->fetchCommon($fromid);
-		if ($result > 0 && ! empty($object->table_element_line)) {
-			$object->fetchLines();
-		}
+        // Reset some properties
+        unset($object->fk_user_creat);
+        unset($object->import_key);
 
-		// Create clone
-        $object->fetchObjectLinked($object->id, 'digiquali_' . $object->element);
-		$object->context['createfromclone'] = 'createfromclone';
-		$object->ref = $object->getNextNumRef();
-		$object->status = 1;
-		$objectid = $object->create($user);
-
-		//add categories
-		$cat = new Categorie($this->db);
-		$categories = $cat->containing($fromid, 'sheet');
-
-		if (is_array($categories) && !empty($categories)) {
-			foreach($categories as $cat) {
-				$categoryIds[] = $cat->id;
-			}
-			if ($objectid > 0) {
-				$object->fetch($objectid);
-				$object->setCategories($categoryIds);
-			}
-		}
+        // Clear fields
+        if (property_exists($object, 'ref')) {
+            $object->ref = '';
+        }
+        if (property_exists($object, 'date_creation')) {
+            $object->date_creation = dol_now();
+        }
+        if (property_exists($object, 'status')) {
+            $object->status = self::STATUS_VALIDATED;
+        }
 
-		//add objects linked
-		if (is_array($object->linkedObjectsIds['digiquali_question']) && !empty($object->linkedObjectsIds['digiquali_question'])) {
-			foreach ($object->linkedObjectsIds['digiquali_question'] as $questionId) {
-				$question->fetch($questionId);
-				$question->add_object_linked('digiquali_' . $object->element, $objectid);
-			}
-			$object->updateQuestionsPosition($object->linkedObjectsIds['digiquali_question']);
-		}
+        $object->context = 'createfromclone';
 
-		unset($object->context['createfromclone']);
+        $object->fetchObjectLinked($object->id, 'digiquali_' . $object->element);
 
-		// End
-		if ( ! $error) {
-			$this->db->commit();
-			return $objectid;
-		} else {
-			$this->db->rollback();
-			return -1;
-		}
-	}
+        $sheetID = $object->create($user);
+        if ($sheetID > 0) {
+            // Categories
+            $categoryIds = [];
+            $category    = new Categorie($this->db);
+            $categories  = $category->containing($fromID, 'sheet');
+            if (is_array($categories) && !empty($categories)) {
+                foreach($categories as $category) {
+                    $categoryIds[] = $category->id;
+                }
+                $object->setCategories($categoryIds);
+            }
+
+            // Add objects linked
+            if (is_array($object->linkedObjects['digiquali_question']) && !empty($object->linkedObjects['digiquali_question'])) {
+                foreach ($object->linkedObjects['digiquali_question'] as $question) {
+                    $question->add_object_linked('digiquali_' . $object->element, $sheetID);
+                }
+            }
+        } else {
+            $error++;
+            $this->error  = $object->error;
+            $this->errors = $object->errors;
+        }
+
+        // End
+        if (!$error) {
+            $this->db->commit();
+            return $sheetID;
+        } else {
+            $this->db->rollback();
+            return -1;
+        }
+    }
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**

diff --git a/class/survey.class.php b/class/survey.class.php
@@ -198,12 +198,12 @@ class Survey extends SaturneObject
     /**
      * @var int User ID
      */
-    public int $fk_user_creat;
+    public $fk_user_creat;
 
     /**
      * @var int|null User ID
      */
-    public ?int $fk_user_modif;
+    public $fk_user_modif;
 
     /**
      * @var int Sheet ID
@@ -750,12 +750,12 @@ class SurveyLine extends SaturneObject
     /**
      * @var int User ID
      */
-    public int $fk_user_creat;
+    public $fk_user_creat;
 
     /**
      * @var int|null User ID
      */
-    public ?int $fk_user_modif;
+    public $fk_user_modif;
 
     /**
      * @var int Survey ID

diff --git a/.../modules/digiquali/digiqualidocuments/controldocument/doc_controldocument_odt.modules.php b/.../modules/digiquali/digiqualidocuments/controldocument/doc_controldocument_odt.modules.php
@@ -48,17 +48,6 @@
  */
 class doc_controldocument_odt extends SaturneDocumentModel
 {
-    /**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
-     */
-    public $phpmin = [7, 4];
-
-    /**
-     * @var string Dolibarr version of the loaded document.
-     */
-    public string $version = 'dolibarr';
-
     /**
      * @var string Module.
      */
@@ -121,7 +110,7 @@ public function fillTagsLines(Odf $odfHandler, Translate $outputLangs, array $mo
             $foundTagForLines = 1;
             try {
                 $listLines = $odfHandler->setSegment('questions');
-            } catch (OdfException $e) {
+            } catch (OdfException|OdfExceptionSegmentNotFound $e) {
                 // We may arrive here if tags for lines not present into template.
                 $foundTagForLines = 0;
                 $listLines = '';
@@ -217,7 +206,7 @@ public function fillTagsLines(Odf $odfHandler, Translate $outputLangs, array $mo
             $foundTagForLines = 1;
             try {
                 $listLines = $odfHandler->setSegment('equipment');
-            } catch (OdfException $e) {
+            } catch (OdfException|OdfExceptionSegmentNotFound $e) {
                 // We may arrive here if tags for lines not present into template.
                 $foundTagForLines = 0;
                 $listLines = '';
@@ -270,7 +259,7 @@ public function fillTagsLines(Odf $odfHandler, Translate $outputLangs, array $mo
             $foundTagForLines = 1;
             try {
                 $listLines = $odfHandler->setSegment('photos');
-            } catch (OdfException $e) {
+            } catch (OdfException|OdfExceptionSegmentNotFound $e) {
                 // We may arrive here if tags for lines not present into template.
                 $foundTagForLines = 0;
                 $listLines = '';

diff --git a/core/modules/digiquali/digiqualidocuments/surveydocument/doc_surveydocument_odt.modules.php b/core/modules/digiquali/digiqualidocuments/surveydocument/doc_surveydocument_odt.modules.php
@@ -39,17 +39,6 @@
  */
 class doc_surveydocument_odt extends SaturneDocumentModel
 {
-    /**
-     * @var array Minimum version of PHP required by module
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
-     */
-    public $phpmin = [7, 4];
-
-    /**
-     * @var string Dolibarr version of the loaded document
-     */
-    public string $version = 'dolibarr';
-
     /**
      * @var string Module
      */
@@ -106,7 +95,7 @@ public function fillTagsLines(Odf $odfHandler, Translate $outputLangs, array $mo
             $foundTagForLines = 1;
             try {
                 $listLines = $odfHandler->setSegment('questions');
-            } catch (OdfException $e) {
+            } catch (OdfException|OdfExceptionSegmentNotFound $e) {
                 // We may arrive here if tags for lines not present into template
                 $foundTagForLines = 0;
                 $listLines        = '';
@@ -185,7 +174,7 @@ public function fillTagsLines(Odf $odfHandler, Translate $outputLangs, array $mo
             $foundTagForLines = 1;
             try {
                 $listLines = $odfHandler->setSegment('photos');
-            } catch (OdfException $e) {
+            } catch (OdfException|OdfExceptionSegmentNotFound $e) {
                 // We may arrive here if tags for lines not present into template
                 $foundTagForLines = 0;
                 $listLines        = '';

diff --git a/core/modules/modDigiQuali.class.php b/core/modules/modDigiQuali.class.php
@@ -77,7 +77,7 @@ public function __construct($db)
 		$this->editor_url = 'https://evarisk.com/';
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = '1.11.0';
+		$this->version = '1.12.0';
 		// Url to the file with your last numberversion of this module
 		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
 

diff --git a/core/tpl/digiquali_answers.tpl.php b/core/tpl/digiquali_answers.tpl.php
@@ -91,8 +91,9 @@
                     <?php if ($question->authorize_answer_photo > 0) : ?>
                         <div class="table-cell table-full linked-medias answer_photo_<?php echo $question->id ?>">
                             <?php if ($object->status == 0 ) : ?>
-                                <input hidden multiple class="fast-upload" id="fast-upload-answer-photo<?php echo $question->id ?>" type="file" name="userfile[]" capture="environment" accept="image/*">
+                                <input hidden multiple class="fast-upload<?php echo getDolGlobalInt('SATURNE_USE_FAST_UPLOAD_IMPROVEMENT') ? '-improvement' : ''; ?>" id="fast-upload-answer-photo<?php echo $question->id ?>" type="file" name="userfile[]" capture="environment" accept="image/*">
                                 <input type="hidden" class="question-answer-photo" id="answer_photo_<?php echo $question->id ?>" name="answer_photo_<?php echo $question->id ?>" value=""/>
+                                <input type="hidden" class="fast-upload-options" data-from-subtype="answer_photo_<?php echo $question->id ?>" data-from-subdir="answer_photo/<?php echo $question->ref ?>"/>
                                 <label for="fast-upload-answer-photo<?php echo $question->id ?>">
                                     <div class="wpeo-button button-square-50">
                                         <i class="fas fa-camera"></i><i class="fas fa-plus-circle button-add"></i>

diff --git a/core/triggers/interface_99_modDigiQuali_DigiQualiTriggers.class.php b/core/triggers/interface_99_modDigiQuali_DigiQualiTriggers.class.php
@@ -49,7 +49,7 @@ public function __construct($db)
 		$this->name        = preg_replace('/^Interface/i', '', get_class($this));
 		$this->family      = 'demo';
 		$this->description = 'DigiQuali triggers.';
-		$this->version     = '1.11.0';
+		$this->version     = '1.12.0';
 		$this->picto       = 'digiquali@digiquali';
 	}
 

diff --git a/lib/digiquali_sheet.lib.php b/lib/digiquali_sheet.lib.php
@@ -354,9 +354,9 @@ function get_sheet_linkable_objects(): array
 	}
 	$hookmanager->initHooks(['get_sheet_linkable_objects']);
 
-	$reshook = $hookmanager->executeHooks('extendSheetLinkableObjectsList', $linkableObjectTypes);
+	$resHook = $hookmanager->executeHooks('extendSheetLinkableObjectsList', $linkableObjectTypes);
 
-	if ($reshook && (is_array($hookmanager->resArray) && !empty($hookmanager->resArray))) {
+	if (empty($resHook) && is_array($hookmanager->resArray) && !empty($hookmanager->resArray)) {
 		$linkableObjectTypes = $hookmanager->resArray;
 	}
 

diff --git a/public/control/public_control.php b/public/control/public_control.php
@@ -22,9 +22,6 @@
  * \brief   Public page to view control.
  */
 
-if (!defined('NOREQUIREUSER')) {
-	define('NOREQUIREUSER', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }