Changeset 419

Timestamp:

04/22/08 23:03:55 (9 months ago)

Author:

aarkerio

Message:

Fixed

Location:

trunk/app

Files:

• controllers/questions_controller.php (modified) (4 diffs)
• controllers/tests_controller.php (modified) (1 diff)
• controllers/webquests_controller.php (modified) (1 diff)
• views/questions/questions.ctp (modified) (1 diff)
• views/tests/admin_questions.ctp (modified) (1 diff)
• views/tests/view.ctp (modified) (1 diff)
• views/vclassrooms/show.ctp (modified) (1 diff)
• views/webquests/admin_edit.ctp (modified) (3 diffs)
• views/webquests/view.ctp (modified) (2 diffs)

trunk/app/controllers/questions_controller.php

@@ -43 +43 @@
    if ( $this->Question->save( $this->data['Question'] ) ) 
    {
-     $conditions = array("Question.test_id" => $this->data['Question']['test_id']);
-     $fields     = array("Question.id", "Question.question", "Question.hint", "Question.worth", "Question.explanation");
+     $conditions = array('Question.test_id' => $this->data['Question']['test_id']);
+     $fields     = array('Question.id','Question.question','Question.hint','Question.worth','Question.explanation','Question.test_id');
      $order      = "Question.id";
                     
@@ -50 +50 @@
                     
      $this->render('questions', 'ajax');
-    }
-    else
-    {
+    }
+    else
+    {
             echo "Ajax error, please report this bug";
-    }
+    }
   }
  }
@@ -70 +70 @@
          if ( $this->Question->save( $this->data['Question'] ) ) 
          {
-              $this->msgFlash('Question saved', '/admin/tests/questions/'.$this->data["Question"]["test_id"]);
+              $this->msgFlash('Question saved', '/admin/tests/questions/'.$this->data['Question']['test_id']);
          }
          else
@@ -124 +124 @@
   }
   
-  public function admin_delete($id) 
+  public function admin_delete() 
   {
-      // deletes from database
-      
-      if ( $this->Question->del($id) )
-      {
-            $this->redirect('/admin/tests/listing');
-      } 
-      else 
-      {
+    if ( $this->Question->del($this->data['Question']['id']) ):
+            $this->redirect('/admin/tests/questions/'.$this->data['Question']['test_id']);
+    else: 
             $this->flash('Database error!', '/admin/tests/listing');
-      }
+    endif;
   }
 }

trunk/app/controllers/tests_controller.php

