Force to choose the same number of proposal than of answers - refs #7878

chamilo · Oct 13, 2015 · 5321bde · 5321bde
1 parent 73a64d3
commit 5321bde
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 24 deletions.
diff --git a/main/exercice/MatchingDraggable.php b/main/exercice/MatchingDraggable.php
@@ -53,16 +53,12 @@ public function createAnswersForm($form)
         if ($form->isSubmitted()) {
             $nb_matches = $form->getSubmitValue('nb_matches');
             $nb_options = $form->getSubmitValue('nb_options');
-            if (isset($_POST['lessMatches'])) {
-                $nb_matches--;
-            }
-            if (isset($_POST['moreMatches'])) {
-                $nb_matches++;
-            }
             if (isset($_POST['lessOptions'])) {
+                $nb_matches--;
                 $nb_options--;
             }
             if (isset($_POST['moreOptions'])) {
+                $nb_matches++;
                 $nb_options++;
             }
         } else if (!empty($this->id)) {
@@ -152,12 +148,6 @@ public function createAnswersForm($form)
         $form->addHtml('</tbody></table>');
         $group = array();
 
-        $renderer->setElementTemplate('<div class="form-group"><div class="col-sm-offset-2">{element}', 'lessMatches');
-        $renderer->setElementTemplate('{element}</div></div>', 'moreMatches');
-
-        $group[] = $form->addButtonDelete(get_lang('DelElem'), 'lessMatches', true);
-        $group[] = $form->addButtonCreate(get_lang('AddElem'), 'moreMatches', true);
-
         $form->addGroup($group);
 
         // DISPLAY OPTIONS

diff --git a/main/exercice/matching.class.php b/main/exercice/matching.class.php
@@ -58,16 +58,12 @@ public function createAnswersForm($form)
         if ($form->isSubmitted()) {
             $nb_matches = $form->getSubmitValue('nb_matches');
             $nb_options = $form->getSubmitValue('nb_options');
-            if (isset($_POST['lessMatches'])) {
-                $nb_matches--;
-            }
-            if (isset($_POST['moreMatches'])) {
-                $nb_matches++;
-            }
             if (isset($_POST['lessOptions'])) {
+                $nb_matches--;
                 $nb_options--;
             }
             if (isset($_POST['moreOptions'])) {
+                $nb_matches++;
                 $nb_options++;
             }
         } else if (!empty($this->id)) {
@@ -160,12 +156,6 @@ public function createAnswersForm($form)
         $form->addHtml('</tbody></table>');
         $group = array();
 
-        $renderer->setElementTemplate('<div class="form-group"><div class="col-sm-offset-2">{element}', 'lessMatches');
-        $renderer->setElementTemplate('{element}</div></div>', 'moreMatches');
-
-        $group[] = $form->addButtonDelete(get_lang('DelElem'), 'lessMatches', true);
-        $group[] = $form->addButtonCreate(get_lang('AddElem'), 'moreMatches', true);
-
         $form->addGroup($group);
 
         // DISPLAY OPTIONS