Changeset 416

Timestamp:

04/21/08 13:05:04 (9 months ago)

Author:

aarkerio

Message:

Discussions fixed

Location:

trunk/app

Files:

• config/sql/karamelo_postgres.sql (modified) (1 diff)
• controllers/components/edublog.php (modified) (2 diffs)
• controllers/vclassrooms_controller.php (modified) (4 diffs)
• controllers/webquests_controller.php (modified) (1 diff)
• models/webquest.php (modified) (1 diff)
• views/webquests/admin_listing.ctp (modified) (2 diffs)

trunk/app/config/sql/karamelo_postgres.sql

@@ -522 +522 @@
 --HABTM
 CREATE TABLE "vclassrooms_webquests" (
-  "vclassroom_id" int NOT NULL REFERENCES vclassrooms(id),
-  "webquest_id"   int NOT NULL REFERENCES webquests(id),
-  PRIMARY KEY  ("vclassroom_id", "webquest_id")
-);
+ "id" serial PRIMARY KEY,
+ "vclassroom_id" int NOT NULL REFERENCES vclassrooms(id) ON DELETE CASCADE,
+ "webquest_id" int NOT NULL REFERENCES webquests(id) ON DELETE CASCADE,
+  UNIQUE ("vclassroom_id", "webquest_id")
+);
+
+
 -- Treasure hunts         http://www.gma.org/surfing/imaging/treasure.html
 CREATE TABLE "treasures" (

trunk/app/controllers/components/edublog.php

@@ -9 +9 @@
 
 App::import('Model','User');
+App::import('Model','Vclassroom');
 
 class EdublogComponent extends Object
 {
- 
  public function startup(&$controller)
  {
@@ -106 +106 @@
                  );
   
- $conditions = array("User.id"=>$user_id, "User.active"=>1);
- $fields     = array("User.id", "User.created", "User.name_blog", "User.quote", "User.cv", "User.avatar", "User.username");
+  $conditions = array("User.id"=>$user_id, "User.active"=>1);
+  $fields     = array("User.id", "User.created", "User.name_blog", "User.quote", "User.cv", "User.avatar", "User.username");
 
- //return $this->User->findAll($conditions, $fields, null, null, null, 2);
+  $this->controller->set('blog', $this->User->find($conditions, $fields, null, 2));  
 
- $this->controller->set('blog', $this->User->find($conditions, $fields, null, 2));  
+ }
 
+ public function setSession($user_id) //set vclassrooms authorized to this student
+ {
+   $this->Vclassroom = new Vclassroom;
+
+   $vclassrooms = $this->Vclassroom->chkVclassrooms($user_id); // check model, what classrooms this student belongs?
+
+   if ($vclassrooms != null)
+   {
+     $this->controller->Session->write('vclassrooms', $vclassrooms);
+   }
+   
+   return true;
  }
 

trunk/app/controllers/vclassrooms_controller.php

@@ -52 +52 @@
       {
        $user_id = (int) $this->Auth->user('id');
-           $this->__setSession($user_id);
+           $this->Edublog->setSession($user_id);
       }
  }
@@ -64 +64 @@
       $conditions = array("Vclassroom.status"=>1, "Vclassroom.id"=>$id);
       
+      // temporal lines, move to model later
       $this->Vclassroom->Ecourse->unbindModel(array('hasMany'=>array('Vclassroom'), 'belongsTo'=>array('User')));
       $this->Vclassroom->Test->unbindModel(array('hasMany'=>array('Question'), 'belongsTo'=>array('User')));
@@ -72 +73 @@
       {
        $user_id = (int) $this->Auth->user('id');
-           $this->__setSession($user_id);
+           $this->Edublog->setSession($user_id);
       }
  }
@@ -106 +107 @@
         }
     }
- }
-
- private function __setSession($user_id) //set vclassrooms authorized to this student
- {
-   $vclassrooms = $this->Vclassroom->chkVclassrooms($user_id); // check model
-
-   if ($vclassrooms != null)
-   {
-     $this->Session->write('vclassrooms', $vclassrooms);
-   }
-   
-   return true;
  }
   

trunk/app/controllers/webquests_controller.php

@@ -269 +269 @@
            $this->msgFlash('Webquest status changed', '/admin/webquests/listing');
      }
