Changeset 570 for trunk/app/models
- Timestamp:
- 05/27/08 19:33:12 (6 months ago)
- Location:
- trunk/app/models
- Files:
-
- 2 modified
-
treasure.php (modified) (1 diff)
-
webquest.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/app/models/treasure.php
r569 r570 39 39 ); 40 40 41 public function getTest($user_id, $t est_id)41 public function getTest($user_id, $treasure_id) 42 42 { 43 $conditions = array(); 44 $data = $this->findAll(); 45 die(debug($data)); 43 $conditions = array('ResultTreasure.treasure_id'=>$treasure_id, 'ResultTreasure.user_id'=>$user_id); 44 $fields = array('User.username', 'ResultTreasure.points', 'ResultTreasure.created', 'Treasure.points', 'Treasure.title', 'Treasure.instructions'); 45 $data = $this->ResultTreasure->find($conditions, $fields); 46 47 return $data; 46 48 } 49 public function getPoints($user_id, $treasure_id) 50 { 51 $conditions = array('ResultTreasure.treasure_id'=>$treasure_id, 'ResultTreasure.user_id'=>$user_id); 52 53 $data = $this->ResultTreasure->field('ResultTreasure.points', $conditions); 54 55 return $data; 56 } 57 47 58 /* 48 59 public $validate = array( -
trunk/app/models/webquest.php
r535 r570 43 43 'points' => VALID_NOT_EMPTY 44 44 ); 45 46 public function getQuest($user_id, $webquest_id) 47 { 48 $conditions = array('ResultTreasure.treasure_id'=>$treasure_id, 'ResultTreasure.user_id'=>$user_id); 49 $fields = array('User.username', 'ResultTreasure.points', 'ResultTreasure.created', 'Treasure.points', 'Treasure.title', 'Treasure.instructions'); 50 $data = $this->ResultTreasure->find($conditions, $fields); 51 52 return $data; 53 } 45 54 /* 46 55 public $validate = array(
