Removal from main map on decay

It seems logical to me that when an evant "ends" its marker should be removed from the map.

diff -rupN endtime/controllers/scheduler/s_endtime.php endtime_git/controllers/scheduler/s_endtime.php
--- endtime/controllers/scheduler/s_endtime.php 2011-12-04 13:37:03.533850152 -0800
+++ endtime_git/controllers/scheduler/s_endtime.php 1969-12-31 16:00:00.000000000 -0800
@@ -1,39 +0,0 @@
-<?php defined('SYSPATH') or die('No direct script access.');
-/**

• * EMAIL Scheduler Controller (IMAP/POP3)
• * PHP version 5
• * LICENSE: This source file is subject to LGPL license
• * that is available through the world-wide-web at the following URI:
• * http://www.gnu.org/copyleft/lesser.html
• * @author Mr Evoltech evoltech@march-hare.org

• * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
  -*/

  -class S_Endtime_Controller extends Controller {
• public function __construct()
• {

•   parent::__construct();
  

- }

• public function index()
• {
• $endtimes = ORM::factory('endtime')

•  ->with('incident')
  

•  ->where(array('incident_active' => '1', 'endtime_date <' => 'NOW()'))
  

- ->find_all();

- //Kohana::log('info', 'S_Endtime_Controller::index: '. print_r($incidents, 3));

• foreach($endtimes as $endtime){

•  Kohana::log('info', 'S_Endtime_Controller::index: '. print_r($endtime->incident->incident_title, 1));
  

•  $incident = ORM::factory('incident')
  

•    ->where('id', $endtime->incident->id)
  

•    ->find();
  

•  $incident->incident_active = 0;
  

•  $incident->save();
  

• }

- }

-}
Binary files endtime/.git/index and endtime_git/.git/index differ
diff -rupN endtime/.git/logs/HEAD endtime_git/.git/logs/HEAD
--- endtime/.git/logs/HEAD 2011-12-03 13:24:42.291950380 -0800
+++ endtime_git/.git/logs/HEAD 2011-12-04 13:55:32.445163979 -0800
@@ -1 +1 @@
-0000000000000000000000000000000000000000 a0dbafd Mr. Evoltech evoltech@hackbloc.org 1322947482 -0800 clone: from https://github.com/jetherton/endtime.git
+0000000000000000000000000000000000000000 a0dbafd Mr. Evoltech evoltech@hackbloc.org 1323035732 -0800 clone: from https://github.com/jetherton/endtime.git
diff -rupN endtime/.git/logs/refs/heads/master endtime_git/.git/logs/refs/heads/master
--- endtime/.git/logs/refs/heads/master 2011-12-03 13:24:42.291950380 -0800
+++ endtime_git/.git/logs/refs/heads/master 2011-12-04 13:55:32.421847537 -0800
@@ -1 +1 @@
-0000000000000000000000000000000000000000 a0dbafd Mr. Evoltech evoltech@hackbloc.org 1322947482 -0800 clone: from https://github.com/jetherton/endtime.git
+0000000000000000000000000000000000000000 a0dbafd Mr. Evoltech evoltech@hackbloc.org 1323035732 -0800 clone: from https://github.com/jetherton/endtime.git
diff -rupN endtime/hooks/endtime.php endtime_git/hooks/endtime.php
--- endtime/hooks/endtime.php 2011-12-03 17:37:08.783886285 -0800
+++ endtime_git/hooks/endtime.php 2011-12-04 13:55:32.448848596 -0800
@@ -36,11 +36,10 @@ class endtime {
// Hook into the report_edit (post_SAVE) event
Event::add('ushahidi_action.report_edit', array($this, '_report_form_submit'));

  // Hook into the Report view (front end)
  Event::add('ushahidi_action.report_meta_after_time', array($this, '_report_view'));

• // Hook into the Map view

•   Event::add('ushahidi_action.map_main_filters', array($this, '_map_view'));
  

• }

  /**
  @@ -244,11 +243,6 @@ class endtime {
  </script>";
  }

• public function _map_view() {

•  Kohana::log('info', 'Endtime::_map_view');
  

•  // Where is the map info?
  

- }

}//end method

-new endtime;
+new endtime;
\ No newline at end of file
diff -rupN endtime/libraries/endtime_install.php endtime_git/libraries/endtime_install.php
--- endtime/libraries/endtime_install.php 2011-12-04 13:55:19.153875766 -0800
+++ endtime_git/libraries/endtime_install.php 2011-12-04 13:55:32.448848596 -0800
@@ -36,19 +36,7 @@ class Endtime_Install {
endtime_date datetime DEFAULT NULL,
applicable tinyint(4) DEFAULT '1',
PRIMARY KEY (id)

- ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1");

• $this->db->query("INSERT INTO ".Kohana::config('database.default.table_prefix')."scheduler (

•  `id`, 
  

•  `scheduler_name`, 
  

•  `scheduler_last`, 
  

•  `scheduler_weekday`, 
  

•  `scheduler_day`, 
  

•  `scheduler_hour`, 
  

•  `scheduler_minute`, 
  

•  `scheduler_controller`, 
  

•  `scheduler_active`) 
  

•  VALUES (NULL, 'Endtime', '0', '-1', '-1', '-1', '', 's_endtime', '1')");
  

•           ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1");
  

  }

  /**
  @@ -57,6 +45,5 @@ class Endtime_Install {
  public function uninstall()
  {
  $this->db->query('DROP TABLE '.Kohana::config('database.default.table_prefix').'endtime');

•   $this->db->query('DELETE FROM `'.Kohana::config('database.default.table_prefix').'scheduler` WHERE `scheduler_name`="Endtime"');
  

  }
  -}
  +}
  \ No newline at end of file
  Binary files endtime/.readme.txt.swp and endtime_git/.readme.txt.swp differ

erg! That did not work!

[evoltech]

close see #2