=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java	2012-01-15 02:14:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java	2012-03-07 02:40:08 +0000
@@ -59,8 +59,6 @@
      */
     private boolean compulsory = false;
 
-    private Boolean showOnReport = false;
-
     private Integer sortOrder;
 
     public ProgramStageDataElement( ProgramStage programStage, DataElement dataElement, boolean compulsory )
@@ -78,17 +76,6 @@
         this.compulsory = compulsory;
         this.sortOrder = sortOrder;
     }
-    
-    public ProgramStageDataElement( ProgramStage programStage, DataElement dataElement, boolean compulsory,
-        Boolean showOnReport, Integer sortOrder )
-    {
-        super();
-        this.programStage = programStage;
-        this.dataElement = dataElement;
-        this.compulsory = compulsory;
-        this.showOnReport = showOnReport;
-        this.sortOrder = sortOrder;
-    }
 
     public ProgramStageDataElement()
     {
@@ -134,16 +121,6 @@
         this.sortOrder = sortOrder;
     }
 
-    public Boolean getShowOnReport()
-    {
-        return showOnReport;
-    }
-
-    public void setShowOnReport( Boolean showOnReport )
-    {
-        this.showOnReport = showOnReport;
-    }
-
     // -------------------------------------------------------------------------
     // hashCode, equals and toString
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstanceService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstanceService.java	2012-03-05 04:22:57 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstanceService.java	2012-03-07 02:40:08 +0000
@@ -86,13 +86,7 @@
     List<ProgramStageInstance> get( OrganisationUnit unit, Date after, Date before, Boolean completed );
 
     List<ProgramStageInstance> getProgramStageInstances( Patient patient, Boolean completed );
-    
-    List<ProgramStageInstance> getProgramStageInstances( ProgramInstance programInstance, Date startDate, Date endDate , int min, int max );
-    
-    int countProgramStageInstances( ProgramInstance programInstance, Date startDate, Date endDate );
-    
-    Grid getSingleEventReport( ProgramInstance programInstance, Date startDate, Date endDate, int min, int max, I18nFormat format, I18n i18n );
-    
+            
     List<ProgramStageInstance> searchProgramStageInstances( ProgramStage programStage, Map<Integer,String> searchingKeys, OrganisationUnit orgunit, Date startDate, Date endDate, int min, int max );
 
     Grid getTabularReport( ProgramStage programStage, List<DataElement> dataElements, Map<Integer,String> searchingKeys, OrganisationUnit orgunit, Date startDate, Date endDate, int min, int max, I18nFormat format, I18n i18n );

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstanceStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstanceStore.java	2012-03-05 04:22:57 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstanceStore.java	2012-03-07 02:40:08 +0000
@@ -69,10 +69,6 @@
 
     List<ProgramStageInstance> get( Patient patient, Boolean completed);
     
-    List<ProgramStageInstance> get( ProgramInstance programInstance, Date startDate, Date endDate , int min, int max );
-
-    int count( ProgramInstance programInstance, Date startDate, Date endDate );
-    
     List<ProgramStageInstance> get( ProgramStage programStage, OrganisationUnit orgunit, Date startDate, Date endDate, int min, int max );
     
     List<ProgramStageInstance> get( ProgramStage programStage, Map<Integer,String> searchingKeys, OrganisationUnit orgunit, Date startDate, Date endDate, int min, int max );

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java	2012-03-05 08:41:21 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java	2012-03-07 02:40:08 +0000
@@ -157,6 +157,8 @@
         executeSql( "ALTER TABLE relationshiptype RENAME description TO name" );
 
         updateProgramStageInstanceOrgunit();
+        
+        executeSql("ALTER TABLE programstage_dataelements DROP COLUMN showOnReport"); 
     }
 
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java	2012-03-05 04:22:57 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java	2012-03-07 02:40:08 +0000
@@ -30,7 +30,6 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
@@ -186,84 +185,6 @@
         return programStageInstanceStore.get( patient, completed );
     }
 
