Skills: add skills in evaluation form #13334

main/gradebook/gradebook_add_eval.php

@@ -68,6 +68,8 @@ if ($form->validate()) {
     ];
     Event::registerLog($logInfo);
 
+    Skill::saveSkills($form, ITEM_TYPE_GRADEBOOK_EVALUATION, $eval->get_id());
+
     if (null == $eval->get_course_code()) {
         if (1 == $values['adduser']) {
             //Disabling code when course code is null see issue #2705

main/gradebook/gradebook_edit_eval.php

@@ -51,7 +51,6 @@ if ($form->validate()) {
     ];
     Event::registerLog($logInfo);
 
-
     Skill::saveSkills($form, ITEM_TYPE_GRADEBOOK_EVALUATION, $values['hid_id']);
 
     header('Location: '.Category::getUrl().'editeval=&selectcat='.$eval->get_category_id());

main/gradebook/lib/fe/evalform.class.php

@@ -463,21 +463,27 @@ class EvalForm extends FormValidator
      */
     protected function build_add_form()
     {
-        $this->setDefaults(
-            [
-                'hid_user_id' => $this->evaluation_object->get_user_id(),
-                'hid_category_id' => $this->evaluation_object->get_category_id(),
-                'hid_course_code' => $this->evaluation_object->get_course_code(),
-                'created_at' => api_get_utc_datetime(),
-            ]
-        );
+        $this->setDefaults([
+            'hid_user_id' => $this->evaluation_object->get_user_id(),
+            'hid_category_id' => $this->evaluation_object->get_category_id(),
+            'hid_course_code' => $this->evaluation_object->get_course_code(),
+            'created_at' => api_get_utc_datetime(),
+        ]);
         $this->build_basic_form();
         if ($this->evaluation_object->get_course_code() == null) {
             $this->addElement('checkbox', 'adduser', null, get_lang('AddUserToEval'));
         } else {
             $this->addElement('checkbox', 'addresult', null, get_lang('AddResult'));
         }
-        $this->addButtonCreate(get_lang('AddAssessment'), 'submit');
+
+        Skill::addSkillsToForm(
+            $this,
+            api_get_course_int_id(),
+            api_get_session_id(),
+            ITEM_TYPE_GRADEBOOK_EVALUATION
+        );
+
+        $this->addButtonCreate(get_lang('AddAssessment'));
     }
 
     /**