Changeset 732 for trunk

Timestamp:

08/21/08 18:11:48 (3 months ago)

Author:

aarkerio

Message:

Little bugs fixed

Location:

trunk/app

Files:

• config/sql/postgresql/reports.sql (modified) (1 diff)
• controllers/participations_controller.php (modified) (2 diffs)
• controllers/tests_controller.php (modified) (1 diff)
• locale/spa/LC_MESSAGES/default.po (modified) (2 diffs)
• models/vclassroom.php (modified) (7 diffs)
• views/vclassrooms/admin_record.ctp (modified) (5 diffs)
• views/vclassrooms/upload.ctp (modified) (1 diff)
• webroot/css/basic/styles.css (modified) (1 diff)
• webroot/css/rubyx/rubyx.css (modified) (1 diff)

trunk/app/config/sql/postgresql/reports.sql

@@ -2 +2 @@
    id serial NOT NULL PRIMARY KEY,
    filename varchar(80) NOT NULL UNIQUE,
+   description varchar(40) NOT NULL, 
    student_id int NOT NULL REFERENCES users(id) ON DELETE CASCADE,
    points smallint NOT NULL DEFAULT 2,

trunk/app/controllers/participations_controller.php

@@ -34 +34 @@
       
       $this->data['Participation']['user_id']  = $this->Auth->user('id');
-      // die( debug($this->data['Participation']));
+     
       $this->Participation->create();
      
       if ($this->Participation->save($this->data['Participation'])):
       $url = '/vclassrooms/show/'.$this->data['Participation']['blogger_id'].'/'.$this->data['Participation']['vclassroom_id'];
-          $this->msgFlash('Your participation has been saved.',$url);
+          $this->msgFlash(__('Your participation has been saved', true), $url);
       endif;
    endif;
@@ -54 +54 @@
    $this->data['Participation']['points']   = $points;
      
-   if ($this->Participation->save($this->data['Participation'])):
+   if ($this->Participation->save($this->data)):
              $this->set('points', $points);
          $this->render('points', 'ajax');

trunk/app/controllers/tests_controller.php

