Changeset 605

Timestamp:

06/13/08 23:34:00 (5 months ago)

Author:

aarkerio

Message:

Add reports

Location:

trunk/app

Files:

• config/sql/postgresql/participations.sql (modified) (1 diff)
• config/sql/postgresql/reports.sql (added)
• controllers/participations_controller.php (modified) (1 diff)
• controllers/reports_controller.php (added)
• controllers/vclassrooms_controller.php (modified) (2 diffs)
• locale/spa/LC_MESSAGES/default.po (modified) (2 diffs)
• models/report.php (added)
• views/vclassrooms/show.ctp (modified) (7 diffs)
• views/vclassrooms/upload.ctp (added)
• webroot/files/studentsfiles (added)

trunk/app/config/sql/postgresql/participations.sql

@@ -2 +2 @@
    id serial NOT NULL PRIMARY KEY,
    title varchar(80) NOT NULL,
-   user_id int NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+   user_id int NOT NULL REFERENCES users(id) ON DELETE CASCADE, -- student id
    points smallint NOT NULL DEFAULT 1,
    participation text NOT NULL,

trunk/app/controllers/participations_controller.php

@@ -8 +8 @@
 *  @package Karamelo
 */
-//File: /app/controllers/answers_controller.php
+//File: /app/controllers/participations_controller.php
 
 uses('sanitize');

trunk/app/controllers/vclassrooms_controller.php

@@ -21 +21 @@
  {
    parent::beforeFilter();
-   $this->Auth->allow(array('show', 'jointoclass', 'aboutme', 'display', 'participation'));
+   $this->Auth->allow(array('show', 'jointoclass', 'aboutme', 'display', 'participation', 'upload'));
  }
 
@@ -85 +85 @@
    $this->layout = 'ajax';
 
-   if ( !empty($this->data['Participation']))
-   {  
+   if ( !empty($this->data['Participation'])):  
           $this->set('vclassroom_id', $this->data['Participation']['vclassroom_id']);
           $this->set('blogger_id', $this->data['Participation']['blogger_id']);
           $this->render('participation', 'ajax');
-   }
+   endif;
+ }
+
+ public function upload()
+ {
+   $this->layout = 'ajax';
+
+   if ( !empty($this->data['Upload'])):  
+          $this->set('vclassroom_id', $this->data['Upload']['vclassroom_id']);
+          $this->set('blogger_id', $this->data['Upload']['blogger_id']);
+          $this->render('upload', 'ajax');
+   endif;
  }
 

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

@@ -10 +10 @@
 msgid  "File"
 msgstr "Archivo"
+
+msgid  "Write participating" 
+msgstr "Escribir participación"
+
+msgid  "Course description"
+msgstr "Descripción del curso"
+
+msgid  "Created"
+msgstr "Creado"
 
 msgid  "Login" 
@@ -140 +149 @@
 msgstr "He leido y aceptado los terminos"
 
+msgid  "Welcome"
+msgstr "Bienvenido"
+
+msgid  "Join to this class"
+msgstr "Unirse a esta clase"
+
 msgid  "Subjects"
 msgstr "Materias"
+
+msgid  "Subject"
+msgstr "Materia"
 
 msgid  "Messages"

trunk/app/views/vclassrooms/show.ctp

@@ -6 +6 @@
   
  if ( $belongs === true ):
-     echo  $html->para(null, 'Welcome! <b>'. $session->read('Auth.User.username') .'</b>');
-     echo  $html->para(null, '<b>Created:</b> ' . $data['Vclassroom']['created']);
-     echo  $html->para(null, '<b>Subject</b>: ' . $data['Ecourse']['title']);
-     echo  $html->para(null, '<b>Course description</b>:'. $data['Ecourse']['description']);
+     echo  $html->para(null, __('Welcome', true) . '!<b>'. $session->read('Auth.User.username') .'</b>');
+     echo  $html->para(null, '<b>'.__('Created', true). '</b>:' . $data['Vclassroom']['created']);
+     echo  $html->para(null, '<b>'.__('Subject', true).'</b>: ' . $data['Ecourse']['title']);
+     echo  $html->para(null, '<b>'.__('Course description', true).'</b>:'. $data['Ecourse']['description']);
 
      //  Forums
@@ -22 +22 @@
     // Tests 
     if ( count($data['Test']) > 0):
-       echo $html->div('titentry', 'Quizz Tests');
+       echo $html->div('titentry', __('Quizz Tests', true));
 
        foreach($data['Test'] as $t):
@@ -39 +39 @@
 
     if ( count($data['Treasure']) > 0):
-       echo $html->div('titentry', 'Treasure Hunts');
+       echo $html->div('titentry', __('Treasure Hunts', true));
 
         foreach($data['Treasure'] as $t):
@@ -45 +45 @@
     endforeach;
     endif;
-
-    echo $ajax->form();
-     
+    // participation
+    echo $ajax->form();     
     echo $form->hidden('Participation.vclassroom_id', array('value'=>$data['Vclassroom']['id']));
     echo $form->hidden('Participation.blogger_id', array('value'=>$blog['User']['id']));  // this to return
-    echo $ajax->submit('Start participating', array("url" => "/vclassrooms/participation/", 
+    echo $ajax->submit(__('Write participating',true), array("url" => "/vclassrooms/participation/", 
                                          "update"=>"setform",
                                          "loading" => "Element.show('charging');Element.hide('setform')",
@@ -56 +55 @@
         ));
     echo '</form>'; 
+    echo $ajax->div('setform') . $ajax->divEnd('setform'); 
+  // upload file
+  echo $ajax->form();     
+    echo $form->hidden('Upload.vclassroom_id', array('value'=>$data['Vclassroom']['id']));
+    echo $form->hidden('Upload.blogger_id', array('value'=>$blog['User']['id']));  // this to return
+    echo $ajax->submit(__('Upload file', true), array("url" => "/vclassrooms/upload/", 
+                                         "update"=>"setform2",
+                                         "loading" => "Element.show('charging');Element.hide('setform2')",
+                                         "complete" => "Element.hide('charging');Effect.Appear('setform2')"
+        ));
+    echo '</form>'; 
+
     // empty ajax div
-    echo $ajax->div('setform') . $ajax->divEnd('setform'); 
+    echo $ajax->div('setform2') . $ajax->divEnd('setform2'); 
   endif;
 
@@ -66 +77 @@
      echo $form->hidden('UsersVclassroom.vclassroom_id', array('value'=>$data['Vclassroom']['id']));
      echo $form->input('UsersVclassroom.code', array('size' => 6, 'maxlength'=>6, 'title'=>'Secret code', 'between'=>': '));
-     echo $ajax->submit('Join to this class '.$session->read('Auth.User.username'), array("url" => "/vclassrooms/jointoclass/", 
+     echo $ajax->submit(__('Join to this class', true).$session->read('Auth.User.username'), array("url" => "/vclassrooms/jointoclass/", 
                                          "update"=>"updater",
                                          "loading" => "Element.show('charging');Element.hide('updater')",
@@ -73 +84 @@
 
      // empty ajax div
+
      echo $ajax->div('updater') . $ajax->divEnd('updater'); 
 endif;