Changeset 375 for trunk/app

Timestamp:

04/09/08 23:53:39 (9 months ago)

Author:

aarkerio

Message:

Vclassroom

Location:

trunk/app

Files:

• . (modified) (1 prop)
• config (modified) (1 prop)
• controllers/images_controller.php (modified) (2 diffs)
• controllers/vclassrooms_controller.php (modified) (3 diffs)
• models/vclassroom.php (modified) (1 diff)
• tmp (modified) (1 prop)
• tmp/cache (modified) (1 prop)
• tmp/cache/models (modified) (1 prop)
• views/images/admin_listing.ctp (modified) (1 diff)
• views/vclassrooms/admin_members.ctp (modified) (1 diff)
• views/vclassrooms/show.ctp (modified) (3 diffs)
• webroot/files/podcasts (modified) (1 prop)
• webroot/files/userfiles (modified) (1 prop)
• webroot/img/avatars (modified) (1 prop)
• webroot/img/imgusers (modified) (1 prop)
• webroot/img/imgusers/aarkerio_9.jpg (modified) (previous)
• webroot/img/imgusers/thumbs (modified) (1 prop)

trunk/app/controllers/images_controller.php

@@ -4 +4 @@
 *  Manuel Montoya 2002-2008 
 *  Chipotle Software TM
-*  GPL manuel<arroba>mononeurona<punto>org
+*  GPLv3 manuel<arroba>mononeurona<punto>org
 */ 
  
@@ -113 +113 @@
     if ( $type != "image/jpeg" && $type != "image/pjpeg" && $type != "image/png" && $type != "image/gif") 
     {   /** is this a valid file? */
-        $ErrMsg   = "<h1>ERROR</h1> the file $imgfile_name $imgfile is not valid.<br>";
-        $ErrMsg  .= "<p>Only .jpg, .gif or .png files<br><br>";
+        $ErrMsg   = "<h1>ERROR</h1> the file $imgfile_name is not valid.<br />";
+        $ErrMsg  .= "<p>Only .jpg, .gif or .png files<br /><br />";
         $ErrMsg  .= "Current type file: " . $type . "</p>\n";
             

trunk/app/controllers/vclassrooms_controller.php

@@ -31 +31 @@
       return false;
  }
-                                                            
+                                                        
  public function show($user_id, $id) 
  {
@@ -41 +41 @@
       $fields     = array("Vclassroom.id", "Vclassroom.name", "Vclassroom.description", "Vclassroom.subject_id", "Vclassroom.created", "Vclassroom.user_id", "Subject.title");
       
-      $this->set('data', $this->Vclassroom->find($conditions, null, null, 2));
+      $this->set('data', $this->Vclassroom->find($conditions));
  }
 
  public function jointoclass()
  {
-    if (!empty($this->data["Vclassroom"])) 
+    if (!empty($this->data['UsersVclassroom'])) 
     {  
        // get the secret code by this classroom 
-        $code = $this->Vclassroom->field('secret', array("Vclassroom.id"=>$this->data['Vclassroom']['vclassroom_id']));
-        
-        if ($code != $this->data['Vclassroom']['code'] || $code == null) //code is correct ?
+        $code = $this->Vclassroom->field('secret', array("Vclassroom.id"=>$this->data['UsersVclassroom']['vclassroom_id']));
+        
+        if ($code != $this->data['UsersVclassroom']['code'] || $code == null) //code is correct ?
         {
             $this->set('msg', 'Code is incorrect');
             $this->render('jointoclass', 'ajax');
-            exit();
-        }
-        elseif($this->chkMember($this->data['Vclassroom']['vclassroom_id'])) // the student is already member in this class?
+        }
+        elseif($this->Vclassroom->chkMember($this->data['UsersVclassroom']['vclassroom_id'], $this->Auth->user('id'))) // the student is already member in this class?
         {
             $this->set('msg', 'You are already member of this class!');
             $this->render('jointoclass', 'ajax');
-            exit();
-         
         }
         else
         {
-        if ($this->Vclassroom->addAssoc('User',  $this->Auth->user('id'), $this->data["Vclassroom"]["vclassroom_id"]))
+        $this->data['UsersVclassroom']['user_id'] = $this->Auth->user('id');
+
+        $this->Vclassroom->UsersVclassroom->create();
+
+        if ($this->Vclassroom->UsersVclassroom->save($this->data['UsersVclassroom']))
             {  
                $this->set('msg', 'You have joined to this class succesfully!');
                $this->render('jointoclass', 'ajax');
-               exit();
             }
         }
@@ -178 +178 @@
       $this->set('data', $this->Vclassroom->find($conditions));
  }
- 
+ public function admin_unlinkstudent()
+ {
+   
+ }
  public function admin_add($ecourse_id=null) 
  {

trunk/app/models/vclassroom.php

@@ -39 +39 @@
                          )
                        );
