Changeset 756 for trunk/app

Timestamp:

09/04/08 19:34:27 (3 months ago)

Author:

aarkerio

Message:

New layout

Location:

trunk/app

Files:

• controllers/vclassrooms_controller.php (modified) (1 diff)
• models/vclassroom.php (modified) (1 diff)
• views/helpers/fpdf.php (modified) (2 diffs)
• views/vclassrooms/admin_export.ctp (modified) (2 diffs)
• views/vclassrooms/admin_listing.ctp (modified) (1 diff)

trunk/app/controllers/vclassrooms_controller.php

@@ -209 +209 @@
 
    $this->set('group',$this->Vclassroom->find($conditions, $fields));
-
    $this->set('data', $this->Vclassroom->recordClass($vclassroom_id));
  }

trunk/app/models/vclassroom.php

@@ -256 +256 @@
    $users      = array();
    $records    = array();
-   
    $data  = $this->UsersVclassroom->findAll(array('UsersVclassroom.vclassroom_id'=>$vclassroom_id), array('user_id'));
-  
    //die(debug($data));   
    foreach ($data as $u):
-
      $this->User->removeBinds();  // remove innecesaries user binds
      
-     $user_id = $u['UsersVclassroom']['user_id'];
+     $user_id = (int) $u['UsersVclassroom']['user_id'];
 
      $conditions        = array('User.id'=>$user_id);
      $fields            = array('User.name', 'User.email'); //null;
      $records[$user_id] = $this->User->find($conditions, $fields);
-  
-     // Test result     
-     $conditions        = array('Result.vclassroom_id'=>$vclassroom_id, 'Result.user_id'=>$user_id);
-     $fields            = array('Result.correct', 'Test.title');  //null;
-     $records[$user_id]['tests']   = $this->Test->Result->findAll($conditions, $fields);
-     //die(debug($records));
-    
+     // Consult Test Model associated to this Vclassroom
+     $this->TestsVclassroom->bindModel(array('belongsTo'=>array('Test')));
+     $conditions        = array('TestsVclassroom.vclassroom_id'=>$vclassroom_id);
+     $fields            = array('TestsVclassroom.test_id', 'TestsVclassroom.id', 'Test.title'); 
+     $tests             = $this->TestsVclassroom->findAll($conditions, $fields);
+
+     // foreach test check in Result model
+     foreach($tests as $k => $t):
+       $records[$user_id]['tests'][$k]['Test']['points'] = $this->Test->getPoints($t['TestsVclassroom']['test_id'], $user_id, $vclassroom_id);
+       $records[$user_id]['tests'][$k]['Test']['title']  = $t['Test']['title']; 
+     endforeach;
+     
      $conditions = array('ResultTreasure.vclassroom_id'=>$vclassroom_id, 'ResultTreasure.user_id'=>$user_id);
      $fields     = array('ResultTreasure.points', 'Treasure.title'); //null;

trunk/app/views/helpers/fpdf.php

@@ -21 +21 @@
   { 
     $this->pdf = new myFPDF($orientation, $unit, $format);
-    $this->pdf->SetFont('Arial','B',14);
+    $this->pdf->SetFont('Arial','B',10);
   }
    
@@ -27 +27 @@
   {
     $string  =  utf8_decode($data);  // UTF-8
-    $this->pdf->Cell(0,5,$string,1,1,'L');
-    $this->pdf->Ln(5);
+    $this->pdf->Cell(0,2,$string,0,1,'L');
+    $this->pdf->Ln(2);
   }
 

trunk/app/views/vclassrooms/admin_export.ctp

@@ -1 +1 @@
 <?php
 //die(debug($data));
- foreach ($data as $u):
-    
+ foreach ($data as $u):    
   $fpdf->newPage();
 
-  $fpdf->setData('Group: ' . $group['Vclassroom']['name'] . '. Created '.$group['Vclassroom']['created']);
-  $fpdf->setData('Student '. $u['User']['name'] . ' '.$u['User']['email']);
+  $fpdf->setData(__('Group', true).': ' . $group['Vclassroom']['name'] . '. Created '.$group['Vclassroom']['created']);
+  $fpdf->setData(__('Student', true) . ': '.$u['User']['name'] . ' '.$u['User']['email']);
   
   if ( count($u['tests']) > 0 ):  
-    foreach ($u['tests'] as $te): 
-         $fpdf->setData($te['Test']['title'] . ', Percentage '.$te['Result']['percentage'].'%');
+    foreach ($u['tests'] as $te):
+       if ( $te['Test']['points'] ):
+           $fpdf->setData($te['Test']['title'] . ', '.__('Points', true).' '.$te['Test']['points']);
+       else:
+           $fpdf->setData($te['Test']['title'] . ', '.__('Not answered this test yet', true));
+       endif;
     endforeach;
   else:
@@ -18 +21 @@
   if ( count($u['treasures']) > 0 ):
     foreach ($u['treasures'] as $t):
-      $fpdf->setData($t['Treasure']['title'] . ', Points '.$t['ResultTreasure']['points']);
+      $fpdf->setData($t['Treasure']['title'] . ', '.__('Points', true).' '.$t['ResultTreasure']['points']);
     endforeach;
   else:

trunk/app/views/vclassrooms/admin_listing.ctp

@@ -6 +6 @@
  echo $html->div('title_section', __('vGroups', true));
 
- echo $html->link($html->image('actions/new.png', array("alt"=>"Add classroom", "title"=>"Add classroom")), '/admin/ecourses/listing', null, null, false); 
+ echo $html->link($html->image('actions/new.png', array('alt'=>__('Add new', true), 'title'=>__('Add new', true))), '/admin/ecourses/listing', null, null, false); 
 ?>
 <table class="tbadmin">
 <?php
-
 $th = array(__('Edit', true), 'Virtual classroom', 'Status', __('See vGroup', true));
 echo $html->tableHeaders($th);  
 foreach ($data as $val):
        
-  $st = ( $val['Vclassroom']['status'] == 1 ) ? 'Enabled' : 'Filed';    
+  $st = ( $val['Vclassroom']['status'] == 1 ) ? __('Enabled', true) : __('Filed', true);    
   $tr = array (
         $gags->sendEdit($val['Vclassroom']['id'], 'vclassrooms'),
         $html->link($val['Vclassroom']['name'], '/admin/vclassrooms/members/'.$val['Vclassroom']['id']) . ' <span class="petit">'.$val['Ecourse']['title'].'</span>',
         $st,
-        $html->link($html->image('static/user-group-icon.jpg', array('width'=>22, 'alt'=>__('See vGroup', true), 'title'=>__('See vGroup', true))), '/vclassrooms/show/'.$val['Vclassroom']['user_id'].'/'.$val['Vclassroom']['id']), null, null, false);
+        $html->link(
+$html->image('static/user-group-icon.jpg', array('width'=>22, 'alt'=>__('See vGroup', true), 'title'=>__('See vGroup', true))), 
+'/vclassrooms/show/'.$val['Vclassroom']['user_id'].'/'.$val['Vclassroom']['id'], null, null, false));
     
    echo $html->tableCells($tr, array("class"=>"altRow", "onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='altRow'"),