Changeset 730 for trunk/app/models

Timestamp:

08/20/08 20:54:59 (3 months ago)

Author:

aarkerio

Message:

Bugs fixed

Files:

• trunk/app/models/vclassroom.php (modified) (5 diffs)

trunk/app/models/vclassroom.php

@@ -120 +120 @@
                        ); */ 
  /**
- *  Get student record in Vclassroom , return array
+ *  Get student record in Vclassroom , return array  usd in admin_record method (vclassrooms_controller.php)
  *
- * @param  integer $user_id  description
+ * @param  integer $user_id:  in $fact student_id
  * @param  integer $vclassroom_id  description
  * @return array   $record description
  * @access public
- * @author author Manuel Montoya 
+ * @author Manuel Montoya 
  **/
  public function studentRecord($user_id, $vclassroom_id)
@@ -133 +133 @@
      $record                  = array();
    
-     $this->User->unbindAll();
-     
+     $this->User->unbindAll();  // unbind unnecesaries tables
+     
+     //Get the student data
      $record   = $this->User->find(array('User.id'=>$user_id), array('id', 'username', 'name', 'email'));
      
-     // Consult Test Model
+     // Consult Test Model associated to this Vclassroom
      $this->TestsVclassroom->bindModel(array('belongsTo'=>array('Test')));
      
@@ -143 +144 @@
      $fields            = array('TestsVclassroom.test_id', 'TestsVclassroom.id', 'Test.title'); 
      $record['tests']   = $this->TestsVclassroom->findAll($conditions, $fields);
-     //die(debug($record['tests']));
+     // die(debug($record));
    
      foreach($record['tests'] as $k => $t):
@@ -151 +152 @@
        
        $conditions = array('Result.vclassroom_id'=>$vclassroom_id,'Result.user_id'=>$user_id,'Result.test_id'=>$t['TestsVclassroom']['test_id']);
-       $fields     = array('Result.correct', 'Result.answer_id','Test.title', 'Question.question', 'Question.worth');
+       $fields     = array('Result.correct', 'Result.answer_id','Question.worth');
        $results    = $this->Test->Result->findAll($conditions, $fields);
-
+       //debug($results);
+       // Get points from answers
        if ( count($results) > 0 ):
             $points     = (int) 0;
        else:
-            $points     = null;   //student has no answered this test yet
+            $points     = null;   //student has not answered this test yet
        endif;
        
        foreach($results as $r):
             if ($r['Result']['correct'] == 1):
-                  $points     += $r['Question']['worth'];     
+                  $points     += (int) $r['Question']['worth'];     
         endif;
        endforeach;
@@ -169 +171 @@
      endforeach;
      //die(debug($record['tests']));
-     // Consult Treasure Model
+
+     // Now Treasure Model
      $conditions = array('ResultTreasure.vclassroom_id'=>$vclassroom_id, 'ResultTreasure.user_id'=>$user_id);
      $fields     = array('ResultTreasure.points', 'Treasure.title', 'Treasure.id'); //null;