Changeset 363

Timestamp:

04/02/08 15:41:18 (9 months ago)

Author:

aarkerio

Message:

Locale and test improvements

Location:

trunk/app

Files:

• config/core.php (modified) (1 diff)
• controllers/acquaintances_controller.php (modified) (2 diffs)
• controllers/answers_controller.php (modified) (3 diffs)
• controllers/questions_controller.php (modified) (2 diffs)
• models/answer.php (modified) (1 diff)
• models/question.php (modified) (1 diff)
• views/answers/admin_edit.ctp (added)
• views/questions/admin_answers.ctp (modified) (2 diffs)
• views/questions/questions.ctp (modified) (1 diff)
• views/tests/admin_questions.ctp (modified) (2 diffs)
• views/users/login.ctp (modified) (1 diff)

trunk/app/config/core.php

@@ -75 +75 @@
  *
  */
-    Configure::write('Session.save', 'database');
+    Configure::write('Session.save', 'cake');
 /**
  * The name of the table used to store CakePHP database sessions.

trunk/app/controllers/acquaintances_controller.php

@@ -44 +44 @@
  }
  
- /** ADMIN METHODS***/
+ /** === ADMIN METHODS === ***/
  public function admin_listing()
  {    
@@ -89 +89 @@
         $this->layout = 'admin';
         
-        $this->Acquaintance->id = $id;
-        
-        $this->data = $this->Acquaintance->read();
+        $this->data = $this->Acquaintance->read(null, $id);
     }
     else

trunk/app/controllers/answers_controller.php

@@ -25 +25 @@
  }
 
-  /***
-   === ADMIN METHODS===
-  ***/
+  /***   === ADMIN METHODS===  ***/
   
   public function admin_add() 
@@ -66 +64 @@
     if (empty($this->data["Answer"]))
     {   
-        $this->Answer->id = $catfaq_id;
-        
-        $this->data = $this->Answer->read();
+        $this->data = $this->Answer->read(null, $answer_id );
     }
     else
@@ -77 +73 @@
         
         if ($this->Answer->save($this->data['Answer']))
-    {
-            $this->msgFlash('Answers has been updated.','/admin/questions/listing/'.$this->data["Answers"]["question_id"]);
-    }
+        {
+            $this->msgFlash('Answer updated.','/admin/questions/answers/'.$this->data["Answer"]["question_id"]);
+        }
     }
   }  

trunk/app/controllers/questions_controller.php

@@ -44 +44 @@
    {
      $conditions = array("Question.test_id" => $this->data['Question']['test_id']);
-     $fields     = array("Question.id", "Question.question", "Question.hint", "Question.worth", "Question.explanation", "Answer.id");
+     $fields     = array("Question.id", "Question.question", "Question.hint", "Question.worth", "Question.explanation");
      $order      = "Question.id";
                     
@@ -53 +53 @@
     else
     {
-            echo "Ajax error, check with the company's computer guy...";
+            echo "Ajax error, please report this bug";
     }
   }

trunk/app/models/answer.php

