Changeset 422

Timestamp:

04/23/08 19:07:23 (9 months ago)

Author:

aarkerio

Message:

Tests answers

Location:

trunk/app

Files:

• controllers/components/edublog.php (modified) (1 diff)
• controllers/messages_controller.php (modified) (8 diffs)
• controllers/results_controller.php (modified) (2 diffs)
• controllers/tests_controller.php (modified) (6 diffs)
• models/test.php (modified) (1 diff)
• views/questions/admin_answers.ctp (modified) (1 diff)
• views/tests/admin_questions.ctp (modified) (1 diff)
• views/tests/view.ctp (modified) (3 diffs)
• views/vclassrooms/admin_listing.ctp (modified) (1 diff)
• views/vclassrooms/admin_members.ctp (modified) (1 diff)
• views/webquests/view.ctp (modified) (2 diffs)

trunk/app/controllers/components/edublog.php

@@ -118 +118 @@
 
    $vclassrooms = $this->Vclassroom->chkVclassrooms($user_id); // check model, what classrooms this student belongs?
-
+   
    if ($vclassrooms != null)
    {

trunk/app/controllers/messages_controller.php

@@ -85 +85 @@
            
            if ($this->Message->save($this->data["Message"]))
-           {
-                $this->sendMail($this->data["Message"]["user_id"], $this->data["Message"]["username"], $this->data["Message"]["title"]);
+       {
+             $this->__sendMail($this->data["Message"]["user_id"], $this->data["Message"]["username"], $this->data["Message"]["title"]);
                 
                 if ( isset($this->data["Message"]["admin"]))
@@ -95 +95 @@
                 {
                     $this->render('sent', 'ajax');
-                }
+        }
         }
      }
  }
-  private function sendMail($user_id, $username, $title) 
-   {
-        $this->User = new User;
-        
-        $fields = array('email', 'username');
-        
-        $data = $this->User->find(array("User.id"=>$user_id), $fields);
-        //exit($data["User"]["email"]);
-        $this->Email->sender    = '::MonoNeurona.org::';
-        $this->Email->to        = $data["User"]["email"];
-        $this->Email->subject   = '::MonoNeurona.org:: New message from '. $username;
-        $this->Email->sendAs    = 'html';
-        $this->Email->template  = null;
-        $this->Email->from      = 'noreply@mononeurona.org';
-        //$this->set('foo', 'Cake tastes good today'); 
-        //Set the body of the mail as we send it.
-        //Note: the text can be an array, each element will appear as a
-        //seperate line in the message body.
-        $url   = '<img src="http://www.mononeurona.org/img/admin/new_user.jpg" alt="MonoNeurona" title="MonoNeurona" /><br />';
-        $url  .= '<h2>'.$data["User"]["username"].'</h2><p>You have a new message from '. $username;
-        $url  .= '<a href="http://'.$_SERVER['SERVER_NAME'].'/admin/messages/listing/">'.$title.'</a></p>';
-        
-        //die($url);
-        
-        if ( $this->Email->send($url) ) 
-        {
-            return true; 
-        } 
-        else 
-        {
-            
-            exit("Error!!");
-        }
+
+  /* == PRIVATE == **/
+  private function __sendMail($email)
+  {   
+    $this->layout          = 'default';
+    $this->Email->to       = $email;
+
+    // this could be just a string too
+    $this->Email->subject  = 'Karamelo e-Learning:: New message';
+    $this->Email->replyTo  = 'support@karamelo.org';
+    $this->Email->from     = 'Chipotle-software.com';
+    $this->Email->template = 'message'; 
+    $this->Email->sendAs   = 'text'; // because we like to send pretty mail
+    //Do not pass any args to send()
+    if ( $this->Email->send() )
+    {
+              return true;
+    }
+    else
+    {
+                return false;
+    }
  }
  
@@ -178 +167 @@
           
           if ($this->Message->save($this->data["Message"]))
-          {
+      {
              $j++;
-          }
+      }
           else
           {
@@ -187 +176 @@
         }
         $this->msgFlash($j . ' messages sent', '/admin/messages/listing');
-      }
+     }
  }
  
