Changeset 744 for trunk/app

Timestamp:

08/30/08 18:26:22 (3 months ago)

Author:

aarkerio

Message:

Little Bugs fixed

Location:

trunk/app

Files:

• controllers/participations_controller.php (modified) (2 diffs)
• views/participations/admin_points.ctp (added)
• views/participations/points.ctp (deleted)
• views/vclassrooms/admin_record.ctp (modified) (11 diffs)

trunk/app/controllers/participations_controller.php

@@ -46 +46 @@
  public function admin_points($participation_id, $sense)
  {
-   $points = $this->Participation->field('points', array('Participation.id'=>$participation_id));
+   $points = (int) $this->Participation->field('points', array('Participation.id'=>$participation_id));
    
    $points = ($sense == 'up' ) ? ($points + 1) : ($points - 1);
@@ -54 +54 @@
    $this->data['Participation']['points']   = $points;
      
-   if ($this->Participation->save($this->data)):
-             $this->set('points', $points);
-         $this->render('points', 'ajax');
+   if ($this->Participation->save($this->data, false)):
+          $this->set('points', $points);
+      $this->render('admin_points', 'ajax');
    endif;
  }

trunk/app/views/vclassrooms/admin_record.ctp

@@ -31 +31 @@
  // Tests
  if ( count($data['tests']) > 0 ):
-     echo '<h1>'. __('Tests', true).'</h1>';
-     foreach ($data['tests'] as $t):
-    
-      $div_id = 'te'.$t['TestsVclassroom']['id'];
-      e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
-
-      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;')));
-      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 '<h1>'. __('Tests', true).'</h1>';
+  foreach ($data['tests'] as $t):
+    $div_id = 'te'.$t['TestsVclassroom']['id'];
+    e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
+
+    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;')));
+    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'=>
         "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;';
@@ -58 +57 @@
                               'loading '=>"Element.show('loadingre')",
                           'complete'=>"Element.hide('loadingre');Effect.Appear(".$div_id.")"),null,false); */
-      e('</div>');
+        e('</div>');
       endif;
-        
-      e('</div>');
- 
-    endforeach;
+      e('</div>');
+    endforeach;
  else:
       echo $html->para(null, __('No tests found', true));
  endif;
 
- // Webquests
+ // Webquests --> ResultWebquest
  $wpoints = (int) 0; // webquest points
  if ( count($data['webquests']) > 0 ):
    echo '<h1>Webquests</h1>';
    foreach ($data['webquests'] as $w):
-   
      $wpoints += $w['ResultWebquest']['points'];
      $div_id   = 'w'.$w['Webquest']['id'];
@@ -85 +81 @@
                            '/admin/webquests/points/'.$w['ResultWebquest']['id'].'/down',
                         array('update'  => $div_id,
-                              'loading' =>"Element.show('loadingweb');",
-                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                          'complete'=>"Element.hide('loadingweb');Effect.Appear(".$div_id.")"),null,false);
+                              'loading' =>"Element.show('loadingweb');Element.hide('".$div_id."')",
+                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
+                          'complete'=>"Element.hide('loadingweb');Effect.Appear('".$div_id."')"),null,false);
       echo $ajax->link($html->image('static/aupmod.png', array('alt'=>__('Points up', true), 'title'=>__('Points up', true))),
                            '/admin/webquests/points/'.$w['ResultWebquest']['id'].'/up',
                         array('update'  => $div_id,
-                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                              'loading' =>"Element.show('loadingweb')",
-                          'complete'=>"Element.hide('loadingweb');Effect.Appear(".$div_id.")"),null,false);
+                                  'loading' =>"Element.show('loadingweb');Element.hide('".$div_id."')",                                  
+                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
+                          'complete'=>"Element.hide('loadingweb');Effect.Appear('".$div_id."')"),null,false);
       e('</div>');  
     e('</div>');
@@ -108 +104 @@
  if ( count($data['treasures']) > 0 ):
   foreach ($data['treasures'] as $tr):
-     $tpoints += (int) $tr['ResultTreasure']['points'];
      $div_id   = 'tr'.$tr['Treasure']['id'];
      e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
