Merge pull request #15 from daigo75/master

Issue #7 and #16 - Dojo sort criteria
CoderDojo · May 10, 2012 · f1b78e5 · f1b78e5
2 parents 27f8ed5 + fe90a29
commit f1b78e5
Show file tree

Hide file tree

Showing 3 changed files with 286 additions and 11 deletions.
diff --git a/application/models/dojo_model.php b/application/models/dojo_model.php
@@ -18,7 +18,7 @@ function get($id = NULL, $verified = NULL, $unverified = NULL){
 		if ($id) {
 			$this->db->where('id', $id);
 		}
-		
+
 		if ($verified){
 			$this->db->where('verified', TRUE);
 		}
@@ -27,8 +27,28 @@ function get($id = NULL, $verified = NULL, $unverified = NULL){
 			$this->db->where('verified', FALSE);
 		}
 
-		$this->db->order_by('country', 'desc');
-		$query = $this->db->get($this->dojo_table);
+		$this->db->select('D.name,
+											D.creator,
+											D.time,
+											D.country,
+											D.location,
+											D.coordinates,
+											D.email,
+											D.google_group,
+											D.twitter,
+											D.notes,
+											D.eb_id,
+											D.need_mentors,
+											D.stage,
+											D.supporter_image,
+											C.name AS country_name');
+		$this->db->from('dojos D');
+		$this->db->join('countries C', 'C.code = D.id', 'left');
+		$this->db->order_by('country_name', 'asc');
+		$this->db->order_by('name', 'asc');
+
+		//$query = $this->db->get($this->dojo_table);
+		$query = $this->db->get();
 		return $query->result();
 	}
 
@@ -142,7 +162,7 @@ function verify($dojo = NULL)
     {
         if($dojo){
             $this->db->set('verified', 1);
-        
+
             if(is_array($dojo)){
                 foreach($dojo as $d){
                     $this->db->or_where('id', $d);

diff --git a/application/views/dojo/dojo.php b/application/views/dojo/dojo.php
@@ -241,20 +241,17 @@
                   "EH" => "Western Sahara",
                   "YE" => "Yemen",
                   "YU" => "Yugoslavia",
-                  "ZM" => "Zambia", 
+                  "ZM" => "Zambia",
                   "ZW" => "Zimbabwe"
                 );
                 $used_countries = array();
 
                 foreach($dojo_data as $dojo){
                     if (!in_array($dojo->country, $used_countries)){
                         $used_countries[] = $dojo->country;
-                        echo "<br /><legend style='margin-bottom:5px;'>".$_countries[$dojo->country]."</legend>";
-                        echo "&bull; <a href='/dojo/".$dojo->id."'>".$dojo->name."</a><br />";
-                    }
-                    else{
-                        echo "&bull; <a href='/dojo/".$dojo->id."'>".$dojo->name."</a><br />";
+                        echo "<br /><legend style='margin-bottom:5px;'>".$dojo->country_name."</legend>";
                     }
+										echo "&bull; <a href='/dojo/".$dojo->id."'>".$dojo->name."</a><br />";
                 }
             ?>
         </div>
@@ -267,4 +264,4 @@
                 </div>
         </div>
     </div><!--.wrap-->
-</div><!--#content-->
+</div><!--#content-->