Changeset 661

Timestamp:

07/21/08 22:11:14 (4 months ago)

Author:

aarkerio

Message:

Update general

Location:

trunk/app

Files:

• controllers/subjects_controller.php (modified) (1 diff)
• models/subject.php (modified) (1 diff)
• views/subjects/view.ctp (modified) (4 diffs)

trunk/app/controllers/subjects_controller.php

@@ -45 +45 @@
 
    $this->title     = __('Subject', true);
-      
-   $conditions = array('Subject.code'=>$code);
    
-   $this->set('data', $this->Subject->find($conditions));
+   $this->set('data', $this->Subject->getSubject($code));
  }
-   
    
   /** ==== ADMIN METHODS ==== */

trunk/app/models/subject.php

@@ -44 +44 @@
                   );
     
-    public $validate = array(
+ public $validate = array(
       'title' => VALID_NOT_EMPTY,         //'/[a-z0-9\_\-]{3,}$/i',
       'id' => VALID_NOT_EMPTY
-   );
+ );
+
+ public function getSubject($code)
+ {
+   $data           = array();
+   $this->unbindAll();
+   $data['S']      = $this->find(array('Subject.code'=>$code), array('Subject.id', 'Subject.code', 'Subject.title'));   
+   
+   $conditions     = array('Lesson.subject_id'=>$data['S']['Subject']['id']);
+   $fields         = array('Lesson.id', 'Lesson.title', 'User.username', 'User.id');
+   $order          = 'Lesson.id DESC';
+   $limit          = 10;
+   $data['Lesson'] = $this->Lesson->findAll($conditions, $fields, $order, $limit);
+
+
+   $conditions     = array('Entry.subject_id'=>$data['S']['Subject']['id']);
+   $fields         = array('Entry.id', 'Entry.title', 'User.username', 'User.id');
+   $order          = 'Entry.id DESC';
+   $limit          = 10;
+   $data['Entry']  = $this->Entry->findAll($conditions, $fields, $order, $limit);
+
+
+   $conditions     = array('Share.subject_id'=>$data['S']['Subject']['id'], 'Share.public'=>1);
+   $fields         = array('Share.secret', 'Share.description', 'User.username', 'User.id');
+   $order          = 'Share.id DESC';
+   $limit          = 10;
+   $data['Share']  = $this->Share->findAll($conditions, $fields, $order, $limit);
+
+   return $data;
+ }
+
 /*
 public $validate = array(

trunk/app/views/subjects/view.ctp

@@ -2 +2 @@
 //die(debug($data));
 
-echo '<h1>'. $data['Subject']['title']. ' '. $data['Subject']['code'] .'</h1>';
+echo '<h1>'. $data['S']['Subject']['title']. ' '. $data['S']['Subject']['code'] .'</h1>';
+
+echo '<br />';
 
 if ( count($data['Lesson']) < 1 ):
@@ -11 +13 @@
 
 foreach($data['Lesson'] as $l):
-  echo $html->link('► '.$l['title'], '/lessons/view/'.$l['id']). '<br />';
+  echo $html->link('► '.$l['Lesson']['title'], '/lessons/view/'.$l['Lesson']['id']). '<br />';
 endforeach;
 
-
+echo '<br /><br />';
 
 if ( count($data['Entry']) < 1 ):
@@ -23 +25 @@
 
 foreach($data['Entry'] as $e):
-  echo $html->link('► '.$e['title'], '/lessons/view/'.$e['id']). '<br />';
+  echo $html->link('► '.$e['Entry']['title'], '/lessons/view/'.$e['Entry']['id']). '<br />';
 endforeach;
 
-
+echo '<br /><br />';
 
 if ( count($data['Share']) < 1 ):
@@ -35 +37 @@
 
 foreach($data['Share'] as $s):
-  echo $html->link('► '.$s['description'], '/shares/view/'.$s['secret']). '<br />';
+  echo $html->link('► '.$s['Share']['description'], '/shares/view/'.$s['Share']['secret']). '<br />';
 endforeach;