Changeset 373

Timestamp:

04/09/08 12:40:29 (9 months ago)

Author:

aarkerio

Message:

Tests fixed

Location:

trunk/app

Files:

• controllers/tests_controller.php (modified) (1 diff)
• controllers/users_controller.php (modified) (10 diffs)
• models/test.php (modified) (1 diff)
• views/tests/admin_listing.ctp (modified) (3 diffs)
• views/tests/admin_vclassrooms.ctp (modified) (1 diff)
• views/users/validate.ctp (modified) (2 diffs)
• webroot/css/cpanel/cpanel.css (modified) (1 diff)

trunk/app/controllers/tests_controller.php

@@ -197 +197 @@
       
    $this->Test->unbindModel(array('hasMany'=>array('Question', 'Result')));
-      
+   
    $this->set('data', $this->Test->findAll($conditions, $fields, $order));
  }

trunk/app/controllers/users_controller.php

@@ -3 +3 @@
 *  Karamelo E-Learning Platform
 *  Chipotle Software 2002-2008
-*  GPL manuel<arroba>mononeurona<punto>org
+*  GPLv3 manuel<arroba>mononeurona<punto>org
 */ 
 //File: /app/controllers/users_controller.php
@@ -19 +19 @@
  public function beforeFilter() 
  {
-    $this->Auth->allow(array('blog', 'entry','portfolio', 'about', 'register', 'directory', 'bloggers', 'insert'));
+    $this->Auth->allow(array('blog', 'entry','portfolio', 'about', 'register', 'directory', 'bloggers', 'insert', 'validate'));
     parent::beforeFilter();
  }
@@ -144 +144 @@
         
         $this->Portal->statics(); // Using Portal component