-  }
+ } 
+ /** Select classroom to link*/
+ public function admin_vclassrooms($webquest_id)
+ {    
+   $this->pageTitle = $this->Auth->user('username') . '\'s Tests';
+      
+   $this->layout = 'admin';
+      
+   $conditions   = array('Vclassroom.user_id'=>$this->Auth->user('id'), 'Vclassroom.status'=>1);
+   
+   $this->set('data', $this->Test->Vclassroom->findAll($conditions)); 
+
+   $this->Test->unbindModel(array('hasMany'=>array('Question', 'Result'), 'belongsTo'=>array('User')));
+
+   $this->set('tests',$this->Test->VclassroomsWebquest->findAll(array('VclassroomsWebquest.webquest_id' => $webquest_id)));
+   
+   $this->set('webquest_id', $webquest_id);
+ }
+
+ public function admin_link2class() 
+ {
+    $this->layout    = 'admin';
+    // add to database
+   if ( !empty($this->data['VclassroomsWebquest']) )
+   {
+      $this->Sanitize = new Sanitize;
+           
+      $this->Sanitize->clean($this->data['VclassroomsWebquest']);
+                 
+      $this->Test->VclassroomsWebquest->create(); 
+      
+      if ( $this->Test->VclassroomsWebquest->save($this->data['VclassroomsWebquest']))
+      {
+               $this->msgFlash('Test assigned', '/admin/tests/vclassrooms/'.$this->data['VclassroomsWebquest']['webquest_id']);
+      }
+      else
+      { 
+              die('Something is wrong, please report this bug');
+      }
+   }
+ }
+
+  public function admin_unlink2class() 
+ {
+    $this->layout    = 'admin';
+    // add to database
+   if ( !empty($this->data['VclassroomsWebquest']) )
+   {
+      $this->Sanitize = new Sanitize;
+           
+      $this->Sanitize->clean($this->data['VclassroomsWebquest']);
+                 
+      if ( $this->Test->VclassroomsWebquest->delete($this->data['VclassroomsWebquest']['id']))
+      {
+               $this->msgFlash('Test unlinked', '/admin/tests/vclassrooms/'.$this->data['VclassroomsWebquest']['webquest_id']);
+      }
+      else
+      { 
+              die('Something is wrong, please report this bug');
+      }
+   }
+ }
+
  public function admin_delete($id)
  {

trunk/app/models/webquest.php

@@ -12 +12 @@
     public $belongsTo   = 'User';
     
+
+    public $hasAndBelongsToMany = array('Vclassroom' =>
+                       array('className'             => 'Vclassroom',
+                         'joinTable'             => 'vclassrooms_webquests',
+                         'foreignKey'            => 'webquest_id',
+                         'associationForeignKey' => 'vclassroom_id',
+                         'conditions'            => null,
+                         'order'                 => null,
+                         'limit'                 => '',
+                         'unique'                => true,
+                         'finderQuery'           => '',
+                         'deleteQuery'           => ''
+                         )
+                            );     
     public $validate = array(
       'title' => VALID_NOT_EMPTY,         //'/[a-z0-9\_\-]{3,}$/i',

trunk/app/views/webquests/admin_listing.ctp

@@ -1 @@
-<div class="title_section"> Webquest </div>
+<?php
 
-<?php
+echo $html->div('title_section', 'Webquest');
+
 echo $ajax->div('loading', array("style"=>"display: none")) . $html->image("static/loading.gif", array("alt"=>"Loading")) . $ajax->divEnd('loading');
 
@@ -15 +16 @@
 
 echo $ajax->divEnd('envelope');
-?>
-</div>
-<div style="clear:both;"></div>
-<table class="tbadmin">
-<?php
-//die(print_r($data));
 
-$th = array ('Edit', 'Title', 'Status', 'Classrooms', 'Delete');
+foreach ($data as $val)
+{
+ $s  =  ($val['Webquest']['status'] == 1) ? 'Published': 'Draft';
+ echo '<div class="grayblock">';
+  echo $html->div('buttonright', $gags->sendEdit($val['Webquest']['id'], 'webquests'));
+  echo $html->div('div_title', $val['Webquest']['title']);
+   
+  if ( count($val['Vclassroom']) < 1 )
+  {
+               
+          echo $html->para(null, $html->link(
+                                         $html->image('admin/vgroups-gray.gif', array(                                                                                                              'alt'  =>'There is no class assigned for this test',
+                                                                    'title'=>'There is no class assigned for this test'                                                                                        )                                                                                ),
+                                    '/admin/webquests/vclassrooms/'.$val['Webquest']['id'], null,  null, false));
+   }
+   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/webquests/vclassrooms/'.$val['Webquest']['id'], null,  null, false));
 
-echo $html->tableHeaders($th);  
+     foreach($val['Vclassroom'] as $class):
+        echo $html->para(null,'This test had been assigned to class: '.$html->link($class['name'],'/admin/vclassrooms/members/'.$class['id']) . '</b>');
+    endforeach;
+     }
 
-foreach ($data as $val) 
-{
-  $status = $gags->setStatus($val['Webquest']['status']);
-  $t="javascript:window.open('/admin/webquest/vclassrooms/'".$val['Webquest']['id'].", 'blank', 'toolbar=no, scrollbars=yes,width=700,height=400')";       
-
-
-  $tr = array (
-        $gags->sendEdit($val['Webquest']['id'], 'webquests'),
-        $val['Webquest']['title'],
-        $html->link($status, '/admin/webquests/change/'.$val['Webquest']['id'] .'/'. $val['Webquest']['status']),
-        $html->link('Link to Classrooms', '#', array("onclick"=>$t)),
-        $gags->confirmDel($val['Webquest']['id'], 'webquests')
-   );
-       
-    echo $html->tableCells($tr, array("class"=>"altRow", "onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='altRow'"), 
-                                array('class'=>'evenRow',"onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='evenRow'")); 
+   echo $html->para(null, $html->link($s, '/admin/webquests/change/'.$val['Webquest']['id'].'/'.$val['Webquest']['status']));
+   echo $html->div('butonright',  $gags->confirmDel($val['Webquest']['id'], 'webquests'));
+echo '</div>';
 }
-?>
-</table>
-
-<?php 
-//echo $pagination; 
+ 
+//echo $pagination;
 ?>