@@ -119 +114 @@
                            '/admin/treasures/points/'.$tr['Treasure']['id'].'/down',
                         array('update'  => $div_id,
-                              'loading '=>"Element.show('loadtre');",
-                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                          'complete'=>"Element.hide('loadtre');Effect.Appear(".$div_id.")"),null,false);
+                              'loading '=>"Element.show('loadtre');Element.hide('".$div_id."')",
+                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
+                          'complete'=>"Element.hide('loadtre');Effect.Appear('".$div_id."')"),null,false);
      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,
                                   'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                              'loading '=>"Element.show('loadtre')",
-                          'complete'=>"Element.hide('loadtre');Effect.Appear(".$div_id.")"),null,false);
-      e('</div>');  
-      e('</div>');
- 
-     endforeach;
+                              'loading '=>"Element.show('loadtre');Element.hide('".$div_id."')",
+                          'complete'=>"Element.hide('loadtre');Effect.Appear('".$div_id."')"),null,false);
+      e('</div>');
+    e('</div>');
+   endforeach;
  echo $ajax->div('loadtre',array('style'=>'display:none')).$html->image('static/loading.gif',array('alt'=>'Loading')).$ajax->divEnd('loadtre');
  else:
      echo $html->para(null, __('No Scavenger hunts found', true));
  endif;
-   
+
+ // Replies on forums. Model: Topic  
  echo '<h1>'.__('Participations in forums', true).'</h1>';
+ $rpoints = (int) 0;
  if ( count($data['replies']) > 0 ):
-   // Replies on forums. Model: Topic
-   $rpoints = (int) 0;  // reply points
    foreach ($data['replies'] as $re):  
-      $div_id = 're'.$re['Reply']['id'];
+      $div_id = 'rep'.$re['Reply']['id'];
       e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
       e($html->div(null, $re['Reply']['points'].' '.__('points', true),  array('id'=>$div_id, 'style'=>'width:150px;float:left;')));
@@ -152 +146 @@
                            '/admin/replies/points/'.$re['Reply']['id'].'/down',
                         array('update'  => $div_id,
-                              'loading '=>"Element.show('loadreply');",
-                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                          'complete'=>"Element.hide('loadreply');Effect.Appear(".$div_id.")"),null,false);
+                              'loading' => "Element.show('lorep');Element.hide('".$div_id."')",
+                                  'complete'=>"Element.hide('lorep');Effect.Appear('".$div_id."')",
+                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')'),
+                                   null,false);
       echo $ajax->link($html->image('static/aupmod.png', array('alt'=>__('Points up', true), 'title'=>__('Points up', true))),
                            '/admin/replies/points/'.$re['Reply']['id'].'/up',
-                        array('update'  => $div_id,
-                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                              'loading '=>"Element.show('loadreply')",
-                          'complete'=>"Element.hide('loadreply');Effect.Appear(".$div_id.")"),null,false);
-        echo '</div>';  
-        $rpoints += $re['Reply']['points']; //sum
-     
+                       array('update'  => $div_id,
+                                 'loading' =>"Element.show('lorep');Element.hide('".$div_id."')",
+                                 'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
+                         'complete'=>"Element.hide('lorep');Effect.Appear('".$div_id."')"),null,false);
+        e('</div>'); 
        e('</div>');
-      endforeach;
-  e($html->div(null, $html->image('static/loading.gif', array('alt'=>'Loading')),array('id'=>'loadreply', 'style'=>'display:none;')));
- else:
-    echo  $html->para(null, 'No reply found');
- endif;
-
+       $rpoints += (int) $re['Reply']['points'];
+    endforeach;
+  e($html->div(null, $html->image('static/loading.gif', array('alt'=>'Loading')), array('style'=>'display:none', 'id'=>'lorep')));
+ else:
+    echo  $html->para(null, __('No reply found', true));
+ endif;
+ 
  // Participations, model:  Participation
  $ppoints = (int) 0;  // participation points
@@ -177 +171 @@
    foreach ($data['participations'] as $p):
    e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
-
    $div_id = 'pa'.$p['Participation']['id'];
- 
    $ppoints += $p['Participation']['points'];
   
@@ -187 +179 @@
    echo __('Participation', true).': '. $html->link($p['Participation']['title'], '#', array('title'=>__('View text', true), 'onclick'=>"window.open('/admin/participations/show/".$p['Participation']['id']."','mywin','left=20,top=20,width=700,height=700,toolbar=0,resizable=1')")).'  ';
 
