Changeset 25

Timestamp:

07/06/07 22:33:57 (18 months ago)

Author:

aarkerio

Message:

tests table CRUD

Location:

trunk/app

Files:

• config/sql/karamelo.sql (modified) (3 diffs)
• controllers/news_controller.php (modified) (1 diff)
• controllers/tests_controller.php (added)
• models/answer.php (added)
• models/question.php (added)
• models/test.php (added)
• views/acquaintances/admin_listing.thtml (modified) (1 diff)
• views/entries/admin_start.thtml (modified) (1 diff)
• views/news/admin_add.thtml (modified) (1 diff)
• views/tests (added)
• views/tests/admin_add.thtml (added)
• views/tests/admin_listing.thtml (added)
• webroot/img/admin/tests.png (added)
• webroot/img/four-reasons.png (added)

trunk/app/config/sql/karamelo.sql

@@ -337 +337 @@
 INSERT INTO permissions (id, name) VALUES (137, 'admin/entries/start');
 
+--Test
+INSERT INTO permissions (id, name) VALUES (138, 'admin/tests/add');
+INSERT INTO permissions (id, name) VALUES (139, 'admin/tests/edit');
+INSERT INTO permissions (id, name) VALUES (140, 'admin/tests/delete');
+INSERT INTO permissions (id, name) VALUES (141, 'admin/tests/listing');
 
 -- Name: groups_permissions; Type: TABLE; Schema: public; Owner: www-data; Tablespace: 
@@ -477 +482 @@
 INSERT INTO groups_permissions (group_id, permission_id) VALUES (1, 137);
 
+INSERT INTO groups_permissions (group_id, permission_id) VALUES (1, 138);
+INSERT INTO groups_permissions (group_id, permission_id) VALUES (1, 139);
+INSERT INTO groups_permissions (group_id, permission_id) VALUES (1, 140);
+INSERT INTO groups_permissions (group_id, permission_id) VALUES (1, 141);
+
 --Teacher permissions
 INSERT INTO groups_permissions (group_id, permission_id) VALUES (5, 1);
@@ -999 +1009 @@
 );
 
-
+--three table to tests
+CREATE TABLE "tests" (
+  "id" serial PRIMARY KEY,
+  "user_id" int NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+  "title" varchar(50),
+  "description" text NOT NULL,
+  "status" smallint NOT NULL DEFAULT 0 CHECK (status IN (1, 0))
+);
+
+CREATE TABLE "questions" (
+  "id" serial PRIMARY KEY,
+  "question" varchar(150) NOT NULL,
+  "hint" varchar(150) NOT NULL,
+  "explanation" text NOT NULL,
+  "test_id" int NOT NULL REFERENCES tests(id) ON DELETE CASCADE,
+  "user_id" int REFERENCES users(id) ON DELETE CASCADE,
+  "status" smallint NOT NULL DEFAULT 0 CHECK (status > 0)
+);
+
+CREATE TABLE "answers" (
+  "id" serial PRIMARY KEY,
+  "answer" varchar(150) NOT NULL,
+  "correct" int NOT NULL, -- wrong = 0, correct = 1
+  "question_id" int NOT NULL REFERENCES questions(id) ON DELETE CASCADE,
+  "user_id" int REFERENCES users(id) ON DELETE CASCADE
+);
+
+

trunk/app/controllers/news_controller.php

@@ -197 +197 @@
   }
   
-  public function  admin_delete($id) {
+  public function  admin_delete($id) 
+  {
       // deletes new from database
       

trunk/app/views/acquaintances/admin_listing.thtml

@@ -7 +7 @@
 
 <p><a href="/vinculums/add/<?php echo $catfaq_id?>">Add acquaintance</a></p>
-<?
+<?php
 
 foreach ($data as $key => $val) {

trunk/app/views/entries/admin_start.thtml

@@ -92 +92 @@
   <a href="/admin/medias/listing" title="Media Manager" class="main-item-caption">Multimedia manager</a>
 </div>
+
+<div class="main-item" title="Tests" onclick="document.location.href = '/admin/tests/list'">
+  <span class="main-item-icon">
+     <?php echo $html->link($html->image('admin/tests.png', array("title"=>"Tests", "alt"=>"Tests")), '/admin/tests/listing', null, null, false); ?>
+  </span>
+  <a href="/admin/tests/listing" title="Test Manager" class="main-item-caption">Tests</a>
+</div>
+
 
 <div class="main-item" title="Your links" onclick="document.location.href = '/admin/vinculums/list'">

trunk/app/views/news/admin_add.thtml

@@ -10 +10 @@
 <?php echo $html->formTag('/admin/news/add/','post', array("onsubmit"=>"return validateNew()")); ?>
 
-<?php echo $html->hiddenTag('News/user_id', $othAuth->user('id')) ?>
 <table>
 <tr>