Changeset 745 for trunk/app

Timestamp:

09/01/08 12:14:13 (3 months ago)

Author:

aarkerio

Message:

Little Bugs fixed

Location:

trunk/app

Files:

• config/sql/postgresql/results.sql (modified) (1 diff)
• controllers/tests_controller.php (modified) (2 diffs)
• controllers/vclassrooms_controller.php (modified) (2 diffs)
• models/test.php (modified) (1 diff)
• models/vclassroom.php (modified) (1 diff)
• views/vclassrooms/admin_record.ctp (modified) (2 diffs)
• webroot/js/admin.js (modified) (1 diff)

trunk/app/config/sql/postgresql/results.sql

@@ -6 +6 @@
    test_id int NOT NULL REFERENCES tests(id) ON DELETE CASCADE,
    vclassroom_id int NOT NULL REFERENCES vclassrooms(id) ON DELETE CASCADE,
-   created timestamp(0) with time zone DEFAULT now() NOT NULL,
-   correct smallint NOT NULL,
+   created timestamp(0) with time zone DEFAULT now() NOT NULL
    PRIMARY KEY (user_id, test_id, vclassroom_id, question_id)
 );
-
--- CREATE TABLE results (  -- tests student results
---   id serial NOT NULL UNIQUE,
---   user_id int NOT NULL REFERENCES users(id) ON DELETE CASCADE,
---   results smallint NOT NULL,
---   test_id int NOT NULL REFERENCES tests(id) ON DELETE CASCADE,
---   vclassroom_id int NOT NULL REFERENCES vclassrooms(id) ON DELETE CASCADE,
---   created timestamp(0) with time zone DEFAULT now() NOT NULL,
---   percentage decimal NOT NULL,
---   PRIMARY KEY (user_id, test_id, vclassroom_id)
--- );
--- Test model tables ends
-

trunk/app/controllers/tests_controller.php

@@ -107 +107 @@
          if ( $res['Answer']['correct'] == 1):    // is the answer correct?
          $points += (int) $res['Question']['worth'];   //sum good points        
-         $this->data['Result']['correct'] = 1;
-         else:
-         $this->data['Result']['correct'] = 0;
      endif;
          $this->data['Result']['question_id']  = $k;
@@ -185 +182 @@
   
  /**   === ADMIN METHODS ====  **/
- /** Select classroom to link*/
+ public function admin_tempo()
+  {      // test_id, user_id vclassroom_id
+   $data  = $this->Test->getPoints(2, 4, 2);
+ }
+ /** Select classrooms to link*/
  public function admin_vclassrooms($test_id)
  {    

trunk/app/controllers/vclassrooms_controller.php

@@ -321 +321 @@
  public function admin_record($student_id, $vclassroom_id) 
  {
-    $this->layout    = 'admin';
-
-    $this->pageTitle = __('Student record', true);
+   $this->layout    = 'admin';
+
+   $this->pageTitle = __('Student record', true);
     
-    $this->set('data', $this->Vclassroom->studentRecord($student_id, $vclassroom_id));
+   $this->set('data', $this->Vclassroom->studentRecord($student_id, $vclassroom_id));
  }
 
  public function admin_points($student_id, $vclassroom_id) 
  {
-    $this->layout    = 'ajax';
+   $this->layout    = 'ajax';
     
-    $this->set('points', $this->Vclassroom->studentPoints($student_id, $vclassroom_id));
+   $this->set('points', $this->Vclassroom->studentPoints($student_id, $vclassroom_id));
     
-    $this->render('points', 'ajax');
+   $this->render('points', 'ajax');
  }
 
@@ -340 +340 @@
  {
   if (empty($this->data['Vclassroom'])):
-        $this->layout = 'admin';
-        
+        $this->layout = 'admin';     
         $this->data = $this->Vclassroom->read(null, $vclassroom_id);
   else:
     
        $this->Sanitize = new Sanitize;
-       
        $this->Sanitize->clean($this->data['Vclassroom']);
        

trunk/app/models/test.php

@@ -54 +54 @@
                          )
                             );   
