Changeset 746

Timestamp:

09/01/08 20:58:25 (3 months ago)

Author:

aarkerio

Message:

Little Bugs fixed

Location:

trunk/app

Files:

• models/test.php (modified) (1 diff)
• models/vclassroom.php (modified) (7 diffs)
• views/vclassrooms/admin_record.ctp (modified) (11 diffs)

trunk/app/models/test.php

@@ -71 +71 @@
  {
   $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
 
-  $conditions = array('Result.test_id'=>$test_id, 'Result.user_id'=>$user_id, 'Result.vclassroom_id'=>$vclassroom_id);
-  
-  $this->Result->unbindAll();  // removeds unnecesary stuff
+  if ( count($answers) < 1):    // test not answer yet
+    return null;
+  endif;
 
-  $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?
+    $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):

trunk/app/models/vclassroom.php

@@ -140 +140 @@
  {
    // 1) wee need check tree models: Test, Webquest and Treasures ans results associated to them:
-   // Result, ResultTreasure and ResultWebquest, so will get the stundents answer  
+   // Result, ResultTreasure and ResultWebquest, so will get the students answer  
   try{   
      $record                  = array();
@@ -151 +151 @@
      // Consult Test Model associated to this Vclassroom
      $this->TestsVclassroom->bindModel(array('belongsTo'=>array('Test')));
-     
      $conditions        = array('TestsVclassroom.vclassroom_id'=>$vclassroom_id);
      $fields            = array('TestsVclassroom.test_id', 'TestsVclassroom.id', 'Test.title'); 
      $record['tests']   = $this->TestsVclassroom->findAll($conditions, $fields);
-     // die(debug($record));
 
      // foreach test check in Result model
      foreach($record['tests'] as $k => $t):
-       $record['tests'][$k]['TestsVclassroom']['title'] = $t['Test']['title'];
-       $this->Test->Result->unbindAll();
-       $this->Test->Result->bindModel(array('belongsTo'=>array('Question','Test')));
-       
-       $conditions = array('Result.vclassroom_id'=>$vclassroom_id,'Result.user_id'=>$user_id,'Result.test_id'=>$t['TestsVclassroom']['test_id']);
-       $fields     = array('Result.correct', 'Result.answer_id','Question.worth');
-       $results    = $this->Test->Result->findAll($conditions, $fields);
-       //debug($results);
-       // Get points from answers
-       if ( count($results) > 0 ):
-            $points     = (int) 0;
-       else:
-            $points     = null;   //student has not answered this test yet
-       endif;
-       
-       foreach($results as $r):
-            if ($r['Result']['correct'] == 1):
-                  $points     += (int) $r['Question']['worth'];     
-        endif;
-       endforeach;
-       
-       $record['tests'][$k]['TestsVclassroom']['points'] = $points;
-     endforeach;
-     //die(debug($record['tests']));
+       $record['tests'][$k]['TestsVclassroom']['points'] = $this->Test->getPoints($t['TestsVclassroom']['test_id'], $user_id, $vclassroom_id);
+     endforeach;
+     // die(debug($record['tests']));
 
      // Now Treasure model
@@ -418 +395 @@
    endif; 
  }
-
+/*
+ *  studentPoints 
+ *   
+ */
  public function studentPoints($user_id, $vclassroom_id)
  {
@@ -424 +404 @@
      $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.points');
-     $tests      = $this->Test->Result->findAll($conditions, $fields);
+     // Consult TestsVclassroom  Model 
+     $conditions = array('TestsVclassroom.vclassroom_id'=>$vclassroom_id);
+     $fields     = array('TestsVclassroom.test_id');
+     $tests      = $this->TestsVclassroom->findAll($conditions, $fields);
+     
      foreach ($tests as $test):
-            $points += (int) $this->Test->getPoints($test['test']['id'], $user_id, $vclassroom_id);
-     endforeach;
-     die('pints  '. $points);*/
+            $points += (int) $this->Test->getPoints($test['TestsVclassroom']['test_id'], $user_id, $vclassroom_id);
+     endforeach;
      
      // Consult Treasure Model
@@ -456 +436 @@
             $points += $pa['Participation']['points'];
      endforeach;
-  
+
+     // Reports
+     $conditions     = array('Report.vclassroom_id'=>$vclassroom_id, 'Report.student_id'=>$user_id);
+     $fields         = array('Report.points'); //null; 
+     $reports        = $this->Report->findAll($conditions, $fields);
+     foreach ($reports as $rep):
+            $points += $rep['Report']['points'];
+     endforeach;
+     
      // Webquest
      $conditions     = array('ResultWebquest.vclassroom_id'=>$vclassroom_id, 'ResultWebquest.user_id'=>$user_id);
@@ -465 +453 @@
      endforeach;
          
-     //die(debug($record));
+     //die(debug($points));
      return $points;
   }
@@ -483 +471 @@
    $data        = $this->UsersVclassroom->findAll($conditions, $fields);
 
-   if ( $data == null )
-   {
+   if ( $data == null ):
      return null; 
-   }
-   else
-   {
+   else:
        $vclassrooms = array();
-
-       foreach ($data as $v)
-       {
-     foreach($v['UsersVclassroom'] as $m)
-     {
-         array_push($vclassrooms, $m);
-     }
-       }
-   }
+       foreach ($data as $v):
+      foreach($v['UsersVclassroom'] as $m):
+          array_push($vclassrooms, $m);
+      endforeach;
+       endforeach;
+   endif;
    return $vclassrooms;
  }
 
