Changeset 466

Timestamp:

05/08/08 19:18:13 (8 months ago)

Author:

aarkerio

Message:

Forums and topics improveds

Location:

trunk/app

Files:

• controllers/tests_controller.php (modified) (2 diffs)
• controllers/treasures_controller.php (modified) (2 diffs)
• controllers/webquests_controller.php (modified) (2 diffs)
• models/test.php (modified) (2 diffs)
• models/treasure.php (modified) (1 diff)
• models/webquest.php (modified) (1 diff)
• views/vclassrooms/show.ctp (modified) (1 diff)

trunk/app/controllers/tests_controller.php

@@ -64 +64 @@
   }
 
-  public function view($test_id, $user_id)
+  public function view($test_id, $vclassroom_id)
   {
-     // the student alredy answered this test?
-     $already = $this->Test->Result->field('Result.id', array("Result.user_id"=>$this->Auth->user('id'), "Result.test_id"=>$test_id));
-     
-    if ($already != null)
+       
+    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));
@@ -77 +75 @@
     if ( $this->Auth->user() && $this->Auth->user('group_id') == 3)
     {
-          $student_id = (int) $this->Auth->user('id');
+     $student_id = (int) $this->Auth->user('id');
          $this->Edublog->setSession($student_id); //check if user belongs to class
     }

trunk/app/controllers/treasures_controller.php

@@ -34 +34 @@
     return false;  // go away !!
  }
+
+/*
+ * check if tresure string is OK, if so, save student data on ResultTreasure model 
+ *
+ */
+ 
  public function  chksw()
  {
@@ -89 +95 @@
  }
 
- public function view($treasure_id)
+ public function view($treasure_id, $vclassroom_id)
  {    
-      $conditions      = array("Treasure.status"=>1, "Treasure.id"=>$treasure_id);
-      
-      $data            = $this->Treasure->find($conditions);
+   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);
+   endif;
+    
+   if ( $this->Auth->user() && $this->Auth->user('group_id') == 3):
+     $student_id = (int) $this->Auth->user('id');
+         $this->Edublog->setSession($student_id); //check if user belongs to class
+   endif;
+
+   $conditions      = array("Treasure.status"=>1, "Treasure.id"=>$treasure_id);
+      
+   $data            = $this->Treasure->find($conditions);
     
-      $this->layout    = $this->Edublog->layout($data['Treasure']['user_id']);
-      
-      $this->pageTitle = 'Treasure Hunt';
-      
-      $this->Edublog->blog($data['Treasure']['user_id']); // blogger elements
+   $this->layout    = $this->Edublog->layout($data['Treasure']['user_id']);
+      
+   $this->pageTitle = 'Treasure Hunt';
+      
+   $this->Edublog->blog($data['Treasure']['user_id']); // blogger elements
             
-      $this->set('data', $data); 
- }
-
+   $this->set('data', $data); 
+ }
 
  /**    === ADMIN METHODS  === **/ 

trunk/app/controllers/webquests_controller.php

@@ -60 +60 @@
  }
 
- public function view($webquest_id)
+ public function view($webquest_id, $vclassroom_id)
  { 
    $conditions      = array("Webquest.status"=>1, "Webquest.id"=>$webquest_id);
@@ -67 +67 @@
      
    // the student alredy answered this webquest?   
-   if ($this->Webquest->chk($webquest_id, $this->Auth->user('id')) === true)
+   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', '/users/portfolio/'.$username);
+    $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');
    }
     

trunk/app/models/test.php

@@ -75 +75 @@
     return $vclassrooms;
  }
+/*
+ *  check if studen already found treasure
+ *  int treasure_id 
+ *  int user_id      
+ *  int vclassroom_id
+ *  return boolean
+ */
+ public function chk($test_id, $user_id, $vclassroom_id)
+ {
+    $conditions =  array("Result.user_id"=>$user_id, "Result.test_id"=>$test_id, "Result.vclassroom_id"=>$vclassroom_id);
+    $data       =  $this->Result->field('Result.id', $conditions);
+   
+    if ($data != null ):
+          return false;   
+    else:
+          return true;
+    endif;
+ }
 
  public function chkAnswers($answers, $test_id)
@@ -82 +100 @@
     $result = 0;
     
-    foreach($questions as $q_id => $a_id)  // question id and answer id
-    {
+    foreach($questions as $q_id => $a_id):  // question id and answer id
          $correct_answer = $this->Test->Question->Answer->field('Answer.correct', array('Answer.id'=>$a_id));   // answer was correct?
          
-         if ($correct_answer == 1)
-         {
+           if ($correct_answer == 1):
               $worth   = $this->Test->Question->field('Question.worth', array('Question.id'=>$q_id));         // how many points
               $result += $worth;
-         }
-    }
-    //exit('Result was:' . $result);
+           endif;
+     endforeach;
+    //exit('Result was:' . $result)e
     return $result; 
   }

