=== added file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/eventchart/EventChartDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/eventchart/EventChartDeletionHandler.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/eventchart/EventChartDeletionHandler.java	2014-07-14 08:17:44 +0000
@@ -0,0 +1,91 @@
+package org.hisp.dhis.eventchart;
+
+/*
+ * Copyright (c) 2004-2014, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import java.util.Collection;
+
+import org.hisp.dhis.program.Program;
+import org.hisp.dhis.program.ProgramStage;
+import org.hisp.dhis.system.deletion.DeletionHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+/**
+ * @author Chau Thu Tran
+ * @version $Id$
+ */
+public class EventChartDeletionHandler
+    extends DeletionHandler
+{
+    // -------------------------------------------------------------------------
+    // Dependencies
+    // -------------------------------------------------------------------------
+
+    @Autowired
+    private EventChartService eventChartService;
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    // -------------------------------------------------------------------------
+    // DeletionHandler implementation
+    // -------------------------------------------------------------------------
+
+    @Override
+    protected String getClassName()
+    {
+        return EventChart.class.getSimpleName();
+    }
+
+    @Override
+    public void deleteProgramStage( ProgramStage programStage )
+    {
+        Collection<EventChart> charts = eventChartService.getAllEventCharts();
+        for( EventChart chart : charts )
+        {
+            if( chart.getProgramStage().equals( programStage ))
+            {
+                eventChartService.deleteEventChart( chart );
+            }
+        }
+    }
+
+    @Override
+    public void deleteProgram( Program program )
+    {
+        Collection<EventChart> charts = eventChartService.getAllEventCharts();
+        for( EventChart chart : charts )
+        {
+            if( chart.getProgram().equals( program ))
+            {
+                eventChartService.deleteEventChart( chart );
+            }
+        }
+    }
+}

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/META-INF/dhis/beans.xml	2014-07-14 04:44:27 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/META-INF/dhis/beans.xml	2014-07-14 08:17:44 +0000
@@ -498,6 +498,11 @@
 			ref="org.hisp.dhis.trackedentity.TrackedEntityFormService" />
 	</bean>
 	
+	<bean
+		id="org.hisp.dhis.eventchart.EventChartDeletionHandler"
+		class="org.hisp.dhis.eventchart.EventChartDeletionHandler">
+	</bean>
+	
 	<!-- DeletionManager -->
 
 	<bean
@@ -526,6 +531,7 @@
 					<ref local="org.hisp.dhis.program.ProgramDataEntryFormDeletionHandler" />
 					<ref local="org.hisp.dhis.program.ProgramIndicatorDeletionHandler" />
 					<ref local="org.hisp.dhis.trackedentity.TrackedEntityFormDeletionHandler" />
+					<ref local="org.hisp.dhis.eventchart.EventChartDeletionHandler" />
 				</list>
 			</list>
 		</property>
@@ -594,7 +600,10 @@
 			<aop:before
 				pointcut="execution( * org.hisp.dhis.trackedentity.TrackedEntityFormService.delete*(..) )"
 				method="intercept" />
-				
+			<aop:before
+				pointcut="execution( * org.hisp.dhis.eventchart.EventChartService.delete*(..) )"
+				method="intercept" />
+					
 		</aop:aspect>
 
 	</aop:config>

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java	2014-05-04 14:04:41 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java	2014-07-14 08:17:44 +0000
@@ -53,6 +53,7 @@
 import org.hisp.dhis.dataset.Section;
 import org.hisp.dhis.datavalue.DataValue;
 import org.hisp.dhis.document.Document;
+import org.hisp.dhis.eventchart.EventChart;
 import org.hisp.dhis.expression.Expression;
 import org.hisp.dhis.i18n.locale.I18nLocale;
 import org.hisp.dhis.indicator.Indicator;
@@ -774,4 +775,14 @@
     {
         return null;
     }
+    
+    
+    public void deleteEventChart( EventChart eventChart )
+    {
+    }
+    
+    public String allowDeleteEventChart( EventChart eventChart )
+    {
+        return null;
+    }
 }