Changeset 372

Timestamp:

04/07/08 15:54:44 (9 months ago)

Author:

aarkerio

Message:

Tests fixed

Location:

trunk/app

Files:

• controllers/ecourses_controller.php (modified) (1 diff)
• controllers/tests_controller.php (modified) (6 diffs)
• views/ecourses/admin_listing.ctp (modified) (1 diff)
• views/tests/admin_listing.ctp (modified) (2 diffs)
• views/tests/admin_vclassrooms.ctp (modified) (1 diff)
• webroot/img/admin/link.gif (added)
• webroot/img/admin/unlink.gif (added)

trunk/app/controllers/ecourses_controller.php

@@ -37 +37 @@
        
        $conditions   =  array("user_id"=>$this->Auth->user('id'));
-       $fields       =  array('id', 'title', 'access',  'status', 'description');
+       $fields       =  array('id', 'title', 'access',  'status');
        $order        =  "Ecourse.title DESC";
        

trunk/app/controllers/tests_controller.php

@@ -14 +14 @@
  public $helpers    = array('Ajax', 'Gags');
   
- public $components = array('Edublog');
+ public $components = array('Edublog', 'Security');
  
  public $paginate = array(
@@ -145 +145 @@
  }
 
- private function getResults($questions)
+ private function get_results($questions)
  {
     $this->Test->unbindModel(array('belongsTo'=>array('User'))); //just few data
@@ -169 +169 @@
  public function admin_vclassrooms($test_id)
  {    
-   $this->pageTitle = $this->Auth->user('username') . '\'s Classrooms';
+   $this->pageTitle = $this->Auth->user('username') . '\'s Tests';
       
    $this->layout = 'admin';
@@ -180 +180 @@
 
    $this->set('tests',$this->Test->TestsVclassroom->findAll(array('TestsVclassroom.test_id' => $test_id)));
+   
+   $this->set('test_id', $test_id);
  }
     
@@ -188 +190 @@
    $this->pageTitle = 'Tests';
         
-   $conditions = array('Vclassroom.user_id'=>$this->Auth->user('id'));
+   $conditions = array('Test.user_id'=>$this->Auth->user('id'));
         
    $fields     = array('Test.id', 'Test.user_id', 'Test.title', 'Test.description', 'Test.status');
@@ -197 +199 @@
       
    $this->set('data', $this->Test->findAll($conditions, $fields, $order));
+ }
+ 
+ public function admin_link2class() 
+ {
+    $this->layout    = 'admin';
+    // add to database
+   if ( !empty($this->data['TestsVclassroom']) )
+   {
+      $this->Sanitize = new Sanitize;
+           
+      $this->Sanitize->clean($this->data['TestsVclassroom']);
+                 
+      $this->Test->TestsVclassroom->create(); 
+      
+      if ( $this->Test->TestsVclassroom->save($this->data['TestsVclassroom']))
+      {
+               $this->msgFlash('Test assigned', '/admin/tests/vclassrooms/'.$this->data['TestsVclassroom']['test_id']);
+      }
+      else
+      { 
+              die('Something is wrong, please report this bug');
+      }
+   }
+ }
+
+  public function admin_unlink2class() 
+ {
+    $this->layout    = 'admin';
+    // add to database
+   if ( !empty($this->data['TestsVclassroom']) )
+   {
+      $this->Sanitize = new Sanitize;
+           
+      $this->Sanitize->clean($this->data['TestsVclassroom']);
+                 
+      if ( $this->Test->TestsVclassroom->delete($this->data['TestsVclassroom']['id']))
+      {
+               $this->msgFlash('Test unlinked', '/admin/tests/vclassrooms/'.$this->data['TestsVclassroom']['test_id']);
+      }
+      else
+      { 
+              die('Something is wrong, please report this bug');
+      }
+   }
  }
  

trunk/app/views/ecourses/admin_listing.ctp

