Changeset 342

Timestamp:

03/25/08 01:03:27 (7 months ago)

Author:

aarkerio

Message:

eCourses fixes

Location:

trunk/app

Files:

• config/sql/karamelo_postgres.sql (modified) (1 diff)
• controllers/ecourses_controller.php (modified) (5 diffs)
• controllers/messages_controller.php (modified) (6 diffs)
• controllers/users_controller.php (modified) (5 diffs)
• models/ecourse.php (modified) (1 diff)
• models/group.php (modified) (2 diffs)
• models/message.php (modified) (1 diff)
• views/ecourses/admin_add.ctp (modified) (2 diffs)
• views/ecourses/admin_edit.ctp (modified) (1 diff)
• views/elements/login.ctp (modified) (1 diff)
• views/entries/admin_add.ctp (modified) (1 diff)
• views/groups/admin_edit.ctp (modified) (1 diff)
• views/groups/admin_listing.ctp (modified) (2 diffs)
• views/layouts/paris.ctp (modified) (3 diffs)
• views/layouts/portal.ctp (modified) (1 diff)
• views/layouts/rubyx.ctp (modified) (2 diffs)
• views/layouts/school.ctp (added)
• views/lessons/display.ctp (modified) (1 diff)
• views/messages/message.ctp (modified) (4 diffs)
• views/users/admin_edit.ctp (modified) (2 diffs)
• views/users/admin_listing.ctp (modified) (1 diff)
• views/users/blog.ctp (modified) (1 diff)
• webroot/css/school (added)
• webroot/css/school/school.css (added)
• webroot/img/css (added)
• webroot/img/css/school (added)
• webroot/img/css/school/bg.gif (added)
• webroot/img/css/school/school.jpg (added)

trunk/app/config/sql/karamelo_postgres.sql

@@ -22 +22 @@
     modified timestamp(0) with time zone DEFAULT now() NOT NULL,
     code varchar(7) NOT NULL DEFAULT 'f78Z67',
+    active smallint NOT NULL DEFAULT 1,  -- active/desactive group
     CHECK ( length(code)  > 6  )
 );

trunk/app/controllers/ecourses_controller.php

@@ -36 +36 @@
        $this->layout = 'admin';
        
-            
        $conditions   =  array("user_id"=>$this->Auth->user('id'));
        $fields       =  array('id', 'title', 'access',  'status', 'description');
        $order        =  "Ecourse.title DESC";
-            
+       
        $this->set('data', $this->Ecourse->findAll($conditions, $fields, $order));
   }
@@ -67 +66 @@
         $this->set('data', $this->Ecourse->find($conditions, $fields));
   }
- 
-  public function admin_add() 
-  {   
-    $this->layout    = 'admin'; 
-    
-    if (!empty($this->data['Ecourse']))
-    {
-        $this->Sanitize = new Sanitize;
-        
-        $this->Sanitize->clean($this->data["Ecourse"]);
-  
-        $this->data['Ecourse']['user_id'] = $this->Auth->user('id');
-
-        $this->Ecourse->create();
-   
-        if ($this->Ecourse->save($this->data['Ecourse']))
-        {
-                $this->msgFlash('Course saved', '/admin/ecourses/listing');
-        }
-    }
-    else
-    {
- 
-     $this->set('subjects', Set::combine($this->Ecourse->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
-
-     $this->set('langs', Set::combine($this->Ecourse->Lang->find('all', array('order' => 'lang')), "{n}.Lang.id","{n}.Lang.lang"));
-
-    }
-  }
   
   public function admin_change($id, $status)
@@ -112 +82 @@
         }
     }
