Changeset 578 for trunk/app/models

Timestamp:

06/02/08 09:10:21 (6 months ago)

Author:

aarkerio

Message:

Update

Files:

• trunk/app/models/test.php (modified) (1 diff)

trunk/app/models/test.php

@@ -116 +116 @@
  }
 
- public function getTest($test_id, $user_id, $vclassroom_id)
+ public function getTest($user_id, $test_id, $vclassroom_id)
  {
-  $tests = $this->Test->Question->findAll(array('Question.test_id'=>$this->data['Test']['test_id']), $fields);
-
-    //die(debug($this->data['Test']));
- 
-    $points  = 0; 
-
-    foreach($this->data['Test'] as $k => $t):
-      if ( is_numeric($k) ):
-    $res = $this->Test->Question->Answer->find(array('Answer.id'=>$t)); 
-     if ( $res['Answer']['correct'] == 1):
-             $points += (int) $res['Question']['worth'];        
-     endif;
-      endif;
-    endforeach;
+  $conditions = array('Result.user_id'=>$user_id, 'Result.test_id'=>$test_id, 'Result.vclassroom_id'=>$vclassroom_id);
+  $this->Result->bindModel(array('belongsTo'=>array('Question', 'Answer')));
+  $fields     = array('Result.id', 'Result.created','Result.question_id','Test.title', 'Question.question', 'Question.worth', 'Answer.answer', 'Answer.correct');
+  $data       = $this->Result->findAll($conditions, $fields);
     
-   return $data;
+  return $data;
  }