MDL-19489 - add conditional branching (my first try)

mod/feedback/complete.php

@@ -249,6 +249,9 @@ if($feedback_can_submit) {
             if($gopage <= 0) {
                 $startposition = 0;
             }else {
+                if(!isset($allbreaks[$gopage - 1])) {
+                    $gopage = count($allbreaks);
+                }
                 $startposition = $allbreaks[$gopage - 1];
             }
             $ispagebreak = true;
@@ -392,7 +395,23 @@ if($feedback_can_submit) {
                         }
                         $startitem = $feedbackitem;
                     }
-                echo $OUTPUT->box_start('feedback_item_box_'.$align);
+                    
+                    if($feedbackitem->dependitem > 0) {
+                        //chech if the conditions are ok
+                        if(!isset($feedbackcompletedtmp->id) OR !feedback_compare_item_value($feedbackcompletedtmp->id, $feedbackitem->dependitem, $feedbackitem->dependvalue, true)) {
+                            $lastitem = $feedbackitem;
+                            $lastbreakposition = $feedbackitem->position;
+                            continue;
+                        }
+                    }
+                    
+                    if($feedbackitem->dependitem > 0) {
+                        $dependstyle = ' feedback_complete_depend';
+                    }else {
+                        $dependstyle = '';
+                    }
+                    
+                    echo $OUTPUT->box_start('feedback_item_box_'.$align.$dependstyle);
                         $value = '';
                         //get the value
                         $frmvaluename = $feedbackitem->typ . '_'. $feedbackitem->id;

mod/feedback/complete_guest.php

@@ -230,11 +230,13 @@ if($feedback_can_submit) {
             }
         }
 
-
         if($allbreaks = feedback_get_all_break_positions($feedback->id)){
             if($gopage <= 0) {
                 $startposition = 0;
             }else {
+                if(!isset($allbreaks[$gopage - 1])) {
+                    $gopage = count($allbreaks);
+                }
                 $startposition = $allbreaks[$gopage - 1];
             }
             $ispagebreak = true;
@@ -246,6 +248,7 @@ if($feedback_can_submit) {
 
         //get the feedbackitems after the last shown pagebreak
         $feedbackitems = $DB->get_records_select('feedback_item', 'feedback = ? AND position > ?', array($feedback->id, $startposition), 'position');
+
         //get the first pagebreak
         if($pagebreaks = $DB->get_records('feedback_item', array('feedback'=>$feedback->id, 'typ'=>'pagebreak'), 'position')) {
             $pagebreaks = array_values($pagebreaks);
@@ -346,7 +349,23 @@ if($feedback_can_submit) {
                         }
                         $startitem = $feedbackitem;
                     }
-                echo $OUTPUT->box_start('feedback_item_box_'.$align);
+                    
+                    if($feedbackitem->dependitem > 0) {
+                        //chech if the conditions are ok
+                        if(!isset($feedbackcompletedtmp->id) OR !feedback_compare_item_value($feedbackcompletedtmp->id, $feedbackitem->dependitem, $feedbackitem->dependvalue, true)) {
+                            $lastitem = $feedbackitem;
+                            $lastbreakposition = $feedbackitem->position;
+                            continue;
+                        }
+                    }
+                    
+                    if($feedbackitem->dependitem > 0) {
+                        $dependstyle = ' feedback_complete_depend';
+                    }else {
+                        $dependstyle = '';
+                    }
+                    
+                    echo $OUTPUT->box_start('feedback_item_box_'.$align.$dependstyle);
                         $value = '';
                         //get the value
                         $frmvaluename = $feedbackitem->typ . '_'. $feedbackitem->id;

mod/feedback/db/install.xml

@@ -55,8 +55,10 @@
         <FIELD NAME="typ" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" PREVIOUS="presentation" NEXT="hasvalue"/>
         <FIELD NAME="hasvalue" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" PREVIOUS="typ" NEXT="position"/>
         <FIELD NAME="position" TYPE="int" LENGTH="3" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" PREVIOUS="hasvalue" NEXT="required"/>
-        <FIELD NAME="required" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" PREVIOUS="position" NEXT="options"/>
+        <FIELD NAME="required" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" PREVIOUS="position" NEXT="dependitem"/>
-        <FIELD NAME="options" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" PREVIOUS="required"/>
+        <FIELD NAME="dependitem" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" PREVIOUS="required" NEXT="dependvalue"/>
+        <FIELD NAME="dependvalue" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" PREVIOUS="dependitem" NEXT="options"/>
+        <FIELD NAME="options" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" PREVIOUS="dependvalue"/>
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for feedback_item" NEXT="feedback"/>

mod/feedback/db/upgrade.php

@@ -301,6 +301,26 @@ function xmldb_feedback_upgrade($oldversion) {
         upgrade_mod_savepoint($result, 2010051101, 'feedback');
     }
 
+    if ($result && $oldversion < 2010051600) {
+        /// Define field options to be added to feedback_item
+        $table = new xmldb_table('feedback_item');
+        $field = new xmldb_field('dependitem', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'required');
+        /// Launch add field
+        $dbman->add_field($table, $field);
+
+        upgrade_mod_savepoint($result, 2010051600, 'feedback');
+    }
+
+    if ($result && $oldversion < 2010051601) {
+        /// Define field options to be added to feedback_item
+        $table = new xmldb_table('feedback_item');
+        $field = new xmldb_field('dependvalue', XMLDB_TYPE_CHAR, '255', null, null, false, '', 'dependitem');
+        /// Launch add field
+        $dbman->add_field($table, $field);
+
+        upgrade_mod_savepoint($result, 2010051601, 'feedback');
+    }
+
     return $result;
 }
 

mod/feedback/edit.php

@@ -253,7 +253,12 @@ if($do_show == 'edit') {
                 if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->movingitem == $feedbackitem->id){ //hiding the item to move
                     continue;
                 }
-                echo $OUTPUT->box_start('feedback_item_box_'.$align);
+                if($feedbackitem->dependitem > 0) {
+                    $dependstyle = ' feedback_depend';
+                }else {
+                    $dependstyle = '';
+                }
+                echo $OUTPUT->box_start('feedback_item_box_'.$align.$dependstyle);
                     //items without value only are labels
                     if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
                         $itemnr++;

mod/feedback/export.php

@@ -71,6 +71,16 @@ function feedback_get_xml_data($feedbackid) {
             //start of item
             $data .= $space.$space.'<ITEM TYPE="'.$item->typ.'" REQUIRED="'.$item->required.'">'."\n";
 
+            //start of itemid
+            $data .= $space.$space.$space.'<ITEMID>'."\n";
+            //start of CDATA
+            $data .= $space.$space.$space.$space.'<![CDATA[';
+            $data .= $item->id;
+            //end of CDATA
+            $data .= ']]>'."\n";
+            //end of itemid
+            $data .= $space.$space.$space.'</ITEMID>'."\n";
+
             //start of itemtext
             $data .= $space.$space.$space.'<ITEMTEXT>'."\n";
             //start of CDATA
@@ -111,6 +121,26 @@ function feedback_get_xml_data($feedbackid) {
             //end of options
             $data .= $space.$space.$space.'</OPTIONS>'."\n";
 
+            //start of dependitem
+            $data .= $space.$space.$space.'<DEPENDITEM>'."\n";
+            //start of CDATA
+            $data .= $space.$space.$space.$space.'<![CDATA[';
+            $data .= $item->dependitem;
+            //end of CDATA
+            $data .= ']]>'."\n";
+            //end of dependitem
+            $data .= $space.$space.$space.'</DEPENDITEM>'."\n";
+
+            //start of dependvalue
+            $data .= $space.$space.$space.'<DEPENDVALUE>'."\n";
+            //start of CDATA
+            $data .= $space.$space.$space.$space.'<![CDATA[';
+            $data .= $item->dependvalue;
+            //end of CDATA
+            $data .= ']]>'."\n";
+            //end of dependvalue
+            $data .= $space.$space.$space.'</DEPENDVALUE>'."\n";
+
             //end of item
             $data .= $space.$space.'</ITEM>'."\n";
         }

mod/feedback/import.php

@@ -163,6 +163,10 @@
             $position = $DB->count_records('feedback_item', array('feedback'=>$feedbackid));
         }
 
+        //depend items we are storing temporary in an mapping list array(new id => dependitem)
+        //we also store a mapping of all items array(oldid => newid)
+        $dependitemsmap = array();
+        $itembackup = array();
         foreach($data as $item) {
             $position++;
             //check the typ
@@ -229,6 +233,18 @@
                     break;
             }
             
+            if(isset($item['#']['DEPENDITEM'][0]['#'])) {
+                $newitem->dependitem = intval($item['#']['DEPENDITEM'][0]['#']);
+            }else {
+                $newitem->dependitem = 0;
+            }
+            if(isset($item['#']['DEPENDVALUE'][0]['#'])) {
+                $newitem->dependvalue = trim($item['#']['DEPENDVALUE'][0]['#']);
+            }else {
+                $newitem->dependvalue = '';
+            }
+            $olditemid = intval($item['#']['ITEMID'][0]['#']);
+            
             if($typ != 'pagebreak') {
                 $newitem->hasvalue = $itemobj->get_hasvalue();
             }else {
@@ -236,8 +252,21 @@
             }
             $newitem->required = intval($item['@']['REQUIRED']);
             $newitem->position = $position;
-            $DB->insert_record('feedback_item', $newitem);
+            $newid = $DB->insert_record('feedback_item', $newitem);
+            
+            $itembackup[$olditemid] = $newid;
+            if($newitem->dependitem) {
+                $dependitemsmap[$newid] = $newitem->dependitem;
             }
+
+        }
+        //remapping the dependency
+        foreach($dependitemsmap as $key => $dependitem) {
+            $newitem = $DB->get_record('feedback_item', array('id'=>$key));
+            $newitem->dependitem = $itembackup[$newitem->dependitem];
+            $DB->update_record('feedback_item', $newitem);
+        }    
+        
         return $error;
     }
 