-    public $validate = array(
-      'title' => VALID_NOT_EMPTY,
-      'description' => VALID_NOT_EMPTY,
-      'user_id' => VALID_NOT_EMPTY
-   ); 
+public $validate = array(
+              'title' => array(
+                          'rule' => array('minLength', '4'),
+                                      'message' => 'Mimimum 4 characters long'
+                       ),
+              'description' => array(
+                             'rule' => array('minLength', '4'),
+                                         'message' => 'Mimimum 4 characters long'
+                            )       
+                );
 /*
-public $validate = array(
-        'login' => array('alphanumeric' => array(
-                                                 'rule' => 'alphaNumeric',
-                                             'required' => true,
-                                                         'message' => 'Alphabets and numbers only'
-                                   ),
-                                'between' => array(
-                                           'rule' => array('between', 5, 15),
-                                                                               'message' => 'Between 5 to 15 characters'
-                                           )
-                                ),
-                       'password' => array(
-                                   'rule' => array('minLength', '8'),
-                                                               'message' => 'Mimimum 8 characters long'
-                                   ),
-                       'email' => 'email',
-                       'born' => array(
-                               'rule' => 'date',
-                               'message' => 'Enter a valid date',
-                                                           'allowEmpty' => true
-                               )
-                       ); */   
-  public function linkClassroom($test_id, $user_id)
-  {
-    $condition = array('Test.status'=>1, 'Test.user_id'=>$user_id, 'Test.id'=>$test_id);
+ *  getPoints  returns points from already answered test by student
+ *  
+ */
+ public function getPoints($test_id, $user_id, $vclassroom_id)
+ {
+  $points = (int) 0;
+
+  $conditions = array('Result.test_id'=>$test_id, 'Result.user_id'=>$user_id, 'Result.vclassroom_id'=>$vclassroom_id);
+  
+  $this->Result->unbindAll();  // removeds unnecesary stuff
+
+  $answers    = $this->Result->findAll($conditions);  // get the answers gived by student
+  
+  foreach($answers as $a):
+    $question = $this->Question->find(array('Question.id'=>$a['Result']['question_id']), array('worth')); // how much points question have?
+    foreach($question['Answer'] as $qa):
+        if ($qa['id'] == $a['Result']['answer_id'] && $qa['question_id'] == $a['Result']['question_id'] && $qa['correct'] == 1):
+            $points += (int) $question['Question']['worth'];  
+    endif;
+     endforeach;
+  endforeach;
+  
+  return $points;
+ }
+ public function linkClassroom($test_id, $user_id)
+ {
+    $conditions = array('Test.status'=>1, 'Test.user_id'=>$user_id, 'Test.id'=>$test_id);
     
     $vclassrooms = array();

trunk/app/models/vclassroom.php

@@ -418 +418 @@
    endif; 
  }
+
  public function studentPoints($user_id, $vclassroom_id)
  {
   try{   
-     $points  = (int) 0;
+     $points  = (int) 0; // student total points in eCourse 
    
      // Consult Test Model 
-     /*$conditions     = array('Result.vclassroom_id'=>$vclassroom_id, 'Result.user_id'=>$user_id);
-     $fields         = array('Result.percentage');  //null;
-     $tests          = $this->Test->Result->findAll($conditions, $fields);
-     foreach ($tests as $t):
-            $points = $t['Test'][''];
-     endforeach; */
+     /* $conditions = array('Result.vclassroom_id'=>$vclassroom_id, 'Result.user_id'=>$user_id);
+     $fields     = array('Result.points');
+     $tests      = $this->Test->Result->findAll($conditions, $fields);
+     foreach ($tests as $test):
+            $points += (int) $this->Test->getPoints($test['test']['id'], $user_id, $vclassroom_id);
+     endforeach;
+     die('pints  '. $points);*/
+     
      // Consult Treasure Model
      $conditions = array('ResultTreasure.vclassroom_id'=>$vclassroom_id, 'ResultTreasure.user_id'=>$user_id);

trunk/app/views/vclassrooms/admin_record.ctp

@@ -9 +9 @@
  echo $html->div('title_section', $data['User']['name']);
  echo $html->div(null, $html->link($data['User']['email'], $data['User']['email']));
- // send message || send record to student   
+ // send message && send record to student   
  echo $html->para(null, 
                  $ajax->link($html->image('admin/compose_on.gif', array('alt'=>'Compose', 'title'=>'Compose Message')) ,
@@ -44 +44 @@
       echo $html->link($t['TestsVclassroom']['title'], '#'.$div_id, array('title'=>'View test', 'onclick'=>
         "window.open('/admin/tests/see/".$data['User']['id']."/".$t['TestsVclassroom']['test_id']."/".$data['Vclassroom']['id']."','mywin','left=20,top=10,width=700,height=700,scrollbars=1,toolbar=0,resizable=1')")) . '  ';
-/*
-      echo $ajax->link($html->image('static/adownmod.png', array('alt'=>'Points down', 'title'=>'Points down')),
-                           '/admin/tests/points/'.$t['TestsVclassroom']['test_id'],
-                        array('update'  => $div_id,
-                              'loading '=>"Element.show('loadingre');",
-                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                          'complete'=>"Element.hide('loadingre');Effect.Appear(".$div_id.")"),null,false);
-      echo $ajax->link($html->image('static/aupmod.png', array('alt'=>'Points up', 'title'=>'Points up')),
-                           '/admin/tests/points/'.$t['TestsVclassroom']['test_id'],
-                        array('update'  => $div_id,
-                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                              'loading '=>"Element.show('loadingre')",
-                          'complete'=>"Element.hide('loadingre');Effect.Appear(".$div_id.")"),null,false); */
         e('</div>');
       endif;

trunk/app/webroot/js/admin.js

@@ -2 +2 @@
 window.onload = preloader;
 
+// preload images in Control Panel
 function preloader() 
 {