+  public function admin_add() 
+  {   
+    $this->layout    = 'admin'; 
+    
+    $this->set('subjects', Set::combine($this->Ecourse->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
+    
+    $this->set('langs', Set::combine($this->Ecourse->Lang->find('all', array('order' => 'lang')), "{n}.Lang.id","{n}.Lang.lang"));
+    
+    if (!empty($this->data['Ecourse']))
+    {
+        $this->Sanitize = new Sanitize;
+        
+        $this->Sanitize->clean($this->data["Ecourse"]);
+        
+        $this->data['Ecourse']['user_id'] = $this->Auth->user('id');
+        
+        $this->Ecourse->create();
+        
+        if ($this->Ecourse->save($this->data['Ecourse']))
+        {
+                $this->msgFlash('Course saved', '/admin/ecourses/listing');
+        }
+    }
+  }
   
   public function admin_edit($id = null)
   {
-     
-    if (empty($this->data['Ecourse']))
+    $this->set('subjects', Set::combine($this->Ecourse->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
+    
+    $this->set('langs', Set::combine($this->Ecourse->Lang->find('all', array('order' => 'lang')), "{n}.Lang.id","{n}.Lang.lang"));
+    
+    if ( empty($this->data['Ecourse']) )
     {
         $this->layout = 'admin';
@@ -124 +121 @@
         $this->Subject     = new Subject;
         
-        $this->set('subjects', $this->Ecourse->Subject->generateList(null, 'title'));       
-    
-        $this->set('langs', $this->Ecourse->Lang->generateList(null, 'lang', null, '{n}.Lang.id', '{n}.Lang.lang'));
-        
         $this->data = $this->Ecourse->read();
+        
     }
     else
@@ -135 +129 @@
         
         $this->Sanitize->html($this->data["Ecourse"]['description']);
-
+        
         if ($this->Ecourse->save($this->data['Ecourse']))
         {

trunk/app/controllers/messages_controller.php

@@ -3 +3 @@
 *  Chipotle Software TM
 *  Manuel Montoya 2002-2008 
-*  GPLv3 manuel<arroba>mononeurona<punto>org ASMO
+*  GPLv3 manuel<arroba>mononeurona<punto>org
 */ 
 
@@ -12 +12 @@
  public $helpers       = array('Javascript', 'Ajax', 'Fck', 'Time');
  
- public $components    = array('Portal', 'Security', 'Email', 'Session');
- 
+ public $components    = array('Portal', 'Security', 'Email', 'Session', 'Edublog');
+ 
+  public function beforeFilter() 
+ {
+    $this->Auth->allow(array('message', 'deliver'));
+    parent::beforeFilter();
+ }
+
  public function isAuthorized() 
  {  
@@ -25 +31 @@
     return false;  // go away !!
  }
-   
- public function show($username, $id)
- {   
-        $this->pageTitle = 'Classrooms';
-        $this->layout    = 'berlin'; //$this->Blog->field;
-        
-        $conditions      = array("Subject.status"=>1, "Subject.id"=>$id);
-        $fields          = array("Subject.id", "Subject.name", "Subject.program_id", "Subject.created");
-        $order           = "Subject.name DESC";
-        
-        $this->set('blog', $this->Edublog->blog($username));
-        
-        $this->set('data', $this->Message->findAll($conditions, $fields, $order, null, null, 2, 2));
-   }
-   
-   public function message($user_id) 
-   {    
+ 
+ public function message($username) // show form to send message to teacher
+ {      
         $this->pageTitle = 'Contact';
         
+        $user_id = $this->Message->User->field('id', array('username'=>$username));
+        
         $this->layout    = $this->Edublog->layout($user_id);
         
-        $this->set('blog', $this->Edublog->blog($user_id));
-        
-        $this->set('user_id', $user_id); 
-   }
-    
-   public function contact()
-   {
+        $this->Edublog->blog($user_id);
+ }
+ 
+ public function contact()
+ {
         $this->layout    = 'portal';
         
         $this->pageTitle = 'Contact';
         
-        $this->set('Element', $this->Portal->statics());      // Using Portal component
-   }
-   
-   public function compose()
-   {    
+        $this->Portal->statics();      // Using Portal component
+ }
+ 
+ public function compose()
+ {    
         $this->layout    = 'portal';
         
         $this->pageTitle = 'Write Message';
         
-        $this->set('Element', $this->Portal->statics());      // Using Portal component
-   }
-   
-   public function search()
-   {    
-        $this->layout    = 'ajax';
-        
-        $this->pageTitle = 'Write Message';
-        
-        $conditions      = array("User.username ~* '".'ad' ."'");
-        
-        $fields          = array("User.username", "User.id");
-        
-        $order           = "User.username";
-        
-        $this->Message->User->unbindModel($this->Message->User->notNow);
-        
-        $limit = 15;
-        
-        $this->set('data', $this->Message->User->findAll($conditions, $fields, $order, $limit)); 
-        
-        $this->render('search', 'ajax');
-   }
-   
-   public function chat($nick='mononeuron')
-   {
+        $this->Portal->statics();      // Using Portal component
+ }
+ 
+ public function chat($nick='mononeuron')
+ {
       $this->pageTitle = 'IRC Chat';
       
@@ -97 +68 @@
       
       $this->set('nick', $nick);
-   }
-   
-   public function deliver()
-   {
+ }
+ 
+ public function deliver()
+ {
     $this->layout = 'ajax';
     
-     if (!empty($this->data["Message"]))
-     {
+    if (!empty($this->data["Message"]))
+    {
            $this->Sanitize = new Sanitize;
            
@@ -123 +94 @@
                 else
                 {
-                    $this->render('send', 'ajax');
+                    $this->render('sent', 'ajax');
                 }
         }
      }
-   }
-
- /**=== ADMIN METHODS ===**/  
- public function admin_general()
- {
-   if ($this->Auth->user('group_id') != 1)
-   {
-        $this->redirect('/admin/messages/listing');
-   }
-    
-   $this->layout = 'admin';
-    
-   if (!empty($this->data["Message"]))
-   {
-     $this->Sanitize = new Sanitize;
-        
-     $this->Sanitize->html($this->data["Message"]["title"]);
-        
-     $this->Sanitize->html($this->data["Message"]["body"]);
-        
-     $this->Message->User->unbindModel(
-                                 array(
-                                       "hasMany"=>array(
-                                                        "Entry", "News", "Category", "Lesson", "Podcast", "Bookmark")));
-        
-        $conditions = array("active"=>1);
-        
-        $fields     = array("id");
-        
-        $data = $this->User->findAll($conditions, $fields);
-        
-        $j = 0; //counter
-        
-        $this->data["Message"]["sender_id"] = $this->Auth->user('id');
-        
-        //exit(print_r($data));
-        
-        foreach($data as $val)
-        { 
-          $this->Message->create();
-          
-          //exit(print_r($val));
-          
-          $this->data["Message"]["user_id"] = $val["User"]["id"];
-          
-          if ($this->Message->save($this->data["Message"]))
-          {
-             $j++;
-          }
-          else
-          {
-             exit('error on save');
-          }
-        }
-        $this->msgFlash($j . ' messages sent', '/admin/messages/listing');
-      }
-    }
-   
-   private function sendMail($user_id, $username, $title) 
+ }
+  private function sendMail($user_id, $username, $title) 
    {
         $this->User = new User;
@@ -218 +132 @@
             exit("Error!!");
         }
- }  
-
+ }
+ 
+ /**=== ADMIN METHODS ===**/  
+ public function admin_general()  // send a general message to all commnunity
+ {
+   if ($this->Auth->user('group_id') != 1)
+   {
+        $this->redirect('/admin/messages/listing');
+   }
+    
+   $this->layout = 'admin';
+    
+   if (!empty($this->data["Message"]))
+   {
+     $this->Sanitize = new Sanitize;
+        
+     $this->Sanitize->html($this->data["Message"]["title"]);
+        
+     $this->Sanitize->html($this->data["Message"]["body"]);
+        
+     $this->Message->User->unbindModel(
+                                 array(
+                                       "hasMany"=>array(
+                                                        "Entry", "News", "Category", "Lesson", "Podcast", "Bookmark")));
+        
+        $conditions = array("active"=>1);
+        
+        $fields     = array("id");
+        
+        $data = $this->User->findAll($conditions, $fields);
+        
+        $j = 0; //counter
+        
+        $this->data["Message"]["sender_id"] = $this->Auth->user('id');
+        
+        //exit(print_r($data));
+        
+        foreach($data as $val)
+        { 
+          $this->Message->create();
+          
+          //exit(print_r($val));
+          
+          $this->data["Message"]["user_id"] = $val["User"]["id"];
+          
+          if ($this->Message->save($this->data["Message"]))
+          {
+             $j++;
+          }
+          else
+          {
+             exit('error on save');
+          }
+        }
+        $this->msgFlash($j . ' messages sent', '/admin/messages/listing');
+      }
+ }
+ 
  public function admin_change($message_id, $message_status)
  {

trunk/app/controllers/users_controller.php

@@ -55 +55 @@
      
      $limit      = 20;
-        
+     
      $this->set('data', $this->User->Entry->findAll($conditions, $fields, $order, $limit)); 
-        
+     
      $this->layout    = $this->Edublog->layout($user_id);
-        
+     
      $this->Edublog->blog($user_id);
  }
@@ -393 +393 @@
  public function admin_edit() 
  {
-    
-    $this->layout    = 'admin';
-    
-    $this->set('Groups', $this->User->Group->generateList());       
-    
-    if (empty($this->data))
-    {
-        $this->User->id = $this->Auth->user('id');
-        $this->data = $this->User->read();
+    if ( empty($this->data['User']) )
+    {
+        $this->layout    = 'admin';
+        
+        $this->set('Groups', Set::combine($this->User->Group->find('all', array('order' => 'name')), "{n}.Group.id","{n}.Group.name"));
+        
+        $this->User->unbindModel($this->User->notNow);
+            
+        $this->data = $this->User->read(null, $this->Auth->user('id'));
     }
     else
@@ -480 +480 @@
      }
  }
-
-  /*** DELETE  **/ 
-  public function delete($id)
-  {
-    $this->User->del($id);
-    $this->msgFlash('User has been deleted.', '/admin/users/listing');
-  }
-  
-  /*** List user's blog entries  **/ 
-  public function blogs($order = null)
-  {
-  
-    $conditions = array("active" => 1 );
-    
-    $data = $this->User->findAll($conditions, $order);
-    
-    $this->set('data', $data);
-   
-  }
-
+ 
+ /*** DELETE  **/ 
+ public function admin_delete($id)
+ {
+    if ($this->User->del($id))
+    {
+       $this->msgFlash('User has been deleted.', '/admin/users/listing');
+    }
+ }
+ 
  /****   AVATAR   ***/
  public function admin_avatar() 
@@ -573 +563 @@
     }
         
-    $extension   = $this->get_extension($type);
+    $extension   = $this->Adds->get_extension($type);
     
     $Name        = $this->Auth->user('username') . "_avatar" . $extension;
@@ -607 +597 @@
    
    }
-}
-
-public function admin_delete($id)
-{
-    if ( $this->User->del($id) )
-    {
-        $this->msgFlash('User has been deleted','/admin/users/listing');
-    }
 }
 

trunk/app/models/ecourse.php

@@ -3 +3 @@
 *  Karamelo E-Learning Platform
 *  Chipotle Software 2002-2008
-*  GPLv3 manuel<at>mononeurona<dot>org
+*  GPLv3 manuel<arroba>mononeurona<punto>org
 */
 //File: /app/models/ecourse.php
 
 class Ecourse extends AppModel {
-
+  
   public $name = 'Ecourse';
-   
+  
   public $belongsTo = array('User', 'Subject', 'Lang');
-
+  
   public $hasMany   = array('Vclassroom');
-
+  
   public $validate = array(
-        'title'       => VALID_NOT_EMPTY,
-        'access'      => VALID_NOT_EMPTY,
-            'description' => VALID_NOT_EMPTY, 
-        'lang_id'     => VALID_NOT_EMPTY
-      );
+        'title' => array(
+            'alphanumeric' => array(
+                'rule' => array('minLength', 4),
+                'required' => true,
+                'allowEmpty' => false,
+                'message' => 'Mimimum 4 characters long in title'
+                )
+        ),
+        'description' => array(
+            'rule' => array('minLength', 20),
+            'allowEmpty' => false,
+            'message' => 'Mimimum 8 characters long'
+        ),
+        'code' => array(
+            'rule' => array('minLength', 4),
+            'allowEmpty' => false,
+            'message' => 'Mimimum 4 characters long'
+        ),
+        'lang_id' => array(
+            'rule' => 'numeric',
+            'message' => 'Enter a valid lang',
+            'allowEmpty' => true
+        )
+    );
 }
 ?>

