Changeset 368

Timestamp:

04/05/08 12:52:08 (9 months ago)

Author:

aarkerio

Message:

vClassrooms ans tests fixed

Location:

trunk/app

Files:

• config/sql/karamelo_postgres.sql (modified) (2 diffs)
• controllers/tests_controller.php (modified) (4 diffs)
• controllers/vclassrooms_controller.php (modified) (1 diff)
• models/test.php (modified) (3 diffs)
• models/vclassroom.php (modified) (3 diffs)
• views/tests/admin_listing.ctp (modified) (2 diffs)
• views/tests/admin_vclassrooms.ctp (added)
• webroot/img/admin/vgroups-gray.gif (added)

trunk/app/config/sql/karamelo_postgres.sql

@@ -573 +573 @@
 );
 --HABTM
-CREATE TABLE "vclassrooms_treasures" (
+CREATE TABLE "treasures_vclassrooms" (
+  "treasure_id"   int NOT NULL REFERENCES treasures(id),
   "vclassroom_id" int NOT NULL REFERENCES vclassrooms(id),
-  "treasure_id"   int NOT NULL REFERENCES treasures(id),
   PRIMARY KEY  ("vclassroom_id", "treasure_id")
 );
@@ -590 +590 @@
 
 --HABTM
-CREATE TABLE "vclassrooms_tests" (
-  "vclassroom_id" int NOT NULL REFERENCES vclassrooms(id),
-  "test_id"   int NOT NULL REFERENCES tests(id),
-  PRIMARY KEY  ("vclassroom_id", "test_id")
+CREATE TABLE "tests_vclassrooms" (
+ "test_id" int NOT NULL REFERENCES tests(id),
+ "vclassroom_id" int NOT NULL REFERENCES vclassrooms(id),
+  PRIMARY KEY  ("test_id", "vclassroom_id")
 );
 

trunk/app/controllers/tests_controller.php

@@ -19 +19 @@
                           'limit' => 25,
                           'order' => array(
-                                           'Test.title' => 'asc'
+                                             'Test.title' => 'ASC'
                                           )
                          );
@@ -123 +123 @@
 }
 
-  private function chk($user_id)
-  {
+ private function chk($user_id)
+ {
     try {
       //exit(var_dump($this->data));
@@ -143 +143 @@
     }
     
-  }
-
-  private function getResults($questions)
-  {
-    $this->Test->unbindModel(array("belongsTo"=>array("User"))); //just few data
+ }
+
+ private function getResults($questions)
+ {
+    $this->Test->unbindModel(array('belongsTo'=>array('User'))); //just few data
     
     $result = 0;
@@ -167 +167 @@
  /**   === ADMIN METHODS ====  **/
  /** Select classroom to link*/
- public function admin_vclassrooms()
+ public function admin_vclassrooms($test_id)
  {    
-      $this->pageTitle = $this->Auth->user('username') . '\'s Classrooms';
-      
-      $this->layout = 'admin';
-      
-      $conditions   = array("Test.user_id"=>$this->Auth->user('id'));
-      $fields       = array("Webquest.id", "Webquest.title", "Webquest.status", "Webquest.created");
-      $order        = "Test.id DESC";
-      $limit        = 12;
-      
-      $this->set('data', $this->Test->findAll($conditions)); 
+   $this->pageTitle = $this->Auth->user('username') . '\'s Classrooms';
+      
+   $this->layout = 'admin';
+      
+   $conditions   = array('Vclassroom.user_id'=>$this->Auth->user('id'), 'Vclassroom.status'=>1);
+   
+   $this->set('data', $this->Test->Vclassroom->findAll($conditions)); 
+
+   $this->Test->unbindModel(array('hasMany'=>array('Question', 'Result'), 'belongsTo'=>array('User')));
+
+   $this->set('tests',$this->Test->TestsVclassroom->findAll(array('TestsVclassroom.test_id' => $test_id)));
  }
     
  public function admin_listing()
  {   
-      $this->layout    = 'admin';
-        
-      $this->pageTitle = 'Tests';
-        
-      $conditions = array("Test.user_id"=>$this->Auth->user('id'));
-        
-      $fields     = array("Test.id", "Test.user_id", "Test.title", "Test.description", "Test.status");
-        
-      $order = "Test.id DESC";
-        
-      $this->set('data', $this->Test->findAll($conditions, $fields, $order));
- }
+   $this->layout    = 'admin';
+        
+   $this->pageTitle = 'Tests';
+        
+   $conditions = array('Vclassroom.user_id'=>$this->Auth->user('id'));
+        
+   $fields     = array('Test.id', 'Test.user_id', 'Test.title', 'Test.description', 'Test.status');
+        
+   $order      = 'Test.id DESC';
+      
+   $this->Test->unbindModel(array('hasMany'=>array('Question', 'Result')));
+      
+   $this->set('data', $this->Test->findAll($conditions, $fields, $order));
+ }
+ 
  public function admin_add() 
  {
-       $this->layout    = 'admin';
-       // add to database
-       if ( !empty($this->data['Test']) )
-       {
-          $this->Sanitize = new Sanitize;
-           
-          $this->Sanitize->clean($this->data['Test']);
-           
-          $this->data['Test']['user_id'] = $this->Auth->user('id');
-           
-          $this->Test->create(); 
-          //var_dump($this->data['Test']);
-      if ( $this->Test->save($this->data["Test"]))
-      {
+    $this->layout    = 'admin';
+    // add to database
+   if ( !empty($this->data['Test']) )
+   {
+      $this->Sanitize = new Sanitize;
+           
+      $this->Sanitize->clean($this->data['Test']);
+           
+      $this->data['Test']['user_id'] = $this->Auth->user('id');
+           
+      $this->Test->create(); 
+      //var_dump($this->data['Test']);
+      if ( $this->Test->save($this->data["Test"]))
+      {
                $this->msgFlash('Test saved', '/admin/tests/listing');
-          }
-          else
-          { 
-              die('Something is wrong');
-          }
-       }
+      }
+      else
+      { 
+              die('Something is wrong, please report this bug');
+      }
+   }
  }
  

trunk/app/controllers/vclassrooms_controller.php

@@ -105 +105 @@
       $this->set('data', $this->Vclassroom->find($conditions));
  }
