Changeset 466 for trunk/app/models

Timestamp:

05/08/08 19:18:13 (7 months ago)

Author:

aarkerio

Message:

Forums and topics improveds

Location:

trunk/app/models

Files:

• test.php (modified) (2 diffs)
• treasure.php (modified) (1 diff)
• webquest.php (modified) (1 diff)

trunk/app/models/test.php

@@ -75 +75 @@
     return $vclassrooms;
  }
+/*
+ *  check if studen already found treasure
+ *  int treasure_id 
+ *  int user_id      
+ *  int vclassroom_id
+ *  return boolean
+ */
+ public function chk($test_id, $user_id, $vclassroom_id)
+ {
+    $conditions =  array("Result.user_id"=>$user_id, "Result.test_id"=>$test_id, "Result.vclassroom_id"=>$vclassroom_id);
+    $data       =  $this->Result->field('Result.id', $conditions);
+   
+    if ($data != null ):
+          return false;   
+    else:
+          return true;
+    endif;
+ }
 
  public function chkAnswers($answers, $test_id)
@@ -82 +100 @@
     $result = 0;
     
-    foreach($questions as $q_id => $a_id)  // question id and answer id
-    {
+    foreach($questions as $q_id => $a_id):  // question id and answer id
          $correct_answer = $this->Test->Question->Answer->field('Answer.correct', array('Answer.id'=>$a_id));   // answer was correct?
          
-         if ($correct_answer == 1)
-         {
+           if ($correct_answer == 1):
               $worth   = $this->Test->Question->field('Question.worth', array('Question.id'=>$q_id));         // how many points
               $result += $worth;
-         }
-    }
-    //exit('Result was:' . $result);
+           endif;
+     endforeach;
+    //exit('Result was:' . $result)e
     return $result; 
   }

trunk/app/models/treasure.php

@@ -42 +42 @@
  *  int treasure_id 
  *  int user_id      
+ *  int vclassroom_id
  *  return boolean
  */
- public function chk($treasure_id, $user_id)
+ public function chk($treasure_id, $user_id, $vclassroom_id)
  {
  
-   $conditons = array("ResultTreasure.user_id"=>$user_id, "ResultTreasure.treasure_id"=>$treasure_id); 
+   $conditons = array("ResultTreasure.user_id"=>$user_id, "ResultTreasure.treasure_id"=>$treasure_id, "ResultTreasure.vclassroom_id"=>$vclassroom_id); 
 
-   $data      = $this->ResultTreasure->field('ResultTreasure.id', $conditions));
+   $data      = $this->ResultTreasure->field('ResultTreasure.id', $conditions);
    
    if ($data != null ):

trunk/app/models/webquest.php

@@ -50 +50 @@
  *  return boolean
  */
-  public function chk($webquest_id, $user_id)
-  {
-    $conditions =  array("ResultWebquest.user_id"=>$user_id, "ResultWebquest.webquest_id"=>$webquest_id);
+ public function chk($webquest_id, $user_id, $vclassroom_id)
+ {
+    $conditions =  array("ResultWebquest.user_id"=>$user_id, "ResultWebquest.webquest_id"=>$webquest_id, "ResultWebquest.vclassroom_id"=>$vclassroom_id);
     $data       =  $this->ResultWebquest->field('ResultWebquest.id', $conditions);