@@ -8 +8 @@
 class Answer extends AppModel {
    
-   public $belongsTo = 'User';
-   
+  public $belongsTo = array('Question' =>
+                                    array('className'  => 'Question',
+                                          'conditions' => '',
+                                          'order'      => '',
+                                          'foreignKey' => 'question_id'
+                                          )
+                          );
+ 
   public $validate = array(
                 'comment'  => VALID_NOT_EMPTY,         //'/[a-z0-9\_\-]{3,}$/i',

trunk/app/models/question.php

@@ -8 +8 @@
 class Question extends AppModel {
    
-  public $belongsTo = array('User' =>
-             array('className'  => 'User',
-               'conditions' => '',
-               'order'      => '',
-                           'foreignKey' => 'user_id'
-                           )
-                     );
+  public $belongsTo = array('Test' =>
+                                    array('className'  => 'Test',
+                                          'conditions' => '',
+                                          'order'      => '',
+                                          'foreignKey' => 'test_id'
+                                          )
+                          );
    
   public $hasMany = array('Answer' =>
-             array('className'=>'Answer',
-                        'conditions'    => null,                
-                        'foreignKey'    => 'question_id',
-                        'dependent'     => true,
-                        'exclusive'     => false,
-                                'finderQuery'   => '',
-                                            'order'         => 'Answer.id ASC'
-                        )
-                      );
+                                    array('className'=>'Answer',
+                                           'conditions'    => null,             
+                                           'foreignKey'    => 'question_id',
+                                           'dependent'     => true,
+                                           'exclusive'     => false,
+                                           'finderQuery'   => null,
+                                           'order'         => 'Answer.id ASC'
+                                          )
+                          );
 
-    public $validate = array('question'   => VALID_NOT_EMPTY,         //'/[a-z0-9\_\-]{3,}$/i',
-                 'user_id' => VALID_NOT_EMPTY,
-                 'explanation'  => VALID_NOT_EMPTY);
+    public $validate = array('question'   => VALID_NOT_EMPTY,         
+                             'user_id' => VALID_NOT_EMPTY,
+                             'explanation'  => VALID_NOT_EMPTY
+                 );
 }
 ?>

trunk/app/views/questions/admin_answers.ctp

@@ -7 +7 @@
 ?>
 
-<div id="loading" style="display: none;">
-           <?php echo $html->image("static/loading.gif", array("alt"=>"Loading")); ?>
-</div>
+<div id="loading" style="display: none;"> <?php echo $html->image("static/loading.gif", array("alt"=>"Loading")); ?></div>
 
-<p>
- <?php echo $html->link($html->image('actions/new.png', array("alt"=>"Add new answer", "title"=>"Add new answer")), '#', array("onclick"=>"hU()"), false, false); ?>
-</p>
+<?php echo $html->para(null, $html->link($html->image('actions/new.png', array("alt"=>"Add new answer", "title"=>"Add new answer")), '#', array("onclick"=>"hU()"), false, false)); ?>
+
 
 <div id="addquestion" style="display:none">
@@ -38 +35 @@
 foreach ($data['Answer'] as $val) 
 {
-  $st = ($val["correct"]==1) ? 'Yes' : 'No';      
+  $st = ($val['correct']==1) ? 'Yes' : 'No';      
   $tmp  = $html->div(null, $html->link('Delete', '/admin/answers/delete/'.$val['id'].'/'.$val['question_id']));
   $tmp .= $html->div(null, $html->link('Edit',   '/admin/answers/edit/'  .$val['id']));
-  $tmp .= "Answer:  "     . $val["answer"]          . "<br />";
-  $tmp .= "Correct: "     . $html->link($st, '/admin/answers/changed/'.$val['id'].'/'.$val['question_id']) . "<br />";
+  $tmp .= "Answer:  "     .    $val["answer"]       . "<br />";
+  $tmp .= "Correct: "     . $html->link($st, '/admin/answers/change/'.$val['id'].'/'.$val['correct'] .'/'.$val['question_id']) . "<br />";
 
   echo $html->div('adminblock', $tmp);

trunk/app/views/questions/questions.ctp

@@ -9 +9 @@
     $i++;
     echo '<div style="padding:5px;border:1px dotted gray;margin:auto;width:60%"><b>' . $i . '.-</b> ';
-    echo $html->div('butonright', $gags->sendEdit($val['id'],   'Question'));
-    echo $html->div('butonright', $gags->confirmDel($val['id'], 'Question'));
-       echo "Question: "    . $val["question"]       . "<br />";
-       echo "Hint: "        . $val["hint"]           . "<br />";
-       echo "Explanation: " . $val["explanation"]    . "<br />";
-       echo "Worth: "       . $val["worth"]          . "<br /><br />";
-       echo $html->link('View answers ('.$answers.')', '/admin/questions/answers/'.$val["id"]);
+    echo $html->div('butonright', $gags->sendEdit($val['Question']['id'],   'Question'));
+    echo $html->div('butonright', $gags->confirmDel($val['Question']['id'], 'Question'));
+       echo "Question: "    . $val['Question']['question']       . "<br />";
+       echo "Hint: "        . $val['Question']['hint']           . "<br />";
+       echo "Explanation: " . $val['Question']['explanation']    . "<br />";
+       echo "Worth: "       . $val['Question']['worth']          . "<br /><br />";
+       echo $html->link('View answers ('.$answers.')', '/admin/questions/answers/'.$val['Question']['id']);
     echo '</div>';
 }

trunk/app/views/tests/admin_questions.ctp

@@ -16 +16 @@
  echo $html->para(null, $html->link($html->image('actions/new.png', array("alt"=>"Add new question", "title"=>"Add new question")), '#', array("onclick"=>"hU()"), false, false)); 
 ?>
+
 <!-- Ajax form beggin -->
 <div id="addquestion" style="display:none">
 <?php 
-   echo $ajax->form(null,'post'); 
+   echo $ajax->form(); 
    echo $form->hidden('Question.test_id', array('value'=>$data['Test']['id'])); 
 ?>
@@ -29 +30 @@
  echo $html->div('required', $form->label('Question.explanation', 'Explanation:') . $form->textarea('Question.explanation', array("cols" => 50, "rows" => 5))); 
 
- $tmp = $form->label('Question.worth', 'Worth:');
+ $tmp  = $form->label('Question.worth', 'Worth:');
  $tmp .=  $form->select('Question.worth',  array(1, 2, 3, 4, 5, 6,7, 8, 9, 10), null, null, false, false); 
  echo $html->div('required', $tmp);

trunk/app/views/users/login.ctp

@@ -2 +2 @@
 <?php
 echo $form->create('User', array('action' => 'login'));
-echo $form->input('email', array('size' => 40, 'maxlength'=> 50));
-echo $form->label('pwd', 'Password:');
-echo $form->password('pwd') . '<br />';
+echo $form->input('email', array('size' => 40, 'maxlength'=> 50, 'between'=>':<br />'));
+echo $form->input('pwd', array('between'=>'<br />', 'type' => 'password', 'label'=>'Password:', 'size' => 9, 'maxlength'=> 9));
 echo $form->label('remember_me', 'Remember me:');
-echo $form->checkbox('remember_me');
+echo $form->checkbox('remember_me', array('value'=>1));
 echo $form->end('Login');
-//sujaclal
 ?>