-  // link test
+ // link test
  public function admin_display($vclassroom_id)
  {

trunk/app/models/test.php

@@ -8 +8 @@
 class Test extends AppModel {
    
-   public $belongsTo = 'User';
+   public $belongsTo = array('User' =>
+             array('className'  => 'User',
+                   'conditions' => '',
+                   'order'      => '',
+                                 'foreignKey' => 'user_id'
+                   )
+             );
    
    public $hasMany = array(
@@ -37 +43 @@
     public $hasAndBelongsToMany = array('Vclassroom' =>
                        array('className'             => 'Vclassroom',
-                         'joinTable'             => 'vclassrooms_tests',
+                         'joinTable'             => 'tests_vclassrooms',
                          'foreignKey'            => 'vclassroom_id',
                          'associationForeignKey' => 'test_id',
@@ -53 +59 @@
       'user_id' => VALID_NOT_EMPTY
    ); 
+   
+  public function linkClassroom($test_id, $user_id)
+  {
+    $condition = array('Test.status'=>1, 'Test.user_id'=>$user_id, 'Test.id'=>$test_id);
+    
+    $vclassrooms = array();
+    
+    $result = $this->find($conditions);
+    
+    foreach ($result['Vclassroom'] as $val)
+    {
+      $vclassrooms[$val['name']] = $val['id'];
+    }
+
+    return $vclassrooms;
+  }
 }
 ?>

trunk/app/models/vclassroom.php

@@ -12 +12 @@
     
     public $belongsTo = 'Ecourse';
-    
+
+    /*
     public $hasAndBelongsToMany = array(
                                         'Test' =>
                        array('className'             => 'Test',
-                         'joinTable'             => 'vclassrooms_tests',
+                         'joinTable'             => 'tests_vclassrooms',
                          'foreignKey'            => 'vclassroom_id',
                          'associationForeignKey' => 'test_id',
@@ -40 +41 @@
                                         'Treasure' =>
                        array('className'             => 'Treasure',
-                         'joinTable'             => 'vclassrooms_treasures',
+                         'joinTable'             => 'treasures_vclassrooms',
                          'foreignKey'            => 'vclassroom_id',
                          'associationForeignKey' => 'treasure_id',
@@ -62 +63 @@
                          'deleteQuery'           => ''
                          )
-                    );
+                    );*/
  //Check if the user already exist in the classroom
  protected function chkMember($vclassroom_id)

trunk/app/views/tests/admin_listing.ctp

@@ -1 @@
-
+<?php
+//die( debug( $data ));
+?>
 <div class="title_section">Tests</div>
 
@@ -12 +14 @@
 
   echo '<div style="padding:6px 3px 28px 4px;margin:10px 0 5px 0;border:1px dotted gray;">';
-         echo '<div class="butonright">' .$gags->sendEdit($val['Test']['id'], 'tests') . '</div>';
+         echo $html->div('butonright', $gags->sendEdit($val['Test']['id'], 'tests'));
          echo $html->link($val['Test']['title'], '/admin/tests/vclassrooms/'.$val['Test']['id']) . '<br /><br />';
          echo $html->link('Questions', '/admin/tests/questions/'.$val['Test']['id']);
+
+         if ( count($val['Vclassroom']) < 1 ) 
+         {
+           echo $html->para(null, $html->link(
+                                              $html->image('admin/vgroups-gray.gif', array(
+                                                                                           'alt'  =>'There is no Classroom assigned for this test', 
+                                                                                           'title'=>'There is no Classroom assigned for this test'
+                                                                                           )
+                                                           ), 
+                                              '/admin/tests/vclassrooms/'.$val['Test']['id'], null,  null, false));
+         }
          echo $html->link($html->image('admin/questions_icon.gif', array('alt'=>'Questions')), 
                           '/admin/tests/questions/'.$val['Test']['id'], null, null, false) . '<br />';
-         echo '<p>' . $val['Test']['description']  . '</p>';
-         echo '<p style="margin-left:15px;">Status: '. $html->link($s, '/admin/tests/change/'.$val['Test']['id'].'/'.$val['Test']['status']) . '</p>';
-         echo '<div class="butonright">'. $gags->confirmDel($val['Test']['id'], 'tests') .'</div>';
+         echo $html->para(null, $val['Test']['description']);
+         echo $html->para(null, $html->link($s, '/admin/tests/change/'.$val['Test']['id'].'/'.$val['Test']['status']));
+         echo $html->div('butonright',  $gags->confirmDel($val['Test']['id'], 'tests'));
     echo '</div>';
 }