Changeset 443

Timestamp:

04/30/08 14:40:36 (8 months ago)

Author:

aarkerio

Message:

New SQL table

Location:

trunk/app

Files:

• controllers/vclassrooms_controller.php (modified) (2 diffs)
• models/result_webquest.php (added)
• models/vclassroom.php (modified) (1 diff)
• views/vclassrooms/admin_members.ctp (modified) (1 diff)

trunk/app/controllers/vclassrooms_controller.php

@@ -211 +211 @@
       $this->set('data', $this->Vclassroom->find($conditions));
  }
- public function admin_unlinkstudent()
+ public function admin_unlink()
  {
    
@@ -260 +260 @@
         }
    }
+ }
+
+ public function admin_record($student_id, $vclassroom_id) 
+ {
+    $record = $this->Vclassroom->getRecord($student_id, $vclassroom_id);
+
+    $this->set('data', $record);
  }
 

trunk/app/models/vclassroom.php

@@ -80 +80 @@
 
  // get student record
- public function getRecord($vclassroom_id, $user_id)
+ public function getRecord($user_id, $vclassroom_id)
  {
-     $record = (string) '';
-
-     $conditions = array('"'=>$vclassroom_id, '"UsersVclassroom"."user_id"'=>$user_id);
-  
-     $tests      = $this->Vclassroom->Test->findAll($conditions, $fields);
-
+     $record     = (string) '';
+
+     $conditions = array('Result.vclassroom_id'=>$vclassroom_id, 'Result.user_id'=>$user_id);
+     $fields     = array('Result.percentage', 'Test.title'); //null;
+     $tests      = $this->Test->Result->findAll($conditions, $fields);
+     //die(debug($tests));
      foreach ($tests as $t) 
      {
-       
-     }   
-
-     $webquests  = $this->Vclassroom->Webquest->findAll($conditions, $fields);
-    
-     $treasures  = $this->Vclassroom->Treasures->findAll($conditions, $fields);
-
+       $record .= $t['Test']['title'];
+       $record .= 'Percentage: ' . $t['Result']['percentage'];  
+     }
+     
+     
+     // $webquests  = $this->Webquest->ResultWebquest->findAll($conditions, $fields);
+     
+     $conditions = array('ResultTreasure.vclassroom_id'=>$vclassroom_id, 'ResultTreasure.user_id'=>$user_id);
+     $fields     = array('ResultTreasure.points', 'Treasure.title'); //null;
+     $treasures  = $this->Treasure->ResultTreasure->findAll($conditions, $fields);
+     
+     foreach ($tests as $t) 
+     {
+       $record .= $t['Test']['title'];
+       $record .= 'Percentage: ' . $t['Result']['percentage'];  
+     }
+     // die(debug($treasures));
      return $record;
  }

trunk/app/views/vclassrooms/admin_members.ctp

@@ -52 +52 @@
              $html->link($val['email'], 'mailto:'.$val['email']),
                  $html->link('Compose', '/admin/messages/write/'.$val['id']),
-         $html->link('Unlink', '/admin/vclassroom/unlink/'.$val['id'].'/'.$data['Vclassroom']['id']),
-                 $html->link('Record', '/admin/vclassroom/record/'.$val['id'].'/'.$data['Vclassroom']['id'])
+         $html->link('Unlink', '/admin/vclassrooms/unlink/'.$val['id'].'/'.$data['Vclassroom']['id']),
+                 $html->link('Record', '/admin/vclassrooms/record/'.$val['id'].'/'.$data['Vclassroom']['id'])
              );