@@ -66 +66 @@
   public function view($test_id, $user_id)
   {
-    $already = $this->Test->Result->field('Result.id', array("Result.user_id"=>$this->Auth->user('id'), "Result.test_id"=>$test_id));
-
-    if ($already != null)
-    {
+     // the student alredy answer?
+     $already = $this->Test->Result->field('Result.id', array("Result.user_id"=>$this->Auth->user('id'), "Result.test_id"=>$test_id));
+
+     if ($already != null)
+     {
          $username = $this->Test->User->field('User.username', array("User.id"=>$user_id));
      $this->flash('You already have answered this test', '/users/portfolio/'.$username);
          exit();
+     }
+
+    if ( $this->Auth->user() && $this->Auth->user('group_id') == 3)
+    {
+       $user_id = (int) $this->Auth->user('id');
+           $this->Edublog->setSession($user_id);
     }
 

trunk/app/controllers/webquests_controller.php

@@ -60 +60 @@
  }
 
- public function view($username, $webquest_id)
- {    
-      $conditions      = array("status"=>1);
-      
-      if ($username != null)
-      {
-            $user_id    = $this->Webquest->User->field('id', array("username"=>$username));
-            
-            $conditions["Webquest.user_id"] = $user_id;
-            
-            $conditions["Webquest.id"]      = $webquest_id;
-      }
-      else
-      {
-          $this->redirect('/');  // go away
-      }
-      
-      $this->layout    = $this->Edublog->layout($user_id);
-      
-      $this->Edublog->blog($user_id); // blogger elements
-      
-      $this->pageTitle = $username . '\'s Webquests';
-      
-      $fields     = array("id", "title", "introduction", "tasks", "process", "evaluation", "conclusion", "created", "roles");
-      
-      $this->set('username',$username);
-      $this->set('data', $this->Webquest->find($conditions, $fields)); 
+ public function view($webquest_id)
+ {    
+      if ( $this->Auth->user() && $this->Auth->user('group_id') == 3)
+      {
+       $user_id = (int) $this->Auth->user('id');
+           $this->Edublog->setSession($user_id);
+      }
+ 
+      $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';   
+
+      $this->set('data', $data); 
  }
  

trunk/app/views/questions/questions.ctp

@@ -6 +6 @@
 foreach ($data as $val) 
 {      
-    $answers = count($val["Answer"]);
+    $answers = count($val['Answer']);
     $i++;
     echo '<div style="padding:5px;border:1px dotted gray;margin:auto;width:60%"><b>' . $i . '.-</b> ';
     echo $html->div('butonright', $gags->sendEdit($val['Question']['id'],   'Question'));
-    echo $html->div('butonright', $gags->confirmDel($val['Question']['id'], 'Question'));
+    echo $html->div('butonright', 
+                    $form->create('Question', array('action'=>'delete', 'onsubmit'=>'return confirm("are you sure?")')).
+            $form->hidden('Question.id', array('value'=>$val['Question']['id'])).$form->hidden('Question.test_id', array('value'=>$val['Question']['test_id'])).$form->end('Delete')); 
+
        echo "Question: "    . $val['Question']['question']       . "<br />";
        echo "Hint: "        . $val['Question']['hint']           . "<br />";

trunk/app/views/tests/admin_questions.ctp

@@ -57 +57 @@
 foreach ($data["Question"] as $val) 
 {      
-    $answers = count($val["Answer"]);
+    $answers = count($val['Answer']);
     $i++;
     echo '<div style="padding:5px;border:1px dotted gray;margin:auto;width:60%"><b>' . $i . '.-</b> ';
     echo $html->div('butonright', $gags->sendEdit($val['id'],   'Question'));
-    echo $html->div('butonright', $gags->confirmDel($val['id'], 'Question'));
+    echo $html->div('butonright', 
+                    $form->create('Question', array('action'=>'delete', 'onsubmit'=>'return confirm("are you sure?")')).
+            $form->hidden('Question.id', array('value'=>$val['id'])).$form->hidden('Question.test_id', array('value'=>$val['test_id'])).$form->end('Delete'));
+
        echo "Question: "    . $val["question"]       . "<br />";
        echo "Hint: "        . $val["hint"]           . "<br />";
        echo "Explanation: " . $val["explanation"]    . "<br />";
        echo "Worth: "       . $val["worth"]          . "<br /><br />";
-       echo $html->link('View answers ('.$answers.')', '/admin/questions/answers/'.$val["id"]);
+       echo $html->link('View answers ('.$answers.')', '/admin/questions/answers/'.$val['id']);
     echo '</div>';
 }

trunk/app/views/tests/view.ctp

@@ -2 +2 @@
 //die(debug($data));
 
-echo $html->div('title', $blog['User']['username'] .'s Exam');
-
-if ( $cU['User'] )
-{
- echo '<h1>'. $data['Test']['title'] . '</h1>';
- echo '<p>'.  $data['Test']['description'] . '</p>';
-
- echo $form->create('Test', array('action'=>'/tests/result/', 'onsubmit'=>"return confirm('Are you sure?')")); 
- echo $form->hidden('Question.test_id', array('value'=>$data['Test']['id']));
-
- foreach ($data['Question'] as $val)
- {
-   //exit(var_dump($val));
-   echo '<div>';
-   echo '<div style="font-size:14pt;margin:5px 0 6px 0">' . $val['question'] .' '. $val['worth']  .'</div>'; 
-    
-   $options = array();
-
-   foreach ($val["Answer"] as $v)
-   {
-      $options[$v['id']] = $v['answer'];
-   }
-
-   echo $form->radio('Result.'.$val['id'], $options, '<br />');
-
-    echo '<br /><b>Hint</b>: <i>' .  $val['hint']  . '</i><br /><br />';
-    echo '</div>';
- }
-
- echo $form->end('Send');
-
-}
-else
-{
-  echo $html->para(null, 'You must be logged to see this exam');
-}
+$auth = false;
+ 
+if ( $session->check('vclassrooms') ):
+   foreach($data['Vclassroom'] as $v):
+       $auth = ( in_array($v['id'], $session->read('vclassrooms'))) ? true : false;  // students belongs this vclass ?
+   endforeach;
+endif;
+ 
+if ( $auth === true ):
+  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');
 
 
+  echo '<h1>'. $data['Test']['title'] . '</h1>';
+  echo '<p>'.  $data['Test']['description'] . '</p>';
 
+   echo $form->create('Test', array('action'=>'result', 'onsubmit'=>"return chkTest()")); 
+//echo $form->hidden('Result.test_id', array('value'=>$data['Test']['id']));
+
+  foreach ($data['Question'] as $val):
+       //exit(var_dump($val));
+       echo '<div>';
+          echo $html->div(null, $val['question'] .' '. $val['worth'], array('style'=>'font-size:14pt;margin:5px 0 6px 0')); 
+       
+          $options = array(); // to build options radio buttons
+       
+          foreach ($val['Answer'] as $v):
+                   $options[$v['id']] = $v['answer'];
+          endforeach;
+
+          echo $form->radio('Result.'.$val['id'], $options);
+
+          echo $html->para(null, $val['hint']);
+       echo '</div>';
+  endforeach;
+
+  echo $form->end('Send');
+
+else:
+   echo $html->para(null, 'You must belong to class to see this exam');
+endif;
+
+?>
+
+<script type="text/javascript">
+
+function chkTest()
+{
+  // set var radio_choice to false
+  var radio_choice = false;
+
+  // Loop from zero to the one minus the number of radio button selections
+  for (counter = 0; counter < radio_form.radio_button.length; counter++)
+  {
+    // If a radio button has been selected it will return true
+    // (If not it will return false)
+    if (radio_form.radio_button[counter].checked)
+       radio_choice = true; 
+  }
+
+  if (!radio_choice)
+  {
+    // If there were no selections made display an alert box 
+    alert("Please select a letter.")
+    return false;
+  }
+
+  var answer = confirm("Are you sure?")
+
+  if (answer)
+      return true
+  else
+      return false
+  
+  return true;
+}
+</script>

trunk/app/views/vclassrooms/show.ctp

@@ -27 +27 @@
        foreach($data['Test'] as $t)
        {
-         echo $html->para(null, $html->link($t['title'], '/vclassrooms/test/'.$t['id']));
+         echo $html->para(null, $html->link($t['title'], '/tests/view/'.$t['id'].'/'.$t['user_id']));
        }
      }

trunk/app/views/webquests/admin_edit.ctp

@@ -12 +12 @@
 <?php
 echo $form->create('Webquest');
-echo $form->input('Webquest.title', array('size'=>60,'maxlength'=>160,'value'=>$wq_title));
-echo $form->hidden('Webquest.id', array('value'=>$id));
+echo $form->input('Webquest.title', array('size'=>60,'maxlength'=>160,'value'=>$wq_title,'style'=>'font-size:7pt'));
+echo $form->hidden('Webquest.id');
 echo $form->end('Save');
 ?>  
@@ -32 +32 @@
 
 <div style="width:800px;text-align:center;height:20px;font-size:14pt" id="menu">
-   <div class="tab">
-            <?php echo $ajax->link('Introduction', '/admin/webquests/get/introduction/'.$id, array("update" => "setform",
-                       "loading"=>"Element.show('loading');", "complete"=>"Element.hide('loading');Effect.Appear('setform')"));
-            ?>
-   </div> 
-   <div class="tab">
-            <?php echo $ajax->link('Tasks', '/admin/webquests/get/tasks/'.$id, array("update" => "setform",
-                       "loading"=>"Element.show('loading');", "complete"=>"Element.hide('loading');Effect.Appear('setform')"));
-            ?>
-   </div> 
-   <div class="tab">
-            <?php echo $ajax->link('Process',  '/admin/webquests/get/process/'.$id, array("update" => "setform",
-                       "loading"=>"Element.show('loading');", "complete"=>"Element.hide('loading');Effect.Appear('setform')"));
-            ?>
-   </div> 
-   <div class="tab">
-            <?php echo $ajax->link('Roles', '/admin/webquests/get/roles/'.$id, array("update" => "setform", 
-                       "loading"=>"Element.show('loading');", "complete"=>"Element.hide('loading');Effect.Appear('setform')"));
-            ?>
-   </div> 
-   <div class="tab">
-            <?php echo $ajax->link('Evaluation', '/admin/webquests/get/evaluation/'.$id, array("update" => "setform", 
-                       "loading"=>"Element.show('loading');", "complete"=>"Element.hide('loading');Effect.Appear('setform')"));
-            ?>
-   </div> 
-   <div class="tab">
-            <?php echo $ajax->link('Conclusion', '/admin/webquests/get/conclusion/'.$id, array("update" => "setform", 
-                       "loading"=>"Element.show('loading');", "complete"=>"Element.hide('loading');Effect.Appear('setform')"));
-            ?>
-   </div>
+<?php
+   echo $html->div('tab', $ajax->link('Introduction', '/admin/webquests/get/introduction/'.$id, array("update" => "setform",
+                       "loading"=>"Element.show('loading');", "complete"=>"Element.hide('loading');Effect.Appear('setform')")));
+
+   echo $html->div('tab', $ajax->link('Tasks', '/admin/webquests/get/tasks/'.$id, array("update" => "setform",
+                       "loading"=>"Element.show('loading');", "complete"=>"Element.hide('loading');Effect.Appear('setform')")));
+
+   echo $html->div('tab', $ajax->link('Process',  '/admin/webquests/get/process/'.$id, array("update" => "setform",
+                       "loading"=>"Element.show('loading');", "complete"=>"Element.hide('loading');Effect.Appear('setform')")));
+
+   echo $html->div('tab', $ajax->link('Roles', '/admin/webquests/get/roles/'.$id, array("update" => "setform", 
+                       "loading"=>"Element.show('loading');", "complete"=>"Element.hide('loading');Effect.Appear('setform')")));
+
+   echo $html->div('tab', $ajax->link('Evaluation', '/admin/webquests/get/evaluation/'.$id, array("update" => "setform", 
+                       "loading"=>"Element.show('loading');", "complete"=>"Element.hide('loading');Effect.Appear('setform')")));
+
+   echo $html->div('tab', $ajax->link('Conclusion', '/admin/webquests/get/conclusion/'.$id, array("update" => "setform", 
+                       "loading"=>"Element.show('loading');", "complete"=>"Element.hide('loading');Effect.Appear('setform')")));
+
+   echo $html->div('tab', $ajax->link('Points', '/admin/webquests/get/points/'.$id, array("update" => "setform", 
+                       "loading"=>"Element.show('loading');", "complete"=>"Element.hide('loading');Effect.Appear('setform')")));
+?>
 </div>
 
@@ -80 +72 @@
     else 
              Div.style.display = 'none';
-      
  }
 -->

trunk/app/views/webquests/view.ctp

@@ +1 @@
+<?php
+//die(debug($data));
+$auth = false;
+ 
+if ( $session->check('vclassrooms') ):
+   foreach($data['Vclassroom'] as $v):
+       $auth = ( in_array($v['id'], $session->read('vclassrooms'))) ? true : false;  // students belongs this vclass ?
+   endforeach;
+endif;
+ 
+if ( $auth === true ):
+  echo $html->para(null, 'hi! '.$cU['User']['username'], array('style'=>'font-weight:bold;font-size:12pt;'));
+?> 
 <h1><?php echo $data['Webquest']['title']; ?></h1>
 
@@ -23 +36 @@
    echo '<p>Created: <b>'. $data['Webquest']['created'].'</b></p>';
 echo '</div>';
-?>
+
+else:
+     echo $html->link('Login to join this group', '/users/login');
+endif;