@@ -225 +214 @@
  public function admin_add()
  {    
-        $this->layout    = 'admin';
-        
-        if (!empty($this->data["Message"]))
-        {
-          $this->Sanitize = new Sanitize;
-          
-          $this->Sanitize->html($this->data["Message"]["title"]);
-          
-          $this->Sanitize->html($this->data["Message"]["body"]);
-          
-          if ( isset( $this->data["Message"]["message_id"] ) )
-          {
+   $this->layout    = 'admin';
+        
+   if (!empty($this->data["Message"]))
+   {
+     $this->Sanitize = new Sanitize;
+          
+     $this->Sanitize->html($this->data["Message"]["title"]);
+          
+     $this->Sanitize->html($this->data["Message"]["body"]);
+          
+     if ( isset( $this->data["Message"]["message_id"] ) )
+     {
               $this->change($this->data["Message"]["message_id"], 2);
-          }
-          
-          $this->Message->create();
-          
-          if ($this->Message->save($this->data["Message"]))
-          {
+     }
+          
+     $this->Message->create();
+          
+     if ($this->Message->save($this->data["Message"]))
+     {
             $this->sendMail($this->data["Message"]["user_id"], $this->data["Message"]["username"], $this->data["Message"]["title"]);
             $this->render('send','ajax');
-          }
-       }
+     }
    }
+ }
    
-   public function admin_display($message_id)
-   {
+ public function admin_display($message_id)
+ {
       $this->pageTitle = 'Message';
       
@@ -291 +280 @@
         }
     }
-}
-  
-  public function admin_delete($id=null)
-  {
-        if ( isset($this->data["Message"]["several"]) )
-        {   
+ }
+
+ public function admin_write($user_id)
+ {    
+        $this->layout    = 'admin';
+        
+        $this->pageTitle = 'Write Message';
+
+        $this->set('user_id', $user_id);
+ }
+
+ public function admin_deliver()
+ {  
+    if (!empty($this->data['Message']))
+    {
+      $this->Sanitize = new Sanitize;
+           
+      $this->Sanitize->html($this->data['Message']['title']);
+           
+      $this->Sanitize->html($this->data['Message']['body']);
+
+      $this->data['Message']['sender'] = $this->Auth->user('id');
+      //die(debug($this->data));
+      $this->Message->create();
+           
+      if ($this->Message->save($this->data['Message']))
+      {
+      $email = $this->Message->User->field('email', array('id'=>$this->data['Message']['user_id']));
+      if ( $this->__sendMail($email) )
+      {
+               $this->msgFlash('Message sent','/admin/messages/listing');
+      }
+      }
+    }
+ }
+ 
+ public function admin_delete($id=null)
+ {
+   if ( isset($this->data["Message"]["several"]) )
+   {   
             //exit(print_r($this->data["Message"]["id"]));
             foreach ($this->data["Message"]["id"] as $v)
@@ -307 +330 @@
             
             $this->msgFlash('The message has been deleted.','/admin/messages/listing');
-        }
-        else
-        {
+   }
+   else
+   {
            if ( isset( $this->data["Message"]["id"] ) )
            {
@@ -315 +338 @@
            }
            
-             $this->Message->del($id);
-        }
-        $this->msgFlash('Message has been deleted.','/admin/messages/listing');
+       $this->Message->del($id);
+  }
+     $this->msgFlash('Message has been deleted.','/admin/messages/listing');
   }
 }

trunk/app/controllers/results_controller.php

@@ -12 +12 @@
 uses('sanitize');
 