-    public List<ProgramStageInstance> getProgramStageInstances( ProgramInstance programInstance, Date startDate,
-        Date endDate, int min, int max )
-    {
-        return programStageInstanceStore.get( programInstance, startDate, endDate, min, max );
-    }
-
-    public int countProgramStageInstances( ProgramInstance programInstance, Date startDate, Date endDate )
-    {
-        return programStageInstanceStore.count( programInstance, startDate, endDate );
-    }
-
-    public Grid getSingleEventReport( ProgramInstance programInstance, Date startDate, Date endDate, int min, int max,
-        I18nFormat format, I18n i18n )
-    {
-        List<ProgramStageInstance> programStageInstances = getProgramStageInstances( programInstance, startDate,
-            endDate, min, max );
-
-        ProgramStage programStage = programInstance.getProgram().getProgramStages().iterator().next();
-
-        Collection<ProgramStageDataElement> psDataElements = programStage.getProgramStageDataElements();
-
-        Collection<DataElement> dataElements = new HashSet<DataElement>();
-        for ( ProgramStageDataElement psDataElement : psDataElements )
-        {
-            if ( psDataElement.getShowOnReport() )
-            {
-                dataElements.add( psDataElement.getDataElement() );
-            }
-        }
-
-        // ---------------------------------------------------------------------
-        // Create a grid
-        // ---------------------------------------------------------------------
-
-        Grid grid = new ListGrid().setTitle( programInstance.getProgram().getName() );
-        grid.setSubtitle( i18n.getString( "from" ) + " " + format.formatDate( startDate ) + " " + i18n.getString( "to" )
-            + " " + format.formatDate( endDate ) );
-
-        // ---------------------------------------------------------------------
-        // Headers
-        // ---------------------------------------------------------------------
-
-        for ( DataElement dataElement : dataElements )
-        {
-            grid.addHeader( new GridHeader( dataElement.getName(), false, false ) );
-        }
-
-        grid.addHeader( new GridHeader( i18n.getString( "operations" ), false, false ) );
-
-        // ---------------------------------------------------------------------
-        // Values
-        // ---------------------------------------------------------------------
-
-        for ( ProgramStageInstance programStageInstance : programStageInstances )
-        {
-            grid.addRow();
-
-            for ( DataElement dataElement : dataElements )
-            {
-                PatientDataValue patientDataValue = patientDataValueService.getPatientDataValue( programStageInstance,
-                    dataElement );
-
-                if ( patientDataValue != null )
-                {
-                    grid.addValue( patientDataValue.getValue() );
-                }
-                else
-                {
-                    grid.addValue( "" );
-                }
-            }
-
-            grid.addValue( programStageInstance.getId() );
-        }
-
-        return grid;
-    }
-
     public List<ProgramStageInstance> searchProgramStageInstances( ProgramStage programStage,
         Map<Integer, String> searchingKeys, OrganisationUnit orgunit, Date startDate, Date endDate, int min, int max )
     {
@@ -333,10 +254,6 @@
                 grid.addHeader( new GridHeader( dataElement.getName(), false, false ) );
             }
 
-            grid.addHeader( new GridHeader( i18n.getString( "operations" ), true, false ) );
-
-            grid.addHeader( new GridHeader( i18n.getString( "status" ), true, false ) );
-
             // ---------------------------------------------------------------------
             // Values
             // ---------------------------------------------------------------------
@@ -366,10 +283,6 @@
                         grid.addValue( "" );
                     }
                 }
-
-                grid.addValue( programStageInstance.getId() );
-
-                grid.addValue( programStageInstance.isCompleted() );
             }
         }
 

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2012-03-05 04:22:57 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2012-03-07 02:40:08 +0000
@@ -178,24 +178,6 @@
     }
 
     @SuppressWarnings( "unchecked" )
