Changeset 361

Timestamp:

04/02/08 13:19:24 (9 months ago)

Author:

aarkerio

Message:

Locale and test improvements

Location:

trunk/app

Files:

• controllers/answers_controller.php (modified) (3 diffs)
• controllers/newsletters_controller.php (modified) (1 diff)
• controllers/podcasts_controller.php (modified) (5 diffs)
• controllers/questions_controller.php (modified) (2 diffs)
• controllers/tests_controller.php (modified) (7 diffs)
• locale/eng/LC_MESSAGES/default.po (added)
• locale/spa (added)
• locale/spa/default.po (added)
• views/podcasts/admin_add.ctp (modified) (1 diff)
• views/questions/admin_answers.ctp (modified) (4 diffs)
• views/questions/admin_edit.ctp (modified) (1 diff)
• views/tests/admin_edit.ctp (modified) (1 diff)
• views/tests/admin_listing.ctp (modified) (1 diff)
• views/tests/admin_questions.ctp (modified) (2 diffs)
• webroot/img/admin/questions_icon.gif (added)

trunk/app/controllers/answers_controller.php

@@ -3 +3 @@
 *  Karamelo E-Learning Platform
 *  Chipotle Software 2002-2008 
-*  GPL manuel<at>mononeurona<punto>org
+*  GPLv3 manuel<arroba>mononeurona<punto>org
 */ 
 //File: /app/controllers/quotes_controller.php
@@ -45 +45 @@
         
         if ( $this->Answer->save($this->data['Answer']) ) 