-  /**
-   * Adds a join record between two records of a hasAndBelongsToMany association
-   *
-   * @param mixed $assoc The name of the HABTM association
-   * @param mixed $assoc_ids The associated id or an array of associated ids
-   * @param integer $id The id of the record in this model
-   * @return boolean Success
-   */
-  public function addAssoc($assoc, $assoc_ids, $id = null)
-  {
-    if ($id != null) 
-    {
-      $this->id = $id;
-    }
-
-    $id = $this->id;
-
-    if (is_array($this->id)) 
-    {
-      $id = $this->id[0];
-    }
-        
-    if ($this->id !== null && $this->id !== false)
-    {
-      $db =& ConnectionManager::getDataSource($this->useDbConfig);
-            
-      $joinTable = $this->hasAndBelongsToMany[$assoc]['joinTable'];
-
-      $table = $db->name($db->fullTableName($joinTable));
-            
-      $keys[] = $this->hasAndBelongsToMany[$assoc]['foreignKey'];
-      $keys[] = $this->hasAndBelongsToMany[$assoc]['associationForeignKey'];
-      $fields = join(',', $keys);
-            
-      if ( !is_array($assoc_ids) ) 
-      {
-    $assoc_ids = array($assoc_ids);
-      }
-        
-      // to prevent duplicates
-      $this->deleteAssoc($assoc,$assoc_ids,$id);
-            
-      foreach ($assoc_ids as $assoc_id) 
-      {
-    $values[]  = $db->value($id, $this->getColumnType($this->primaryKey));
-    $values[]  = $db->value($assoc_id);
-    $values    = join(',', $values);
-        
-        $q = "INSERT INTO {$table} ({$fields}) VALUES ({$values})";
-
-        // echo $q;
-
-    $db->execute($q);
-
-    unset ($values);
-      }
-            
-      return true;
-    } 
-    else 
-    {
-      return false;
-    }
-  }
-
-  /**
-   * Deletes any join records between two records of a hasAndBelongsToMany association
-   *
-   * @param integer $id The id of the record in this model
-   * @param mixed $assoc The name of the HABTM association
-   * @param mixed $assoc_ids The associated id or an array of associated ids
-   * @return boolean Success
-   */
-  public function deleteAssoc($assoc, $assoc_ids, $id = null)
-  {
-    if ($id != null) 
-    {
-      $this->id = $id;
-    }
-
-    $id = $this->id;
-
-    if (is_array($this->id)) 
-    {
-      $id = $this->id[0];
-    }
-        
-    if ($this->id !== null && $this->id !== false) {
-      $db =& ConnectionManager::getDataSource($this->useDbConfig);
-            
-      $joinTable = $this->hasAndBelongsToMany[$assoc]['joinTable'];    
-      $table = $db->name($db->fullTableName($joinTable));
-            
-      $mainKey = $this->hasAndBelongsToMany[$assoc]['foreignKey'];
-      $assocKey = $this->hasAndBelongsToMany[$assoc]['associationForeignKey'];
-            
-      if (!is_array($assoc_ids)) 
-      {
-    $assoc_ids = array($assoc_ids);
-      }
-            
-      foreach ($assoc_ids as $assoc_id) 
-      {
-    $db->execute("DELETE FROM {$table} WHERE {$mainKey} = '{$id}' AND {$assocKey} = '{$assoc_id}'");
-      }
-            
-       return true;
-    } 
-    else 
-    {
-        return false;
-    }
-  }
 /*
  *  check if student belongs to class group

trunk/app/views/vclassrooms/admin_record.ctp

@@ -30 +30 @@
 
  // Tests
+ $test_points = (int) 0;
  if ( count($data['tests']) > 0 ):
   echo '<h1>'. __('Tests', true).'</h1>';
@@ -38 +39 @@
     if ($t['TestsVclassroom']['points'] === null):  // not answered yet
       e($html->div(null, __('Not answered this test yet', true), array('id'=>$div_id,'style'=>'width:220px;float:left;font-size:7pt;')));
-      e($html->div(null, $t['TestsVclassroom']['title'], array('style'=>'width:350px;float:right;')));
+      e($html->div(null, $t['Test']['title'], array('style'=>'width:350px;float:right;')));
     else:
       e($html->div(null, $t['TestsVclassroom']['points'].' '.__('points',true),array('id'=>$div_id,'style'=>'width:180px;float:left;')));
       e('<div style="width:450px;float:right;">');
-      echo $html->link($t['TestsVclassroom']['title'], '#'.$div_id, array('title'=>'View test', 'onclick'=>
+      echo $html->link($t['Test']['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')")) . '&nbsp;&nbsp;';
         e('</div>');
       endif;
       e('</div>');
+      $test_points += (int) $t['TestsVclassroom']['points'];
     endforeach;
  else:
@@ -53 +55 @@
 
  // Webquests --> ResultWebquest
- $wpoints = (int) 0; // webquest points
+ $webquest_points = (int) 0; // webquest points
  if ( count($data['webquests']) > 0 ):
    echo '<h1>Webquests</h1>';
    foreach ($data['webquests'] as $w):
-     $wpoints += $w['ResultWebquest']['points'];
+     $webquest_points += $w['ResultWebquest']['points'];
      $div_id   = 'w'.$w['Webquest']['id'];
      e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
@@ -87 +89 @@
  
  // Treasures. Model: Treasure  
- $tpoints = (int) 0; // tresure points
+ $treasure_points = (int) 0; // tresure points
  echo '<h1>'. __('Scavengers hunts', true).'</h1>';
  if ( count($data['treasures']) > 0 ):
   foreach ($data['treasures'] as $tr):
+     $treasure_points += (int) $tr['ResultTreasure']['points'];
      $div_id   = 'tr'.$tr['Treasure']['id'];
      e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
@@ -120 +123 @@
  // Replies on forums. Model: Topic  
  echo '<h1>'.__('Participations in forums', true).'</h1>';
- $rpoints = (int) 0;
+ $reply_points = (int) 0;
  if ( count($data['replies']) > 0 ):
    foreach ($data['replies'] as $re):  
@@ -145 +148 @@
         e('</div>'); 
        e('</div>');
-       $rpoints += (int) $re['Reply']['points'];
+       $reply_points += (int) $re['Reply']['points'];
     endforeach;
   e($html->div(null, $html->image('static/loading.gif', array('alt'=>'Loading')), array('style'=>'display:none', 'id'=>'lorep')));
@@ -153 +156 @@
  
  // Participations, model:  Participation
- $ppoints = (int) 0;  // participation points
+ $participation_points = (int) 0;  // participation points
  echo '<h1>'.__('Participations', true).'</h1>'; 
  if ( count($data['participations']) > 0 ):
@@ -159 +162 @@
    e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
    $div_id = 'pa'.$p['Participation']['id'];
-   $ppoints += $p['Participation']['points'];
+   $participation_points += (int) $p['Participation']['points'];
   
    echo $html->div(null, $p['Participation']['points'].' '.__('points', true), array('id'=>$div_id,'style'=>'width:150px;float:left;'));
@@ -189 +192 @@
  
  // Reports, model:  Report
- $repoints = (int) 0;  // report points
+ $report_points = (int) 0;  // report points
  echo '<h1>'.__('Reports', true).'</h1>'; 
  if ( count($data['reports']) > 0 ):
@@ -195 +198 @@
    e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
    $div_id = 're'.$r['Report']['id'];
-   $repoints += (int) $r['Report']['points'];
+   $report_points += (int) $r['Report']['points'];
    echo $html->div(null, $r['Report']['points'].' '.__('points',true),  array('id'=>$div_id,'style'=>'width:150px;float:left;'));
 
@@ -224 +227 @@
  endif;
 
- echo  $html->div(null, __('Scavengers hunts', true) .' ' .__('points', true) .': '. $tpoints);
- echo  $html->div(null, 'Webquests ' .__('points', true) .': '. $wpoints);
- echo  $html->div(null, __('Replies', true). ' ' .__('points', true) .': '. $rpoints);
- echo  $html->div(null, __('Participations', true) .' '. __('points', true) .': '. $ppoints, array('id'=>'parpoints'));
- echo  $html->div(null, __('Reports', true) .' '. __('points', true) .': '. $repoints, array('id'=>'reppoints'));
- 
- $points = ($tpoints + $wpoints + $rpoints + $ppoints + $repoints);
+ echo  $html->div(null, __('Test', true) .' ' .__('points', true) .': '. $test_points);
+ echo  $html->div(null, __('Scavengers hunts', true) .' ' .__('points', true) .': '. $treasure_points);
+ echo  $html->div(null, 'Webquests ' .__('points', true) .': '. $webquest_points);
+ echo  $html->div(null, __('Replies', true). ' ' .__('points', true) .': '. $reply_points);
+ echo  $html->div(null, __('Participations', true) .' '. __('points', true) .': '. $participation_points, array('id'=>'parpoints'));
+ echo  $html->div(null, __('Reports', true) .' '. __('points', true) .': '. $report_points, array('id'=>'reppoints'));
+ 
+ $points = ($test_points + $treasure_points + $webquest_points + $reply_points + $participation_points + $report_points);
  
  echo  $ajax->div('totalpoints') .'<b>'.__('Total points', true).': ' . $points .'</b>'. $ajax->divEnd('totalpoints');