-    public List<ProgramStageInstance> get( ProgramInstance programInstance, Date startDate, Date endDate, int min,
-        int max )
-    {
-        return getCriteria( Restrictions.eq( "programInstance.id", programInstance.getId() ),
-            Restrictions.between( "executionDate", startDate, endDate ) ).setFirstResult( min ).setMaxResults( max )
-            .list();
-    }
-
-    public int count( ProgramInstance programInstance, Date startDate, Date endDate )
-    {
-        Number rs = (Number) getCriteria( Restrictions.eq( "programInstance.id", programInstance.getId() ),
-            Restrictions.between( "executionDate", startDate, endDate ) ).setProjection( Projections.rowCount() )
-            .uniqueResult();
-
-        return rs != null ? rs.intValue() : 0;
-    }
-
-    @SuppressWarnings( "unchecked" )
     public List<ProgramStageInstance> get( ProgramStage programStage, OrganisationUnit orgunit, Date startDate,
         Date endDate, int min, int max )
     {

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageDataElement.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageDataElement.hbm.xml	2012-01-15 02:14:29 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageDataElement.hbm.xml	2012-03-07 02:40:08 +0000
@@ -16,8 +16,6 @@
     <property name="compulsory" column="compulsory" not-null="true" />
 	  
 	<property name="sortOrder" column="sort_order" /> 
-	
-	<property name="showOnReport" />
 
   </class>
 </hibernate-mapping>

=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateSingleEventReportAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateSingleEventReportAction.java	2012-01-15 02:14:29 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateSingleEventReportAction.java	1970-01-01 00:00:00 +0000
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2004-2012, 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.
- */
-
-package org.hisp.dhis.caseentry.action.report;
-
-import java.util.Collection;
-import java.util.Date;
-
-import org.hisp.dhis.common.Grid;
-import org.hisp.dhis.i18n.I18n;
-import org.hisp.dhis.i18n.I18nFormat;
-import org.hisp.dhis.paging.ActionPagingSupport;
-import org.hisp.dhis.program.ProgramInstance;
-import org.hisp.dhis.program.ProgramInstanceService;
-import org.hisp.dhis.program.ProgramStageInstance;
-import org.hisp.dhis.program.ProgramStageInstanceService;
-
-/**
- * @author Chau Thu Tran
- * 
- * @version $Id: GenerateSingleEventReportAction.java Jan 03, 2012 13:58:34 AM $
- */
-
-public class GenerateSingleEventReportAction
-    extends ActionPagingSupport<ProgramStageInstance>
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ProgramInstanceService programInstanceService;
-
-    public void setProgramInstanceService( ProgramInstanceService programInstanceService )
-    {
-        this.programInstanceService = programInstanceService;
-    }
-
-    private ProgramStageInstanceService programStageInstanceService;
-
-    public void setProgramStageInstanceService( ProgramStageInstanceService programStageInstanceService )
-    {
-        this.programStageInstanceService = programStageInstanceService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input/Output
-    // -------------------------------------------------------------------------
-
-    private Integer programInstanceId;
-
-    public void setProgramInstanceId( Integer programInstanceId )
-    {
-        this.programInstanceId = programInstanceId;
-    }
-
-    private String startDate;
-
-    public void setStartDate( String startDate )
-    {
-        this.startDate = startDate;
-    }
-
-    private String endDate;
-
-    public void setEndDate( String endDate )
-    {
-        this.endDate = endDate;
-    }
-
-    private Collection<ProgramStageInstance> programStageInstances;
-
-    public Collection<ProgramStageInstance> getProgramStageInstances()
-    {
-        return programStageInstances;
-    }
-
-    private Grid grid;
-
-    public Grid getGrid()
-    {
-        return grid;
-    }
-
-    private Integer total;
-
-    public Integer getTotal()
-    {
-        return total;
-    }
-
-    private I18n i18n;
-
-    public void setI18n( I18n i18n )
-    {
-        this.i18n = i18n;
-    }
-
-    private I18nFormat format;
-
-    public void setFormat( I18nFormat format )
-    {
-        this.format = format;
-    }
-
-    // -------------------------------------------------------------------------
-    // Implementation Action
-    // -------------------------------------------------------------------------
-
-    public String execute()
-        throws Exception
-    {
-        ProgramInstance programInstance = programInstanceService.getProgramInstance( programInstanceId );
-
-        Date startValue = format.parseDate( startDate );
-        
-        Date endValue = format.parseDate( endDate );
-
-        total = programStageInstanceService.countProgramStageInstances( programInstance, startValue, endValue );
-
-        this.paging = createPaging( total );
-
-        grid = programStageInstanceService.getSingleEventReport( programInstance, startValue, endValue, paging.getStartPos(),
-            paging.getPageSize(), format, i18n );
-
-        return SUCCESS;
-    }
-}

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2012-03-05 08:41:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2012-03-07 02:40:08 +0000
@@ -253,14 +253,6 @@
 			ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
 	</bean>
 	
-	<bean id="org.hisp.dhis.caseentry.action.report.GenerateSingleEventReportAction"
-    	class="org.hisp.dhis.caseentry.action.report.GenerateSingleEventReportAction" scope="prototype">
-    	<property name="programInstanceService"
-        	ref="org.hisp.dhis.program.ProgramInstanceService" />
-        <property name="programStageInstanceService"
- 	       	ref="org.hisp.dhis.program.ProgramStageInstanceService" />
-	</bean>
-	
 	<bean id="org.hisp.dhis.caseentry.action.report.TabularReportSelectAction"
 		class="org.hisp.dhis.caseentry.action.report.TabularReportSelectAction"
 		scope="prototype">

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-03-06 08:58:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-03-07 02:40:08 +0000
@@ -243,9 +243,6 @@
 leftSide=Left Side
 rightSide=Right Side
 in_range_due_date_plus_or_minus=In range due date +/-
-anonymous_event_report=Anonymous Event
-anonymous_event_reports=Anonymous Event Reports
-intro_anonymous_event_reports=Create reports based on anonymous events registered in system. Gives an overview of data for each event.
 activity_planning=Activity Planning
 back_to_main_menu=Back to main menu
 of=of

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2012-03-05 07:32:05 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2012-03-07 02:40:08 +0000
@@ -218,35 +218,6 @@
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/records.vm</param>
 		</action>
-
-		 <action name="getSingleEventReport"
-			class="org.hisp.dhis.caseentry.action.report.GenerateSingleEventReportAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/historyAnonymousEvents.vm</param>
-			<param name="javascripts">javascript/anonymousRegistration.js</param>
-			<param name="stylesheets">../dhis-web-caseentry/style/patient.css</param>
-		</action>
-		
-		<action name="showSingleEventReportForm" 
-			class="org.hisp.dhis.caseentry.action.caseentry.LoadAnonymousProgramsAction">
-		   <result name="success" type="velocity">/main.vm</result>
-		   <param name="page">/dhis-web-caseentry/singleEventReportForm.vm</param>
-		   <param name="menu">/dhis-web-caseentry/reportsMenu.vm</param>
-		   <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/singleEventReport.js</param>
-		</action>
-		
-		<action name="generateSingleEventReport"
-			class="org.hisp.dhis.caseentry.action.report.GenerateSingleEventReportAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/historyAnonymousEvents.vm</param>
-			<param name="stylesheets">../dhis-web-caseentry/style/patient.css</param>
-		</action>
-		
-        <action name="viewAnonymousEvents"
-             class="org.hisp.dhis.caseentry.action.caseentry.ProgramStageCustomDataEntryAction">
-             <result name="success" type="velocity">/content.vm</result>
-             <param name="page">/dhis-web-caseentry/dataEntryForm.vm</param>
-        </action>
         
         <action name="tabularReportSelect"
 			class="org.hisp.dhis.caseentry.action.report.TabularReportSelectAction">

=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/historyAnonymousEvents.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/historyAnonymousEvents.vm	2012-01-15 02:14:29 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/historyAnonymousEvents.vm	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<div>
-	#parse( "dhis-web-caseentry/htmlGrid.vm" )
-</div>
-
-<div class="paging-container">
-	#parse( "/dhis-web-commons/paging/paging.vm" )
-</div>
-
-<div id='viewRecordsDiv'></div>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2012-03-05 10:55:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2012-03-07 02:40:08 +0000
@@ -7,7 +7,6 @@
 	#introListImgItem( "multipledataEntrySelect.action" "multiple_name_based_data_entry" "dataentry" )
 	#introListImgItem( "anonymousRegistration.action" "anonymous_events" "dataentry" )
     #introListImgItem( "reportSelect.action" "program_summary" "summaryreport" )
-    #introListImgItem( "showSingleEventReportForm.action" "anonymous_event_reports" "summaryreport" )
 	#introListImgItem( "tabularReportSelect.action" "tabular_report" "summaryreport" )
 	#introListImgItem( "visitplan.action" "visit_plan" "visitplan" )
     #introListImgItem( "caseAggregationForm.action" "case_aggregation" "caseaggregation" )

=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEventReport.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEventReport.js	2012-03-05 07:32:05 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEventReport.js	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-
-function organisationUnitSelected( orgUnits )
-{
-	hideById('contentDiv');
-	setFieldValue('startDate', '');
-	setFieldValue('endDate', '');
-	
-	$.getJSON( 'loadAnonymousPrograms.action',{}
-		, function( json ) 
-		{
-			clearListById( 'programId' );
-			addOptionById( 'programId', '', i18n_please_select );
-			
-			var preSelectedProgramId = getFieldValue('selectedProgramId');
-			for ( i in json.programInstances ) 
-			{ 
-				if( preSelectedProgramId == json.programInstances[i].id )
-				{
-					$('#programId').append('<option selected value=' + json.programInstances[i].id + ' singleevent="true" programInstanceId=' + json.programInstances[i].programInstanceId + '>' + json.programInstances[i].name + '</option>');
-				}
-				else
-				{
-					$('#programId').append('<option value=' + json.programInstances[i].id + ' singleevent="true" programInstanceId=' + json.programInstances[i].programInstanceId + '>' + json.programInstances[i].name + '</option>');
-				}
-			}
-
-			if( json.programInstances.length > 0 )
-			{
-				enable('generateBtn');
-			}
-			else
-			{
-				disable('generateBtn');
-			}
-			
-		} );
-}
-
-selection.setListenerFunction( organisationUnitSelected );
-
-function loadGeneratedReport()
-{
-	showLoader();
-	isAjax = true;
-	jQuery( "#contentDiv" ).load( "generateSingleEventReport.action",
-	{
-		programInstanceId: jQuery('select[id=programId] option:selected').attr('programInstanceId'),
-		startDate: getFieldValue('startDate'),
-		endDate: getFieldValue('endDate')
-	}, function() 
-	{ 
-		hideLoader();
-		hideById( 'message' );
-		showById( 'contentDiv' );
-	});
-	
-	return false;
-}
-
-function showDetails( programStageInstanceId ) 
-{	
-	$( '#viewRecordsDiv' )
-		.load( 'viewAnonymousEvents.action',
-			{
-				programStageInstanceId: programStageInstanceId
-			}
-			,function( )
-			{
-				showById('entryFormContainer');
-				jQuery("#entryFormContainer :input").attr("disabled", true);
-				jQuery("#entryFormContainer .ui-datepicker-trigger").each(function()
-				{
-					jQuery(this).hide();
-				});
-				 
-						
-			}).dialog({
-				title: i18n_reports,
-				maximize: true, 
-				closable: true,
-				modal:false,
-				overlay:{background:'#000000', opacity:0.1},
-				width: 800,
-				height: 400
-			});
-}
-
-function entryFormContainerOnReady (){}
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2012-03-05 04:22:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2012-03-07 02:40:08 +0000
@@ -14,7 +14,6 @@
 <h2>$i18n.getString( "reports" )&nbsp;</h2>
 <ul>
     <li><a href="reportSelect.action">$i18n.getString( "program_summary" )&nbsp;</a></li> 
-	<li><a href="showSingleEventReportForm.action"> $i18n.getString( "anonymous_event_report" )&nbsp;</a></li> 	    
 	<li><a href="tabularReportSelect.action"> $i18n.getString( "tabular_report" )&nbsp;</a></li> 
 </ul>
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm	2012-03-05 12:03:06 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm	2012-03-07 02:40:08 +0000
@@ -2,7 +2,6 @@
 <a href="index.action"><h2>$i18n.getString( "reports" )&nbsp;</h2></a>
 <ul>
     <li><a href="reportSelect.action">$i18n.getString( "program_summary" )&nbsp;</a></li>
-	<li><a href="showSingleEventReportForm.action"> $i18n.getString( "anonymous_event_report" )&nbsp;</a></li> 
 	<li><a href="tabularReportSelect.action"> $i18n.getString( "tabular_report" )&nbsp;</a></li> 
 </ul>
 

=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventReportForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventReportForm.vm	2012-02-17 17:00:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventReportForm.vm	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-<script>
-	jQuery(document).ready(	function(){
-		validation( 'singleEventreportForm', function(form){
-			loadGeneratedReport();
-		}); 
-	});		
-</script>
-
-<h3>$i18n.getString( "anonymous_event_reports" )</h3>
-<form id="singleEventreportForm" name="singleEventreportForm" method="post" action="generateSingleEventReport.action">
-
-<div class="inputCriteria" style="width:530px;height:130px;margin-bottom:20px;">
-
-<table>
-
-    <tr>
-        <td><label for="programId">$i18n.getString( "program" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-        <td>
-            <select id="programId" name="programId" style="width:350px" class="{validate:{required:true}}" >
-				<option value="">[ $i18n.getString('please_select') ]</option>
-					#foreach( $programInstance in $programInstances)
-						<option value="$programInstance.program.id" singleevent='$programInstance.program.singleEvent' programInstanceId='$programInstance.id'>$programInstance.program.name</option>
-					#end
-			</select>
-        </td>
-    </tr>
-        
-    <tr>
-        <td><label>$i18n.getString( "start_date" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-        <td>
-            <input type="text" id="startDate" name="startDate" class="{validate:{required:true}}" style="width:350px"/>
-			<script type="text/javascript">
-				datePicker('startDate');
-            </script>  	
-        </td>
-    </tr>
-	
-	<tr>
-        <td><label>$i18n.getString( "end_date" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-        <td>
-            <input type="text" id="endDate" name="endDate" class="{validate:{required:true}}" style="width:350px"/>
-			<script type="text/javascript">
-				datePicker('endDate');
-            </script>  	
-        </td>
-    </tr>
-	
-	<tr>
-		<td></td>
-		<td>
-			<input type="submit" id='generateBtn' name='generateBtn' value="$i18n.getString( 'generate' )" style="width:10em" #if( $!program.size() == 0 ) disabled #end/>
-			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='index.action'" style="width:10em"/>
-		</td>
-	</tr>
-	
-</table>
-
-</div>
-
-#parse( "dhis-web-commons/loader/loader.vm" )
-
-<div id="contentDiv"></div>
-
-
-<script type="text/javascript">
-	var i18n_report_generation_failed = '$encoder.jsEscape( $i18n.getString( "report_generation_failed" ), "'")';    
-	var i18n_please_select = '[' + '$encoder.jsEscape( $i18n.getString( "please_select" ), "'")' + ']'; 
-	var i18n_reports = '$encoder.jsEscape( $i18n.getString( "reports" ), "'")';    	
-	var i18n_patient_profile = '$encoder.jsEscape( $i18n.getString( "patient_profile" ), "'")';    	
-</script>   
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.java	2012-01-15 02:14:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.java	2012-03-07 02:40:08 +0000
@@ -120,13 +120,6 @@
         this.compulsories = compulsories;
     }
 
-    private List<Boolean> showOnReport = new ArrayList<Boolean>();
-    
-    public void setShowOnReport( List<Boolean> showOnReport )
-    {
-        this.showOnReport = showOnReport;
-    }
-
     private int programId;
 
     public int getProgramId()
@@ -170,21 +163,17 @@
 
             ProgramStageDataElement programStageDataElement = programStageDataElementService.get( programStage,
                 dataElement );
-
-            Boolean isShow =  ( showOnReport == null ) ? false : showOnReport.get( i );
             
             if ( programStageDataElement == null )
             {
                 programStageDataElement = new ProgramStageDataElement( programStage, dataElement, this.compulsories
-                    .get( i ), isShow,  new Integer( i ) );
+                    .get( i ), new Integer( i ) );
                 programStageDataElementService.addProgramStageDataElement( programStageDataElement );
             }
             else
             {
                 programStageDataElement.setCompulsory( this.compulsories.get( i ) );
                 
-                programStageDataElement.setShowOnReport( isShow );
-
                 programStageDataElement.setSortOrder( new Integer( i ) );
 
                 programStageDataElementService.updateProgramStageDataElement( programStageDataElement );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js	2012-01-30 04:32:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js	2012-03-07 02:40:08 +0000
@@ -60,7 +60,6 @@
 		if( item.selected ){
 			html = "<tr class='selected' id='" + item.value + "' ondblclick='unSelectDataElement( this )'><td onclick='select(this)'>" + item.text + "</td>";
 			html += "<td align='center'><input type='checkbox' name='compulsory' value='" + item.value + "'></td>";
-			html += "<td align='center' ><input type='checkbox' name='showOnReport' value='" + item.value + "'></td>";
 			html += "</tr>";
 			selectedList.append( html );
 			jQuery( item ).remove();

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/updateProgramStageForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/updateProgramStageForm.js	2012-01-30 08:25:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/updateProgramStageForm.js	2012-03-07 02:40:08 +0000
@@ -9,10 +9,6 @@
 		compulsories = jQuery( "#compulsories" );
 		compulsories.empty();
 		
-		showOnReport = jQuery( "#showOnReport" );
-		showOnReport.empty();
-		
-		var hasDeShowReport = false;
 		jQuery("#selectedList").find("tr").each( function( i, item ){ 
 			selectedDataElementsValidator.append( "<option value='" + item.id + "' selected='true'>" + item.id + "</option>" );
 			var compulsory = jQuery( item ).find( "input[name='compulsory']:first");
@@ -20,14 +16,6 @@
 
 			var checked = compulsory.attr('checked') ? true : false;
 			compulsories.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
-			
-			checked = isShow.attr('checked') ? true : false;
-			showOnReport.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
-			if( checked )
-			{
-				hasDeShowReport = true;
-				jQuery( "#checkShowOnReport" ).append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
-			}
 		});
 	});
 	

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm	2012-01-15 02:14:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm	2012-03-07 02:40:08 +0000
@@ -40,7 +40,7 @@
 				<td>$encoder.htmlEncode( $association.description )</td>
 				
 				<td style="text-align:center"#alternate( $mark )>
-				  <a href="showUpdateProgramStageForm.action?id=$association.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
+				  <a href="showUpdateProgramStageForm.action?id=$association.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
 				  #if( $association.program.singleEvent == 'false' )
 					<a href="javascript:removeItem( '$association.id', '$encoder.jsEncode( $association.name )', i18n_confirm_delete , 'removeProgramStage.action' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
 				  #end

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2012-02-16 16:07:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2012-03-07 02:40:08 +0000
@@ -86,7 +86,6 @@
 			<th>$i18n.getString( "selected_data_elements" )
 				<select id="selectedDataElementsValidator" name='selectedDataElementsValidator' multiple="multiple" class="{validate:{required:true}}" style="display:none"> </select>
 				<select id="compulsories" name='compulsories' multiple="multiple" style="display:none"></select>
-				<select id="showOnReport" name='showOnReport' multiple="multiple" style="display:none"></select>				
 			</th>
 		</tr>
     </thead>
@@ -108,19 +107,13 @@
 						<tr>
 							<th>$i18n.getString( "dataelement" )</th>
 							<th width="20px">$i18n.getString( "compulsory" )</th>
-							#if( $programStage.program.anonymous == 'true' )
-							<th width="120px">$i18n.getString( "shown_on_reports" )</th>
-							#end
 						</tr>
 					</thead>
 					<tbody id="selectedList">
 						#foreach ( $programStageDataElement in $programStageDataElements )
-							 <tr ondblclick="unSelectDataElement( this )" id="$programStageDataElement.dataElement.id">
+							<tr ondblclick="unSelectDataElement( this )" id="$programStageDataElement.dataElement.id">
 								<td onclick="select(this)">$encoder.htmlEncode( $programStageDataElement.dataElement.name )</td>
 								<td align="center"><input type="checkbox" name="compulsory" value="$programStageDataElement.dataElement.id" #if($programStageDataElement.compulsory == true ) checked #end /></td>
-								#if( $programStage.program.anonymous == 'true' )
-								<td align="center"><input type="checkbox" name="isShow" value="$programStageDataElement.dataElement.id" #if($programStageDataElement.showOnReport == true ) checked #end /></td>
-								#end
 							</tr>
 						#end
 					</tbody>