-  /*
-                                        'Webquest' =>
-                       array('className'             => 'Webquest',
-                         'joinTable'             => 'vclassrooms_webquests',
-                         'foreignKey'            => 'vclassroom_id',
-                         'associationForeignKey' => 'webquest_id',
-                         'conditions'            => '',
-                         'order'                 => '',
-                         'limit'                 => '',
-                         'unique'                => true,
-                         'finderQuery'           => '',
-                         'deleteQuery'           => ''
-                         ),
-                                        'Treasure' =>
-                       array('className'             => 'Treasure',
-                         'joinTable'             => 'treasures_vclassrooms',
-                         'foreignKey'            => 'vclassroom_id',
-                         'associationForeignKey' => 'treasure_id',
-                         'conditions'            => '',
-                         'order'                 => '',
-                         'limit'                 => '',
-                         'unique'                => true,
-                         'finderQuery'           => '',
-                         'deleteQuery'           => ''
-                         ),
-                                        'User' =>
-                       array('className'             => 'User',
-                         'joinTable'             => 'vclassrooms_users',
-                         'foreignKey'            => 'vclassroom_id',
-                         'associationForeignKey' => 'user_id',
-                         'conditions'            => '',
-                         'order'                 => '',
-                         'limit'                 => '',
-                         'unique'                => true,
-                         'finderQuery'           => '',
-                         'deleteQuery'           => ''
-                         )
-                    );*/
  //Check if the user already exist in the classroom
- protected function chkMember($vclassroom_id)
+ public function chkMember($vclassroom_id, $user_id)
  { 
-   $already_member = false;
-
-   $conditions = array('"Vclassroom"."id"'=>$vclassroom_id);
   
-   $data = $this->find($conditions);
+   $conditions = array('"UsersVclassroom"."vclassroom_id"'=>$vclassroom_id, '"UsersVclassroom"."user_id"'=>$user_id);
+  
+   $data = $this->UsersVclassroom->field('user_id', $conditions);
    
-   foreach ($data['User'] as $user)
+   if ($data == null)
    {
-      if ($user['id'] == $this->Auth->user('id'))    
-      {
-       $already_member = true;  // yes, is already member
-      }   
+     return false;    
    }
-   return $already_member; 
+   else
+   {
+     return true; 
+   } 
  }
 
-  public $validate = array(
+ public $validate = array(
       'name'    => VALID_NOT_EMPTY,
       'user_id' => VALID_NOT_EMPTY,

trunk/app/views/images/admin_listing.ctp

@@ -19 +19 @@
   <td style="text-align:left;" colspan="5">  
   <?php 
-     echo $form->create('Image', array(""=>"admin_add", "enctype"=>"multipart/form-data") ); 
+     echo $form->create('Image', array('action'=>'add', 'enctype'=>'multipart/form-data')); 
      echo $form->hidden('Image.return', array('value'=>'/admin/images/listing/'.$return)); 
   ?>

trunk/app/views/vclassrooms/admin_members.ctp

@@ -44 +44 @@
 {
   // die(debug($val));
- echo '<div style="padding:6px 3px 28px 4px;margin:10px 0 5px 0;border:1px dotted gray;">';
-       echo '<b>Name</b>: '    . $val['name'] . '  ' . '<b> Username</b>:' . $val['username']                . '<br />';
-       echo 'Email: '   . $html->link($val['email'], 'mailto:'.$val['email']) . '<br />';
-       echo $html->div('butonright', $gags->confirmDel($val['id'], 'vclassmembers'));
- echo '</div>';
+   $tmp  = '<b>Name</b>: '    . $val['name'] . '  ' . '<b> Username</b>:' . $val['username']                . '<br />';
+   $tmp .= 'Email: '   . $html->link($val['email'], 'mailto:'.$val['email']) . '<br />';
+   $tmp .= $html->div('butonright', $gags->confirmDel($val['id'], 'Vclassroom'));
+  
+   echo $html->div('divgray', $tmp);
 }
 

trunk/app/views/vclassrooms/show.ctp

@@ -1 +1 @@
 <?php
-//exit(var_dump($data));
+exit(debug($data));
 ?>
 <h2>Classrooms</h2>
@@ -6 +6 @@
 <?php
   echo  '<h1>' . $data['Vclassroom']['name']      . '</h1>';
-  echo  '<p style="font-size:7pt;"><b>Created:</b> ' . $data['Vclassroom']['created'] . '</p> ';
-  echo  '<p><b>Subject</b>: ' .$data['Ecourse']['Subject']['title'] . "</p>";
-
-  echo  '<p><b>Course description</b>: <br />';
+  echo  $html->para(null, '<b>Created:</b> ' . $data['Vclassroom']['created']);
+  echo  $html->para(null, '<b>Subject</b>: ' .$data['Ecourse']['Subject']['title']);
+  echo  $html->para(null, '<b>Course description</b>:'. $data['Ecourse']['description']);
   
-  echo   $data['Ecourse']['description'] . "</p>";
-  
-  if ( isset( $cU['User']['id'] )  )  // a student is login in so, show "Join" button 
+  if ( isset( $cU['User']['id'] )  && $cU['User']['group_id'] == 3 )  // a student is login in so, show "Join" button 
   {  
      echo $ajax->form();
      
-     echo $html->hidden('Vclassroom/vclassroom_id', array("value" => $data['Vclassroom']['id']));
-      
-     echo '<p><p>';
-
-     echo $html->input('Vclassroom/code', array("size" => 6, "maxlength"=>6));
-     
+     echo $form->hidden('UsersVclassroom.vclassroom_id', array('value'=>$data['Vclassroom']['id']));
+     echo $form->input('UsersVclassroom.code', array('size' => 6, 'maxlength'=>6, 'title'=>'Secret code', 'between'=>': '));
      echo $ajax->submit('Join to this class '.$cU['User']['username'], array("url" => "/vclassrooms/jointoclass/", 
                                          "update"=>"updater",
@@ -28 +21 @@
                                          "complete" => "Element.hide('charging');Effect.Appear('updater')"
         ));
-     echo $ajax->div('updater');
-     echo $ajax->divEnd('updater'); 
+
+     // empty ajax div
+     echo $ajax->div('updater') . $ajax->divEnd('updater'); 
    }
    else