-         {
+    {
                     $conditions = array("Answer.question_id" => $this->data['Answer']['question_id']);
                     $fields     = array("Answer.id", "Answer.answer", "Answer.correct");
@@ -112 +112 @@
         $this->set('data', $this->Answer->findAll($conditions, $fields, $order));
   }
+
+  public function admin_change($answer_id, $correct, $question_id)
+  {  
+     $this->data['Answer']['correct'] = ($correct == 0 ) ? 1 : 0;
+     
+     $this->data['Answer']['id']      = $answer_id;
+    
+     if ($this->Answer->save($this->data['Answer'])) 
+     {
+        $this->msgFlash('Answer updated', '/admin/question/listing/'.$question_id);
+     }
+  }
   
-  
-  public function admin_delete($id, $question_id) 
+  public function admin_delete($answer_id, $question_id) 
   {
       // deletes from database
       
-      if ( $this->Answer->del($id) )
+      if ( $this->Answer->del($answer_id) )
       {
             $this->msgFlash('Answer deleted', '/admin/questions/answers/'.$question_id);

trunk/app/controllers/newsletters_controller.php

@@ -1 +1 @@
 <?php
-/**
+/** 
 *   Karamelo E-Learning Platform
 *   Manuel Montoya 2002-2008

trunk/app/controllers/podcasts_controller.php

@@ -29 +29 @@
            {
             return true;
-       } 
+           } 
     } 
-        return false;  // go away !!
+    return false;  // go away !!
  }
 
@@ -44 +44 @@
    $conditions = array("Podcast.status"=>1);
         
-   $fields     = array('Podcast.id','Podcast.title','Podcast.description','Podcast.created','Podcast.filename','Podcast.length','Podcast.duration', 'User.username');
+   $fields     = array('Podcast.id','Podcast.title', 'Podcast.description','Podcast.created','Podcast.filename', 'Podcast.length','Podcast.duration', 'User.username');
      
    $order      = 'Podcast.id DESC';
@@ -64 +64 @@
     $this->Podcast->User->unbindModel(array('hasMany'=>array('Entry', 'Lesson', 'Category', 'Vclassroom', 'Faq', 'Acquaintance')));
 
-    $User =  $this->Podcast->User->find(array("User.username"=>$username));
-    //die(debug($User));
-    $this->set('User', $User);
-
-    // die(debug($User));
-
     $conditions = array("status"=>1, "user_id"=>$User['User']['id']);
     
@@ -83 +77 @@
  public function show($user_id, $id)
  {   
-        $this->layout    = $this->Edublog->layout($user_id);
-        
-        $this->set('blog', $this->Edublog->blog($user_id));
-        
-        $this->pageTitle = 'Podcast';
-        
-        $conditions = array("Podcast.id"=>$id, "Podcast.status"=>1);
-        
-        $fields     = array("id", "title", "description", "created", "filename", "length", "size", "duration");
-        
-        $this->set('data', $this->Podcast->findAll($conditions, $fields));
-    }
+    $this->layout    = $this->Edublog->layout($user_id);
+        
+    $this->set('blog', $this->Edublog->blog($user_id));
+        
+    $this->pageTitle = 'Podcast';
+        
+    $conditions = array("Podcast.id"=>$id, "Podcast.status"=>1);
+        
+    $fields     = array("id", "title", "description", "created", "filename", "length", "size", "duration");
+        
+    $this->set('data', $this->Podcast->findAll($conditions, $fields));
+ }
     
 /******    ====ADMIN METHODS==== ***/    
@@ -100 +94 @@
  public function admin_listing()
  {   
-        $this->pageTitle = $this->Auth->user('username') . '\'s Podcasts';
-        
-        $this->layout = 'admin';
-        
-        $conditions   = array("Podcast.user_id"=>$this->Auth->user('id'));
-        $fields       = array('id', 'title', 'description', 'created', 'length', 'status', 'filename');
-        $order        = "Podcast.id DESC";
-        $limit        = 12;
-        
-        $this->set('data', $this->Podcast->findAll($conditions, $fields, $order, $limit, null, 1)); 
+    $this->pageTitle = $this->Auth->user('username') . '\'s Podcasts';
+        
+    $this->layout = 'admin';
+        
+    $conditions   = array("Podcast.user_id"=>$this->Auth->user('id'));
+    $fields       = array('id', 'title', 'description', 'created', 'length', 'status', 'filename');
+    $order        = "Podcast.id DESC";
+    $limit        = 12;
+        
+    $this->set('data', $this->Podcast->findAll($conditions, $fields, $order, $limit, null, 1)); 
  }
     

trunk/app/controllers/questions_controller.php

@@ -15 +15 @@
   public function isAuthorized()
   {
-             if (isset($this->params[Configure::read('Routing.admin')]))
-                    {
-                             if ($this->Auth->user('group_id') != 1)
-                                      {
-                                                   return false;
-                                                             }
-                                                            }
-                                                               return true;
+      if (isset($this->params[Configure::read('Routing.admin')]))
+      {
+          if ($this->Auth->user('group_id') != 1)
+          {
+               return false;
+          }
+      }
+  return true;
   }                                                        
 
-  /***
-  ===   ADMIN METHODS
-  ***/  
-  public function admin_add() 
-  {
-    // adds new vote to database
-    if (!empty($this->data["Question"]))
-    {  
-        //die(print_r($this->data));
+ /***  ===   ADMIN METHODS ===  ***/  
+ public function admin_add() 
+ {
+  // adds new vote to database
+  if (!empty($this->data["Question"]))
+  {  
+   //die(print_r($this->data));
         
-        $this->Sanitize = new Sanitize;
+   $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->clean($this->data['Question']);
+   $this->Sanitize->clean($this->data['Question']);
         
-        $this->data["Question"]['user_id'] = $this->Auth->user('id');
+   $this->data["Question"]['user_id'] = $this->Auth->user('id');
 
-        $this->Question->create();
+   $this->Question->create();
         
-        if ( $this->Question->save( $this->data['Question'] ) ) 
-    {
-                    $conditions = array("Question.test_id" => $this->data['Question']['test_id']);
-                    $fields     = array("Question.id", "Question.question", "Question.hint", "Question.worth", "Question.explanation");
-                    $order      = "Question.id";
+   if ( $this->Question->save( $this->data['Question'] ) ) 
+   {
+     $conditions = array("Question.test_id" => $this->data['Question']['test_id']);
+     $fields     = array("Question.id", "Question.question", "Question.hint", "Question.worth", "Question.explanation");
+     $order      = "Question.id";
                     
-                    $this->set('data', $this->Question->findAll($conditions, $fields, $order));
+     $this->set('data', $this->Question->findAll($conditions, $fields, $order));
                     
-                    $this->render('questions', 'ajax');
+     $this->render('questions', 'ajax');
     }
     else
     {
-                echo "Ajax error, check with the company's computer guy...";
+            echo "Ajax error, check with the company's computer guy...";
     }
-     }
   }
+ }
 
-  public function admin_edit($question_id=null) 
-  {
-        $this->layout = 'admin';
+ public function admin_edit($question_id=null) 
+ {
+    $this->layout = 'admin';
     // adds new vote to database
-    if (!empty($this->data["Question"]))
-    {  
-        
+    if ( !empty($this->data["Question"]) )
+    {         
         $this->Sanitize = new Sanitize;
         
@@ -72 +69 @@
                 
          if ( $this->Question->save( $this->data['Question'] ) ) 
-     {
+         {
               $this->msgFlash('Question saved', '/admin/tests/questions/'.$this->data["Question"]["test_id"]);
-     }
-     else
-     {
+         }
+         else
+         {
                 echo "Ajax error, check with the company's computer guy...";
-     }
-        }
-        else
-        {
-             $this->Question->id = $question_id;
-          
-             $this->data = $this->Question->read();
-        }
+         }
+     }
+     else
+     {  
+        $this->data = $this->Question->read(null, $question_id);
+     }
   }
   

trunk/app/controllers/tests_controller.php

@@ -8 +8 @@
 
 uses('Sanitize');
+uses('L10n');
 
 class TestsController extends AppController
@@ -15 +16 @@
  public $components = array('Edublog');
  
+ public $paginate = array(
+                          'limit' => 25,
+                          'order' => array(
+                                           'Test.title' => 'asc'
+                                          )
+                         );
+ 
  public function beforeFilter() 
  {
     $this->Auth->allow(array('view', 'display'));
     parent::beforeFilter();
+    
+    // L10n
+    $this->L10n = new L10n();
+    $this->L10n->get("en");
+ 
+    Configure::write('Config.language', "en");
  }
  
@@ -151 +165 @@
   }
   
-  /**
-   === ADMIN METHODS ====
-  **/
+ /**   === ADMIN METHODS ====  **/
  /** Select classroom to link*/
  public function admin_vclassrooms()
@@ -168 +180 @@
       $this->set('data', $this->Test->findAll($conditions)); 
  }
-
-     
-  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));
-  }
-  
-  public function admin_questions($test_id)
-  {
-       $this->layout    = 'admin';
-        
-       $this->pageTitle = 'Tests';
-        
-       $conditions = array("Test.user_id"=>$this->Auth->user('id'), "Test.id"=>$test_id);
-        
-       $fields     = array("Test.id", "Test.user_id", "Test.title", "Test.description");
-
-       $this->Test->unbindModel(array("belongsTo"=>array("User")));
-        
-       $this->set('data', $this->Test->find($conditions, $fields, null, 2));
-  }
-
-  public function admin_add() 
-  {
+    
+ 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));
+ }
+ public function admin_add() 
+ {
        $this->layout    = 'admin';
        // add to database
@@ -223 +218 @@
           }
        }