trunk/app/models/group.php

@@ -3 +3 @@
 *  Chipotle Software TM
 *  Manuel Montoya 2002-2008
-*  GPLv3 manuel<at>mononeurona<dot>org
+*  GPLv3 manuel<arroba>mononeurona<punto>org
 */
 class Group extends AppModel
@@ -10 +10 @@
 
   public $hasMany = 'User';
+  
+  public $validate = array(
+    'code' => array(
+        'required'  => true,
+        'rule'      => array('minLength', 5),  
+        'message'   => 'Code must be at least 5 characters long.' 
+       )
+  );
 
 }

trunk/app/models/message.php

@@ -3 +3 @@
 *  Karamelo eLearning Platform
 *  Chipotle Software 2002-2008 
-*  GPLv3 manuel<arroba>mononeurona<punto>org ASMO
+*  GPLv3 manuel<arroba>mononeurona<punto>org
 **/ 
 

trunk/app/views/ecourses/admin_add.ctp

@@ -1 @@
-<?php echo $form->create('Ecourse', array('onsubmit'=>'return chkForm()'));  ?>
+<?php 
+   echo $javascript->link('fckeditor/fckeditor');
+   echo $form->create('Ecourse', array('onsubmit'=>'return chkForm()')); 
+?>
 <fieldset>
   <legend>New Course</legend>
