Changeset 468

Timestamp:

05/09/08 00:41:41 (8 months ago)

Author:

aarkerio

Message:

Forums and topics improveds

Location:

trunk/app

Files:

• config/sql/postgresql/result_webquests.sql (modified) (1 diff)
• controllers/forums_controller.php (modified) (1 diff)
• controllers/tests_controller.php (modified) (3 diffs)
• controllers/vclassrooms_controller.php (modified) (1 diff)
• controllers/webquests_controller.php (modified) (4 diffs)
• models/test.php (modified) (1 diff)
• models/treasure.php (modified) (1 diff)
• models/webquest.php (modified) (2 diffs)
• views/forums/display.ctp (modified) (2 diffs)
• views/tests/view.ctp (modified) (2 diffs)
• views/vclassrooms/show.ctp (modified) (2 diffs)
• views/webquests/display.ctp (modified) (1 diff)
• views/webquests/view.ctp (modified) (2 diffs)

trunk/app/config/sql/postgresql/result_webquests.sql

@@ -1 +1 @@
 CREATE TABLE result_webquests (  -- webquests student results
    id serial NOT NULL UNIQUE,
+   answer text NOT NULL,
    user_id int NOT NULL REFERENCES users(id) ON DELETE CASCADE,
    points smallint NOT NULL,
-   webquest_id int NOT NULL REFERENCES tests(id) ON DELETE CASCADE,
+   webquest_id int NOT NULL REFERENCES webquests(id) ON DELETE CASCADE,
    vclassroom_id int NOT NULL REFERENCES vclassrooms(id) ON DELETE CASCADE,
    PRIMARY KEY (user_id, webquest_id, vclassroom_id)

trunk/app/controllers/forums_controller.php

@@ -53 +53 @@
  }
  
