Changeset 741 for trunk

Timestamp:

08/27/08 20:16:13 (3 months ago)

Author:

aarkerio

Message:

Little Bugs fixed

Location:

trunk/app

Files:

• controllers/reports_controller.php (modified) (1 diff)
• controllers/webquests_controller.php (modified) (2 diffs)
• models/vclassroom.php (modified) (1 diff)
• views/reports/admin_points.ctp (added)
• views/vclassrooms/admin_record.ctp (modified) (3 diffs)
• views/webquests/admin_points.ctp (added)

trunk/app/controllers/reports_controller.php

@@ -113 +113 @@
  }
  /*=== ADMIN  METHODS ===*/
- public function admin_points($participation_id, $sense)
+ public function admin_points($report_id, $sense)
  {
-   $points = $this->Participation->field('points', array('Participation.id'=>$participation_id));
+   $points = (int) $this->Report->field('points', array('Report.id'=>$report_id));
    
    $points = ($sense == 'up' ) ? ($points + 1) : ($points - 1);
 
-   $this->data['Participation']['id']       = $participation_id;    
+   $this->data['Report']['id']       = $report_id;    
       
-   $this->data['Participation']['points']   = $points;
+   $this->data['Report']['points']   = $points;
      
-   if ($this->Participation->save($this->data['Participation'])):
+   if ($this->Report->save($this->data)):
              $this->set('points', $points);
-         $this->render('points', 'ajax');
+         $this->render('admin_points', 'ajax');
    endif;
  }

trunk/app/controllers/webquests_controller.php

@@ -85 +85 @@
          $this->data['ResultWebquest']['user_id'] = $this->Auth->user('id');
                   
-         if ($this->Webquest->ResultWebquest->save($this->data['ResultWebquest'])):
+         if ($this->Webquest->ResultWebquest->save($this->data)):
              $this->msgFlash(__('Data saved', true), 
           '/vclassrooms/show/'.$this->data['ResultWebquest']['blogger_id'].'/'.$this->data['ResultWebquest']['vclassroom_id']);
@@ -94 +94 @@
  public function admin_points($resultwebquest_id, $sense)
  {
-   $points = $this->Webquest->ResultWebquest->field('points', array('ResultWebquest.id'=>$resultwebquest_id));
-   
-   $points = ($sense == 'up' ) ? ($points + 1) : ($points - 1);
-
-   $this->data['Participation']['id']       = $participation_id;    
-      
-   $this->data['Participation']['points']   = $points;
+  $points = (int) $this->Webquest->ResultWebquest->field('points', array('ResultWebquest.id'=>$resultwebquest_id));
+   
+  $points = ($sense == 'up' ) ? ($points + 1) : ($points - 1);
+  
+  $this->data['ResultWebquest']['id']       = $resultwebquest_id;    
+      
+  $this->data['ResultWebquest']['points']   = $points;
      
-   if ($this->Webquest->ResultWebquest->save($this->data['Participation'])):
-             $this->set('points', $points);
-         $this->render('points', 'ajax');
-   endif;
+  if ($this->Webquest->ResultWebquest->save($this->data)):
+        $this->set('points', $points);
+        $this->render('admin_points', 'ajax');
+  endif;
  }
 

trunk/app/models/vclassroom.php

@@ -206 +206 @@
      // Webquest
      $conditions     = array('ResultWebquest.vclassroom_id'=>$vclassroom_id, 'ResultWebquest.user_id'=>$user_id);
-     $fields         = array('Webquest.title', 'Webquest.id', 'ResultWebquest.points'); //null;
+     $fields         = array('Webquest.title', 'Webquest.id', 'ResultWebquest.points', 'ResultWebquest.id'); //null;
      $record['webquests']          = $this->Webquest->ResultWebquest->findAll($conditions, $fields);
      $record['Vclassroom']['id']   = $vclassroom_id; // dirty but works     

trunk/app/views/vclassrooms/admin_record.ctp

@@ -1 +1 @@
 <?php
- //die(debug($data));
+ // die(debug($data));
  echo $html->addCrumb('Control Panel', '/admin/entries/start'); 
  echo $html->addCrumb(__('Groups', true), '/admin/vclassrooms/listing');
@@ -79 +79 @@
      e($html->div(null, $w['ResultWebquest']['points'] .' '.__('points', true),  array('id'=>$div_id, 'style'=>'width:150px;float:left;')));
      e('<div style="width:450px;float:right;">');
-     echo $html->link($w['Webquest']['title'], '#'.$div_id, array('title'=>__('View reply', true), 'onclick'=>
+     echo $html->link($w['Webquest']['title'], '#'.$div_id, array('title'=>__('View text', true), 'onclick'=>
         "window.open('/admin/webquests/see/".$data['User']['id']."/".$w['Webquest']['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', true), 'title'=>__('Points down', true))),
-                           '/admin/webquests/points/'.$w['Webquest']['id'].'/down',
-                        array('update'  => $div_id,
-                              'loading '=>"Element.show('loadingre');",
-                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                          'complete'=>"Element.hide('loadingre');Effect.Appear(".$div_id.")"),null,false);
+                           '/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);
       echo $ajax->link($html->image('static/aupmod.png', array('alt'=>__('Points up', true), 'title'=>__('Points up', true))),
-                           '/admin/webquests/points/'.$w['Webquest']['id'].'/up',
-                        array('update'  => $div_id,
-                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                              'loading '=>"Element.show('loadingre')",
-                          'complete'=>"Element.hide('loadingre');Effect.Appear(".$div_id.")"),null,false);
+                           '/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);
       e('</div>');  
-      e('</div>');
- 
-       endforeach;
+    e('</div>');
+ 
+    endforeach;
+ echo $ajax->div('loadingweb',array('style'=>'display:none')).$html->image('static/loading.gif',array('alt'=>'Loading')).$ajax->divEnd('loadingweb');
  else:
     echo  $html->para(null, __('No Webquests found', true));
@@ -118 +119 @@
                            '/admin/treasures/points/'.$tr['Treasure']['id'].'/down',
                         array('update'  => $div_id,
-                              'loading '=>"Element.show('loadingre');",
-                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                          'complete'=>"Element.hide('loadingre');Effect.Appear(".$div_id.")"),null,false);
+                              'loading '=>"Element.show('loadtre');",
+                                  '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('loadingre')",
-                          'complete'=>"Element.hide('loadingre');Effect.Appear(".$div_id.")"),null,false);
+                              'loading '=>"Element.show('loadtre')",
+                          '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));