T7 Inactive Button

* FIRST commit! * change opacity according to category_id
jenpaff · Aug 12, 2014 · 5468674 · aoduor · Aug 15, 2014 · aoduor
1 parent a6c6f7f
commit 5468674
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 25 deletions.
diff --git a/application/controllers/json.php b/application/controllers/json.php
@@ -234,7 +234,40 @@ protected function markers_geojson($incidents, $category_id, $color, $icon, $inc
 				'name' => $item_name,
 				'link' => $link,
 				'category' => array($category_id),
-				'color' => $color,
+				'color' => (if ! empty($projects_ended['project_end']))
+
+						{ 
+							if ($projects_ended['project_end'] == TRUE && $category_id=1) 
+								{ 
+									"d043ff": $color; 
+								} 
+									else {
+										"9900CC": $color;
+									}
+							if ($projects_ended['project_end'] == TRUE && $category_id=2) 
+								{
+									"004dff": $color;
+								}
+									else {
+										"3300FF": $color;
+									}
+							if ($projects_ended['project_end'] == TRUE && $category_id=3)
+								{
+									"b35900": $color;
+								}
+									else {
+										"663300": $color;
+									}
+							if ($projects_ended['project_end'] == TRUE && $category_id=4) 
+								{
+									"94ff5e": $color
+								}
+									else {
+										"339900": $color;
+									}
+						}	
+							return $color; 
+		
 				'icon' => $icon,
 				'thumb' => $thumb,
 				'timestamp' => strtotime($marker->incident_date),
@@ -593,16 +626,6 @@ public function timeline($category_id = 0)
 			$incident_id_in .= " AND i.id IN ( $query ) ";
 		}
 
-		// Apply status type filters
-		if (isset($_GET['t']) AND intval($_GET['t']) > 0)
-		{
-			$query = "SELECT id AS id FROM ".$this->table_prefix."incident"
-			    . "WHERE incident_active = :ttype ";
-
-			$params[':ttype'] = $_GET['t'];
-			$id_in .= " AND i.id IN ( $query ) ";
-		}
-
 		// Fetch the timeline data
 		$query = 'SELECT UNIX_TIMESTAMP('.$select_date_text.') AS time, COUNT(i.id) AS number '
 		    . 'FROM '.$this->table_prefix.'incident AS i '

diff --git a/application/i18n b/application/i18n
diff --git a/application/models/incident.php b/application/models/incident.php
@@ -140,7 +140,6 @@ public static function get_latest_report_timestamp($approved = TRUE)
 			return strtotime($report->incident_date);
 		}
 	}
-
 	/**
 	 * Get the number of reports by date for dashboard chart
 	 *
@@ -587,5 +586,32 @@ public function save()
 
 		parent::save();
 	}
+
+	/**
+	* return project end dates and assign to $project_end array() 
+	*/
+	public static function get_finished_incidents()
+	{
+		// Table Prefix
+                $table_prefix = Kohana::config('database.default.table_prefix');
+
+                // Database instance
+                $db = new Database();
+
+		$projects_ended = array(); 
+
+		$current_date = "SELECT CURDATE()";		
 
-}
+		$sql =	'SELECT FORM_RESPONSE as project_end, incident_id as id FROM FORM_RESPONSE'
+			. 'INNER JOIN FORM_FIELD ON FORM_FIELD.ID=FORM_RESPONSE.FORM_FIELD_ID'
+			. 'WHERE (FORM_FIELD.FIELD_NAME = "Project End Date") <' .$current_date;
+		foreach ($db->query($sql) as $project_ended)
+		{
+			$projects_ended[$project_ended->id] = array(
+				$project_ended->id, 
+				$project_ended->project_end,
+			);
+		}
+		return $projects_ended;
+	}
+}
diff --git a/themes/default/views/main/layout.php b/themes/default/views/main/layout.php
@@ -238,17 +238,6 @@
 							<li><a id="media_2" href="#"><span><?php echo Kohana::lang('ui_main.video'); ?></span></a></li>
 						</ul>
 					</div>
-						</br >
-						</br >
-					<div class="status-filters">
-						<strong><?php echo Kohana::lang('ui_main.filters'); ?></strong>	
-						<ul>
-                            				<li><a id="incident_active_" class="active" href="#"><span><?php echo Kohana::lang('ui_main.all'); ?></span></a></li>
-							<li><a id="incident_active_0" href="#"><span><?php echo Kohana::lang('ui_main.inactive'); ?></span></a></li>
-                            				<li><a id="incident_active_1" href="#"><span><?php echo Kohana::lang('ui_main.active'); ?></span></a></li>
-						</ul>
-					</div>
-				</div>
 
 
 					<?php