Merge pull request #4200 from christianbeeznest/majorel-19785

Admin: Add course extra fields as mandatory - refs BT#19785

Author: NicoDucou

main/admin/course_add.php

@@ -192,8 +192,29 @@
 $obj->fill_grade_model_select_in_form($form);
 
 //Extra fields
+$setExtraFieldsMandatory = api_get_configuration_value('course_creation_form_set_extra_fields_mandatory');
+$fieldsRequired = [];
+if (false !== $setExtraFieldsMandatory && !empty($setExtraFieldsMandatory['fields'])) {
+    $fieldsRequired = $setExtraFieldsMandatory['fields'];
+}
 $extra_field = new ExtraField('course');
-$extra = $extra_field->addElements($form);
+$extra = $extra_field->addElements(
+    $form,
+    0,
+    [],
+    false,
+    false,
+    [],
+    [],
+    [],
+    false,
+    false,
+    [],
+    [],
+    false,
+    [],
+    $fieldsRequired
+);
 
 if (api_get_configuration_value('allow_course_multiple_languages')) {
     // Course Multiple language.

main/create_course/add_course.php

@@ -282,12 +282,33 @@ function MM_openBrWindow(theURL, winName, features) { //v2.0
     );
 }
 
-//Extra fields to show
+//Extra fields to show and mandatory
+$setExtraFieldsMandatory = api_get_configuration_value('course_creation_form_set_extra_fields_mandatory');
 $extraFieldsToShow = api_get_configuration_value('course_creation_by_teacher_extra_fields_to_show');
 $fillExtraField = api_get_configuration_value('course_creation_user_course_extra_field_relation_to_prefill');
 if (false !== $extraFieldsToShow && !empty($extraFieldsToShow['fields'])) {
+    $fieldsRequired = [];
+    if (false !== $setExtraFieldsMandatory && !empty($setExtraFieldsMandatory['fields'])) {
+        $fieldsRequired = $setExtraFieldsMandatory['fields'];
+    }
     $extra_field = new ExtraField('course');
-    $extra = $extra_field->addElements($form, 0, [], false, false, $extraFieldsToShow['fields']);
+    $extra = $extra_field->addElements(
+        $form,
+        0,
+        [],
+        false,
+        false,
+        $extraFieldsToShow['fields'],
+        [],
+        [],
+        false,
+        false,
+        [],
+        [],
+        false,
+        [],
+        $fieldsRequired
+    );
 
     // Relation to prefill course extra field with user extra field
     if (false !== $fillExtraField && !empty($fillExtraField['fields'])) {

main/install/configuration.dist.php

@@ -2136,6 +2136,9 @@
 // Course extra fields to be presented on main/create_course/add_course.php
 //$_configuration['course_creation_by_teacher_extra_fields_to_show'] = ['fields' => ['ExtrafieldLabel1', 'ExtrafieldLabel2']];
 
+// Configuration setting to make some extra field required in course creation form.
+//$_configuration['course_creation_form_set_extra_fields_mandatory'] = ['fields' => ['fieldLabel1','fieldLabel2']];
+
 // Course extra fields to be presented on course settings
 //$_configuration['course_configuration_tool_extra_fields_to_show_and_edit'] = ['fields' => ['ExtrafieldLabel1', 'ExtrafieldLabel2']];