Changeset 370

Timestamp:

04/06/08 13:50:06 (9 months ago)

Author:

aarkerio

Message:

Wiki starting

Location:

trunk/app

Files:

• config/core.php (modified) (1 diff)
• config/sql/karamelo_postgres.sql (modified) (3 diffs)
• controllers/vclassrooms_controller.php (modified) (3 diffs)
• models/vclassroom.php (modified) (3 diffs)
• views/vclassrooms/admin_members.ctp (modified) (2 diffs)
• views/vclassrooms/admin_tests.ctp (modified) (1 diff)

trunk/app/config/core.php

@@ -14 +14 @@
  * In development mode, you need to click the flash message to continue.
  */
-    Configure::write('debug', 1);
+    Configure::write('debug', 2);
 /**
  * Application wide charset encoding

trunk/app/config/sql/karamelo_postgres.sql

@@ -87 +87 @@
 INSERT INTO subjects (code, title) VALUES ('0006', 'Music');
 INSERT INTO subjects (code, title) VALUES ('0007', 'Psichology');
-INSERT INTO subjects (code, title) VALUES ('0008', 'Chemistry');
-INSERT INTO subjects (code, title) VALUES ('0009', 'Physiscs');
-INSERT INTO subjects (code, title) VALUES ('0010', 'Science');
-INSERT INTO subjects (code, title) VALUES ('0011', 'Public health');
-INSERT INTO subjects (code, title) VALUES ('0012', 'Biology');
-INSERT INTO subjects (code, title) VALUES ('0013', 'Sociology');
-INSERT INTO subjects (code, title) VALUES ('0014', 'Archeology');
-INSERT INTO subjects (code, title) VALUES ('0015', 'Spanish');
-INSERT INTO subjects (code, title) VALUES ('0016', 'Geography');
-INSERT INTO subjects (code, title) VALUES ('0017', 'Computing');
-INSERT INTO subjects (code, title) VALUES ('0018', 'Business Studies');
-INSERT INTO subjects (code, title) VALUES ('0019', 'Genre Studies');
-INSERT INTO subjects (code, title) VALUES ('0020', 'French');
-INSERT INTO subjects (code, title) VALUES ('0021', 'German');
-INSERT INTO subjects (code, title) VALUES ('0022', 'Health Care');
-INSERT INTO subjects (code, title) VALUES ('0023', 'Commerce');
-INSERT INTO subjects (code, title) VALUES ('0024', 'Graphic Design');
-INSERT INTO subjects (code, title) VALUES ('0025', 'Administration');
-INSERT INTO subjects (code, title) VALUES ('0026', 'Accounting');
-INSERT INTO subjects (code, title) VALUES ('0027', 'Classic Latin');
-INSERT INTO subjects (code, title) VALUES ('0028', 'Literature');
-INSERT INTO subjects (code, title) VALUES ('0029', 'Japanese');
-INSERT INTO subjects (code, title) VALUES ('0030', 'Chinese');
-INSERT INTO subjects (code, title) VALUES ('0031', 'Engineering');
-INSERT INTO subjects (code, title) VALUES ('0032', 'Sports');
+
 
 -- Confirms user registration table, just a support table until new user confirm his/her email
@@ -590 +566 @@
 --HABTM
 CREATE TABLE "tests_vclassrooms" (
+ "id" serial PRIMARY KEY,
  "test_id" int NOT NULL REFERENCES tests(id),
  "vclassroom_id" int NOT NULL REFERENCES vclassrooms(id),
-  PRIMARY KEY  ("test_id", "vclassroom_id")
+  UNIQUE  ("test_id", "vclassroom_id")
 );
 
@@ -674 +651 @@
  status int NOT NULL DEFAULT 0
 );
+
+-- Wiki tables beggin
+CREATE TABLE wikis (
+  id serial PRIMARY KEY,
+  title varchar(255) NOT NULL,
+  content text NOT NULL,
+  access smallint NOT NULL DEFAULT 0,
+  modified timestamp NOT NULL default now(),
+  user_id serial NOT NULL,
+  ip varchar(15) NOT NULL,
+  revision int(5) NOT NULL,
+  accessed datetime NOT NULL
+);
+
+CREATE TABLE wiki_revisions (
+  id serial PRIMARY KEY,
+  title varchar(255) NOT NULL,
+  content text NOT NULL,
+  access smallint NOT NULL default 0,
+  modified timestamp NOT NULL default now(),
+  user_id serial NOT NULL,
+  ip varchar(15) NOT NULL,
+  revision int(5) NOT NULL,
+  accessed date NOT NULL default now()
+);
+
+CREATE TABLE settings (
+  id serial PRIMARY KEY,
+  name varchar(50) NOT NULL UNIQUE,
+  value varchar(255) NOT NULL,
+  default varchar(255) NOT NULL,
+  description varchar(255) NOT NULL
+);
+
+CREATE TABLE upload_revisions (
+  id serial PRIMARY KEY,
+  filename varchar(250) NOT NULL,
+  location varchar(250) NOT NULL,
+  access smallint NOT NULL,
+  modified timestamp NOT NULL default now(),
+  user_id int NOT NULL REFERENCES users(id),
+  ip varchar(15) NOT NULL,
+  revision int NOT NULL
+);
+
+CREATE TABLE uploads (
+  id serial PRIMARY KEY,
+  filename varchar(255) NOT NULL UNIQUE,
+  location varchar(255) NOT NULL,
+  access smallint NOT NULL,
+  modified timestamp NOT NULL default now(),
+  user_id int NOT NULL REFERENCES users(id),
+  ip varchar(15) NOT NULL,
+  revision int NOT NULL
+);
+
+-- wiki tables ends

trunk/app/controllers/vclassrooms_controller.php

@@ -19 +19 @@
       parent::beforeFilter();
  }
+
  public function isAuthorized()
  {
@@ -122 +123 @@
       $this->set('test', $this->Vclassroom->Test->findAll(array("Test.user_id"=>$this->Auth->user('id'), "Test.status"=>1)));
  }
+
+ public function admin_linktest()
+ {
+   if (!empty($this->data["TestsVclassroom"]))
+   {
+        $this->Sanitize = new Sanitize;
+        
+        $this->Sanitize->clean($this->data["TestsVclassroom"]); 
+        
+        $this->Vclassroom->TestsVclassroom->create();
+        
+        unset($this->Vclassroom->TestsVclassroom->id);
+
+        if ( $this->Vclassroom->TestsVclassroom->save($this->data["TestsVclassroom"]))
+    {
+          
+               $this->msgFlash('Test linked', '/admin/vclassrooms/tests/'.$this->data["TestsVclassroom"]["vclassroom_id"]);
+    }
+    } 
+ }
  // link webquest to classroom
  public function admin_webquest($vclassroom_id)
@@ -200 +221 @@
         else
         {
-        echo 'Problem';
-        }
-  }
-}
-
- /**
-  *  
-  *  args id 
-  *  
- **/ 
-  public function admin_edit($id = null)
-  {
+        echo 'Problem please report bug';
+        }
+   }
+ }
+
+ public function admin_edit($vclassroom_id = null)
+ {
     if (empty($this->data["Vclassroom"]))
     {
         $this->layout = 'admin';
         
-        $this->Vclassroom->id = $id;
-                
-        $this->data = $this->Vclassroom->read();
+        $this->data = $this->Vclassroom->read(null, $vclassroom_id);
     }
     else

trunk/app/models/vclassroom.php

@@ -16 +16 @@
                    array('className'    => 'User',
                      'joinTable'    => 'users_vclassrooms',
-                     'foreignKey'   => 'user_id',
-                     'associationForeignKey'=> 'vclassroom_id',
+                     'foreignKey'   => 'vclassroom_id',
+                     'associationForeignKey'=> 'user_id',
                      'conditions'   => '',
+                                         'fields'       => 'username, id, email, name',
                      'order'        => '',
                      'limit'        => '',
@@ -24 +25 @@
                      'finderQuery'  => '',
                      'deleteQuery'  => '',
-                     )
-                   );
-
-    /*
-    public $hasAndBelongsToMany = array(
+                     ),
                                         'Test' =>
                        array('className'             => 'Test',
@@ -40 +37 @@
                          'finderQuery'           => '',
                          'deleteQuery'           => ''
-                         ),
+                         )
+                       );
+  /*
                                         'Webquest' =>
                        array('className'             => 'Webquest',

trunk/app/views/vclassrooms/admin_members.ctp

@@ -1 +1 @@
 <?php
-//die( debug($users));
+//die( debug($data));
 echo '<div style="padding:4px;margin:10px auto 10px;width:700px;text-align:center;">';
 
 //popup window for tests
-$t="javascript:window.open('/admin/vclassrooms/display/".$data['Vclassroom']['id']."', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=400')"; 
+$t="javascript:window.open('/admin/vclassrooms/tests/".$data['Vclassroom']['id']."', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=400')"; 
 
 //popup window for webquest
@@ -36 +36 @@
 echo $html->div('title_section', 'Students belonging to ' . $data['Vclassroom']['name']);
 
-if ( count($users) < 1 )
+if ( count($data['User']) < 1 )
 {
   echo $html->div('divblock', 'There are no students in this classrroom yet');
 }
 
-foreach ($users as $val)
+foreach ($data['User'] as $val)
 {
+  // die(debug($val));
  echo '<div style="padding:6px 3px 28px 4px;margin:10px 0 5px 0;border:1px dotted gray;">';
-       echo 'Name: '    . $val['User']['name']                    . '<br />';
-       echo 'Username:' . $val['User']['username']                . '<br />';
-       echo 'Email: '   . $html->linkEmail($val['User']['email']) . '<br />';
-       echo $html->div('butonright', $gags->confirmDel($val['User']['id'], 'vclassmembers'));
+       echo '<b>Name</b>: '    . $val['name'] . '  ' . '<b> Username</b>:' . $val['username']                . '<br />';
+       echo 'Email: '   . $html->link($val['email'], 'mailto:'.$val['email']) . '<br />';
+       echo $html->div('butonright', $gags->confirmDel($val['id'], 'vclassmembers'));
  echo '</div>';
 }

trunk/app/views/vclassrooms/admin_tests.ctp

@@ -28 +28 @@
      {
        $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');
+       $tmp .=  $form->create('Vclassroom', array('action'=>'linktest'));
+       $tmp .=  $form->hidden('TestsVclassroom.test_id', array('value'=>$val['Test']['id'])); 
+       $tmp .=  $form->hidden('TestsVclassroom.vclassroom_id', array('value'=>$data['Vclassroom']['id']));
+       $tmp .=  $form->end('Assign this test to this class');
                       
        echo $html->div('divblock', $tmp);