-    }
-    
-    public function parents()
-    {
+ }
+    
+ public function parents()
+ {
         $this->layout    = 'portal';
         
@@ -162 +162 @@
         
         $this->Portal->statics(); // Using Portal component
-  }
-  
-  public function directory($filter = null)
-  {
+ }
+  
+ public function directory($filter = null)
+ {
         $this->pageTitle = 'Students :: Karamelo E-learning on Web 2.0';
         
@@ -185 +185 @@
         $limit      = null;        
         $this->set('users', $this->User->findAll($conditions, $fields, $order, $limit));
-  }
-  
-  public function karanet()
-  {
+ }
+  
+ public function karanet()
+ {
         $this->pageTitle = 'Directory :: Karamelo E-learning on Web 2.0';
         
@@ -254 +254 @@
  {
     $this->layout    = 'portal';
+
+    $this->pageTitle = 'Register new user';
     
     $conditions = array("id"=>'>1', "id"=>"<5");
@@ -284 +286 @@
    if (strlen($this->data['User']['pwd']) < 6)
    {
-       $message['pwd_worng'] = "The password has less than 6 characters ";
+       $message['pwd_wrong'] = "The password have less than 6 characters ";
    }
     
-   if (strpos($this->data['User']['username'], ' '))  // nos spaces
+   if (strpos($this->data['User']['username'], ' '))  // no spaces   
    {
        $message['username_spaces'] = "Your username should not contain spaces";
-    }
-    
-    /** username check **/
-    if (strlen($this->data['User']['username']) < 5)
-    {
+   }
+    
+   /** username check **/
+   if (strlen($this->data['User']['username']) < 5)
+   {
        $message['pwd_username'] = "The username has less than 5 characters ";
-    }
-    
-    /** name check **/
-    if (strlen($this->data['User']['name']) < 5)
-    {
+   }
+    
+   /** name check **/
+   if (strlen($this->data['User']['name']) < 5)
+   {
        $message['pwd_username'] = "The name is too short";
-    }
+   }
     
     if (strpos($this->data['User']['pwd'], ' '))  // pwd too short
@@ -318 +320 @@
     if ($this->Adds->validEmail($this->data['User']['email']) === false)
     {
-       $message['pwd_username'] = "The email is invalid";
+       $message['pwd_username'] = "Typed email is invalid";
     }
     
@@ -330 +332 @@
     
     /** Check the email **/
-    $email        = $this->User->field('email', array("email" => $this->data['User']['email']));
+    $email        = $this->User->field('email', array('email' => $this->data['User']['email']));
     
     if ($email != null)
@@ -338 +340 @@
     
     // get the secret code for teachers registration process
-    $code  = $this->User->Group->field('code', array("id"=>$this->data['User']['group_id']));
+    $code  = $this->User->Group->field('code', array('id'=>$this->data['User']['group_id']));
     
     if ( $this->data['User']['code'] != $code )

trunk/app/models/test.php

@@ -44 +44 @@
                        array('className'             => 'Vclassroom',
                          'joinTable'             => 'tests_vclassrooms',
-                         'foreignKey'            => 'vclassroom_id',
-                         'associationForeignKey' => 'test_id',
-                         'conditions'            => '',
-                         'order'                 => '',
+                         'foreignKey'            => 'test_id',
+                         'associationForeignKey' => 'vclassroom_id',
+                         'conditions'            => null,
+                         'order'                 => null,
                          'limit'                 => '',
                          'unique'                => true,

trunk/app/views/tests/admin_listing.ctp

@@ -16 +16 @@
   echo '<div class="grayblock">';
          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->div('div_title', $val['Test']['title']);
          echo $html->para(null, '<b>Test description:</b> '.$val['Test']['description']);
 
@@ -22 +22 @@
          echo $html->link($html->image('admin/questions_icon.gif', array('alt'=>'Questions', 'title'=>'Questions')), 
                           '/admin/tests/questions/'.$val['Test']['id'], null, null, false) . '<br />';
-
-
-         if ( count($val['Vclassroom']) < 0 ) 
+         if ( count($val['Vclassroom']) < 1 ) 
          {
+           
            echo $html->para(null, $html->link(
                                               $html->image('admin/vgroups-gray.gif', array(
@@ -45 +44 @@
 
            foreach($val['Vclassroom'] as $class):
-               echo $html->para(null, 'This test had been assigned to class: '. $html->link($class['name'], '/admi/ecourses/vclassroom/'.$class['id']) . '</b>');
+               echo $html->para(null, 'This test had been assigned to class: '. $html->link($class['name'], '/admin/vclassrooms/members/'.$class['id']) . '</b>');
            endforeach;
          }

trunk/app/views/tests/admin_vclassrooms.ctp

@@ -1 +1 @@
 <?php
  echo $html->addCrumb('Control Tools', '/admin/entries/start');
- echo $html->addCrumb('Courses', '/admin/tests/listing');
+ echo $html->addCrumb('Tests', '/admin/tests/listing');
  echo $html->getCrumbs(' / ');
 //die( debug( $data ) );

trunk/app/views/users/validate.ctp

@@ -2 +2 @@
 //die(print_r($message));
 foreach ($message as $m)
-  {
-     echo $m . "  <br />";
-  }
+{
+      echo $m . "  <br />";
+}
   
 if ( isset($ok) )
@@ -10 +10 @@
 
 ?>
-    <script type="text/javascript">
-        <!--
-            var ok = true; 
-            if ( ok == true ) 
-       { 
+ <script type="text/javascript">
+<!--
+  var ok = true; 
+  if ( ok == true ) 
+  { 
               //alert('I am in!!');
               var myDiv = document.getElementById('form_register');
               myDiv.innerHTML = '';
-       }
-        //-->
-        </script>
+  }
+//-->
+</script>
     
 <?php } ?>

trunk/app/webroot/css/cpanel/cpanel.css

@@ -1022 +1022 @@
 .grayblock{ padding:6px 3px 28px 4px;margin:10px 0 5px 0;border:1px dotted gray;}
 
+a.titlink:link { text-decoration: none; color: orange;font-size:13pt;} 
+a.titlink:active { text-decoration: none} 
+a.titlink:visited { text-decoration: none} 
+a.titlink:hover { text-decoration: underline }
+
+.div_title{font-size:13pt;font-weight:bold;color:orange;}