Changeset 369

Timestamp:

04/05/08 13:20:54 (9 months ago)

Author:

aarkerio

Message:

Vclassrooms improved

Location:

trunk/app

Files:

• config/sql/karamelo_postgres.sql (modified) (1 diff)
• controllers/vclassrooms_controller.php (modified) (1 diff)
• models/user.php (modified) (1 diff)
• models/vclassroom.php (modified) (1 diff)
• views/vclassrooms/admin_members.ctp (modified) (3 diffs)
• views/vclassrooms/admin_tests.ctp (moved) (moved from trunk/app/views/vclassrooms/admin_display.ctp)

trunk/app/config/sql/karamelo_postgres.sql

@@ -346 +346 @@
 );
 
-CREATE TABLE vclassrooms_users (
-  "vclassroom_id" int REFERENCES vclassrooms(id) NOT NULL DEFAULT 0,
-  "user_id" int REFERENCES users(id) NOT NULL DEFAULT 0
-);
-
-CREATE UNIQUE INDEX vclasroom_id_user_id_key on vclassrooms_users(vclassroom_id, user_id);
+CREATE TABLE users_vclassrooms (
+  "user_id" int REFERENCES users(id) NOT NULL,
+  "vclassroom_id" int REFERENCES vclassrooms(id) NOT NULL,
+   PRIMARY KEY  ("user_id", "vclassroom_id")
+);
 
 -- Categories users blogs

trunk/app/controllers/vclassrooms_controller.php

@@ -102 +102 @@
       
       $this->pageTitle = 'Class members';
+
+      $this->set('users',$this->Vclassroom->UsersVclassroom->findAll(array('UsersVclassroom.vclassroom_id' => $vclassroom_id)));
       
       $this->set('data', $this->Vclassroom->find($conditions));
  }
  // link test
- public function admin_display($vclassroom_id)
+ public function admin_tests($vclassroom_id)
  {
       $this->layout = 'popup';

trunk/app/models/user.php

@@ -8 +8 @@
 class User extends AppModel {
     
-    public $belongsTo  = array(
-             "Group" => array(
+  public $belongsTo  = array(
+             "Group" => array( 
                         "className" => "Group"
                                ));
+
+  /*  public $hasAndBelongsToMany = array('Vclassroom' =>
+                   array('className'    => 'Vclassroom',
+                     'joinTable'    => 'users_vclassrooms',
+                     'foreignKey'   => 'user_id',
+                     'associationForeignKey'=> 'vclassroom_id',
+                     'conditions'   => '',
+                     'order'        => '',
+                     'limit'        => '',
+                     'unique'       => true,
+                     'finderQuery'  => '',
+                     'deleteQuery'  => '',
+                     )
+                   ); */
     
     public $hasMany = array(

trunk/app/models/vclassroom.php

@@ -13 +13 @@
     public $belongsTo = 'Ecourse';
 
+    public $hasAndBelongsToMany = array('User' =>
+                   array('className'    => 'User',
+                     'joinTable'    => 'users_vclassrooms',
+                     'foreignKey'   => 'user_id',
+                     'associationForeignKey'=> 'vclassroom_id',
+                     'conditions'   => '',
+                     'order'        => '',
+                     'limit'        => '',
+                     'unique'       => true,
+                     'finderQuery'  => '',
+                     'deleteQuery'  => '',
+                     )
+                   );
+
     /*
     public $hasAndBelongsToMany = array(

trunk/app/views/vclassrooms/admin_members.ctp

@@ -1 +1 @@
 <?php
-//var_dump($data);
-echo '<div style="padding:4px;margin:10px auto 10px;width:500px;text-align:center;">';
+//die( debug($users));
+echo '<div style="padding:4px;margin:10px auto 10px;width:700px;text-align:center;">';
 
 //popup window for tests
@@ -34 +34 @@
 echo '</div>';
 
+echo $html->div('title_section', 'Students belonging to ' . $data['Vclassroom']['name']);
 
-echo $html->div('title_section', 'Students belonging to ' . $data['Vclassroom']['name']);
-?>
+if ( count($users) < 1 )
+{
+  echo $html->div('divblock', 'There are no students in this classrroom yet');
+}
 
-<p>
-<?php
- echo  $html->link($html->image('static/vgroups.gif', array("alt"=>"Add new member", "title"=>"Add new member")),  '/admin/vclassmembers/add/'.$data['Vclassroom']['id'], null, null, false);
-?>
-</p>
-<h2>Classrooms members</h2>
-<?php
-foreach ($data['User'] as $val)
+foreach ($users as $val)
 {
  echo '<div style="padding:6px 3px 28px 4px;margin:10px 0 5px 0;border:1px dotted gray;">';
@@ -51 +47 @@
        echo 'Username:' . $val['User']['username']                . '<br />';
        echo 'Email: '   . $html->linkEmail($val['User']['email']) . '<br />';
-       echo '<div class="butonright">'. $gags->confirmDel($val['User']['id'], 'vclassmembers') .'</div>';
+       echo $html->div('butonright', $gags->confirmDel($val['User']['id'], 'vclassmembers'));
  echo '</div>';
 }
 
-if (count($data['User']) < 1)
-{
-  echo $html->para(null, 'No members on this class');
-}
-
 ?>