-class EntriesController extends AppController {
+class ResultsController extends AppController {
  
   public $helpers       = array('Ajax', 'Fck', 'Gags');
@@ -37 +37 @@
 
   public function result()
-  {   
-    $this->layout    = 'rss';
+  { 
+    die(debug($this->data));
+
+    $this->pageTitle = 'Results';
+               
+    $this->layout    = $this->Edublog->layout($user_id);
+         
+    $this->Edublog->blog($user_id); // set edublog components
+         
+   
+    $answers = $this->Resukts->Question->findAll($conditions, $fields, $order);
       
     $conditions      = array("Result.status"=>1, "Result.user_id"=>$user_id);

trunk/app/controllers/tests_controller.php

@@ -66 +66 @@
   public function view($test_id, $user_id)
   {
-     // the student alredy answer?
+     // 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));
 
@@ -78 +78 @@
     if ( $this->Auth->user() && $this->Auth->user('group_id') == 3)
     {
-       $user_id = (int) $this->Auth->user('id');
-           $this->Edublog->setSession($user_id);
+       $student_id = (int) $this->Auth->user('id');
+           $this->Edublog->setSession($student_id); //check if user belongs to class
     }
 
@@ -90 +90 @@
     $conditions = array("Test.id"=>$test_id, "Test.status"=>1);
 
-    $this->set('data', $this->Test->find($conditions, null, null, 2));
+    $fields = null; // array('Test.id', 'Test.title', 'Question.id');
+
+    $order  = null;
+
+    $this->set('data', $this->Test->find($conditions, $fields, $order, 2));
   }
 
@@ -109 +113 @@
       $this->Sanitize->clean($this->data['Result']);  
     
-      $this->data['Result']['results']   = $this->getResults($this->data['Result']); 
+      $this->data['Result']['results']   = $this->Test->($this->data['Result']); 
 
       $this->data['Result']['test_id'] =  $this->data['Question']['test_id'];
@@ -126 +130 @@
     {
       echo "Caught my exception\n" . $e;
-    }
-    
-}
-
- private function chk($user_id)
+    }   
+ }
+
+ private function chk($user_id) // preview tests before send
  {
     try {
@@ -152 +155 @@
  }
 
- private function get_results($questions)
- {
-    $this->Test->unbindModel(array('belongsTo'=>array('User'))); //just few data
-    
-    $result = 0;
-    
-    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)
-         {
-              $worth   = $this->Test->Question->field('Question.worth', array('Question.id'=>$q_id));         // how many points
-              $result += $worth;
-         }
-    }
-    //exit('Result was:' . $result);
-    return $result; 
-  }
   
  /**   === ADMIN METHODS ====  **/

trunk/app/models/test.php

@@ -74 +74 @@
 
     return $vclassrooms;
+ }
+
+ private function chkAnswers($answers)
+ {
+    $this->Test->unbindModel(array('belongsTo'=>array('User'))); //just few data
+    
+    $result = 0;
+    
+    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)
+         {
+              $worth   = $this->Test->Question->field('Question.worth', array('Question.id'=>$q_id));         // how many points
+              $result += $worth;
+         }
+    }
+    //exit('Result was:' . $result);
+    return $result; 
   }
 }

trunk/app/views/questions/admin_answers.ctp

@@ -1 +1 @@
 <?php
+//die(debug($data));
  echo $html->addCrumb('Control Tools', '/admin/entries/start');
  echo $html->addCrumb('Tests', '/admin/tests/listing');
+ echo $html->addCrumb($data['Test']['title'], '/admin/tests/questions/'.$data['Test']['id']);
  echo $html->getCrumbs(' / '); 
 

trunk/app/views/tests/admin_questions.ctp

@@ -10 +10 @@
 </div>
 <?php
- echo $html->para(null, $html->link('Edit', '/admin/tests/edit/'.$data['Test']['id'])) . '&nbsp;&nbsp;';
- echo $data['Test']['title'] . "  " . $data['Test']['description'];
+ echo $html->para(null, $html->link('Edit', '/admin/tests/edit/'.$data['Test']['id']).'&nbsp;&nbsp;'.$html->link('Assign to class', '/admin/tests/vclassrooms/'.$data['Test']['id']));
+
+ echo '<b>Description:</b> '. $data['Test']['title'] . "  " . $data['Test']['description'];
  echo "  ". count($data["Question"]) . " questions";
 

trunk/app/views/tests/view.ctp

@@ -1 +1 @@
 <?php
-//die(debug($data));
+// 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 ?
+       if ( in_array($v['id'], $session->read('vclassrooms'))):
+              $auth = true;
+          break;
+       endif;
    endforeach;
 endif;