-  }
-  public function admin_edit($test_id=null) 
-  {
+ }
+ 
+ public function admin_edit($test_id=null) 
+ {
        $this->layout    = 'admin';
        
@@ -242 +238 @@
        else
        {
-        $this->Test->id = $test_id;
-          
-        $this->data = $this->Test->read();
+          $this->data = $this->Test->read(null, $test_id);
        }
   }
@@ -260 +254 @@
     }
  }
+ 
+ public function admin_questions($test_id)
+ {
+       $this->layout    = 'admin';
+        
+       $this->pageTitle = 'Tests';
+        
+       $conditions = array("Test.user_id"=>$this->Auth->user('id'), "Test.id"=>$test_id);
+        
+       $fields     = array("Test.id", "Test.user_id", "Test.title", "Test.description");
+
+       $this->Test->unbindModel(array("belongsTo"=>array("User")));
+        
+       $this->set('data', $this->Test->find($conditions, $fields, null, 2));
+  }
 
  public function admin_delete($id) 

trunk/app/views/podcasts/admin_add.ctp

@@ -31 +31 @@
   echo $form->select('Podcast.subject_id', $subjects, null, null, null, false);
 
- 
   echo $form->input('Podcast.title', array("size" => 25, "maxlength" => 50)); 
 

trunk/app/views/questions/admin_answers.ctp

@@ -1 +1 @@
 <?php