trunk/app/models/treasure.php

@@ -42 +42 @@
  *  int treasure_id 
  *  int user_id      
+ *  int vclassroom_id
  *  return boolean
  */
- public function chk($treasure_id, $user_id)
+ public function chk($treasure_id, $user_id, $vclassroom_id)
  {
  
-   $conditons = array("ResultTreasure.user_id"=>$user_id, "ResultTreasure.treasure_id"=>$treasure_id); 
+   $conditons = array("ResultTreasure.user_id"=>$user_id, "ResultTreasure.treasure_id"=>$treasure_id, "ResultTreasure.vclassroom_id"=>$vclassroom_id); 
 
-   $data      = $this->ResultTreasure->field('ResultTreasure.id', $conditions));
+   $data      = $this->ResultTreasure->field('ResultTreasure.id', $conditions);
    
    if ($data != null ):

trunk/app/models/webquest.php

@@ -50 +50 @@
  *  return boolean
  */
-  public function chk($webquest_id, $user_id)
-  {
-    $conditions =  array("ResultWebquest.user_id"=>$user_id, "ResultWebquest.webquest_id"=>$webquest_id);
+ public function chk($webquest_id, $user_id, $vclassroom_id)
+ {
+    $conditions =  array("ResultWebquest.user_id"=>$user_id, "ResultWebquest.webquest_id"=>$webquest_id, "ResultWebquest.vclassroom_id"=>$vclassroom_id);
     $data       =  $this->ResultWebquest->field('ResultWebquest.id', $conditions);
    

trunk/app/views/vclassrooms/show.ctp

@@ -19 +19 @@
      echo  $html->para(null, '<b>Subject</b>: ' . $data['Ecourse']['title']);
      echo  $html->para(null, '<b>Course description</b>:'. $data['Ecourse']['description']);
-     
-     if ( count($data['Test']) > 0)
-     {
+
+     //  Forums
+     if ( count($data['Forum']) > 0):
+        echo $html->div('titentry', 'Forums');
+
+        foreach($data['Forum'] as $f):
+             echo $html->para(null, $html->link($f['title'], '/forums/display/'.$f['id']));
+        endforeach;
+    endif;
+    
+    // Tests 
+    if ( count($data['Test']) > 0):
        echo $html->div('titentry', 'Quizz Tests');
 
-       foreach($data['Test'] as $t)
-       {
-         echo $html->para(null, $html->link($t['title'], '/tests/view/'.$t['id'].'/'.$t['user_id']));
-       }
-     }
+       foreach($data['Test'] as $t):
+                echo $html->para(null, $html->link($t['title'], '/tests/view/'.$t['id'].'/'.$data['Vclassroom']['id']));
+       endforeach;
+    endif;
 
-     if ( count($data['Forum']) > 0)
-     {
-       echo $html->div('titentry', 'Forums');
-
-       foreach($data['Forum'] as $f)
-       {
-         echo $html->para(null, $html->link($f['title'], '/forums/display/'.$f['id']));
-       }
-     }
-
-     if ( count($data['Webquest']) > 0)
-     {
+    // Webquests
+    if ( count($data['Webquest']) > 0):
        echo $html->div('titentry', 'Webquests');
 
-       foreach($data['Webquest'] as $wq)
-       {
-         echo $html->para(null, $html->link($wq['title'], '/webquests/view/'.$wq['id']));
-       }
-     }
+       foreach($data['Webquest'] as $wq):
+         echo $html->para(null, $html->link($wq['title'], '/webquests/view/'.$wq['id'].'/'.$data['Vclassroom']['id']));
+       endforeach;
+    endif;
 
-     if ( count($data['Treasure']) > 0)
-     {
+    if ( count($data['Treasure']) > 0):
        echo $html->div('titentry', 'Treasure Hunts');
 
-       foreach($data['Treasure'] as $t)
-       {
-         echo $html->para(null, $html->link($t['title'], '/treasures/view/'.$t['id']));
-       }
-     }
-      echo $ajax->form();
+        foreach($data['Treasure'] as $t):
+                echo $html->para(null, $html->link($t['title'], '/treasures/view/'.$t['id'].'/'.$data['Vclassroom']['id']));
+    endforeach;
+    endif;
+
+    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 $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/", 
                                          "update"=>"setform",
                                          "loading" => "Element.show('charging');Element.hide('setform')",
                                          "complete" => "Element.hide('charging');Effect.Appear('setform')"
         ));
-     echo '</form>'; 
-     // empty ajax div
-     echo $ajax->div('setform') . $ajax->divEnd('setform'); 
+    echo '</form>'; 
+    // empty ajax div
+    echo $ajax->div('setform') . $ajax->divEnd('setform'); 
   }