@@ -24 +27 @@
        //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
@@ -32 +34 @@
           endforeach;
 
-          echo $form->radio('Result.'.$val['id'], $options);
+          echo $form->radio('Result.'. $val['worth'] .' points, '.$val['question'], $options);
 
           echo $html->para(null, $val['hint']);

trunk/app/views/vclassrooms/admin_listing.ctp

@@ -10 +10 @@
 <?php
 
-$th = array ('Edit', 'Virtual classroom', 'View students', 'Status', 'Delete');
+$th = array ('Edit', 'Virtual classroom', 'Status');
 echo $html->tableHeaders($th);  
 foreach ($data as $val)
 {       
-  $st = ( $val['Vclassroom']['status'] == 1 ) ? 'Active' : 'Filed';     
+  $st = ( $val['Vclassroom']['status'] == 1 ) ? 'Enabled' : 'Filed';     
        $tr = array (
         $gags->sendEdit($val['Vclassroom']['id'], 'vclassrooms'),
-        $html->link($val['Vclassroom']['name'], '/admin/ecourses/vclassrooms/'.$val['Vclassroom']['id']) . ' <span class="petit">'.$val['Ecourse']['title'].'</span>',
-        $html->link('View students','/admin/vclassrooms/start/'.$val['Vclassroom']['id']),
-        $html->link('File','/admin/vclassrooms/change/'.$val['Vclassroom']['id'].'/'.$val['Vclassroom']['status']),
-        $gags->confirmDel($val['Vclassroom']['id'], 'vclassrooms')
+        $html->link($val['Vclassroom']['name'], '/admin/vclassrooms/members/'.$val['Vclassroom']['id']) . ' <span class="petit">'.$val['Ecourse']['title'].'</span>',
+        $html->link($st,'/admin/vclassrooms/change/'.$val['Vclassroom']['id'].'/'.$val['Vclassroom']['status'])
+        //$gags->confirmDel($val['Vclassroom']['id'], 'vclassrooms')
         );
        

trunk/app/views/vclassrooms/admin_members.ctp

@@ -41 +41 @@
 }
 
-foreach ($data['User'] as $val)
-{
-  // die(debug($val));
-   $tmp  = '<b>Name</b>: '    . $val['name'] . '  ' . '<b> Username</b>:' . $val['username']                . '<br />';
-   $tmp .= 'Email: '   . $html->link($val['email'], 'mailto:'.$val['email']) . '<br />';
-   $tmp .= $html->div('butonright', $gags->confirmDel($val['id'], 'Vclassroom'));
-  
-   echo $html->div('divgray', $tmp);
-}
-
+echo '<table class="tbadmin">';
+//die(print_r($data));
+ 
+$th = array ('Name', 'Username', 'Send Message', 'Email', 'Undettach');
+echo $html->tableHeaders($th); 
+foreach ($data['User'] as $val):
+         $tr = array (
+             $val['name'],
+             $val['username'],
+             $html->link($val['email'], 'mailto:'.$val['email']),
+                 $html->link('Compose', '/admin/messages/write/'.$val['id']),
+         $html->link('Undetach', '/admin/vclassroom/unlink/'.$val['id'].'/'.$data['Vclassroom']['id'])
+             );
+     
+     echo $html->tableCells($tr, array("class"=>"altRow", "onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='altRow'"), array('class'=>'evenRow',"onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='evenRow'"));
+endforeach;
 ?>
+</table>

trunk/app/views/webquests/view.ctp

@@ -2 +2 @@
 //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 ?
+       if ( in_array($v['id'], $session->read('vclassrooms'))):
+              $auth = true;
+          break;
+       endif;
    endforeach;
 endif;
@@ -37 +40 @@
 echo '</div>';
 
+echo $form->create('Result', array('onsubmit'=>'return chkForm()'));
+
+echo $form->label('Result.answer', 'Answer:').'<br />';
+echo $form->textarea('Result.answer', array('cols'=>60, 'rows'=>20));
+echo $form->end('Send');
+
 else:
      echo $html->link('Login to join this group', '/users/login');