Changeset 418

Timestamp:

04/22/08 00:33:07 (9 months ago)

Author:

aarkerio

Message:

Webquest

Location:

trunk/app

Files:

• config/sql/karamelo_postgres.sql (modified) (1 diff)
• controllers/webquests_controller.php (modified) (3 diffs)
• views/webquests/admin_edit.ctp (modified) (2 diffs)
• views/webquests/admin_vclassrooms.ctp (modified) (2 diffs)

trunk/app/config/sql/karamelo_postgres.sql

@@ -518 +518 @@
   "user_id" int REFERENCES users(id) ON DELETE CASCADE,
   "status" smallint NOT NULL DEFAULT 0,
+  "value" smallint NOT NULL DEFAULT 10,
   "karanet" smallint NOT NULL DEFAULT 0  -- share karanet?
 );

trunk/app/controllers/webquests_controller.php

@@ -208 +208 @@
      }
     */
-    exit(var_dump($this->data["Webquest"]));
+    //exit(var_dump($this->data["Webquest"]));
     
     
-        if ($this->Webquest->save($this->data["Webquest"]))
+        if ($this->Webquest->save($this->data['Webquest']))
         {
-            $this->msgFlash('Webquest saved', '/admin/webquests/edit/'.$this->data["Webquest"]["id"]);
-            exit();
-         }
-         else 
-         {
+            $this->msgFlash('Webquest saved', '/admin/webquests/edit/'.$this->data['Webquest']['id']);
+        }
+        else 
+        {
             $this->msgFlash('Database error!', '/admin/webquests/listing');
-         }
+        }
       }
       else
@@ -300 +299 @@
       $this->Webquest->VclassroomsWebquest->create(); 
       
-      if ( $this->Webquest->VclassroomsWebquest->save($this->data['VclassroomsWebquest']))
-      {
-               $this->msgFlash('Webquest assigned', '/admin/tests/vclassrooms/'.$this->data['VclassroomsWebquest']['webquest_id']);
-      }
-      else
-      { 
+      if ( $this->Webquest->VclassroomsWebquest->save($this->data['VclassroomsWebquest'])):
+               $this->msgFlash('Webquest assigned', '/admin/webquests/vclassrooms/'.$this->data['VclassroomsWebquest']['webquest_id']);
+      else: 
               die('Something is wrong, please report this bug');
-      }
+      endif;
    }
  }
@@ -323 +319 @@
       if ( $this->Webquest->VclassroomsWebquest->delete($this->data['VclassroomsWebquest']['id']))
       {
-               $this->msgFlash('Webquest unlinked', '/admin/tests/vclassrooms/'.$this->data['VclassroomsWebquest']['webquest_id']);
+               $this->msgFlash('Webquest unlinked', '/admin/webquests/vclassrooms/'.$this->data['VclassroomsWebquest']['webquest_id']);
       }
       else

trunk/app/views/webquests/admin_edit.ctp

@@ -7 +7 @@
 ?>
 <div style="clear:both"></div>
-<h2>Editing: <?php echo $wq_title; ?></h2>
-  
+<h2>Editing: <?php echo $wq_title . '  ' . $html->link('Edit', '#', array('onclick'=>'hU()')); ?></h2>
+
+<div id="tit" style="margin:0;padding:0;padding-left:40px;width:80%;display:none;">
+<?php
+echo $form->create('Webquest');
+echo $form->input('Webquest.title', array('size'=>60,'maxlength'=>160,'value'=>$wq_title));
+echo $form->hidden('Webquest.id', array('value'=>$id));
+echo $form->end('Save');
+?>  
+</div>
 <!--my images window -->
 <p style="text-align:right;">
@@ -61 +69 @@
  echo $fck->fckAjax(); 
 ?>
+
+<script type="text/javascript">
+<!--
+ function hU() {
  
+ var Div = document.getElementById('tit');
+ 
+    if (Div.style.display == 'none')
+             Div.style.display = 'block';
+    else 
+             Div.style.display = 'none';
+      
+ }
+-->
+</script>
+ 

trunk/app/views/webquests/admin_vclassrooms.ctp

@@ -16 +16 @@
   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->create('Webquest', array('action'=>'link2class'));
        $tmp .= $form->hidden('VclassroomsWebquest.webquest_id', array('value'=>$webquest_id));
        $tmp .= $form->hidden('VclassroomsWebquest.vclassroom_id', array('value'=>$val['Vclassroom']['id']));
@@ -25 +25 @@
        $tmp = $html->para(null, $html->image('admin/unlink.gif').'This test is already assigned to  <b>'.$val['Vclassroom']['name'].'</b>');
        
-       foreach ( $webquests as $test):
-         if ($test['VclassroomsWebquest']['vclassroom_id'] == $val['Vclassroom']['id'])
-             {
-            $webquestsvclasroom_id =  $test['VclassroomsWebquest']['id'];
-         }   
+       foreach ( $webquests as $wq):
+             if ($wq['VclassroomsWebquest']['vclassroom_id'] == $val['Vclassroom']['id']):
+                 $id =  $wq['VclassroomsWebquest']['id'];
+         endif;   
        endforeach;
 
 
-       $tmp .= $form->create('Test', array('action'=>'unlink2class'));
-       $tmp .= $form->hidden('VclassroomsWebquest.id', array('value'=>$webquestsvclasroom_id));
-       $tmp .= $form->hidden('VclassroomsWebquest.webquest_id', array('value'=>$webquest_id));
+       $tmp .= $form->create('Webquest', array('action'=>'unlink2class'));
+       $tmp .= $form->hidden('VclassroomsWebquest.id', array('value'=>$id));
+       $tmp .= $form->hidden('VclassroomsWebquest.webquest_id', array('value'=>$webquest_id)); //used for return here
        $tmp .= $form->end('Unlink this test');
    endif;