- public function display($forum_id) 
- {      
+ public function display($forum_id, $vclassroom_id) 
+ {      
+  // student belongst to this class?
+  if ( $this->Auth->user() && $this->Auth->user('group_id') == 3):
+             $this->set('belongs', $this->Forum->Vclassroom->belongs($this->Auth->user('id'), $vclassroom_id));
+  else:
+             $this->set('belongs', false);
+  endif;
+
   $conditions = array('Forum.id'=>$forum_id, 'Forum.status'=>1);
         

trunk/app/controllers/tests_controller.php

@@ -66 +66 @@
   public function view($test_id, $vclassroom_id)
   {
+    $user_id = $this->Test->field('Test.user_id', array("Test.id"=>$test_id));
+
+    $this->pageTitle = 'Exam';
+               
+    $this->layout    = $this->Edublog->layout($user_id);
+         
+    $this->Edublog->blog($user_id); // set edublog components
+   
     // student belongst to this class?
     if ( $this->Auth->user() && $this->Auth->user('group_id') == 3):
@@ -74 +82 @@
        
     if ( $this->Test->chk($test_id, $this->Auth->user('id'), $vclassroom_id) === true ):
-         $username = $this->Test->User->field('User.username', array("User.id"=>$user_id));
-     $this->flash('You already have answered this test', '/users/portfolio/'.$username);
+             $this->set('already', false);
+             $this->set('data', false);
+     else:
+             $this->set('already', true);
     endif;
     
-    $this->pageTitle = 'Exams';
-               
-    $this->layout    = $this->Edublog->layout($user_id);
-         
-    $this->Edublog->blog($user_id); // set edublog components
          
     $conditions = array("Test.id"=>$test_id, "Test.status"=>1);
@@ -89 +94 @@
 
     $order  = null;
-
+    
     $this->set('data', $this->Test->find($conditions, $fields, $order, 2));
+
+    $this->set('vclassroom_id', $vclassroom_id);
  }
 

trunk/app/controllers/vclassrooms_controller.php

@@ -77 +77 @@
    $this->Edublog->blog($user_id);
    
-   // student belongst to this class?
+   // student belongs to this class?
    if ( $this->Auth->user() && $this->Auth->user('group_id') == 3):
              $this->set('belongs', $this->Vclassroom->belongs($this->Auth->user('id'), $vclassroom_id));

trunk/app/controllers/webquests_controller.php

@@ -16 +16 @@
  public function beforeFilter() 
  {
-    $this->Auth->allow(array('display', 'view'));
+    $this->Auth->allow(array('display', 'view', 'result'));
     parent::beforeFilter();
  }
@@ -36 +36 @@
       $conditions      = array("Webquest.status"=>1);
       
-      if ($username != null)
-      {
+      if ($username != null):
             $user_id    = $this->Webquest->User->field('id', array("username"=>$username));
             
             $conditions["Webquest.user_id"] = $user_id;
-      }
-      else
-      {
-          $this->redirect('/');  // go away
-      }
+      else:
+            $this->redirect('/');  // go away
+      endif;
       
       $this->layout    = $this->Edublog->layout($user_id);
@@ -62 +59 @@
  public function view($webquest_id, $vclassroom_id)
  { 
-   $conditions      = array("Webquest.status"=>1, "Webquest.id"=>$webquest_id);
- 
-   $data            = $this->Webquest->find($conditions);
-     
+  $conditions      = array("Webquest.status"=>1, "Webquest.id"=>$webquest_id);
+ 
+  $data            = $this->Webquest->find($conditions);
+
+  $this->layout    = $this->Edublog->layout($data['Webquest']['user_id']);
+      
+  $this->Edublog->blog($data['Webquest']['user_id']); // blogger elements
+      
+  $this->pageTitle = $data['Webquest']['title'] . '\'s Webquest';   
+
    // the student alredy answered this webquest?   
-   if ($this->Webquest->chk($webquest_id, $this->Auth->user('id'), $vclassroom_id) === true)
-   {
-    $username = $this->Webquest->User->field('User.username', array("User.id"=>$data['Webquest']['user_id']));
-    $this->flash('You already have answered this webquest', '/vclassrooms/show/'.$data['Webquest']['user_id'].'/'.$data['Webquest']['user_id');
-   }
+  if ($this->Webquest->chk($webquest_id, $this->Auth->user('id'), $vclassroom_id) === true):
+         $this->set('already', true);
+  else:
+         $this->set('already', false);
+  endif;
 
   // student belongst to this class?
@@ -80 +83 @@
   endif;
            
-  $this->layout    = $this->Edublog->layout($data['Webquest']['user_id']);
-      
-  $this->Edublog->blog($data['Webquest']['user_id']); // blogger elements
-      
-  $this->pageTitle = $data['Webquest']['title'] . '\'s Webquest';   
-
   $this->set('data', $data); 
- }
- 
+  $this->set('vclassroom_id', $vclassroom_id);
+ }
+ 
+ public function result()
+ { 
+      // adds new blog entries 
+      if ( !empty($this->data['ResultWebquest']) )  
+      {
+         $this->Sanitize = new Sanitize;
+         
+         $this->Sanitize->clean($this->data['ResultWebquest']); 
+
+         $this->data['ResultWebquest']['user_id'] = $this->Auth->user('id');
+         
+         $this->Webquest->ResultWebquest->create();
+         
+         if ($this->Webquest->ResultWebquest->save($this->data['ResultWebquest']))
+         {
+             $this->msgFlash('Webquest saved', 
+          '/vclassrooms/show/'.$this->data['ResultWebquest']['blogger_id'].'/'.$this->data['ResultWebquest']['vclassroom_id']);
+         }
+         else 
+         {
+            $this->msgFlash('Database error!', '/admin/webquests/listing');
+         }
+      }
+ }
  /** ADMIN METHODS**/
  public function admin_listing()

trunk/app/models/test.php

@@ -88 +88 @@
     $data       =  $this->Result->field('Result.id', $conditions);
    
-    if ($data != null ):
+    if ($data == false ):
           return false;   
     else:

trunk/app/models/treasure.php

@@ -52 +52 @@
    $data      = $this->ResultTreasure->field('ResultTreasure.id', $conditions);
    
-   if ($data != null ):
+   if ( $data == false ):
           return false;   
    else:

trunk/app/models/webquest.php

@@ -45 +45 @@
 
 /*
- *  check if studen already found treasure
+ *  check if studen already found webquest
  *  int treasure_id 
  *  int user_id      
@@ -54 +54 @@
     $conditions =  array("ResultWebquest.user_id"=>$user_id, "ResultWebquest.webquest_id"=>$webquest_id, "ResultWebquest.vclassroom_id"=>$vclassroom_id);
     $data       =  $this->ResultWebquest->field('ResultWebquest.id', $conditions);
-   
-    if ($data != null ):
+    
+    if ($data == false ):
           return false;   
     else:

trunk/app/views/forums/display.ctp

@@ -1 +1 @@
 <?php
 //die(debug($data));
+
+if ( $belongs === true ):
  echo $html->div(null, 'Category: ' . $data['Catforum']['title'], array('style'=>'font-weight:bold;'));
 
@@ -49 +51 @@
        echo '</table>'; 
  
- if ( ! isset( $cU ) ) 
- {
-         echo $html->div(null, $this->renderElement('login'));
- }
+  echo $html->para(null, 'Legend:');
 
-echo $html->para(null, 'Leyenda del Tema');
+  $tmp  = $html->image('static/board.gif', array("alt"=>"Tema normal", "title"=>"Tema normal")) . ' Tema normal <br />';
+  $tmp .= $html->image('static/locked.gif', array("alt"=>"Tema bloqueado", "title"=>"Tema bloqueado")) . ' Tema bloqueado<br />';
+  $tmp .= $html->image('static/new.gif', array("alt"=>"Comentario nuevo", "title"=>"Comentario nuevo")). ' Comentario nuevo<br />';
 
-$tmp  = $html->image('static/board.gif', array("alt"=>"Tema normal", "title"=>"Tema normal")) . ' Tema normal <br />';
-$tmp .= $html->image('static/locked.gif', array("alt"=>"Tema bloqueado", "title"=>"Tema bloqueado")) . ' Tema bloqueado<br />';
-$tmp .= $html->image('static/new.gif', array("alt"=>"Comentario nuevo", "title"=>"Comentario nuevo")). ' Comentario nuevo<br />';
-
-echo $html->para(null, $tmp);
+  echo $html->para(null, $tmp);
+else:
+  e($html->para(null, 'You must be logged and belogs to this class to see the forum'));
+endif;
 ?>

trunk/app/views/tests/view.ctp

@@ -1 +1 @@
 <?php
-//die(debug($data));
-
-$auth = false;
-// esto lo tengo que cambiar porque esta de la verch
-if ( $session->check('vclassrooms') ):
-   foreach($data['Vclassroom'] as $v):
-       if ( in_array($v['id'], $session->read('vclassrooms'))):
-              $auth = true;
-              $vclassroom_id = $v['id']; 
-          break;
-       endif;
-   endforeach;
+//die(debug($already));  
+if ( $already === true ):
+      e($html->para(null, 'You already have answered this test'));
 endif;
 
-// die(var_dump($auth));
 
-if ( $auth === true ):
+if ( $belongs === true && $already === false):
   echo $html->para(null, 'hi! '.$cU['User']['username'], array('style'=>'font-weight:bold;font-size:12pt;'));
   echo $html->div('title', $blog['User']['username'] .'s Exam');
@@ -53 +43 @@
   echo $form->end('Send');
 
-else:
-   echo $html->para(null, 'You must belong to class to see this exam');
+endif;
+
+if ( !isset($cU) ):
+      e($html->para(null, 'You must belong to class to see this exam'));
 endif;
 

trunk/app/views/vclassrooms/show.ctp

@@ -17 +17 @@
 
         foreach($data['Forum'] as $f):
-             echo $html->para(null, $html->link($f['title'], '/forums/display/'.$f['id']));
+             echo $html->para(null, $html->link($f['title'], '/forums/display/'.$f['id'].'/'.$data['Vclassroom']['id']));
         endforeach;
     endif;
@@ -75 +75 @@
      // empty ajax div
      echo $ajax->div('updater') . $ajax->divEnd('updater'); 
-   
- elseif ( !isset( $cU['User']) ):
+endif;
+
+if ( !isset( $cU['User']) ):
      e($html->link('Login to join this group', '/users/login'));
- endif;
+endif;
 ?>
 <div id="charging" style="display:none;"><?php echo $html->image('static/loading.gif', array("alt"=>"Loading")); ?></div>

trunk/app/views/webquests/display.ctp

@@ -5 +5 @@
 {
 echo '<div style="margin:10px;padding:5px;background-color:yellow;border:1px dotted red;">'; 
-   echo '<div>'.$html->link($v['Webquest']['title'], '/webquests/view/'.$blog['User']['username'].'/'.$v['Webquest']['id']) . '</div>';
+   echo '<div>'.$v['Webquest']['title'] . '</div>';
    echo '<div>' . $v['Webquest']['introduction'].'</div>';
 echo '</div>';

trunk/app/views/webquests/view.ctp

@@ -1 +1 @@
 <?php
-//die(debug($data));
-$auth = false;
+//die(debug($blog));
 
-if ( $session->check('vclassrooms') ):
-   foreach($data['Vclassroom'] as $v):
-       if ( in_array($v['id'], $session->read('vclassrooms'))):
-              $auth = true;
-          break;
-       endif;
-   endforeach;
+if ( $already === true ):
+      e($html->para(null, 'You already have answered this webquest'));
 endif;
- 
-if ( $auth === true ):
+
+if ( $belongs === true && $already === false):
+
   echo $html->para(null, 'hi! '.$cU['User']['username'], array('style'=>'font-weight:bold;font-size:12pt;'));
 ?> 
@@ -40 +35 @@
 echo '</div>';
 
-echo $form->create('Result', array('onsubmit'=>'return chkForm()'));
+echo '<fieldset>';
+  echo $form->create('Webquest', array('action'=>'result', 'onsubmit'=>'return chkForm()'));
+  echo $form->hidden('ResultWebquest.points', array('value'=>$data['Webquest']['points']));
+  echo $form->hidden('ResultWebquest.webquest_id', array('value'=>$data['Webquest']['id']));
+  echo $form->hidden('ResultWebquest.vclassroom_id', array('value'=>$vclassroom_id));
+  echo $form->hidden('ResultWebquest.blogger_id', array('value'=>$blog['User']['id']));
 
-echo $form->label('Result.answer', 'Answer:').'<br />';
-echo $form->textarea('Result.answer', array('cols'=>60, 'rows'=>20));
-echo $form->end('Send');
+  echo $form->label('ResultWebquest.answer', 'Answer:').'<br />';
+  echo $form->textarea('ResultWebquest.answer', array('cols'=>50, 'rows'=>20));
+  echo $form->end('Send');
+echo '</fieldset>';
 
-else:
-     echo $html->link('Login to join this group', '/users/login');
 endif;
+
+if ( !isset($cU) ):
+      e($html->para(null, 'You must belong to class to see this exam'));
+endif;
+
+?>