@@ -68 +68 @@
  public function result()
  { 
- try {
+  if ( !$this->Auth->user()):
+    $this->redirect('/');
+  endif; 
+
+  try {
    //die(debug($this->data['Test']));
    

trunk/app/locale/spa/LC_MESSAGES/default.po

@@ -5 +5 @@
 msgstr "Si"
 
+msgid  "No reports found"
+msgstr "No hay reportes"
+
+msgid  "Your participation has been saved"
+msgstr "Tu participación ha sido registrada"
+
 msgid  "See participation"
 msgstr "Ver participación"
@@ -16 +22 @@
 msgid  "Participations in forums"
 msgstr "Participaciones en foros"
+
+msgid  "Participations"
+msgstr "Participaciones"
 
 msgid  "You have been registered"

trunk/app/models/vclassroom.php

@@ -35 +35 @@
                       'Participation' =>
                array('className'     => 'Participation',
+                 'conditions'    => null,
+                 'order'         => null,
+                 'limit'         => null,
+                 'foreignKey'    => 'vclassroom_id'
+                 ),
+                      'Report' =>
+               array('className'     => 'Report',
                  'conditions'    => null,
                  'order'         => null,
@@ -97 +104 @@
       'status'  => VALID_NOT_EMPTY
    );
+
 /*
 public $validate = array(
@@ -120 +128 @@
                                )
                        ); */ 
- /**
- *  Get student record in Vclassroom , return array  usd in admin_record method (vclassrooms_controller.php)
+/**
+ *  Get student record in Vclassroom , return array used in admin_record method (vclassrooms_controller.php)
  *
  * @param  integer $user_id:  in $fact student_id
@@ -128 +136 @@
  * @access public
  * @author Manuel Montoya 
- **/
+**/
  public function studentRecord($user_id, $vclassroom_id)
  {
-  try 
-  {   
+   // 1) wee need check tree models: Test, Webquest and Treasures ans results associated to them:
+   // Result, ResultTreasure and ResultWebquest, so will get the stundents answer  
+  try{   
      $record                  = array();
    
-     $this->User->unbindAll();  // unbind unnecesaries tables
+     $this->User->unbindAll();  // unbind unnecesary tables
      
      //Get the student data
@@ -147 +156 @@
      $record['tests']   = $this->TestsVclassroom->findAll($conditions, $fields);
      // die(debug($record));
-   
+
+     // foreach test check in Result model
      foreach($record['tests'] as $k => $t):
        $record['tests'][$k]['TestsVclassroom']['title'] = $t['Test']['title'];
@@ -174 +184 @@
      //die(debug($record['tests']));
 
-     // Now Treasure Model
+     // Now Treasure model
      $conditions = array('ResultTreasure.vclassroom_id'=>$vclassroom_id, 'ResultTreasure.user_id'=>$user_id);
      $fields     = array('ResultTreasure.points', 'Treasure.title', 'Treasure.id'); //null;
      $record['treasures']  =  $this->Treasure->ResultTreasure->findAll($conditions, $fields);
-  
-     // Consult Reply Model    
+     
+     // Consult Reply model to know student participation in forums    
      $conditions        = array('Reply.vclassroom_id'=>$vclassroom_id, 'Reply.user_id'=>$user_id);
      $fields            = array('Reply.topic_id', 'Reply.vclassroom_id', 'Reply.id', 'Reply.points'); //null;
@@ -188 +198 @@
      $fields         = array('Participation.title', 'Participation.id', 'Participation.points'); //null; 
      $record['participations'] = $this->Participation->findAll($conditions, $fields);
-
+     
+     // Reports
+     $conditions     = array('Report.vclassroom_id'=>$vclassroom_id, 'Report.student_id'=>$user_id);
+     $fields         = array('Report.filename', 'Report.description', 'Report.id', 'Report.points'); //null; 
+     $record['reports'] = $this->Report->findAll($conditions, $fields);
+     
      // Webquest
      $conditions     = array('ResultWebquest.vclassroom_id'=>$vclassroom_id, 'ResultWebquest.user_id'=>$user_id);

trunk/app/views/vclassrooms/admin_record.ctp

@@ -6 +6 @@
  echo $html->getCrumbs(' / ');
 
- echo '<br /><br />';
- echo '<div style="border: 1px dotted black;width:80%;padding:9px;margin:0 auto;">';
+ echo '<div style="border: 1px dotted black;width:80%;padding:9px;margin:15px auto;">';
  echo $html->div('title_section', $data['User']['name']);
  echo $html->div(null, $html->link($data['User']['email'], $data['User']['email']));
@@ -136 +135 @@
  endif;
    
-
  echo '<h1>'.__('Participations in forums', true).'</h1>';
-
  if ( count($data['replies']) > 0 ):
    // Replies on forums. Model: Topic
@@ -173 +170 @@
 
  // Participations, model:  Participation
- $ppoints = (int) 0;  // participation points 
+ $ppoints = (int) 0;  // participation points
+ echo '<h1>'.__('Participations', true).'</h1>'; 
  if ( count($data['participations']) > 0 ):
-   echo '<h1>'.__('Participations', true).'</h1>';
    foreach ($data['participations'] as $p):
    e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
@@ -204 +201 @@
     e('</div>');
     endforeach;
-    e($html->div(null, $html->image('static/loading.gif', array('alt'=>'Loading'), array('id'=>'loadingpa', 'style'=>'display:none'))));
+
+  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
+ 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;'));
+
+   echo '<div style="width:450px;float:right;">';    
+   echo __('Report', true).': '. $html->link($r['Report']['description'], '#', array('title'=>__('View reply', true), 'onclick'=>"window.open('/admin/participations/show/".$r['Report']['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))) ,
+                           '/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);
+     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);
+
+      e('</div>');
+    e('</div>');
+    endforeach;
+
+  e($html->div(null, $html->image('static/loading.gif', array('alt'=>'Loading')), array('style'=>'display:none;', 'id'=>'loadingrep')));
+
+ else:
+    echo  $html->para(null, __('No reports found', true));
  endif;
 
@@ -213 +250 @@
  echo  $html->div(null, 'Webquests ' .__('points', true) .': '. $wpoints);
  echo  $html->div(null, __('Participations', true) .' '. __('points', true) .': '. $ppoints, array('id'=>'parpoints'));
- 
- $points = ($tpoints + $wpoints + $rpoints + $ppoints);
+ echo  $html->div(null, __('Reports', true) .' '. __('points', true) .': '. $repoints, array('id'=>'reppoints'));
+ 
+ $points = ($tpoints + $wpoints + $rpoints + $ppoints + $repoints);
  
  echo  $ajax->div('totalpoints') . '<b>'.__('Total points', true).': ' . $points .'</b>'. $ajax->divEnd('totalpoints');

trunk/app/views/vclassrooms/upload.ctp

@@ -9 +9 @@
 <?php
  echo $form->label('Report.file', __('File', true). ': ');
- echo $form->file('Report.file').'<br /><br />';
-  
+ echo $form->file('Report.file').'<br /><br />';  
 
- echo $form->input('Report.description', array('size'=>40, 'maxlength'=>100, 'label'=>__('Description', true)));
+ echo $form->input('Report.description', array('size'=>40, 'maxlength'=>40, 'label'=>__('Description', true)));
  echo $form->end(__('Upload', true)); 
 ?>

trunk/app/webroot/css/basic/styles.css

@@ -112 +112 @@
    margin:4px;
 }
+
+/* Message by flash CakePHP stuff */
+.message
+{
+    position:absolute;
+    top:20px;
+    left:800px;
+    width:200px;
+    font-size:7pt;
+    font-weight:bold;
+    color:white;
+    border: solid 1px orange;
+    padding:2px;
+    background-color:#66cc00;
+    text-align:center;
+}
+/* Hint text on Tests */
+.hint{font-size:7pt; padding:3px;margin:2px;border:1px dotted gray;}

trunk/app/webroot/css/rubyx/rubyx.css

@@ -271 +271 @@
 }
 
+/* Used in tests */
 .hint{font-size:7pt; padding:3px;margin:2px;border:1px dotted gray;}