Changeset 746 for trunk/app/views

Timestamp:

09/01/08 20:58:25 (3 months ago)

Author:

aarkerio

Message:

Little Bugs fixed

Files:

• trunk/app/views/vclassrooms/admin_record.ctp (modified) (11 diffs)

trunk/app/views/vclassrooms/admin_record.ctp

@@ -30 +30 @@
 
  // Tests
+ $test_points = (int) 0;
  if ( count($data['tests']) > 0 ):
   echo '<h1>'. __('Tests', true).'</h1>';
@@ -38 +39 @@
     if ($t['TestsVclassroom']['points'] === null):  // not answered yet
       e($html->div(null, __('Not answered this test yet', true), array('id'=>$div_id,'style'=>'width:220px;float:left;font-size:7pt;')));
-      e($html->div(null, $t['TestsVclassroom']['title'], array('style'=>'width:350px;float:right;')));
+      e($html->div(null, $t['Test']['title'], array('style'=>'width:350px;float:right;')));
     else:
       e($html->div(null, $t['TestsVclassroom']['points'].' '.__('points',true),array('id'=>$div_id,'style'=>'width:180px;float:left;')));
       e('<div style="width:450px;float:right;">');
-      echo $html->link($t['TestsVclassroom']['title'], '#'.$div_id, array('title'=>'View test', 'onclick'=>
+      echo $html->link($t['Test']['title'], '#'.$div_id, array('title'=>'View test', 'onclick'=>
         "window.open('/admin/tests/see/".$data['User']['id']."/".$t['TestsVclassroom']['test_id']."/".$data['Vclassroom']['id']."','mywin','left=20,top=10,width=700,height=700,scrollbars=1,toolbar=0,resizable=1')")) . '&nbsp;&nbsp;';
         e('</div>');
       endif;
       e('</div>');
+      $test_points += (int) $t['TestsVclassroom']['points'];
     endforeach;
  else:
@@ -53 +55 @@
 
  // Webquests --> ResultWebquest
- $wpoints = (int) 0; // webquest points
+ $webquest_points = (int) 0; // webquest points
  if ( count($data['webquests']) > 0 ):
    echo '<h1>Webquests</h1>';
    foreach ($data['webquests'] as $w):
-     $wpoints += $w['ResultWebquest']['points'];
+     $webquest_points += $w['ResultWebquest']['points'];
      $div_id   = 'w'.$w['Webquest']['id'];
      e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
@@ -87 +89 @@
  
  // Treasures. Model: Treasure  
- $tpoints = (int) 0; // tresure points
+ $treasure_points = (int) 0; // tresure points
  echo '<h1>'. __('Scavengers hunts', true).'</h1>';
  if ( count($data['treasures']) > 0 ):
   foreach ($data['treasures'] as $tr):
+     $treasure_points += (int) $tr['ResultTreasure']['points'];
      $div_id   = 'tr'.$tr['Treasure']['id'];
      e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
@@ -120 +123 @@
  // Replies on forums. Model: Topic  
  echo '<h1>'.__('Participations in forums', true).'</h1>';
- $rpoints = (int) 0;
+ $reply_points = (int) 0;
  if ( count($data['replies']) > 0 ):
    foreach ($data['replies'] as $re):  
@@ -145 +148 @@
         e('</div>'); 
        e('</div>');
-       $rpoints += (int) $re['Reply']['points'];
+       $reply_points += (int) $re['Reply']['points'];
     endforeach;
   e($html->div(null, $html->image('static/loading.gif', array('alt'=>'Loading')), array('style'=>'display:none', 'id'=>'lorep')));
@@ -153 +156 @@
  
  // Participations, model:  Participation
- $ppoints = (int) 0;  // participation points
+ $participation_points = (int) 0;  // participation points
  echo '<h1>'.__('Participations', true).'</h1>'; 
  if ( count($data['participations']) > 0 ):
@@ -159 +162 @@
    e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
    $div_id = 'pa'.$p['Participation']['id'];
-   $ppoints += $p['Participation']['points'];
+   $participation_points += (int) $p['Participation']['points'];
   
    echo $html->div(null, $p['Participation']['points'].' '.__('points', true), array('id'=>$div_id,'style'=>'width:150px;float:left;'));
@@ -189 +192 @@
  
  // Reports, model:  Report
- $repoints = (int) 0;  // report points
+ $report_points = (int) 0;  // report points
  echo '<h1>'.__('Reports', true).'</h1>'; 
  if ( count($data['reports']) > 0 ):
@@ -195 +198 @@
    e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
    $div_id = 're'.$r['Report']['id'];
-   $repoints += (int) $r['Report']['points'];
+   $report_points += (int) $r['Report']['points'];
    echo $html->div(null, $r['Report']['points'].' '.__('points',true),  array('id'=>$div_id,'style'=>'width:150px;float:left;'));
 
@@ -224 +227 @@
  endif;
 
- echo  $html->div(null, __('Scavengers hunts', true) .' ' .__('points', true) .': '. $tpoints);
- echo  $html->div(null, 'Webquests ' .__('points', true) .': '. $wpoints);
- echo  $html->div(null, __('Replies', true). ' ' .__('points', true) .': '. $rpoints);
- echo  $html->div(null, __('Participations', true) .' '. __('points', true) .': '. $ppoints, array('id'=>'parpoints'));
- echo  $html->div(null, __('Reports', true) .' '. __('points', true) .': '. $repoints, array('id'=>'reppoints'));
- 
- $points = ($tpoints + $wpoints + $rpoints + $ppoints + $repoints);
+ echo  $html->div(null, __('Test', true) .' ' .__('points', true) .': '. $test_points);
+ echo  $html->div(null, __('Scavengers hunts', true) .' ' .__('points', true) .': '. $treasure_points);
+ echo  $html->div(null, 'Webquests ' .__('points', true) .': '. $webquest_points);
+ echo  $html->div(null, __('Replies', true). ' ' .__('points', true) .': '. $reply_points);
+ echo  $html->div(null, __('Participations', true) .' '. __('points', true) .': '. $participation_points, array('id'=>'parpoints'));
+ echo  $html->div(null, __('Reports', true) .' '. __('points', true) .': '. $report_points, array('id'=>'reppoints'));
+ 
+ $points = ($test_points + $treasure_points + $webquest_points + $reply_points + $participation_points + $report_points);
  
  echo  $ajax->div('totalpoints') .'<b>'.__('Total points', true).': ' . $points .'</b>'. $ajax->divEnd('totalpoints');