@@ -12 +12 @@
 foreach ($data as $val)
 {
-
       $tmp  = $html->div('butonright', $gags->sendEdit($val['Ecourse']['id'], 'ecourses'));
       $tmp .= $html->link($val['Ecourse']['title'], '/admin/ecourses/vclassrooms/'.$val['Ecourse']['id']);
-      $tmp .= $html->para(null, $val['Ecourse']['description']);
       $tmp .= $html->div('butonright', $gags->confirmDel($val['Ecourse']['id'], 'ecourses'));
       echo $html->div('grayblock', $tmp);

trunk/app/views/tests/admin_listing.ctp

@@ -1 +1 @@
 <?php
 //die( debug( $data ));
-?>
-<div class="title_section">Tests</div>
 
-<p><?php echo $html->link($html->image('actions/new.png', array("alt"=>"Add entry", "title"=>"Add entry")), '/admin/tests/add', null, false, false) ?></p>
+echo $html->div('title_section', 'Tests');
 
-<?php
+echo $html->para(null, 
+                $html->link($html->image('actions/new.png', array("alt"=>"Add entry", "title"=>"Add entry")), '/admin/tests/add', null, false, false)
+                ); 
+
 //die(print_r($data));
 
@@ -13 +14 @@
   $s  =  ($val['Test']['status'] == 1) ? 'Published': 'Draft';
 
-  echo '<div style="padding:6px 3px 28px 4px;margin:10px 0 5px 0;border:1px dotted gray;">';
+  echo '<div class="grayblock">';
          echo $html->div('butonright', $gags->sendEdit($val['Test']['id'], 'tests'));
          echo $html->link($val['Test']['title'], '/admin/tests/vclassrooms/'.$val['Test']['id']) . '<br /><br />';
+         echo $html->para(null, '<b>Test description:</b> '.$val['Test']['description']);
+
          echo $html->link('Questions', '/admin/tests/questions/'.$val['Test']['id']);
+         echo $html->link($html->image('admin/questions_icon.gif', array('alt'=>'Questions', 'title'=>'Questions')), 
+                          '/admin/tests/questions/'.$val['Test']['id'], null, null, false) . '<br />';
 
-         if ( count($val['Vclassroom']) < 1 ) 
+
+         if ( count($val['Vclassroom']) < 0 ) 
          {
            echo $html->para(null, $html->link(
                                               $html->image('admin/vgroups-gray.gif', array(
-                                                                                           'alt'  =>'There is no Classroom assigned for this test', 
-                                                                                           'title'=>'There is no Classroom assigned for this test'
+                                                                                           'alt'  =>'There is no class assigned for this test', 
+                                                                                           'title'=>'There is no class assigned for this test'
                                                                                            )
                                                            ), 
                                               '/admin/tests/vclassrooms/'.$val['Test']['id'], null,  null, false));
          }
-         echo $html->link($html->image('admin/questions_icon.gif', array('alt'=>'Questions')), 
-                          '/admin/tests/questions/'.$val['Test']['id'], null, null, false) . '<br />';
-         echo $html->para(null, $val['Test']['description']);
+         else
+         {
+           echo $html->para(null, $html->link(
+                                              $html->image('static/vgroups.gif', array(
+                                                                                           'alt'  =>'Assign this test to new class', 
+                                                                                           'title'=>'Assign this test to new class'
+                                                                                           )
+                                                           ), 
+                                              '/admin/tests/vclassrooms/'.$val['Test']['id'], null,  null, false));
+
+           foreach($val['Vclassroom'] as $class):
+               echo $html->para(null, 'This test had been assigned to class: '. $html->link($class['name'], '/admi/ecourses/vclassroom/'.$class['id']) . '</b>');
+           endforeach;
+         }
+
          echo $html->para(null, $html->link($s, '/admin/tests/change/'.$val['Test']['id'].'/'.$val['Test']['status']));
          echo $html->div('butonright',  $gags->confirmDel($val['Test']['id'], 'tests'));

trunk/app/views/tests/admin_vclassrooms.ctp

@@ -1 +1 @@
 <?php
-die( debug($tests));
+ echo $html->addCrumb('Control Tools', '/admin/entries/start');
+ echo $html->addCrumb('Courses', '/admin/tests/listing');
+ echo $html->getCrumbs(' / ');
+//die( debug( $data ) );
 
-foreach ( $data as $val)
-{
-  $tmp  = $html->para(null, $val['Vclassroom']['name']);
-  $tmp .= $form->create('Test', array('action'=>'linkvclassroom'));
-  $tmp .= $form->hidden('Test.test_id', array('value'=>$val['Test']['id']));
-  $tmp .= $form->hidden('Vclassroom.test_id', array('value'=>$val['Test']['id']));
-  $tmp .= $form->end('Assign this test');
+$vclasses = array();   // contains vclassroom already linked to this test
+
+foreach ( $tests as $test):
+     $vclasses[$test['TestsVclassroom']['id']] = $test['TestsVclassroom']['vclassroom_id'];
+endforeach;
+
+//die( debug( $vclasses ) ); 
+
+foreach ( $data as $val):
+  if ( !in_array($val['Vclassroom']['id'], $vclasses) ):
+       $tmp  = $html->para(null, $html->image('admin/link.gif').$val['Vclassroom']['name']);
+       $tmp .= $form->create('Test', array('action'=>'link2class'));
+       $tmp .= $form->hidden('TestsVclassroom.test_id', array('value'=>$test_id));
+       $tmp .= $form->hidden('TestsVclassroom.vclassroom_id', array('value'=>$val['Vclassroom']['id']));
+       $tmp .= $form->end('Assign this test');
   
-  
-  echo $html->div('divblock', $tmp);
-}
+   else:
+
+       $tmp = $html->para(null, $html->image('admin/unlink.gif').'This test is already assigned to  <b>'.$val['Vclassroom']['name'].'</b>');
+       
+       foreach ( $tests as $test):
+         if ($test['TestsVclassroom']['vclassroom_id'] == $val['Vclassroom']['id'])
+             {
+            $testsvclasroom_id =  $test['TestsVclassroom']['id'];
+         }   
+       endforeach;
+
+
+       $tmp .= $form->create('Test', array('action'=>'unlink2class'));
+       $tmp .= $form->hidden('TestsVclassroom.id', array('value'=>$testsvclasroom_id));
+       $tmp .= $form->hidden('TestsVclassroom.test_id', array('value'=>$test_id));
+       $tmp .= $form->end('Unlink this test');
+   endif;
+
+   echo $html->div('grayblock', $tmp); // print
+
+endforeach;
 ?>