merge from 18-STABLE MDL-8809

diff --git a/question/type/calculated/edit_calculated_form.php b/question/type/calculated/edit_calculated_form.php
index b52f62823a4e29a0cdb8c161da6a8cd6e4e26773..1dea97645d8daaf815e20b7d1bcfcb171a7d84dc 100644 (file)
--- a/question/type/calculated/edit_calculated_form.php
+++ b/question/type/calculated/edit_calculated_form.php
@@ -62,6 +62,9 @@ class question_edit_calculated_form extends question_edit_form {
         $repeatsatstart = $count + 1;
         $this->repeat_elements($repeated, $repeatsatstart, $repeatedoptions, 'noanswers', 'addanswers', 1, get_string('addmoreanswerblanks', 'qtype_calculated'));*/
 //------------------------------------------------------------------------------------------
+        $label = get_string("sharedwildcards", "qtype_datasetdependent");
+        $html2 = $this->qtypeobj->print_dataset_definitions_category($this->question);
+        $mform->insertElementBefore($mform->createElement('static','list',$label,$html2),'questiontext');
 
         $mform->addElement('header', 'answerhdr', get_string('answerhdr', 'qtype_calculated'));
 
@@ -73,7 +76,7 @@ class question_edit_calculated_form extends question_edit_form {
         $mform->addElement('select', 'fraction[0]', get_string('grade'), $gradeoptions);
         $mform->setDefault('fraction[0]', 0);*/
         $mform->addElement('hidden', 'fraction[0]', 1);
-        $mform->setConstants(array('fraction[0]'=>PARAM_INT));
+      //  $mform->setConstants(array('fraction[0]'=>PARAM_INT));
 
         $tolgrp = array();
         $tolgrp[] =& $mform->createElement('text', 'tolerance[0]', get_string('tolerance', 'qtype_calculated'));
@@ -170,8 +173,18 @@ class question_edit_calculated_form extends question_edit_form {
         $answercount = 0;
         //check grades
         /*$totalfraction = 0;
-        $maxfraction = -1;*/
-
+        $maxfraction = -1; */
+        $possibledatasets = $this->qtypeobj->find_dataset_names($data['questiontext']);
+        $mandatorydatasets = array();
+        foreach ($answers as $key => $answer){
+            $mandatorydatasets += $this->qtypeobj->find_dataset_names($data['questiontext']);
+        }      
+        if (count($possibledatasets) == 0 && count($mandatorydatasets )==0){
+            $errors['questiontext']=get_string('atleastonewildcard', 'qtype_datasetdependent');
+            foreach ($answers as $key => $answer){
+                $errors['answers['.$key.']'] = get_string('atleastonewildcard', 'qtype_datasetdependent');
+            }      
+        }  
         foreach ($answers as $key => $answer){
             //check no of choices
             $trimmedanswer = trim($answer);