Changeset 676 for trunk/app/controllers

Timestamp:

07/25/08 00:24:52 (4 months ago)

Author:

aarkerio

Message:

Update testt

Location:

trunk/app/controllers

Files:

• tests_controller.php (modified) (3 diffs)
• vclassrooms_controller.php (modified) (1 diff)

trunk/app/controllers/tests_controller.php

@@ -45 +45 @@
   public function view($test_id, $vclassroom_id)
   {
-    $user_id = $this->Test->field('Test.user_id', array("Test.id"=>$test_id));
+    $user_id = (int) $this->Test->field('Test.user_id', array("Test.id"=>$test_id));
     
     $this->pageTitle = __('Test', true);
@@ -55 +55 @@
     // student belongst to this class?
     if ( $this->Auth->user() ):
-      $this->set('belongs', $this->Test->Vclassroom->belongs($this->Auth->user('id'), $vclassroom_id));
+           $this->set('belongs', $this->Test->Vclassroom->belongs($this->Auth->user('id'), $vclassroom_id));
     else:
-             $this->set('belongs', false);
+           $this->set('belongs', false);
     endif;     
-   
-    if ( $this->Test->chk($test_id, $this->Auth->user('id'), $vclassroom_id) === false ):   // true = already
+     
+    if ( $this->Test->chk($test_id, $this->Auth->user('id'), $vclassroom_id) === false ):   // true = already answered this test
              $this->set('already', false);
              $this->set('data', false);
@@ -66 +66 @@
              $this->set('already', true);
     endif;
-    
-         
+             
     $conditions = array("Test.id"=>$test_id, "Test.status"=>1);
 

trunk/app/controllers/vclassrooms_controller.php

@@ -76 +76 @@
              $this->set('belongs', false);
    endif;
-       
-   // temporal lines, move to model later
-   //$this->Vclassroom->Ecourse->unbindModel(array('hasMany'=>array('Vclassroom'), 'belongsTo'=>array('User')));
-   //$this->Vclassroom->Test->unbindModel(array('hasMany'=>array('Question'), 'belongsTo'=>array('User')));
-   $this->Vclassroom->bindModel(array('belongsTo'=>array('Ecourse'=>array('fields'=>'id, title'))));
-   $conditions = array("Vclassroom.status"=>1, "Vclassroom.id"=>$vclassroom_id);
-   $this->set('data', $this->Vclassroom->find($conditions));
+      
+   $this->set('data', $this->Vclassroom->classElements($vclassroom_id));
  }