Changeset 470

Timestamp:

05/09/08 19:49:28 (8 months ago)

Author:

aarkerio

Message:

Forums and topics improveds

Location:

trunk/app

Files:

• models/vclassroom.php (modified) (3 diffs)
• views/vclassrooms/admin_export.ctp (modified) (2 diffs)
• views/vclassrooms/admin_members.ctp (modified) (1 diff)
• views/vclassrooms/admin_record.ctp (modified) (3 diffs)
• webroot/img/admin/message_board.gif (modified) (previous)

trunk/app/models/vclassroom.php

@@ -118 +118 @@
      $fields           = array('Forum.title', 'Topic.subject'); //null;
      $record['topics'] = $this->Forum->Topic->findAll($conditions, $fields);
-     
+
+     // forums
+     //$conditions     = array('Forum.vclassroom_id'=>$vclassroom_id, 'Forum.user_id'=>$user_id);
+     //$fields         = array('Participation.title', 'Participation.id', 'Participation.points'); //null;
+     
+     //$record['participations'] = $this->Participation->findAll($conditions, $fields);
+     
+     // Participations
      $conditions     = array('Participation.vclassroom_id'=>$vclassroom_id, 'Participation.user_id'=>$user_id);
      $fields         = array('Participation.title', 'Participation.id', 'Participation.points'); //null;
@@ -124 +131 @@
      $record['participations'] = $this->Participation->findAll($conditions, $fields);
 
+     // Webquest
      $conditions     = array('ResultWebquest.vclassroom_id'=>$vclassroom_id, 'ResultWebquest.user_id'=>$user_id);
      $fields         = array('Webquest.title', 'Webquest.id', 'ResultWebquest.points'); //null;
@@ -173 +181 @@
      $fields         = array('Webquest.title', 'ResultWebquest.points'); //null;
 
-     $records[$user_id]['webquests']      = $this->Webquest->ResultWebquest->findAll($conditions, $fields);
+     $records[$user_id]['webquests']  = $this->Webquest->ResultWebquest->findAll($conditions, $fields);
      
   endforeach;
-  // die(debug($records));
+  //die(debug($records));
   return $records;
  }

trunk/app/views/vclassrooms/admin_export.ctp

@@ -1 +1 @@
 <?php
- //$tmp = null;
-$position = 40; // cell()  first parameter
+//die(debug($data));
 
  foreach ($data as $u):
@@ -15 +14 @@
     endforeach;
    
-    foreach ($u['participations'] as $p):
-      $fpdf->setData($p['Participation']['title'] . ', Points ' . $p['Participation']['points']);
+    foreach ($u['participations'] as $Par):
+            foreach ($Par as $p):
+                      $fpdf->setData($p['title'] . ', Points ' . $p['points']);
+            endforeach;
     endforeach;
 
     foreach ($u['webquests'] as $w):
-      $fpdf->setData($w['Webquest']['title'] . ', Points ' . $w['Webquest']['points']);
+                       $fpdf->setData($w['Webquest']['title'] . ', Points ' . $w['ResultWebquest']['points']);
     endforeach;
  

trunk/app/views/vclassrooms/admin_members.ctp

@@ -36 +36 @@
         ), '/admin/vclassrooms/export/'.$data['Vclassroom']['id'], null, null, false);
 
+
+
+ echo $ajax->link($html->image('admin/message_board.gif', array('alt'=>'Compose message to group', 'title'=>'Compose message to group')),
+     '/admin/messages/allclass/'.$data['Vclassroom']['id'],
+                                            array("update" => "qn",
+                                                 "loading"=>"Element.show('loading3');",
+                                                 "complete"=>"Element.hide('loading3');Effect.Appear('qn')"),
+                                                  null,
+                                                  false
+                                                   );
+   
+ echo '<div id="loading3" style="display: none;">'.$html->image("static/loading.gif", array("alt"=>"Loading")).'</div>';
+                        
+ echo $ajax->div('qn', array("style"=>"padding:3px")) . $ajax->divEnd('qn');
+                      
 echo '</div>';
 

trunk/app/views/vclassrooms/admin_record.ctp

@@ -39 +39 @@
      foreach ($data['treasures'] as $tr):
            $record .= 'Treasure: '. $tr['Treasure']['title'] . ' Points: ' . $tr['ResultTreasure']['points'] . '<br />';
-           $points += $w['ResultTreasure']['points'];
+           $points += $tr['ResultTreasure']['points'];
      endforeach;
  else:
@@ -51 +51 @@
 
     foreach ($data['topics'] as $p):
-        $record .= 'Forum: '. $p['Forum']['title'] . '<br />';
+        $record .= '1 participation on Forum: '. $p['Forum']['title'] . '<br />';
         $num_topics++;
     endforeach;
@@ -57 +57 @@
     $record .= $html->para(null, 'No topic found');
  endif;
-    
+ 
+ $record .= $html->para(null, 'Total points: ' .$points);
+
+ $record .= $html->para(null, 'Participation: ' .$num_topics);
+
+   
   echo $html->div(null, $record);  
 ?>