-// die(print_r($data));
-  if ( isset($javascript) ):
-      echo $html->charsetTag('UTF-8');
-      echo $javascript->link('prototype');
-      echo $javascript->link('scriptaculous.js?load=effects');
-  endif;
- 
-  echo $html->addCrumb('Control Tools', '/admin/entries/start');
-  echo $html->addCrumb('Tests', '/admin/tests/listing');
-  echo $html->getCrumbs(' / '); 
+ echo $html->addCrumb('Control Tools', '/admin/entries/start');
+ echo $html->addCrumb('Tests', '/admin/tests/listing');
+ echo $html->getCrumbs(' / '); 
+
+ echo $html->div('title_section', 'Answers to ' . $data['Question']['question']);
 ?>
-
-<div class="title_section">Answers to <?php echo $data['Question']['question']; ?></div>
 
 <div id="loading" style="display: none;">
@@ -25 +18 @@
 
 <?php 
-   echo $ajax->form(null,'post');
-   echo $html->hiddenTag('Answer/question_id', $data['Question']['id']);
+   echo $ajax->form();
+   echo $form->hidden('Answer.question_id', array('value'=>$data['Question']['id']));
  ?>
-<fieldset>
-<legend>New answer</legend>
-
-<div class="required">
-  <?php echo $form->labelTag('Answer/answer', 'Answer:' ); ?>
-  <?php echo $html->input('Answer/answer', array("size" => 55, "maxlength" => 120)); ?>
-  <?php echo $html->tagErrorMsg('Answer/answer', 'Answer is required.'); ?>
-</div>
-<div class="required">
-  <?php echo $form->labelTag('Answer/correct', 'Answer is correct:' ); ?>
-  <?php echo $html->checkbox('Answer/correct', null, array("value" => 1)); ?>
-</div>
-<div>
+<fieldset><legend>New answer</legend>
 <?php
