add help questions for RGPD's - refs #2763

Author: aragonc

main/admin/legal_add.php

@@ -29,6 +29,7 @@
 $extraField = new ExtraField('terms_and_condition');
 
 $types = LegalManager::getTreatmentTypeList();
+
 foreach ($types as $variable => $name) {
     $label = 'PersonalData'.ucfirst($name).'Title';
     $params = [
@@ -40,7 +41,7 @@
         'changeable' => true,
         'filter' => true,
         'visible_to_self' => true,
-        'visible_to_others' => true,
+        'visible_to_others' => true
     ];
     $extraField->save($params);
 }
@@ -153,9 +154,18 @@
         [],
         [],
         false,
+        true,
+        [],
+        [],
+        false,
+        [],
+        [],
+        false,
         true
+
     );
 
+
     $jqueryReady = $returnParams['jquery_ready_content'];
 
     $form->addElement('textarea', 'changes', get_lang('ExplainChanges'), ['width' => '20']);

main/inc/lib/extra_field.lib.php

@@ -51,7 +51,7 @@ class ExtraField extends Model
         'extra_field_type',
         //Enable this when field_loggeable is introduced as a table field (2.0)
         //'field_loggeable',
-        'created_at',
+        'created_at'
     ];
 
     public $ops = [
@@ -514,7 +514,8 @@ public function addElements(
         $addEmptyOptionSelects = false,
         $introductionTextList = [],
         $requiredFields = [],
-        $hideGeoLocalizationDetails = false
+        $hideGeoLocalizationDetails = false,
+        $help = false
     ) {
         if (empty($form)) {
             return false;
@@ -562,7 +563,8 @@ public function addElements(
             $customLabelsExtraMultipleSelect,
             $addEmptyOptionSelects,
             $introductionTextList,
-            $hideGeoLocalizationDetails
+            $hideGeoLocalizationDetails,
+            $help
         );
 
         if (!empty($requiredFields)) {
@@ -1038,7 +1040,8 @@ public function set_extra_fields_in_form(
         $customLabelsExtraMultipleSelect = [],
         $addEmptyOptionSelects = false,
         $introductionTextList = [],
-        $hideGeoLocalizationDetails = false
+        $hideGeoLocalizationDetails = false,
+        $help = false
     ) {
         $jquery_ready_content = null;
         if (!empty($extra)) {
@@ -1102,8 +1105,13 @@ public function set_extra_fields_in_form(
                 }
 
                 $translatedDisplayText = get_lang($field_details['display_text'], true);
+                $translatedDisplayHelpText = '';
+                if ($help) {
+                    $translatedDisplayHelpText .= get_lang($field_details['display_text'] . 'Help');
+                }
+                $label = [$translatedDisplayText, $translatedDisplayHelpText];
                 if (!empty($translatedDisplayText)) {
-                    $field_details['display_text'] = $translatedDisplayText;
+                    $field_details['display_text'] = $label;
                 }
 
                 switch ($field_details['field_type']) {
@@ -1129,6 +1137,7 @@ public function set_extra_fields_in_form(
                         }
                         break;
                     case self::FIELD_TYPE_TEXTAREA:
+
                         $form->addHtmlEditor(
                             'extra_'.$field_details['variable'],
                             $field_details['display_text'],
@@ -1139,6 +1148,7 @@ public function set_extra_fields_in_form(
                                 'Width' => '100%',
                                 'Height' => '130',
                                 'id' => 'extra_'.$field_details['variable'],
+
                             ]
                         );
                         $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');