Changeset 85

Timestamp:

05.01.2012 11:22:42 (18 months ago)

Author:

gnum

Message:

estimate will try to set current item now, if none found - will need to wait until anything is set to model.

Location:

trunk

Files:

• actions/digimina/test/estimate.php (modified) (1 diff)
• classes/DigiMinaTest.php (modified) (1 diff)
• views/default/forms/digimina/test/item.php (modified) (2 diffs)

trunk/actions/digimina/test/estimate.php

@@ -16 +16 @@
 
 if (($level instanceof DigiMinaPerformanceLevel) && ($level->getContainerGUID() == $dmtest->getCurrentSubCompetency())) {
+    $item = $level->getRandomItem();
+    if (!($item instanceof DigiMinaItem)) {
+        /*translation:No questions could be assigned. Please contact administrator.*/
+        register_error(elgg_echo('digimina:error:no:items:found'));
+        forward(REFERER);
+    }
     $dmtest->current_level = $level->getGUID();
+    $dmtest->current_item = $item->getGUID();
     forward('digimina/test');
 } else {

trunk/classes/DigiMinaTest.php

@@ -76 +76 @@
 
     /**
+     * Returns Item if any
+     *
+     * @return string
+     */
+    public function getCurrentItem() {
+        return $this->current_item;
+    }
+
+    /**
      * Returns next subcompetency for the test.
      * Changes competency if needed.

trunk/views/default/forms/digimina/test/item.php

@@ -14 +14 @@
 $subcompetency = $level->getContainerEntity();
 $competency = $subcompetency->getContainerEntity();
-
-// XXX This needs to be saved or something; possibly this should be set elsewhere
-$item = $level->getRandomItem();
+$item = get_entity($dmtest->getCurrentItem());
 ?>
 <h3>
@@ -30 +28 @@
             echo elgg_view_entity($item, array('full_view' => TRUE));
         } else {
-            /*translation:There are no questions assigned to current level.*/
-            echo elgg_echo('digimina:no:question:assigned');
+            /*translation:No question was assigned. Please contact administrator.*/
+            echo elgg_echo('digimina:no:question:was:assigned');
         }
     ?>