-    echo $ajax->submit('Save', array("url" => "/admin/answers/add",
+ echo $html->div('required',$form->input('Answer.answer', array("size" => 55, "maxlength" => 120))); 
+ echo $html->div('required',$form->label('Answer.correct','Answer is correct:').$form->checkbox('Answer.correct', array("value" => 1))); 
+ echo $ajax->submit('Save', array("url" => "/admin/answers/add",
                                          "update"=>"questions",
                                          "loading" => "Element.hide('questions');Element.hide('addquestion');Element.show('loading')",
@@ -48 +31 @@
             )); 
  ?>
-</div>
 </fieldset>
-
 </div>
 
@@ -58 +39 @@
 {
   $st = ($val["correct"]==1) ? 'Yes' : 'No';      
-    echo '<div style="padding:5px;border:1px dotted gray;margin:4px;">';
-       echo '<div class="butonright">' . $html->link('Delete', '/admin/answers/delete/'.$val['id'].'/'.$val['question_id'])   . '</div>';
-       echo '<div class="butonright">' . $html->link('Edit',   '/admin/answers/edit/'  .$val['id']) . '</div>';
-       echo "Answer: "      . $val["answer"]       . "<br />";
-       echo "Correct: "     . $st                  . "<br />";
-    echo '</div>';
+  $tmp  = $html->div(null, $html->link('Delete', '/admin/answers/delete/'.$val['id'].'/'.$val['question_id']));
+  $tmp .= $html->div(null, $html->link('Edit',   '/admin/answers/edit/'  .$val['id']));
+  $tmp .= "Answer:  "     . $val["answer"]          . "<br />";
+  $tmp .= "Correct: "     . $html->link($st, '/admin/answers/changed/'.$val['id'].'/'.$val['question_id']) . "<br />";
+
+  echo $html->div('adminblock', $tmp);
 }
 ?>

trunk/app/views/questions/admin_edit.ctp

@@ -1 @@
-<?php echo $html->addCrumb('Control Tools', '/admin/entries/start'); ?> 
-<?php echo $html->addCrumb('Test', '/admin/tests/listing'); ?> 
-<?php echo $html->getCrumbs(' / '); ?>
-
 <?php 
-   echo $html->formTag('/admin/questions/edit','post', array("onsubmit"=>"return validateNew()")); 
-   echo $html->hidden('Question/test_id');
+   echo $html->addCrumb('Control Tools', '/admin/entries/start');
+   echo $html->addCrumb('Test', '/admin/tests/listing'); 
+   echo $html->getCrumbs(' / '); 
+ 
+   echo $form->create('Question', array("onsubmit"=>"return validateNew()")); 
+   echo $form->hidden('Question.id');
+   echo $form->hidden('Question.test_id', array('value'=>$this->data['Question']['test_id']));
 ?>
 <fieldset>
 <legend>Edit question</legend>
-<div class="required">
-  <?php 
-      echo $form->labelTag('Question/question', 'Question:' ); 
-      echo $html->input('Question/question', array("size" => 40, "maxlength" => 120)); 
-      echo $html->tagErrorMsg('Question/question', 'Question is required.'); 
-   ?>
-</div>
+<?php
+ echo $html->div('required',$form->input('Question.question', array("size" => 40, "maxlength" => 120))); 
+  
+ echo $html->div('required',$form->input('Question.hint', array("size" => 40, "maxlength" => 120))); 
+    
+ $tmp  = $form->label('Question.explanation', 'Explanation:'); 
+ $tmp .= $form->textarea('Question.explanation', array("cols" => 50, "rows" => 5)); 
 
-<div class="required">
-  <?php 
-     echo $form->labelTag('Question/hint', 'Hint:' );
-     echo $html->input('Question/hint', array("size" => 40, "maxlength" => 120)); 
-     echo $html->tagErrorMsg('Question/hint', 'Hint is required.'); 
-   ?>
-</div>
+ echo $html->div('required',$tmp);
+ 
+ $t  = $form->label('Question.worth', 'Worth:');
+ $t .= $form->select('Question.worth', array(1,2,3,4,5,6,7,8,9,10), null, null, false, false);
+ echo $html->div('required',$t);
+?>
+</fieldset>
+<?php echo $form->end('Save'); ?> 
 
-<div class="required">
-<?php 
-   echo $form->labelTag('Question/explanation', 'Explanation:' ); 
-   echo $html->textarea('Question/explanation', array("cols" => 50, "rows" => 5)); 
-   echo $html->tagErrorMsg('Question/explanation', 'Description is required.');
-?>
-</div>
-
-<div class="required">
-<?php 
-    echo $form->labelTag( 'Question/status', 'Published:' );
-    $options = array(1,2,3,4,5,6,7,8,9,10);
-    echo $html->selectTag('Question/value', $options, null, null, false, false);
-?>
-</div>
-
-<div>
-    <?php echo $html->submit('Save'); ?> </form>
-</div>
-</fieldset>

trunk/app/views/tests/admin_edit.ctp

@@ -1 @@
-<?php echo $html->addCrumb('Control Tools', '/admin/entries/start'); ?> 
-<?php echo $html->addCrumb('Test', '/admin/tests/listing'); ?> 
-<?php echo $html->getCrumbs(' / '); ?>
-
 <?php 
-   echo $html->formTag('/admin/tests/edit','post', array("onsubmit"=>"return validateNew()")); 
-   echo $html->hidden('Test/id');
+ echo $html->addCrumb('Control Tools', '/admin/entries/start');
+ echo $html->addCrumb('Test', '/admin/tests/listing'); 
+ echo $html->getCrumbs(' / '); 
+ 
+ echo $form->create('Test', array("onsubmit"=>"return validateNew()")); 
+ echo $form->hidden('Test.id');
 ?>
 <fieldset>
 <legend>Edit test</legend>
-<div class="required">
-  <?php 
-      echo $form->labelTag('Test/title', 'Title:' ); 
-      echo $html->input('Test/title', array("size" => 40, "maxlength" => 120)); 
-      echo $html->tagErrorMsg('Test/title', 'Test is required.'); 
-   ?>
-</div>
+<?php 
+ echo $html->div('required', $form->input('Test.title', array("size" => 40, "maxlength" => 120))); 
+   
+ echo $html->div('required', $form->label('Test.description', 'Description:') . $form->textarea('Test.description', array("cols" => 50, "rows" => 5))); 
+   
+ echo $html->div('required', $form->label('Test.status', 'Published:' ) . $form->checkbox('Test.status', array('value'=>1)));
+ 
+ echo $form->end('Save'); 
+?> 
+</fieldset>
 
-<div class="required">
-<?php 
-   echo $form->labelTag('Test/explanation', 'Explanation:' ); 
-   echo $html->textarea('Test/explanation', array("cols" => 50, "rows" => 5)); 
-   echo $html->tagErrorMsg('Test/explanation', 'Description is required.');
-?>
-</div>
-<div>
-<?php
-   echo $form->labelTag('Test/status', 'Published:' );
-    echo $html->checkbox('Test/status', null);
-?>
-</div>
-<div>
-    <?php echo $html->submit('Save'); ?> </form>
-</div>