-       echo $ajax->link($html->image('static/adownmod.png', array('alt'=>__('Points down', true), 'title'=>__('Points down', true))) ,
+       echo $ajax->link($html->image('static/adownmod.png', array('alt'=>__('Points down', true), 'title'=>__('Points down', true))),
                            '/admin/participations/points/'.$p['Participation']['id'].'/down',
                         array('update'     => $div_id,
-                              'loading'    =>"Element.show('loadingpa');",
-                                  'interactive'=>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                          'complete'   =>"Element.hide('loadingpa');Effect.Appear(".$div_id.");"),null,false);
+                              'loading'    =>"Element.show('loadingpa');Element.hide('".$div_id."')",
+                                  'interactive'=>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
+                          'complete'   =>"Element.hide('loadingpa');Effect.Appear('".$div_id."')"),null,false);
        echo $ajax->link($html->image('static/aupmod.png', array('alt'=>__('Points up', true), 'title'=>__('Points up', true))),
                            '/admin/participations/points/'.$p['Participation']['id'].'/up',
                         array('update'     => $div_id,
-                                  'loading'    =>"Element.show('loadingpa');",
-                                  'interactive'=>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                          'complete'   =>"Element.hide('loadingpa');Effect.Appear(".$div_id.");"),null,false);
-
-      e('</div>');
-    e('</div>');
-    endforeach;
-
-  e($html->div(null, $html->image('static/loading.gif', array('alt'=>'Loading')), array('style'=>'display:none;', 'id'=>'loadingpa')));
-      
+                                  'loading'    =>"Element.show('loadingpa');Element.hide('".$div_id."')",
+                                  'interactive'=>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
+                          'complete'   =>"Element.hide('loadingpa');Effect.Appear('".$div_id."')"),null,false);
+
+      e('</div>');
+    e('</div>');
+  endforeach;     
+  e($html->div(null, $html->image('static/loading.gif', array('alt'=>'Loading')), array('style'=>'display:none', 'id'=>'loadingpa')));
  else:
     echo  $html->para(null, __('No participation found', true));
  endif;
-
+ 
+ 
  // Reports, model:  Report
- $repoints = (int) 0;  // participation points
+ $repoints = (int) 0;  // report points
  echo '<h1>'.__('Reports', true).'</h1>'; 
  if ( count($data['reports']) > 0 ):
    foreach ($data['reports'] as $r):
    e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
-
    $div_id = 're'.$r['Report']['id'];
- 
    $repoints += (int) $r['Report']['points'];
-  
    echo $html->div(null, $r['Report']['points'].' '.__('points',true),  array('id'=>$div_id,'style'=>'width:150px;float:left;'));
 
@@ -229 +217 @@
                            '/admin/reports/points/'.$r['Report']['id'].'/down',
                         array('update'     => $div_id,
-                              'loading'    =>"Element.show('loadingrep');",
-                                  'interactive'=>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                          'complete'   =>"Element.hide('loadingrep');Effect.Appear(".$div_id.");"),null,false);
+                              'loading'    =>"Element.show('loadingrep');Element.hide('".$div_id."')",
+                                  'interactive'=>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
+                          'complete'   =>"Element.hide('loadingrep');Effect.Appear('".$div_id."')"),null,false);
      echo $ajax->link($html->image('static/aupmod.png', array('alt'=>__('Points up', true), 'title'=>__('Points up', true))),
                            '/admin/reports/points/'.$r['Report']['id'].'/up',
                         array('update'     => $div_id,
-                                  'loading'    =>"Element.show('loadingrep');",
-                                  'interactive'=>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                          'complete'   =>"Element.hide('loadingrep');Effect.Appear(".$div_id.");"),null,false);
+                                  'loading'    =>"Element.show('loadingrep');Element.hide('".$div_id."')",
+                                  'interactive'=>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
+                          'complete'   =>"Element.hide('loadingrep');Effect.Appear('".$div_id."')"),null,false);
 
       e('</div>');
@@ -251 +239 @@
  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'));
@@ -256 +245 @@
  $points = ($tpoints + $wpoints + $rpoints + $ppoints + $repoints);
  
- echo  $ajax->div('totalpoints') . '<b>'.__('Total points', true).': ' . $points .'</b>'. $ajax->divEnd('totalpoints');
+ echo  $ajax->div('totalpoints') .'<b>'.__('Total points', true).': ' . $points .'</b>'. $ajax->divEnd('totalpoints');
 ?>
 </div>