Changeset 730 for trunk/app

Timestamp:

08/20/08 20:54:59 (3 months ago)

Author:

aarkerio

Message:

Bugs fixed

Location:

trunk/app

Files:

• config/core.php (modified) (1 diff)
• controllers/answers_controller.php (modified) (4 diffs)
• controllers/vclassrooms_controller.php (modified) (1 diff)
• locale/spa/LC_MESSAGES/default.po (modified) (1 diff)
• models/vclassroom.php (modified) (5 diffs)
• views/vclassrooms/admin_record.ctp (modified) (4 diffs)

trunk/app/config/core.php

@@ -199 +199 @@
  *                  );
  */
-     Cache::config('default', array('engine' => 'File'));
+ Cache::config('default', array('engine' => 'File'));
+ 
+/* Cache::config('default', array('engine' => 'Xcache', //[required]
+                      'duration'=> 3600, //[optional]
+                      'probability'=> 100, //[optional]
+                      'user' => 'aarkerio', //user from xcache.admin.user settings
+                      'password' => 'kunst99' //plaintext password (xcache.admin.pass)
+                 )
+         ); */
 ?>

trunk/app/controllers/answers_controller.php

@@ -49 +49 @@
    $this->layout = 'admin';
 
-   if (empty($this->data["Answer"])):
+   if (empty($this->data['Answer'])):
         $this->data = $this->Answer->read(null, $answer_id );
    else:
@@ -56 +56 @@
         
        $this->Sanitize->clean($this->data['Answer']); 
-        
+       
        if ($this->Answer->save($this->data)):
-          $this->msgFlash(__('Answer updated', true),'/admin/questions/answers/'.$this->data['Answer']['question_id']);
+          $this->msgFlash(__('Data saved', true),'/admin/questions/answers/'.$this->data['Answer']['question_id']);
        endif;
  endif;  
@@ -65 +65 @@
  public function admin_listing($question_id)
  {
-     $this->layout    = 'ajax';
+     $this->layout = 'ajax';
         
-     $conditions = array("Answer.user_id"=>$this->Auth->user('id'), "Answer.question_id"=>$question_id);
+     $conditions   = array('Answer.user_id'=>$this->Auth->user('id'), 'Answer.question_id'=>$question_id);
         
-     $fields     = array("Answer.id", "Answer.user_id", "Answer.correct");
+     $fields       = array('Answer.id', 'Answer.user_id', 'Answer.correct');
         
-     $order = "Answer.id DESC";
+     $order        = 'Answer.id DESC';
         
      $this->set('data', $this->Answer->findAll($conditions, $fields, $order));
@@ -80 +80 @@
   public function admin_questions($test_id)
   {
-        $this->pageTitle = 'Answers';
+     $this->pageTitle = __('Answers', true);
         
-        $conditions = array("Answer.user_id"=>$this->Auth->user('id'), "Answer.id"=>$test_id);
+     $conditions = array('Answer.user_id'=>$this->Auth->user('id'), 'Answer.id'=>$test_id);
         
-        $fields     = array("Answer.id", "Answer.user_id", "Answer.title", "Answer.description");
+     $fields     = array("Answer.id", "Answer.user_id", "Answer.title", "Answer.description");
         
-        $order = "Answer.id DESC";
+     $order    = 'Answer.id DESC';
         
-        $this->set('data', $this->Answer->findAll($conditions, $fields, $order));
+     $this->set('data', $this->Answer->findAll($conditions, $fields, $order));
   }
 

trunk/app/controllers/vclassrooms_controller.php

@@ -115 +115 @@
             $this->set('msg', __('You are already member of this class', true));
             $this->render('jointoclass', 'ajax');
-     else:
+    else:
             $this->data['UsersVclassroom']['user_id'] = $this->Auth->user('id');
 

trunk/app/locale/spa/LC_MESSAGES/default.po

@@ -4 +4 @@
 msgid  "Yes"
 msgstr "Si"
+
+msgid  "Points up"
+msgstr "Subir puntos"
+
+msgid  "Points down"
+msgstr "Bajar puntos"
+
+msgid  "Participations in forums"
+msgstr "Participaciones en foros"
 
 msgid  "You have been registered"

trunk/app/models/vclassroom.php

@@ -120 +120 @@
                        ); */ 
  /**
- *  Get student record in Vclassroom , return array
+ *  Get student record in Vclassroom , return array  usd in admin_record method (vclassrooms_controller.php)
  *
- * @param  integer $user_id  description
+ * @param  integer $user_id:  in $fact student_id
  * @param  integer $vclassroom_id  description
  * @return array   $record description
  * @access public
- * @author author Manuel Montoya 
+ * @author Manuel Montoya 
  **/
  public function studentRecord($user_id, $vclassroom_id)
@@ -133 +133 @@
      $record                  = array();
    
-     $this->User->unbindAll();
-     
+     $this->User->unbindAll();  // unbind unnecesaries tables
+     
+     //Get the student data
      $record   = $this->User->find(array('User.id'=>$user_id), array('id', 'username', 'name', 'email'));
      
