Changeset 367

Timestamp:

04/04/08 00:23:34 (9 months ago)

Author:

aarkerio

Message:

sql

Location:

trunk/app

Files:

• config/sql/karamelo_postgres.sql (modified) (1 diff)
• controllers/vclassrooms_controller.php (modified) (4 diffs)
• views/layouts/popup.ctp (modified) (1 diff)
• views/vclassrooms/admin_display.ctp (modified) (3 diffs)

trunk/app/config/sql/karamelo_postgres.sql

@@ -585 +585 @@
   "title" varchar(50),
   "description" text NOT NULL,
-  "status" smallint NOT NULL DEFAULT 0 CHECK (status IN (1, 0))
+  "status" smallint NOT NULL DEFAULT 0 CHECK (status IN (1, 0)),
+  "karanet" smallint NOT NULL DEFAULT 0
 );
 

trunk/app/controllers/vclassrooms_controller.php

@@ -23 +23 @@
          if (isset($this->params[Configure::read('Routing.admin')]))
          {
-              if ($this->Auth->user('group_id') == 1)
+              if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 )
               {
-                        return true;
+        return true; // welcome
           }
          }
@@ -115 +115 @@
       
       $this->set('data', $this->Vclassroom->find($conditions));
+      
+      $this->Vclassroom->Test->unbindModel(array('hasMany'=>array('Question', 'Result'), 'belongsTo'=>array('User')));
+
       $this->set('test', $this->Vclassroom->Test->findAll(array("Test.user_id"=>$this->Auth->user('id'), "Test.status"=>1)));
  }
@@ -181 +184 @@
  public function admin_addtest() 
  {
-   $this->layout = 'ajax';
-
    if (!empty($this->data))
    {
@@ -192 +193 @@
     if ($this->Vclassroom->addAssoc('Test', $this->data["Test"]["id"], $this->data["Vclassroom"]["id"])) //link vclassrooms_tests
         {
-              $this->set('msg', 'Test added');
-              $this->render('admin_result', 'ajax');
+             
+              $this->msgFlash('Test linked', '/');
         }
         else

trunk/app/views/layouts/popup.ctp

@@ -30 +30 @@
 #footer {border:1px grey solid; margin-top:16pt;padding:4px;color:#000;background-color:#dad9d9;font-size:7pt;text-align:left;width:70%;margin-left:auto;margin-right:auto;}
 .warning {color:red;font-size:10px;text-align:left;}
-button {background-color:orange;color:#fff;border:1px solid gray;font-size:8pt;padding:5px;}
+button {background-color:orange;color:#fff;border:1px solid gray;font-size:7pt;padding:5px;}
 input {background-color:#eda2bb;color:#000;border:1px solid gray;font-size:7pt;padding:1px;}
+.divblock{margin:5px;border:1px dotted gray;padding:4px;}
 -->
 </style>

trunk/app/views/vclassrooms/admin_display.ctp

@@ -1 +1 @@
 <?php
-//debug($test);
+//die(debug($test));
 
 $test_assigned = array();
@@ -6 +6 @@
 foreach ( $test as $v)
 {
-   $test_assigned[$v['Test']['id']] = $v['Test']['id'];
+    $test_assigned[$v['Test']['id']] = $v['Test']['id']; // tests already linked with this classroom
 }
 
+echo $html->div('title_section', $data['Vclassroom']['name']); 
 
-echo '<h1>Group: '. $data['Vclassroom']['name'] .'</h1>'; 
-
-echo $ajax->div('loading', array("style"=>"display: none"));
-                   echo $html->image("static/loading.gif", array("alt"=>"Loading"));
-echo $ajax->divEnd('loading');
- 
-echo $ajax->div('envelope');
-
-echo $ajax->divEnd('envelope');
 
 if ( count($data) < 1)
@@ -28 +20 @@
    foreach ($test as $val)
    {
-     if ( in_array($val['Test']['id'], $test_assigned) )
+     if ( !in_array($val['Test']['id'], $test_assigned) )
      {
-       echo '<div style="padding:6px;margin:10px">The exam <b>'. $val['Test']['title'] . "</b> is already assigned to class <i>" . $data['Vclassroom']['name'] . '</i><br /></div>';
+       echo $html->div(null, 
+                       'The exam <b>'.$val['Test']['title'].'</b> is already assigned to class <i>'.$data['Vclassroom']['name'].'</i>');
      }
      else
      {
-        echo '<div class="round">';
-             echo 'Exam:' . $val['Test']['title'];
-         echo $ajax->form();
-         echo $html->hidden('Test/id',array("value"=>$val['Test']['id'])); 
-             echo $html->hidden('Vclassroom/id', array("value"=>$data['Vclassroom']['id']));
-         echo $ajax->submit('Assign this test', array("url"  => "/admin/vclassrooms/addtest",
-                                           "update" =>"envelope",
-                                           "loading" => "Element.show('charging');Element.hide('envelope')",
-                                           "complete" => "Element.hide('charging');Effect.Appear('envelope')"
-                          ));
-         echo '</form>';
-       echo '</div>';
+       $tmp  =  'Test:' . $val['Test']['title'];
+       $tmp .=  $form->create('Vclassroom', array('action'=>'admin_addtest'));
+       $tmp .=  $form->hidden('Test.id', array('value'=>$val['Test']['id'])); 
+       $tmp .=  $form->hidden('Vclassroom.id', array('value'=>$data['Vclassroom']['id']));
+       $tmp .=  $form->end('Assign this test');
+                      
+       echo $html->div('divblock', $tmp);
      }
    }