Changeset 365

Timestamp:

04/03/08 10:43:08 (9 months ago)

Author:

aarkerio

Message:

Locale and test improvements

Location:

trunk/app

Files:

• controllers/answers_controller.php (modified) (1 diff)
• controllers/vclassrooms_controller.php (modified) (1 diff)
• models/answer.php (modified) (2 diffs)
• views/answers/questions.ctp (modified) (1 diff)
• views/ecourses/admin_edit.ctp (modified) (1 diff)
• views/ecourses/admin_vclassrooms.ctp (modified) (1 diff)

trunk/app/controllers/answers_controller.php

@@ -44 +44 @@
    {
      $conditions = array("Answer.question_id" => $this->data['Answer']['question_id']);
-     $fields     = array("Answer.id", "Answer.answer", "Answer.correct");
+     $fields     = array("Answer.id", "Answer.answer", "Answer.correct", "Answer.question_id");
      $order      = "Answer.id";
                     

trunk/app/controllers/vclassrooms_controller.php

@@ -227 +227 @@
             $this->msgFlash('Your virtual classroom  has been updated.', '/admin/vclassrooms/edit/'.$this->data['Vclassroom']['id']);
        }
+    }
+ }
+
+ // change status published/draft
+ public function admin_change($id, $status, $ecourse_id)
+ {
+    $this->data['Vclassroom']['status'] = ($status == 0 ) ? 1 : 0;
+   
+    $this->data['Vclassroom']['id']     = $id;
+     
+    if ($this->Vclassroom->save($this->data['Vclassroom']))
+    {
+         $this->msgFlash('Clasroom status changed', '/admin/ecourses/vclassrooms/'.$ecourse_id);
     }
  }

trunk/app/models/answer.php

@@ -3 +3 @@
 *  Chipotle Software TM
 *  Manuel Montoya 2002-2008
-*  GPLv3 manuel<at>mononeurona<dot>org
+*  GPLv3 manuel<arroba>mononeurona<punto>org
 **/
 
@@ -10 +10 @@
   public $belongsTo = array('Question' =>
                                     array('className'  => 'Question',
-                                          'conditions' => '',
-                                          'order'      => '',
-                                          'foreignKey' => 'question_id'
+                                          'conditions' => '',
+                                      'order'      => '',
+                                                  'foreignKey' => 'question_id'
                                           )
                           );
  
   public $validate = array(
-                'comment'  => VALID_NOT_EMPTY,         //'/[a-z0-9\_\-]{3,}$/i',
+                'comment'  => VALID_NOT_EMPTY, 
                 'user_id'  => VALID_NOT_EMPTY,
                 'entry_id' => VALID_NOT_EMPTY,

trunk/app/views/answers/questions.ctp

@@ -1 +1 @@
 <?php
-foreach ($data as $val) 
-{      
-    echo '<div style="padding:5px;border:1px dotted gray;margin:4px;">';
-       echo "Answer: "      . $val["Answer"]["answer"]       . "<br />";
-       echo "Correct: "     . $val["Answer"]["correct"]      . "<br />";
-    echo '</div>';
+// die( debug( $data ));
+foreach ($data as $val)   
+{
+  $st = ($val['Answer']['correct']==1) ? 'Yes' : 'No';      
+  $tmp  = $html->div(null, $html->link('Delete', '/admin/answers/delete/'.$val['Answer']['id'].'/'.$val['Answer']['question_id']));
+  $tmp .= $html->div(null, $html->link('Edit',   '/admin/answers/edit/'  .$val['Answer']['id']));
+  $tmp .= "Answer:  "     .    $val['Answer']['answer']       . "<br />";
+  $url  = '/admin/answers/change/'.$val['Answer']['id'].'/'.$val['Answer']['correct'].'/'.$val['Answer']['question_id'];
+  $tmp .= "Correct: "     . $html->link($st, $url) . "<br />";
+
+  echo $html->div('adminblock', $tmp);
 }
 ?>

trunk/app/views/ecourses/admin_edit.ctp

@@ -1 +1 @@
 <?php 
  echo $javascript->link('fckeditor/fckeditor');
+
+ echo $html->addCrumb('Control Tools', '/admin/entries/start');
+ echo $html->addCrumb('Ecourses', '/admin/ecourses/listing');
+ echo $html->getCrumbs(' / ');
+
  echo $form->create('Ecourse',array("onsubmit"=>"return chkForm();")); 
  echo $form->hidden('Ecourse.id');

trunk/app/views/ecourses/admin_vclassrooms.ctp

@@ -28 +28 @@
       $tmp  =  $html->div('butonright', $gags->sendEdit($val['id'], 'Vclassroom'));
       $tmp .=  $html->link($val['name'], '/admin/vclassrooms/members/'.$val['id']);
-      $tmp .=  $html->para(null, 'Status: '. $html->link($s, '/admin/vclassroom/change/'.$val['id'].'/'.$val['status']));
+      $tmp .=  $html->para(null, 'Status: '.$html->link($s,'/admin/vclassrooms/change/'.$val['id'].'/'.$val['status'].'/'.$val['ecourse_id']));
       $tmp .=  $html->div('butonright', $gags->confirmDel($val['id'], 'Vclassroom'));