-     // Consult Test Model
+     // Consult Test Model associated to this Vclassroom
      $this->TestsVclassroom->bindModel(array('belongsTo'=>array('Test')));
      
@@ -143 +144 @@
      $fields            = array('TestsVclassroom.test_id', 'TestsVclassroom.id', 'Test.title'); 
      $record['tests']   = $this->TestsVclassroom->findAll($conditions, $fields);
-     //die(debug($record['tests']));
+     // die(debug($record));
    
      foreach($record['tests'] as $k => $t):
@@ -151 +152 @@
        
        $conditions = array('Result.vclassroom_id'=>$vclassroom_id,'Result.user_id'=>$user_id,'Result.test_id'=>$t['TestsVclassroom']['test_id']);
-       $fields     = array('Result.correct', 'Result.answer_id','Test.title', 'Question.question', 'Question.worth');
+       $fields     = array('Result.correct', 'Result.answer_id','Question.worth');
        $results    = $this->Test->Result->findAll($conditions, $fields);
-
+       //debug($results);
+       // Get points from answers
        if ( count($results) > 0 ):
             $points     = (int) 0;
        else:
-            $points     = null;   //student has no answered this test yet
+            $points     = null;   //student has not answered this test yet
        endif;
        
        foreach($results as $r):
             if ($r['Result']['correct'] == 1):
-                  $points     += $r['Question']['worth'];     
+                  $points     += (int) $r['Question']['worth'];     
         endif;
        endforeach;
@@ -169 +171 @@
      endforeach;
      //die(debug($record['tests']));
-     // Consult Treasure Model
+
+     // Now Treasure Model
      $conditions = array('ResultTreasure.vclassroom_id'=>$vclassroom_id, 'ResultTreasure.user_id'=>$user_id);
      $fields     = array('ResultTreasure.points', 'Treasure.title', 'Treasure.id'); //null;

trunk/app/views/vclassrooms/admin_record.ctp

@@ -1 +1 @@
 <?php
  //die(debug($data));
-
  echo $html->addCrumb('Control Panel', '/admin/entries/start'); 
  echo $html->addCrumb(__('Groups', true), '/admin/vclassrooms/listing');
@@ -101 +100 @@
        endforeach;
  else:
-    echo  $html->para(null, 'No webquests found');
+    echo  $html->para(null, __('No Webquests found', true));
  endif;
  
  // Treasures. Model: Treasure  
  $tpoints = (int) 0; // tresure points
+ echo '<h1>'. __('Scavengers hunts', true).'</h1>';
  if ( count($data['treasures']) > 0 ):
-  echo '<h1>Treasures</h1>';
   foreach ($data['treasures'] as $tr):
- 
-     $tpoints += $tr['ResultTreasure']['points'];
+     $tpoints += (int) $tr['ResultTreasure']['points'];
      $div_id   = 'tr'.$tr['Treasure']['id'];
      e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
      e($html->div(null, $tr['ResultTreasure']['points'] .' points',  array('id'=>$div_id, 'style'=>'width:150px;float:left;')));
      e('<div style="width:450px;float:right;">');
-     echo $html->link($tr['Treasure']['title'], '#', array('title'=>'View reply', 'onclick'=>
+     echo $html->link($tr['Treasure']['title'], '#', array('title'=>__('View text', true), 'onclick'=>
         "window.open('/admin/treasures/see/".$data['User']['id']."/".$tr['Treasure']['id']."','mywin','left=20,top=20,width=700,height=700,toolbar=0,resizable=1')")) . '&nbsp;&nbsp;';
 
-     echo $ajax->link($html->image('static/adownmod.png', array('alt'=>'Points down', 'title'=>'Points down')),
+     echo $ajax->link($html->image('static/adownmod.png', array('alt'=>__('Points down', true), 'title'=>__('Points down', true))),
                            '/admin/treasures/points/'.$tr['Treasure']['id'].'/down',
                         array('update'  => $div_id,
@@ -124 +122 @@
                                   'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
                           'complete'=>"Element.hide('loadingre');Effect.Appear(".$div_id.")"),null,false);
-     echo $ajax->link($html->image('static/aupmod.png', array('alt'=>'Points up', 'title'=>'Points up')),
+     echo $ajax->link($html->image('static/aupmod.png', array('alt'=>__('Points up', true), 'title'=>__('Points up', true))),
                            '/admin/treasures/points/'.$tr['Treasure']['id'].'/up',
                         array('update'  => $div_id,
@@ -135 +133 @@
      endforeach;
  else:
-       echo  $html->para(null, 'No treasures found');
+     echo $html->para(null, __('No Scavenger hunts found', true));
  endif;
    
- // Replies on forums. Model: Topic
- $rpoints = (int) 0;  // reply points
+
+ echo '<h1>'.__('Participations in forums', true).'</h1>';
+
  if ( count($data['replies']) > 0 ):
-    echo '<h1>Replies in forums</h1>';
-    foreach ($data['replies'] as $re):
-     
+   // Replies on forums. Model: Topic
+   $rpoints = (int) 0;  // reply points
+   foreach ($data['replies'] as $re):  
       $div_id = 're'.$re['Reply']['id'];
       e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');