mod/feedback/import_form.php

@@ -24,8 +24,8 @@ class feedback_import_form extends moodleform {
         $strnodeleteolditmes = get_string('append_new_items', 'feedback').' ('.get_string('oldvaluespreserved','feedback').')';
         
         $deleteolditemsarray = array();
-        $mform->addElement('radio', 'deleteolditems', $strdeleteolditmes, '', true);
+        $mform->addElement('radio', 'deleteolditems', '', $strdeleteolditmes, true);
-        $mform->addElement('radio', 'deleteolditems', $strnodeleteolditmes);
+        $mform->addElement('radio', 'deleteolditems', '', $strnodeleteolditmes);
         $mform->addGroup($deleteolditemsarray, 'deleteolditemsarray', '', array(''), false);
 
         // hidden elements

mod/feedback/item/captcha/captcha_form.php

@@ -28,6 +28,22 @@ class feedback_captcha_form extends feedback_item_form {
         ////////////////////////////////////////////////////////////////////////
         //the following is used in all itemforms
         ////////////////////////////////////////////////////////////////////////
+        //itemdepending
+        if($common['items']) {
+            $mform->addElement('select',
+                                'dependitem',
+                                get_string('dependitem', 'feedback').' ',
+                                $common['items']
+                                );
+            $mform->addHelpButton('dependitem', 'depending', 'feedback');
+            $mform->addElement('text', 'dependvalue', get_string('dependvalue', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
+        }else {
+            $mform->addElement('hidden', 'dependitem', 0);
+            $mform->setType('dependitem', PARAM_INT);
+            $mform->addElement('hidden', 'dependvalue', '');
+            $mform->setType('dependitem', PARAM_ALPHA);
+        }
+
         $position_select = $mform->addElement('select',
                                             'position',
                                             get_string('position', 'feedback').' ',
@@ -47,11 +63,8 @@ class feedback_captcha_form extends feedback_item_form {
         $mform->addElement('hidden', 'template', 0);
         $mform->setType('template', PARAM_INT);
         
-        $mform->addElement('hidden', 'name', 'label');
+        $mform->setType('name', PARAM_RAW);
-        $mform->setType('template', PARAM_ALPHA);
+        $mform->setType('label', PARAM_ALPHANUM);
-        
-        $mform->addElement('hidden', 'label', '-');
-        $mform->setType('label', PARAM_ALPHA);
         
         $mform->addElement('hidden', 'typ', $this->type);
         $mform->setType('typ', PARAM_ALPHA);

mod/feedback/item/captcha/lib.php

@@ -33,9 +33,12 @@ class feedback_item_captcha extends feedback_item_base {
         $item->presentation = empty($item->presentation) ? 3 : $item->presentation;
         $item->required = 1;
 
+        //all items for dependitem
+        $feedbackitems = feedback_get_depend_candidates_for_item($feedback, $item);
         $commonparams = array('cmid'=>$cm->id,
                              'id'=>isset($item->id) ? $item->id : NULL,
                              'typ'=>$item->typ,
+                             'items'=>$feedbackitems,
                              'feedback'=>$feedback->id);
 
         //build the form
@@ -129,6 +132,11 @@ class feedback_item_captcha extends feedback_item_base {
         echo '<div class="feedback_item_label_'.$align.'">';
         echo '('.$item->label.') ';
         echo format_text($item->name.$requiredmark, true, false, false);
+        if($item->dependitem) {
+            if($dependitem = $DB->get_record('feedback_item', array('id'=>$item->dependitem))) {
+                echo ' <span class="feedback_depend">('.$dependitem->label.'-&gt;'.$item->dependvalue.')</span>';
+            }
+        }
         echo '</div>';
         
         //print the presentation
@@ -269,6 +277,16 @@ class feedback_item_captcha extends feedback_item_base {
         return $data;
     }
 
+    //compares the dbvalue with the dependvalue
+    //dbvalue is value stored in the db
+    //dependvalue is the value to check
+    function compare_value($item, $dbvalue, $dependvalue) {
+        if($dbvalue == $dependvalue) {
+            return true;
+        }
+        return false;
+    }
+    
     function get_presentation($data) {
         return $data->count_of_nums;
     }

mod/feedback/item/info/info_form.php

@@ -30,6 +30,22 @@ class feedback_info_form extends feedback_item_form {
         ////////////////////////////////////////////////////////////////////////
         //the following is used in all itemforms
         ////////////////////////////////////////////////////////////////////////
+        //itemdepending
+        if($common['items']) {
+            $mform->addElement('select',
+                                'dependitem',
+                                get_string('dependitem', 'feedback').' ',
+                                $common['items']
+                                );
+            $mform->addHelpButton('dependitem', 'depending', 'feedback');
+            $mform->addElement('text', 'dependvalue', get_string('dependvalue', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
+        }else {
+            $mform->addElement('hidden', 'dependitem', 0);
+            $mform->setType('dependitem', PARAM_INT);
+            $mform->addElement('hidden', 'dependvalue', '');
+            $mform->setType('dependitem', PARAM_ALPHA);
+        }
+
         $position_select = $mform->addElement('select',
                                             'position',
                                             get_string('position', 'feedback').' ',
@@ -49,11 +65,8 @@ class feedback_info_form extends feedback_item_form {
         $mform->addElement('hidden', 'template', 0);
         $mform->setType('template', PARAM_INT);
         
-        $mform->addElement('hidden', 'name', 'label');
+        $mform->setType('name', PARAM_RAW);
-        $mform->setType('template', PARAM_ALPHA);
+        $mform->setType('label', PARAM_ALPHANUM);
-        
-        $mform->addElement('hidden', 'label', '-');
-        $mform->setType('label', PARAM_ALPHA);
         
         $mform->addElement('hidden', 'typ', $this->type);
         $mform->setType('typ', PARAM_ALPHA);

mod/feedback/item/info/lib.php

@@ -33,9 +33,12 @@ class feedback_item_info extends feedback_item_base {
         $item->presentation = empty($item->presentation) ? 1 : $item->presentation;
         $item->required = 0;
 
+        //all items for dependitem
+        $feedbackitems = feedback_get_depend_candidates_for_item($feedback, $item);
         $commonparams = array('cmid'=>$cm->id,
                              'id'=>isset($item->id) ? $item->id : NULL,
                              'typ'=>$item->typ,
+                             'items'=>$feedbackitems,
                              'feedback'=>$feedback->id);
 
         //build the form
@@ -186,6 +189,11 @@ class feedback_item_info extends feedback_item_base {
         echo '<div class="feedback_item_label_'.$align.'">';
         echo '('.$item->label.') ';
         echo format_text($item->name.$requiredmark, true, false, false);
+        if($item->dependitem) {
+            if($dependitem = $DB->get_record('feedback_item', array('id'=>$item->dependitem))) {
+                echo ' <span class="feedback_depend">('.$dependitem->label.'-&gt;'.$item->dependvalue.')</span>';
+            }
+        }
         echo '</div>';
         //print the presentation
         echo '<div class="feedback_item_presentation_'.$align.'">';
@@ -281,6 +289,16 @@ class feedback_item_info extends feedback_item_base {
         return $data;
     }
 
+    //compares the dbvalue with the dependvalue
+    //the values can be the shortname of a course or the category name
+    //the date is not compareable :(.
+    function compare_value($item, $dbvalue, $dependvalue) {
+        if($dbvalue == $dependvalue) {
+            return true;
+        }
+        return false;
+    }
+    
     function get_presentation($data) {
         return $data->infotype;
     }

mod/feedback/item/label/label_form.php

@@ -35,6 +35,22 @@ class feedback_label_form extends feedback_item_form {
         ////////////////////////////////////////////////////////////////////////
         //the following is used in all itemforms
         ////////////////////////////////////////////////////////////////////////
+        //itemdepending
+        if($common['items']) {
+            $mform->addElement('select',
+                                'dependitem',
+                                get_string('dependitem', 'feedback').' ',
+                                $common['items']
+                                );
+            $mform->addHelpButton('dependitem', 'depending', 'feedback');
+            $mform->addElement('text', 'dependvalue', get_string('dependvalue', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
+        }else {
+            $mform->addElement('hidden', 'dependitem', 0);
+            $mform->setType('dependitem', PARAM_INT);
+            $mform->addElement('hidden', 'dependvalue', '');
+            $mform->setType('dependitem', PARAM_ALPHA);
+        }
+
         $position_select = $mform->addElement('select',
                                             'position',
                                             get_string('position', 'feedback').' ',

mod/feedback/item/label/lib.php

@@ -34,9 +34,12 @@ class feedback_item_label extends feedback_item_base {
         //the elements for position dropdownlist
         $positionlist = array_slice(range(0,$i_formselect_last),1,$i_formselect_last,true);
 
+        //all items for dependitem
+        $feedbackitems = feedback_get_depend_candidates_for_item($feedback, $item);
         $commonparams = array('cmid'=>$cm->id,
                              'id'=>isset($item->id) ? $item->id : NULL,
                              'typ'=>$item->typ,
+                             'items'=>$feedbackitems,
                              'feedback'=>$feedback->id);
 
         $this->context = get_context_instance(CONTEXT_MODULE, $cm->id);
@@ -128,6 +131,13 @@ class feedback_item_label extends feedback_item_base {
      * @return void
      */
     function print_item_preview($item) {
+        global $OUTPUT, $DB;
+        
+        if($item->dependitem) {
+            if($dependitem = $DB->get_record('feedback_item', array('id'=>$item->dependitem))) {
+                echo ' <span class="feedback_depend">('.$dependitem->label.'-&gt;'.$item->dependvalue.')</span>';
+            }
+        }
         $this->print_item($item);
     }
     
@@ -160,6 +170,10 @@ class feedback_item_label extends feedback_item_base {
         return false;
     }
 
+    function compare_value($item, $dbvalue, $dependvalue) {
+        return false;
+    }
+    
     //used by create_item and update_item functions,
     //when provided $data submitted from feedback_show_edit
     function get_presentation($data) {

mod/feedback/item/multichoice/lib.php

@@ -42,9 +42,12 @@ class feedback_item_multichoice extends feedback_item_base {
         $item->ignoreempty = $this->ignoreempty($item);
         $item->hidenoselect = $this->hidenoselect($item);
         
+        //all items for dependitem
+        $feedbackitems = feedback_get_depend_candidates_for_item($feedback, $item);
         $commonparams = array('cmid'=>$cm->id,
                              'id'=>isset($item->id) ? $item->id : NULL,
                              'typ'=>$item->typ,
+                             'items'=>$feedbackitems,
                              'feedback'=>$feedback->id);
 
         //build the form
@@ -248,7 +251,7 @@ class feedback_item_multichoice extends feedback_item_base {
      * @return void
      */
     function print_item_preview($item) {
-        global $OUTPUT;
+        global $OUTPUT, $DB;
         $info = $this->get_info($item);
         $align = right_to_left() ? 'right' : 'left';
 
@@ -263,6 +266,11 @@ class feedback_item_multichoice extends feedback_item_base {
         echo '<div class="feedback_item_label_'.$align.'">';
         echo '('.$item->label.') ';
         echo format_text($item->name.$requiredmark, true, false, false);
+        if($item->dependitem) {
+            if($dependitem = $DB->get_record('feedback_item', array('id'=>$item->dependitem))) {
+                echo ' <span class="feedback_depend">('.$dependitem->label.'-&gt;'.$item->dependvalue.')</span>';
+            }
+        }
         echo '</div>';
         
         //print the presentation
@@ -478,6 +486,31 @@ class feedback_item_multichoice extends feedback_item_base {
         return trim($this->item_arrayToString($vallist));
     }
     
+    //compares the dbvalue with the dependvalue
+    //dbvalue is the number of one selection
+    //dependvalue is the presentation of one selection
+    function compare_value($item, $dbvalue, $dependvalue) {
+
+        if (is_array($dbvalue)) {
+            $dbvalues = $dbvalue;
+        }else {
+            $dbvalues = explode(FEEDBACK_MULTICHOICE_LINE_SEP, $dbvalue);
+        }
+        
+        $info = $this->get_info($item);
+        $presentation = explode (FEEDBACK_MULTICHOICE_LINE_SEP, $info->presentation);
+        $index = 1;
+        foreach($presentation as $pres) {
+            foreach($dbvalues as $dbval) {
+                if($dbval == $index AND trim($pres) == $dependvalue) {
+                    return true;
+                }
+            }
+            $index++;
+        }
+        return false;
+    }
+    
     function get_presentation($data) {
         $present = str_replace("\n", FEEDBACK_MULTICHOICE_LINE_SEP, trim($data->itemvalues));
         if(!isset($data->subtype)) {

mod/feedback/item/multichoice/multichoice_form.php

@@ -32,6 +32,7 @@ class feedback_multichoice_form extends feedback_item_form {
                                   'c'=>get_string('check', 'feedback'),
                                   'd'=>get_string('dropdown', 'feedback')));
 
+        
         $mform->addElement('selectyesno', 'ignoreempty', get_string('do_not_analyse_empty_submits', 'feedback'));
         $mform->addElement('selectyesno', 'hidenoselect', get_string('hide_no_select_option', 'feedback'));
         
@@ -43,6 +44,22 @@ class feedback_multichoice_form extends feedback_item_form {
         ////////////////////////////////////////////////////////////////////////
         //the following is used in all itemforms
         ////////////////////////////////////////////////////////////////////////
+        //itemdepending
+        if($common['items']) {
+            $mform->addElement('select',
+                                'dependitem',
+                                get_string('dependitem', 'feedback').' ',
+                                $common['items']
+                                );
+            $mform->addHelpButton('dependitem', 'depending', 'feedback');
+            $mform->addElement('text', 'dependvalue', get_string('dependvalue', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
+        }else {
+            $mform->addElement('hidden', 'dependitem', 0);
+            $mform->setType('dependitem', PARAM_INT);
+            $mform->addElement('hidden', 'dependvalue', '');
+            $mform->setType('dependitem', PARAM_ALPHA);
+        }
+        
         $position_select = $mform->addElement('select',
                                             'position',
                                             get_string('position', 'feedback').' ',
@@ -62,11 +79,8 @@ class feedback_multichoice_form extends feedback_item_form {
         $mform->addElement('hidden', 'template', 0);
         $mform->setType('template', PARAM_INT);
         
-        $mform->addElement('hidden', 'name', 'label');
+        $mform->setType('name', PARAM_RAW);
-        $mform->setType('template', PARAM_ALPHA);
+        $mform->setType('label', PARAM_ALPHANUM);
-        
-        $mform->addElement('hidden', 'label', '-');
-        $mform->setType('label', PARAM_ALPHA);
         
         $mform->addElement('hidden', 'typ', $this->type);
         $mform->setType('typ', PARAM_ALPHA);

mod/feedback/item/multichoicerated/lib.php

@@ -47,9 +47,12 @@ class feedback_item_multichoicerated extends feedback_item_base {
         $item->ignoreempty = $this->ignoreempty($item);
         $item->hidenoselect = $this->hidenoselect($item);
 
+        //all items for dependitem
+        $feedbackitems = feedback_get_depend_candidates_for_item($feedback, $item);
         $commonparams = array('cmid'=>$cm->id,
                              'id'=>isset($item->id) ? $item->id : NULL,
                              'typ'=>$item->typ,
+                             'items'=>$feedbackitems,
                              'feedback'=>$feedback->id);
 
         //build the form
@@ -238,7 +241,8 @@ class feedback_item_multichoicerated extends feedback_item_base {
      * @return void
      */
     function print_item_preview($item) {
-        global $OUTPUT;
+        global $OUTPUT, $DB;
+        
         $align = right_to_left() ? 'right' : 'left';
         $info = $this->get_info($item);
 
@@ -248,6 +252,11 @@ class feedback_item_multichoicerated extends feedback_item_base {
         echo '<div class="feedback_item_label_'.$align.'">';
         echo '('.$item->label.') ';
         echo format_text($item->name.$requiredmark, true, false, false);
+        if($item->dependitem) {
+            if($dependitem = $DB->get_record('feedback_item', array('id'=>$item->dependitem))) {
+                echo ' <span class="feedback_depend">('.$dependitem->label.'-&gt;'.$item->dependvalue.')</span>';
+            }
+        }
         echo '</div>';
         
         //print the presentation
@@ -352,6 +361,32 @@ class feedback_item_multichoicerated extends feedback_item_base {
         return $data;
     }
 
+    //compares the dbvalue with the dependvalue
+    //dbvalue is the number of one selection
+    //dependvalue is the presentation of one selection
+    function compare_value($item, $dbvalue, $dependvalue) {
+
+        if (is_array($dbvalue)) {
+            $dbvalues = $dbvalue;
+        }else {
+            $dbvalues = explode(FEEDBACK_MULTICHOICERATED_LINE_SEP, $dbvalue);
+        }
+        
+        $info = $this->get_info($item);
+        $presentation = explode (FEEDBACK_MULTICHOICERATED_LINE_SEP, $info->presentation);
+        $index = 1;
+        foreach($presentation as $pres) {
+            $presvalues = explode(FEEDBACK_MULTICHOICERATED_VALUE_SEP, $pres);
+
+            foreach($dbvalues as $dbval) {
+                if($dbval == $index AND trim($presvalues[1]) == $dependvalue) {
+                    return true;
+                }
+            }
+            $index++;
+        }
+        return false;
+    }
     function get_presentation($data) {
         // $present = str_replace("\n", FEEDBACK_MULTICHOICERATED_LINE_SEP, trim($data->itemvalues));
         $present = $this->prepare_presentation_values_save(trim($data->itemvalues), FEEDBACK_MULTICHOICERATED_VALUE_SEP2, FEEDBACK_MULTICHOICERATED_VALUE_SEP);

mod/feedback/item/multichoicerated/multichoicerated_form.php

@@ -42,6 +42,22 @@ class feedback_multichoicerated_form extends feedback_item_form {
         ////////////////////////////////////////////////////////////////////////
         //the following is used in all itemforms
         ////////////////////////////////////////////////////////////////////////
+        //itemdepending
+        if($common['items']) {
+            $mform->addElement('select',
+                                'dependitem',
+                                get_string('dependitem', 'feedback').' ',
+                                $common['items']
+                                );
+            $mform->addHelpButton('dependitem', 'depending', 'feedback');
+            $mform->addElement('text', 'dependvalue', get_string('dependvalue', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
+        }else {
+            $mform->addElement('hidden', 'dependitem', 0);
+            $mform->setType('dependitem', PARAM_INT);
+            $mform->addElement('hidden', 'dependvalue', '');
+            $mform->setType('dependitem', PARAM_ALPHA);
+        }
+
         $position_select = $mform->addElement('select',
                                             'position',
                                             get_string('position', 'feedback').' ',
@@ -61,11 +77,8 @@ class feedback_multichoicerated_form extends feedback_item_form {
         $mform->addElement('hidden', 'template', 0);
         $mform->setType('template', PARAM_INT);
         
-        $mform->addElement('hidden', 'name', 'label');
+        $mform->setType('name', PARAM_RAW);
-        $mform->setType('template', PARAM_ALPHA);
+        $mform->setType('label', PARAM_ALPHANUM);
-        
-        $mform->addElement('hidden', 'label', '-');
-        $mform->setType('label', PARAM_ALPHA);
         
         $mform->addElement('hidden', 'typ', $this->type);
         $mform->setType('typ', PARAM_ALPHA);

mod/feedback/item/numeric/lib.php

@@ -47,9 +47,12 @@ class feedback_item_numeric extends feedback_item_base {
         $item->rangefrom = $range_from;
         $item->rangeto = $range_to;
 
+        //all items for dependitem
+        $feedbackitems = feedback_get_depend_candidates_for_item($feedback, $item);
         $commonparams = array('cmid'=>$cm->id,
                              'id'=>isset($item->id) ? $item->id : NULL,
                              'typ'=>$item->typ,
+                             'items'=>$feedbackitems,
                              'feedback'=>$feedback->id);
 
         //build the form
@@ -184,7 +187,8 @@ class feedback_item_numeric extends feedback_item_base {
      * @return void
      */
     function print_item_preview($item) {
-        global $OUTPUT;
+        global $OUTPUT, $DB;
+        
         $align = right_to_left() ? 'right' : 'left';
 
         //get the range
@@ -198,6 +202,11 @@ class feedback_item_numeric extends feedback_item_base {
         echo '<div class="feedback_item_label_'.$align.'">';
             echo '('.$item->label.') ';
             echo format_text($item->name . $requiredmark, true, false, false);
+            if($item->dependitem) {
+                if($dependitem = $DB->get_record('feedback_item', array('id'=>$item->dependitem))) {
+                    echo ' <span class="feedback_depend">('.$dependitem->label.'-&gt;'.$item->dependvalue.')</span>';
+                }
+            }
             echo '<span class="feedback_item_numinfo">';
             switch(true) {
                 case ($range_from === '-' AND is_numeric($range_to)):
@@ -363,6 +372,16 @@ class feedback_item_numeric extends feedback_item_base {
         return $data;
     }
 
+    //compares the dbvalue with the dependvalue
+    //dbvalue is the number put in by the user
+    //dependvalue is the value that is compared
+    function compare_value($item, $dbvalue, $dependvalue) {
+        if($dbvalue == $dependvalue) {
+            return true;
+        }
+        return false;
+    }
+    
     function get_presentation($data) {
         $num1 = str_replace($this->sep_dec, FEEDBACK_DECIMAL, $data->numericrangefrom);
         if(is_numeric($num1)) {

mod/feedback/item/numeric/numeric_form.php

@@ -28,6 +28,22 @@ class feedback_numeric_form extends feedback_item_form {
         ////////////////////////////////////////////////////////////////////////
         //the following is used in all itemforms
         ////////////////////////////////////////////////////////////////////////
+        //itemdepending
+        if($common['items']) {
+            $mform->addElement('select',
+                                'dependitem',
+                                get_string('dependitem', 'feedback').' ',
+                                $common['items']
+                                );
+            $mform->addHelpButton('dependitem', 'depending', 'feedback');
+            $mform->addElement('text', 'dependvalue', get_string('dependvalue', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
+        }else {
+            $mform->addElement('hidden', 'dependitem', 0);
+            $mform->setType('dependitem', PARAM_INT);
+            $mform->addElement('hidden', 'dependvalue', '');
+            $mform->setType('dependitem', PARAM_ALPHA);
+        }
+
         $position_select = $mform->addElement('select',
                                             'position',
                                             get_string('position', 'feedback').' ',
@@ -47,11 +63,8 @@ class feedback_numeric_form extends feedback_item_form {
         $mform->addElement('hidden', 'template', 0);
         $mform->setType('template', PARAM_INT);
         
-        $mform->addElement('hidden', 'name', 'label');
+        $mform->setType('name', PARAM_RAW);
-        $mform->setType('template', PARAM_ALPHA);
+        $mform->setType('label', PARAM_ALPHANUM);
-        
-        $mform->addElement('hidden', 'label', '-');
-        $mform->setType('label', PARAM_ALPHA);
         
         $mform->addElement('hidden', 'typ', $this->type);
         $mform->setType('typ', PARAM_ALPHA);

mod/feedback/item/textarea/lib.php

@@ -38,9 +38,12 @@ class feedback_item_textarea extends feedback_item_base {
         $item->itemwidth = $itemwidth;
         $item->itemheight = $itemheight;
 
+        //all items for dependitem
+        $feedbackitems = feedback_get_depend_candidates_for_item($feedback, $item);
         $commonparams = array('cmid'=>$cm->id,
                              'id'=>isset($item->id) ? $item->id : NULL,
                              'typ'=>$item->typ,
+                             'items'=>$feedbackitems,
                              'feedback'=>$feedback->id);
 
         //build the form
@@ -152,7 +155,8 @@ class feedback_item_textarea extends feedback_item_base {
      * @return void
      */
     function print_item_preview($item) {
-        global $OUTPUT;
+        global $OUTPUT, $DB;
+        
         $align = right_to_left() ? 'right' : 'left';
 
         $presentation = explode ("|", $item->presentation);
@@ -161,6 +165,11 @@ class feedback_item_textarea extends feedback_item_base {
         echo '<div class="feedback_item_label_'.$align.'">';
         echo '('.$item->label.') ';
         echo format_text($item->name.$requiredmark, true, false, false);
+        if($item->dependitem) {
+            if($dependitem = $DB->get_record('feedback_item', array('id'=>$item->dependitem))) {
+                echo ' <span class="feedback_depend">('.$dependitem->label.'-&gt;'.$item->dependvalue.')</span>';
+            }
+        }
         echo '</div>';
 
         //print the presentation
@@ -244,6 +253,16 @@ class feedback_item_textarea extends feedback_item_base {
         return $data;
     }
 
+    //compares the dbvalue with the dependvalue
+    //dbvalue is the value put in by the user
+    //dependvalue is the value that is compared
+    function compare_value($item, $dbvalue, $dependvalue) {
+        if($dbvalue == $dependvalue) {
+            return true;
+        }
+        return false;
+    }
+    
     function get_presentation($data) {
         return $data->itemwidth . '|'. $data->itemheight;
     }

mod/feedback/item/textarea/textarea_form.php

@@ -33,6 +33,22 @@ class feedback_textarea_form extends feedback_item_form {
         ////////////////////////////////////////////////////////////////////////
         //the following is used in all itemforms
         ////////////////////////////////////////////////////////////////////////
+        //itemdepending
+        if($common['items']) {
+            $mform->addElement('select',
+                                'dependitem',
+                                get_string('dependitem', 'feedback').' ',
+                                $common['items']
+                                );
+            $mform->addHelpButton('dependitem', 'depending', 'feedback');
+            $mform->addElement('text', 'dependvalue', get_string('dependvalue', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
+        }else {
+            $mform->addElement('hidden', 'dependitem', 0);
+            $mform->setType('dependitem', PARAM_INT);
+            $mform->addElement('hidden', 'dependvalue', '');
+            $mform->setType('dependitem', PARAM_ALPHA);
+        }
+
         $position_select = $mform->addElement('select',
                                             'position',
                                             get_string('position', 'feedback').' ',
@@ -52,11 +68,8 @@ class feedback_textarea_form extends feedback_item_form {
         $mform->addElement('hidden', 'template', 0);
         $mform->setType('template', PARAM_INT);
         
-        $mform->addElement('hidden', 'name', 'label');
+        $mform->setType('name', PARAM_RAW);
-        $mform->setType('template', PARAM_ALPHA);
+        $mform->setType('label', PARAM_ALPHANUM);
-        
-        $mform->addElement('hidden', 'label', '-');
-        $mform->setType('label', PARAM_ALPHA);
         
         $mform->addElement('hidden', 'typ', $this->type);
         $mform->setType('typ', PARAM_ALPHA);

mod/feedback/item/textfield/lib.php

@@ -38,9 +38,12 @@ class feedback_item_textfield extends feedback_item_base {
         $item->itemsize = $itemsize;
         $item->itemmaxlength = $itemlength;
 
+        //all items for dependitem
+        $feedbackitems = feedback_get_depend_candidates_for_item($feedback, $item);
         $commonparams = array('cmid'=>$cm->id,
                              'id'=>isset($item->id) ? $item->id : NULL,
                              'typ'=>$item->typ,
+                             'items'=>$feedbackitems,
                              'feedback'=>$feedback->id);
 
         //build the form
@@ -149,7 +152,7 @@ class feedback_item_textfield extends feedback_item_base {
      * @return void
      */
     function print_item_preview($item) {
-        global $OUTPUT;
+        global $OUTPUT, $DB;
         $align = right_to_left() ? 'right' : 'left';
 
         $presentation = explode ("|", $item->presentation);
@@ -158,6 +161,11 @@ class feedback_item_textfield extends feedback_item_base {
         echo '<div class="feedback_item_label_'.$align.'">';
         echo '('.$item->label.') ';
         echo format_text($item->name.$requiredmark, true, false, false);
+        if($item->dependitem) {
+            if($dependitem = $DB->get_record('feedback_item', array('id'=>$item->dependitem))) {
+                echo ' <span class="feedback_depend">('.$dependitem->label.'-&gt;'.$item->dependvalue.')</span>';
+            }
+        }
         echo '</div>';
 
         //print the presentation
@@ -239,6 +247,16 @@ class feedback_item_textfield extends feedback_item_base {
         return $data;
     }
 
+    //compares the dbvalue with the dependvalue
+    //dbvalue is the value put in by the user
+    //dependvalue is the value that is compared
+    function compare_value($item, $dbvalue, $dependvalue) {
+        if($dbvalue == $dependvalue) {
+            return true;
+        }
+        return false;
+    }
+    
     function get_presentation($data) {
         return $data->itemsize . '|'. $data->itemmaxlength;
     }

mod/feedback/item/textfield/textfield_form.php

@@ -33,6 +33,22 @@ class feedback_textfield_form extends feedback_item_form {
         ////////////////////////////////////////////////////////////////////////
         //the following is used in all itemforms
         ////////////////////////////////////////////////////////////////////////
+        //itemdepending
+        if($common['items']) {
+            $mform->addElement('select',
+                                'dependitem',
+                                get_string('dependitem', 'feedback').' ',
+                                $common['items']
+                                );
+            $mform->addHelpButton('dependitem', 'depending', 'feedback');
+            $mform->addElement('text', 'dependvalue', get_string('dependvalue', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
+        }else {
+            $mform->addElement('hidden', 'dependitem', 0);
+            $mform->setType('dependitem', PARAM_INT);
+            $mform->addElement('hidden', 'dependvalue', '');
+            $mform->setType('dependitem', PARAM_ALPHA);
+        }
+
         $position_select = $mform->addElement('select',
                                             'position',
                                             get_string('position', 'feedback').' ',
@@ -52,11 +68,8 @@ class feedback_textfield_form extends feedback_item_form {
         $mform->addElement('hidden', 'template', 0);
         $mform->setType('template', PARAM_INT);
         
-        $mform->addElement('hidden', 'name', 'label');
+        $mform->setType('name', PARAM_RAW);
-        $mform->setType('template', PARAM_ALPHA);
+        $mform->setType('label', PARAM_ALPHANUM);
-        
-        $mform->addElement('hidden', 'label', '-');
-        $mform->setType('label', PARAM_ALPHA);
         
         $mform->addElement('hidden', 'typ', $this->type);
         $mform->setType('typ', PARAM_ALPHA);

mod/feedback/lang/en/feedback.php

@@ -62,6 +62,28 @@ $string['delete_item'] = 'Delete question';
 $string['delete_old_items'] = 'Delete old items';
 $string['delete_template'] = 'Delete template';
 $string['delete_templates'] = 'Delete template...';
+$string['depending'] = 'depending items';
+$string['depending_help'] = 'Depending items allow you to show items depend on values from other items.<br />
+<strong>Here an build expample to use it:</strong><br />
+<ul>
+<li>First create an item on which value other items depends.</li>
+<li>Next add a pagebreak.</li>
+<li>Next add the items depend on the item-value before<br />
+Choose in the item creation-form the item in the list "depend item" and put the needed value into the textbox "depend value".</li>
+</ul>
+<strong>The structure should looks like this:</strong>
+<ol>
+<li>Item Q: do you have a car? A: yes/no</li>
+<li>Pagebreak</li>
+<li>Item Q: what color has your car?<br />
+(this item depends on item 1 with value = yes)</li>
+<li>Item Q: why you have not a car?<br />
+(this item depends on item 1 with value = no)</li>
+<li> ... other items</li>
+</ol>
+That is all. Have fun!';
+$string['dependitem'] = 'depend item';
+$string['dependvalue'] = 'depend value';
 $string['description'] = 'Description';
 $string['do_not_analyse_empty_submits'] = 'Do not analyse empty submits';
 $string['dropdown'] = 'Multiple choice - single answer allowed (dropdownlist)';

mod/feedback/lib.php

@@ -870,7 +870,12 @@ function feedback_save_as_template($feedback, $name, $ispublic = 0) {
     $f_context = get_context_instance(CONTEXT_MODULE, $cm->id);
     
     //create items of this new template
+    //depend items we are storing temporary in an mapping list array(new id => dependitem)
+    //we also store a mapping of all items array(oldid => newid)
+    $dependitemsmap = array();
+    $itembackup = array();
     foreach($feedbackitems as $item) {
+        
         $t_item = clone($item);
         
         unset($t_item->id);
@@ -887,7 +892,21 @@ function feedback_save_as_template($feedback, $name, $ispublic = 0) {
                 $fs->create_file_from_storedfile($file_record, $ifile);
             }
         }
+        
+        $itembackup[$item->id] = $t_item->id;
+        if($t_item->dependitem) {
+            $dependitemsmap[$t_item->id] = $t_item->dependitem;
         }
+        
+    }
+    
+    //remapping the dependency
+    foreach($dependitemsmap as $key => $dependitem) {
+        $newitem = $DB->get_record('feedback_item', array('id'=>$key));
+        $newitem->dependitem = $itembackup[$newitem->dependitem];
+        $DB->update_record('feedback_item', $newitem);
+    }
+    
     return true;
 }
 
@@ -963,6 +982,11 @@ function feedback_items_from_template($feedback, $templateid, $deleteold = false
         $positionoffset = $DB->count_records('feedback_item', array('feedback'=>$feedback->id));
     }
 
+    //create items of this new template
+    //depend items we are storing temporary in an mapping list array(new id => dependitem)
+    //we also store a mapping of all items array(oldid => newid)
+    $dependitemsmap = array();
+    $itembackup = array();
     foreach($templitems as $t_item) {
         $item = clone($t_item);
         unset($item->id);
@@ -982,6 +1006,18 @@ function feedback_items_from_template($feedback, $templateid, $deleteold = false
                 $fs->create_file_from_storedfile($file_record, $tfile);
             }
         }
+        
+        $itembackup[$t_item->id] = $item->id;
+        if($item->dependitem) {
+            $dependitemsmap[$item->id] = $item->dependitem;
+        }
+    }
+    
+    //remapping the dependency
+    foreach($dependitemsmap as $key => $dependitem) {
+        $newitem = $DB->get_record('feedback_item', array('id'=>$key));
+        $newitem->dependitem = $itembackup[$newitem->dependitem];
+        $DB->update_record('feedback_item', $newitem);
     }    
 }
 
@@ -1056,6 +1092,26 @@ function feedback_load_feedback_items_options() {
     return $feedback_options;
 }
 
+function feedback_get_depend_candidates_for_item($feedback, $item) {
+    global $DB;
+    //all items for dependitem
+    $where = "feedback = ? AND typ != 'pagebreak' AND hasvalue = 1";
+    $params = array($feedback->id);
+    if(isset($item->id) AND $item->id) {
+        $where .= ' AND id != ?';
+        $params[] = $item->id;
+    }
+    $dependitems = array(0 => get_string('choose'));
+    if(!$feedbackitems = $DB->get_records_select_menu('feedback_item', $where, $params, 'position', 'id, label')) {
+        return $dependitems;
+    }
+    //adding the choose-option
+    foreach($feedbackitems as $key=>$val) {
+        $dependitems[$key] = $val;
+    }
+    return $dependitems;
+}
+
 /**
  * creates a new item-record
  *
@@ -1150,6 +1206,11 @@ function feedback_delete_item($itemid, $renumber = true){
     
     $DB->delete_records("feedback_value", array("item"=>$itemid));
     $DB->delete_records("feedback_valuetmp", array("item"=>$itemid));
+    
+    //remove all depends
+    $DB->set_field('feedback_item', 'dependvalue', '', array('dependitem'=>$itemid));
+    $DB->set_field('feedback_item', 'dependitem', 0, array('dependitem'=>$itemid));
+    
     $DB->delete_records("feedback_item", array("id"=>$itemid));
     if($renumber) {
         feedback_renumber_items($item->feedback);
@@ -1435,54 +1496,44 @@ function feedback_save_tmp_values($feedbackcompletedtmp, $feedbackcompleted, $us
     global $DB;
 
     $tmpcplid = $feedbackcompletedtmp->id;
-    if(!$feedbackcompleted) {
+    if($feedbackcompleted) {
-
-        //first we create a completedtmp
-        $newcpl = new object();
-        foreach($feedbackcompletedtmp as $key => $value) {
-            $newcpl->{$key} = $value;
-        }
-
-        unset($newcpl->id);
-        $newcpl->userid = $userid;
-        $newcpl->timemodified = time();
-        $newcpl->id = $DB->insert_record('feedback_completed', $newcpl);
-        //get all values of tmp-completed
-        if(!$values = $DB->get_records('feedback_valuetmp', array('completed'=>$feedbackcompletedtmp->id))) {
-            return false;
-        }
-
-        foreach($values as $value) {
-            unset($value->id);
-            $value->completed = $newcpl->id;
-            $DB->insert_record('feedback_value', $value);
-        }
-        //drop all the tmpvalues
-        $DB->delete_records('feedback_valuetmp', array('completed'=>$tmpcplid));
-        $DB->delete_records('feedback_completedtmp', array('id'=>$tmpcplid));
-        return $newcpl->id;
-
-    } else {
         //first drop all existing values
         $DB->delete_records('feedback_value', array('completed'=>$feedbackcompleted->id));
         //update the current completed
         $feedbackcompleted->timemodified = time();
         $DB->update_record('feedback_completed', $feedbackcompleted);
+    }else {
+        $feedbackcompleted = clone($feedbackcompletedtmp);
+        $feedbackcompleted->id = '';
+        $feedbackcompleted->userid = $userid;
+        $feedbackcompleted->timemodified = time();
+        $feedbackcompleted->id = $DB->insert_record('feedback_completed', $feedbackcompleted);
+    }
+
     //save all the new values from feedback_valuetmp
     //get all values of tmp-completed
     if(!$values = $DB->get_records('feedback_valuetmp', array('completed'=>$feedbackcompletedtmp->id))) {
         return false;
     }
     foreach($values as $value) {
+        //check if there are depend items
+        $item = $DB->get_record('feedback_item', array('id'=>$value->item));
+        if($item->dependitem > 0) {
+            $check = feedback_compare_item_value($tmpcplid, $item->dependitem, $item->dependvalue, true);
+        }else {
+            $check = true;
+        }
+        if($check) {
             unset($value->id);
             $value->completed = $feedbackcompleted->id;
             $DB->insert_record('feedback_value', $value);
         }
+    }
     //drop all the tmpvalues
     $DB->delete_records('feedback_valuetmp', array('completed'=>$tmpcplid));
     $DB->delete_records('feedback_completedtmp', array('id'=>$tmpcplid));
     return $feedbackcompleted->id;
-    }
+
 }
 
 /**
@@ -1561,7 +1612,9 @@ function feedback_get_all_break_positions($feedbackid) {
  * @return int the position of the last pagebreak
  */
 function feedback_get_last_break_position($feedbackid) {
-    if(!$allbreaks = feedback_get_all_break_positions($feedbackid)) return false;
+    if(!$allbreaks = feedback_get_all_break_positions($feedbackid)) {
+        return false;
+    }
     return $allbreaks[count($allbreaks) - 1];
 }
 
@@ -1695,6 +1748,22 @@ function feedback_get_item_value($completedid, $itemid, $tmp = false) {
     return $DB->get_field('feedback_value'.$tmpstr, 'value', array('completed'=>$completedid, 'item'=>$itemid));
 }
 
+function feedback_compare_item_value($completedid, $itemid, $dependvalue, $tmp = false) {
+    global $DB, $CFG;
+    
+    $dbvalue = feedback_get_item_value($completedid, $itemid, $tmp);
+    
+    //get the class of the given item-typ
+    $item = $DB->get_record('feedback_item', array('id'=>$itemid));
+    $itemclass = 'feedback_item_'.$item->typ;
+    if (!class_exists($itemclass)) {
+        require_once($CFG->dirroot.'/mod/feedback/item/'.$item->typ.'/lib.php');
+    }
+    //get the instance of the item-class
+    $itemobj = new $itemclass();
+    return $itemobj->compare_value($item, $dbvalue, $dependvalue); //true or false
+}
+
 /**
  * this function checks the correctness of values.
  * the rules for this are implemented in the class of each item.

mod/feedback/styles.css

@@ -16,6 +16,18 @@ span.feedback_info {
 div.feedback_item_box_left, div.feedback_item_box_right {
 }
 
+div.feedback_depend {
+	background:#DDDDDD;
+}
+
+div.feedback_complete_depend {
+	background:#EEEEEE;
+}
+
+span.feedback_depend {
+	color:#ff0000;
+}
+
 div.feedback_item_number_left, div.feedback_item_left {
 	float:left;
 }

mod/feedback/version.php

@@ -9,8 +9,8 @@
 */
 
 
-    $module->version = 2010051101; // The current module version (Date: YYYYMMDDXX)
+    $module->version = 2010051601; // The current module version (Date: YYYYMMDDXX)
-    $module->requires = 2009041700;  // Requires this Moodle version
+    $module->requires = 2010050414;  // Requires this Moodle version
     $feedback_version_intern = 1; //this version is used for restore older backups
     $module->cron = 0; // Period for cron to check this module (secs)