Changeset 732 for trunk/app/models

Timestamp:

08/21/08 18:11:48 (3 months ago)

Author:

aarkerio

Message:

Little bugs fixed

Files:

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

trunk/app/models/vclassroom.php

@@ -35 +35 @@
                       'Participation' =>
                array('className'     => 'Participation',
+                 'conditions'    => null,
+                 'order'         => null,
+                 'limit'         => null,
+                 'foreignKey'    => 'vclassroom_id'
+                 ),
+                      'Report' =>
+               array('className'     => 'Report',
                  'conditions'    => null,
                  'order'         => null,
@@ -97 +104 @@
       'status'  => VALID_NOT_EMPTY
    );
+
 /*
 public $validate = array(
@@ -120 +128 @@
                                )
                        ); */ 
- /**
- *  Get student record in Vclassroom , return array  usd in admin_record method (vclassrooms_controller.php)
+/**
+ *  Get student record in Vclassroom , return array used in admin_record method (vclassrooms_controller.php)
  *
  * @param  integer $user_id:  in $fact student_id
@@ -128 +136 @@
  * @access public
  * @author Manuel Montoya 
- **/
+**/
  public function studentRecord($user_id, $vclassroom_id)
  {
-  try 
-  {   
+   // 1) wee need check tree models: Test, Webquest and Treasures ans results associated to them:
+   // Result, ResultTreasure and ResultWebquest, so will get the stundents answer  
+  try{   
      $record                  = array();
    
-     $this->User->unbindAll();  // unbind unnecesaries tables
+     $this->User->unbindAll();  // unbind unnecesary tables
      
      //Get the student data
@@ -147 +156 @@
      $record['tests']   = $this->TestsVclassroom->findAll($conditions, $fields);
      // die(debug($record));
-   
+
+     // foreach test check in Result model
      foreach($record['tests'] as $k => $t):
        $record['tests'][$k]['TestsVclassroom']['title'] = $t['Test']['title'];
@@ -174 +184 @@
      //die(debug($record['tests']));
 
-     // Now 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;
      $record['treasures']  =  $this->Treasure->ResultTreasure->findAll($conditions, $fields);
-  
-     // Consult Reply Model    
+     
+     // Consult Reply model to know student participation in forums    
      $conditions        = array('Reply.vclassroom_id'=>$vclassroom_id, 'Reply.user_id'=>$user_id);
      $fields            = array('Reply.topic_id', 'Reply.vclassroom_id', 'Reply.id', 'Reply.points'); //null;
@@ -188 +198 @@
      $fields         = array('Participation.title', 'Participation.id', 'Participation.points'); //null; 
      $record['participations'] = $this->Participation->findAll($conditions, $fields);
-
+     
+     // Reports
+     $conditions     = array('Report.vclassroom_id'=>$vclassroom_id, 'Report.student_id'=>$user_id);
+     $fields         = array('Report.filename', 'Report.description', 'Report.id', 'Report.points'); //null; 
+     $record['reports'] = $this->Report->findAll($conditions, $fields);
+     
      // Webquest
      $conditions     = array('ResultWebquest.vclassroom_id'=>$vclassroom_id, 'ResultWebquest.user_id'=>$user_id);