INT-15923: Open Forums implements its own grading elements like core forums does

Author: jgg9026

mod_form.php

@@ -227,11 +227,11 @@ function definition() {
         $mform->addHelpButton('gradetype', 'gradetype', 'hsuforum');
 
         $mform->insertElementBefore($mform->removeElement('gradetype'), 'grade');
-//        $scale = $mform->insertElementBefore($mform->removeElement('scale'), 'grade');
-//        $scale->setLabel(get_string('grade'));
-//
-//        // Done abusing this poor fellow...
-//        $mform->removeElement('grade');
+        $scale = $mform->insertElementBefore($mform->removeElement('scale'), 'grade');
+        $scale->setLabel(get_string('grade'));
+
+        // Done abusing this poor fellow...
+        $mform->removeElement('grade');
 
         if ($this->_features->advancedgrading) {
             foreach ($this->current->_advancedgradingdata['areas'] as $areaname => $areadata) {
@@ -266,10 +266,100 @@ function definition() {
 
     function standard_grading_coursemodule_elements() {
         $this->_features->rating = false;
-        parent::standard_grading_coursemodule_elements();
+        $this->standard_hsuforum_grading_coursemodule_elements();
         $this->_features->rating = true;
     }
 
+    public function standard_hsuforum_grading_coursemodule_elements() {
+        global $COURSE, $CFG;
+        $mform =& $this->_form;
+        $isupdate = !empty($this->_cm);
+        $gradeoptions = array('isupdate' => $isupdate,
+            'currentgrade' => false,
+            'hasgrades' => false,
+            'canrescale' => $this->_features->canrescale,
+            'useratings' => $this->_features->rating);
+
+        if ($this->_features->hasgrades) {
+
+            if (!$this->_features->rating || $this->_features->gradecat) {
+                $mform->addElement('header', 'modstandardgrade', get_string('grade'));
+            }
+
+            //if supports grades and grades arent being handled via ratings
+            if (!$this->_features->rating) {
+
+                if ($isupdate) {
+                    $gradeitem = grade_item::fetch(array('itemtype' => 'mod',
+                        'itemmodule' => $this->_cm->modname,
+                        'iteminstance' => $this->_cm->instance,
+                        'itemnumber' => 0,
+                        'courseid' => $COURSE->id));
+                    if ($gradeitem) {
+                        $gradeoptions['currentgrade'] = $gradeitem->grademax;
+                        $gradeoptions['currentgradetype'] = $gradeitem->gradetype;
+                        $gradeoptions['currentscaleid'] = $gradeitem->scaleid;
+                        $gradeoptions['hasgrades'] = $gradeitem->has_grades();
+                    }
+                }
+                $mform->addElement('modgrade', 'grade', get_string('grade'), $gradeoptions);
+                $mform->addHelpButton('grade', 'modgrade', 'grades');
+                $mform->setDefault('grade', $CFG->gradepointdefault);
+            }
+
+            if ($this->_features->advancedgrading
+                and !empty($this->current->_advancedgradingdata['methods'])
+                and !empty($this->current->_advancedgradingdata['areas'])) {
+
+                if (count($this->current->_advancedgradingdata['areas']) == 1) {
+                    // if there is just one gradable area (most cases), display just the selector
+                    // without its name to make UI simplier
+                    $areadata = reset($this->current->_advancedgradingdata['areas']);
+                    $areaname = key($this->current->_advancedgradingdata['areas']);
+                    $mform->addElement('select', 'advancedgradingmethod_'.$areaname,
+                        get_string('gradingmethod', 'core_grading'), $this->current->_advancedgradingdata['methods']);
+                    $mform->addHelpButton('advancedgradingmethod_'.$areaname, 'gradingmethod', 'core_grading');
+                    if (!$this->_features->rating) {
+                        $mform->hideIf('advancedgradingmethod_'.$areaname, 'grade[modgrade_type]', 'eq', 'none');
+                    }
+
+                } else {
+                    // the module defines multiple gradable areas, display a selector
+                    // for each of them together with a name of the area
+                    $areasgroup = array();
+                    foreach ($this->current->_advancedgradingdata['areas'] as $areaname => $areadata) {
+                        $areasgroup[] = $mform->createElement('select', 'advancedgradingmethod_'.$areaname,
+                            $areadata['title'], $this->current->_advancedgradingdata['methods']);
+                        $areasgroup[] = $mform->createElement('static', 'advancedgradingareaname_'.$areaname, '', $areadata['title']);
+                    }
+                    $mform->addGroup($areasgroup, 'advancedgradingmethodsgroup', get_string('gradingmethods', 'core_grading'),
+                        array(' ', '<br />'), false);
+                }
+            }
+
+            if ($this->_features->gradecat) {
+                $mform->addElement('select', 'gradecat',
+                    get_string('gradecategoryonmodform', 'grades'),
+                    grade_get_categories_menu($COURSE->id, $this->_outcomesused));
+                $mform->addHelpButton('gradecat', 'gradecategoryonmodform', 'grades');
+                if (!$this->_features->rating) {
+                    $mform->hideIf('gradecat', 'grade[modgrade_type]', 'eq', 'none');
+                }
+            }
+
+            // Grade to pass.
+            $mform->addElement('text', 'gradepass', get_string('gradepass', 'grades'));
+            $mform->addHelpButton('gradepass', 'gradepass', 'grades');
+            $mform->setDefault('gradepass', '');
+            $mform->setType('gradepass', PARAM_RAW);
+            if (!$this->_features->rating) {
+                $mform->hideIf('gradepass', 'grade[modgrade_type]', 'eq', 'none');
+            } else {
+                $mform->hideIf('gradepass', 'assessed', 'eq', '0');
+            }
+        }
+    }
+
     function definition_after_data() {
         $this->_features->rating = false;
         parent::definition_after_data();

tests/lib_test.php

@@ -3607,7 +3607,6 @@ public function test_hsuforum_word_count() {
      */
 
     public function test_hsuforum_scale_dependency_form() {
-        $this->markTestSkipped('Skipped since the 3.8 grade API changes, the scale property was removed. To be fixed in INT-15881');
         $this->resetAfterTest();
         $this->setAdminUser();
         $course = get_course(1);