-<p>By default, your course is accessible to everybody. If you want some confidentiality, the simplest way is to open registration during one week, ask the students to register themselves, then close registration and check for possible intruders in the user list.</p>
 <?php 
- echo $form->input('Ecourse.title', array("size" => 30, "maxlength" => 90)) . ' e.g. History of Literature';
- echo $form->error('Ecourse.title', 'A FAQ title is required.');
+ 
+ echo $form->input('Ecourse.title', array("size" => 30, "maxlength" => 90, 'title'=>' e.g. History of Literature'));
 
  echo $form->label('Ecourse.description', 'Description:');
  echo $form->textarea('Ecourse.description', array("cols" => 40, "rows" =>4));
-
- echo $form->input('Ecourse.code', array("size" => 12, "maxlenght" => 12))  . ' max. 12 characters, ie.ROM2121';
- echo $form->error('Ecourse.code', 'A category description is required.');
+ echo $fck->load('EcourseDescription', 'Default');
+ echo $form->error('Ecourse.description', 'You must describe course ');
+ 
+ echo $form->input('Ecourse.code', array("size" => 12, "maxlenght" => 12, 'title'=>' max. 12 characters. Example: ROM2121', 'error'=>'Code is required'));
  
  echo $form->label('Ecourse.subject_id', 'Subject:');
@@ -18 +21 @@
  echo $form->label('Ecourse.lang_id', 'Lang:');
  echo $form->select('Ecourse.lang_id', $langs, null, null, null, false);
+ 
+ echo $form->label('Ecourse.status', 'Enabled:' );
+ echo $form->checkbox('Ecourse.status', array("value"=>1, 'title'=>'Enabled course')); 
 ?>
-
-  <div style="clear:both"></div>
+</fieldset>
   <br />
   <?php echo $form->end('Save'); ?>
-</fieldset>
 
 <script type="text/javascript">

trunk/app/views/ecourses/admin_edit.ctp

@@ -1 +1 @@
 <?php 
-echo $form->create('Ecourse',array("onsubmit"=>"return chkForm();")); 
-echo $form->hidden('Ecourse.id');