← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17458: local/in add missing files

 

------------------------------------------------------------
revno: 17458
committer: Mithilesh Kumar Thakur <mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-11-13 07:47:22 +0000
message:
  local/in add missing files
added:
  local/in/dhis-web-birtreports/
  local/in/dhis-web-birtreports/pom.xml
  local/in/dhis-web-birtreports/src/
  local/in/dhis-web-birtreports/src/main/
  local/in/dhis-web-birtreports/src/main/java/
  local/in/dhis-web-birtreports/src/main/java/org/
  local/in/dhis-web-birtreports/src/main/java/org/hisp/
  local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/
  local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/
  local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/
  local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/BirtReportOptionsStack.java
  local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/BirtReportTypeObject.java
  local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/ReportsHomePageAction.java
  local/in/dhis-web-birtreports/src/main/resources/
  local/in/dhis-web-birtreports/src/main/resources/META-INF/
  local/in/dhis-web-birtreports/src/main/resources/META-INF/dhis/
  local/in/dhis-web-birtreports/src/main/resources/META-INF/dhis/beans.xml
  local/in/dhis-web-birtreports/src/main/resources/arial.ttf
  local/in/dhis-web-birtreports/src/main/resources/org/
  local/in/dhis-web-birtreports/src/main/resources/org/hisp/
  local/in/dhis-web-birtreports/src/main/resources/org/hisp/dhis/
  local/in/dhis-web-birtreports/src/main/resources/org/hisp/dhis/birtreports/
  local/in/dhis-web-birtreports/src/main/resources/org/hisp/dhis/birtreports/i18n_module.properties
  local/in/dhis-web-birtreports/src/main/resources/struts.xml
  local/in/dhis-web-birtreports/src/main/webapp/
  local/in/dhis-web-birtreports/src/main/webapp/WEB-INF/
  local/in/dhis-web-birtreports/src/main/webapp/WEB-INF/web.xml
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/StylesForTags.css
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/document.js
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/report.js
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/reportConfiguration.js
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/reportParams.js
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/style.css
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/stylesForReports.css
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/images/
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/images/goback.png
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/javascript/
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/menu.vm
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/menuWithTree.vm
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/selectReport.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== added directory 'local/in/dhis-web-birtreports'
=== added file 'local/in/dhis-web-birtreports/pom.xml'
--- local/in/dhis-web-birtreports/pom.xml	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/pom.xml	2014-11-13 07:47:22 +0000
@@ -0,0 +1,71 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.hisp.dhis</groupId>
+		<artifactId>dhis-web</artifactId>
+		<version>2.17-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>dhis-web-birtreports</artifactId>
+	<packaging>war</packaging>
+	<name>DHIS Birt Reports</name>
+	
+	<build>
+		<finalName>dhis-web-birtreports</finalName>
+	</build>
+	
+	<dependencies>
+		
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+	</dependency>
+
+		<!-- DHIS -->
+		<dependency>
+			<groupId>org.hisp.dhis</groupId>
+			<artifactId>dhis-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.hisp.dhis</groupId>
+			<artifactId>dhis-in-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hisp.dhis</groupId>
+			<artifactId>dhis-service-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.hisp.dhis</groupId>
+			<artifactId>dhis-in-service-configuration</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+        <dependency>
+            <groupId>org.hisp.dhis</groupId>
+            <artifactId>dhis-support-external</artifactId>
+        </dependency>
+		
+        <dependency>
+            <groupId>org.hisp.dhis</groupId>
+            <artifactId>dhis-support-system</artifactId>
+        </dependency>
+
+		<dependency>
+			<groupId>org.hisp.dhis</groupId>
+			<artifactId>dhis-web-commons</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.hisp.dhis</groupId>
+			<artifactId>dhis-web-commons-resources</artifactId>
+			<type>war</type>
+		</dependency>
+		<dependency>
+		  <groupId>org.hisp.dhis</groupId>
+		  <artifactId>dhis-web-api</artifactId>
+		</dependency>
+
+    </dependencies>
+</project>

=== added directory 'local/in/dhis-web-birtreports/src'
=== added directory 'local/in/dhis-web-birtreports/src/main'
=== added directory 'local/in/dhis-web-birtreports/src/main/java'
=== added directory 'local/in/dhis-web-birtreports/src/main/java/org'
=== added directory 'local/in/dhis-web-birtreports/src/main/java/org/hisp'
=== added directory 'local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis'
=== added directory 'local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports'
=== added directory 'local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action'
=== added file 'local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/BirtReportOptionsStack.java'
--- local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/BirtReportOptionsStack.java	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/BirtReportOptionsStack.java	2014-11-13 07:47:22 +0000
@@ -0,0 +1,40 @@
+package org.hisp.dhis.birtreports.action;
+
+/**
+ * User: gaurav
+ * Date: 12/7/13
+ * Time: 3:06 PM
+ */
+public class BirtReportOptionsStack {
+
+
+    private String reportClass;
+
+    private String reportName;
+
+    private String reportDesignFileName;
+
+    public String getReportName() {
+        return reportName;
+    }
+
+    public void setReportName(String reportName) {
+        this.reportName = reportName;
+    }
+
+    public String getReportDesignFileName() {
+        return reportDesignFileName;
+    }
+
+    public void setReportDesignFileName(String reportDesignFileName) {
+        this.reportDesignFileName = reportDesignFileName;
+    }
+
+    public String getReportClass() {
+        return reportClass;
+    }
+
+    public void setReportClass(String reportClass) {
+        this.reportClass = reportClass;
+    }
+}

=== added file 'local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/BirtReportTypeObject.java'
--- local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/BirtReportTypeObject.java	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/BirtReportTypeObject.java	2014-11-13 07:47:22 +0000
@@ -0,0 +1,29 @@
+package org.hisp.dhis.birtreports.action;
+
+/**
+ * User: gaurav
+ * Date: 16/7/13
+ * Time: 2:35 PM
+ */
+public class BirtReportTypeObject {
+
+    private String reportTypeName;
+
+    private Integer reportTypeId;
+
+    public String getReportTypeName() {
+        return reportTypeName;
+    }
+
+    public void setReportTypeName(String reportTypeName) {
+        this.reportTypeName = reportTypeName;
+    }
+
+    public Integer getReportTypeId() {
+        return reportTypeId;
+    }
+
+    public void setReportTypeId(Integer reportTypeId) {
+        this.reportTypeId = reportTypeId;
+    }
+}

=== added file 'local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/ReportsHomePageAction.java'
--- local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/ReportsHomePageAction.java	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/ReportsHomePageAction.java	2014-11-13 07:47:22 +0000
@@ -0,0 +1,83 @@
+package org.hisp.dhis.birtreports.action;
+/*
+ * Copyright (c) 2004-2007, 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 com.opensymphony.xwork2.Action;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Gaurav
+ * @version $Id$
+ */
+public class ReportsHomePageAction
+        implements Action {
+
+    public List<BirtReportTypeObject> birtReportTypeObjectList = new ArrayList<BirtReportTypeObject>();
+    public List<BirtReportOptionsStack> birtReportOptionsList = new ArrayList<BirtReportOptionsStack>();
+
+    public String execute() {
+
+        String birtHomeFolder = System.getenv("BIRT_HOME");
+        System.out.println("* Birt home points to " + "\"" + birtHomeFolder + "\"");
+
+        File birtFolder = new File(birtHomeFolder);
+
+        if (!birtFolder.exists()) {
+            System.out.println("Error: Birt Home Not Defined");
+            return ERROR;
+        }
+
+        File[] contentFiles = birtFolder.listFiles();
+        Integer typeID = new Integer(0);
+        System.out.println("-------------------------------------------------------//-------------------------------------------------------------");
+        for (File reportTypeFolder : contentFiles) {
+            BirtReportTypeObject birtReportTypeObject = new BirtReportTypeObject();
+            birtReportTypeObject.setReportTypeName(reportTypeFolder.getName());
+            birtReportTypeObject.setReportTypeId(typeID);
+            ++typeID;
+            birtReportTypeObjectList.add(birtReportTypeObject);
+            System.out.println("<option value=" + birtReportTypeObject.getReportTypeId() + ">" + birtReportTypeObject.getReportTypeName() + "</option>");
+            if (reportTypeFolder.isDirectory()) {
+                File[] categoryFiles = reportTypeFolder.listFiles();
+                for (File reportFile : categoryFiles) {
+                    BirtReportOptionsStack birtReportOptionsStack = new BirtReportOptionsStack();
+                    birtReportOptionsStack.setReportName(reportFile.getName().replace("_", " ").replace(".rptdesign", ""));
+                    birtReportOptionsStack.setReportDesignFileName(birtHomeFolder + birtReportTypeObject.getReportTypeName() + File.separator + reportFile.getName());
+                    birtReportOptionsStack.setReportClass("sub_" + birtReportTypeObject.getReportTypeId());
+                    birtReportOptionsList.add(birtReportOptionsStack);
+                    System.out.println("<option value=" + birtReportOptionsStack.getReportDesignFileName() + " class=" + birtReportOptionsStack.getReportClass() + ">" + birtReportOptionsStack.getReportName() + "</option>");
+                }
+            }
+        }
+        System.out.println("--------------------------------------------------------//------------------------------------------------------------");
+
+        return SUCCESS;
+    }
+}
\ No newline at end of file

=== added directory 'local/in/dhis-web-birtreports/src/main/resources'
=== added directory 'local/in/dhis-web-birtreports/src/main/resources/META-INF'
=== added directory 'local/in/dhis-web-birtreports/src/main/resources/META-INF/dhis'
=== added file 'local/in/dhis-web-birtreports/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-birtreports/src/main/resources/META-INF/dhis/beans.xml	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/resources/META-INF/dhis/beans.xml	2014-11-13 07:47:22 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans";
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+    xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
+
+    
+    <!--Birt Reports -->
+    <bean id="org.hisp.dhis.birtreports.action.ReportsHomePageAction"
+        class="org.hisp.dhis.birtreports.action.ReportsHomePageAction"
+        scope="prototype">
+    </bean>
+			
+</beans>

=== added file 'local/in/dhis-web-birtreports/src/main/resources/arial.ttf'
Binary files local/in/dhis-web-birtreports/src/main/resources/arial.ttf	1970-01-01 00:00:00 +0000 and local/in/dhis-web-birtreports/src/main/resources/arial.ttf	2014-11-13 07:47:22 +0000 differ
=== added directory 'local/in/dhis-web-birtreports/src/main/resources/org'
=== added directory 'local/in/dhis-web-birtreports/src/main/resources/org/hisp'
=== added directory 'local/in/dhis-web-birtreports/src/main/resources/org/hisp/dhis'
=== added directory 'local/in/dhis-web-birtreports/src/main/resources/org/hisp/dhis/birtreports'
=== added file 'local/in/dhis-web-birtreports/src/main/resources/org/hisp/dhis/birtreports/i18n_module.properties'
--- local/in/dhis-web-birtreports/src/main/resources/org/hisp/dhis/birtreports/i18n_module.properties	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/resources/org/hisp/dhis/birtreports/i18n_module.properties	2014-11-13 07:47:22 +0000
@@ -0,0 +1,347 @@
+goi_ra = Government of India Reports Analyser
+routine_ra = Routine Report Analyser
+ra_cold_chain = Cold Chain Report Analyser
+physical_output_ra = Quarterly Physical Output Report
+periodwise_progress_ra = PeriodWise Progress Report Analyser
+orgunitwise_progress_ra = OrganisationunitWise Progress Report Analyser
+aggregation_ra = Aggregation Reports Analyser
+feedback_ra = Feedback Report Analyser
+bulk_ra = Bulk Report Analyser
+ll_bulk_ra = Line Listing Bulk Report Analyser
+periodtype = PeriodType
+organisationunit = OrganisationUnit
+select_periodtype = Select PeriodType
+aggregated_data = Aggregated Data
+generate_report = Generate Report
+all = ALL
+district_feedback= Feedback Template Analyser
+selected_only = Selected Only
+orgunitgrouptype = OrgUnitGroupType 
+year = Year
+use_existing_agg_data = Use Existing Aggregated Data
+generate_agg_data = Generate Aggregate Data
+use_captured_data = Use Captured Data
+generated_data_type = Generated Data Type
+use_data_type = Use Data Values From
+
+please_select_an_orgUnit= Please select an OrganisationUnit.
+please_select_a_dataset= Please select a dataset.
+please_select_period= Please select a period.
+refresh_datamart= Refresh datamart
+error_in_input_parameters= Not all required parameters are selected!
+aggregation_mode= Aggregation mode
+reporting_unit= Reporting unit
+reporting_period= Reporting period
+error_startDate = You must enter a valid start date!  
+error_endDate = You must enter a valid start date!
+error_organisationUnitId = You must select an organisation unit!
+error_dataSetId= You must select a data set!
+error_after= End date must be after start date!
+select_data_set= Please select a data set
+select_period = Please select a period
+select_organisation_unit = Please select an organisation unit
+reporting_organisation_unit= Reporting Organisation Unit
+dataset_report= Dataset Report
+add_selected= Add selected
+add_all= Add all
+remove_selected= Remove selected
+remove_all= Remove All
+create_report_table= Create report table
+manage_report_table= Manage report table
+available_indicators= Available indicators
+select_indicatorgroup_all= Select indicator group / View all
+selected_indicators= Selected indicators
+available_organisationunits= Available organisation units
+select_organisationunit_level_all= Select organsation unit level / View all
+level= Level
+available_organisationunits= Available organisation units
+selected_organisationunits= Selected organisation units
+available_periods= Available periods
+selected_periods= Selected periods
+select_period_type_all= Select period type / View all
+add_children= Add children
+create_and_save= Create and Save
+create= Create
+save= Save
+cancel= Cancel
+name= Name
+id= Id
+model= Model
+frequency= Frequency
+reportType= Report Type
+exceltemplate= Excel Template
+xmltemplate= Xml Template
+skip_data_mart= Skip data mart
+indicators= Indicators
+organisation_units= Organisation units
+periods= Periods
+period_from= Periods From
+period_to= Periods To
+relative_periods= Relative periods
+reporting_month= Reporting month
+last_3_months= Last 3 months
+last_6_months= Last 6 months
+last_9_months= Last 9 months
+last_12_months= Last 12 months
+last_3_to_6_months= Last 3 to 6 months
+last_6_to_9_months= Last 6 to 9 months
+last_9_to_12_months= Last 9 to 12 months
+last_12_individual_months= Last 12 individual months
+report_table= Report Table
+crosstab_dimensions= Crosstab dimensions
+confirm_delete_table= Are you sure you want to remove table?
+operations= Operations
+edit= Edit
+remove= Remove
+show_details= Show Details
+report_table_management= Report table management
+creating_table= Creating table...
+done= Done
+hide_details= Hide details
+table_name= Table name
+crosstab_indicators= Crosstab indicators
+crosstab_periods= Crosstab periods
+crosstab_organisation_units= Crosstab organisation units
+cannot_crosstab_all_dimensions= You cannot crosstabulate all dimensions
+cannot_crosstab_no_dimensions= Please select at least one dimension
+must_select_at_least_one_dataelement= Please select at least one dataelement
+must_select_at_least_one_indicator= Please select at least one indicator
+must_select_at_least_one_unit= Please select at least one organisation unit
+must_select_at_least_one_period= Please select at least one period
+cannot_include_more_organisation_unit_regression = Cannot include more that one organisation unit with regression
+must_enter_name= Please enter a name
+yes= Yes
+no= No
+specify_name= Please specify a name
+specify_title= Please specify a title
+select_file= Select file
+select_report_table= Select report table
+name_in_use= The name is already in use
+title_in_use= The title is already in use
+design = Design
+home= Home
+directory= Directory
+select_table= Select table
+add= Add
+create_new_report= Create new report
+create_report= Create report
+standard_report= Standard Report
+file_upload_failed= File upload failed
+confirm_remove_report= Are you sure you will delete the report?
+confirm_delete_chart= Are you sure you want to remove chart?
+report_management= Report management
+name= Name
+report= Report
+completed= completed
+no_process_running= No process running
+aggregating_data= Aggregating data
+creating_report_datasource= Creating report datasource
+process_done= Process done
+details= Details
+generate_datasource_and_view_report= Generate datasource and view report
+view_report_based_on_existing_datasource= View report based on existing datasource
+remove_report= Remove report
+data_completeness= Data Completeness
+view_data_completeness= View data completeness
+submit= Submit
+generate_pdf= Generate PDF
+data_completeness_report= Data Completeness Report
+district_health_information_software= District Health Information Software
+edit_report= Edit report
+processing= Processing
+report_configuration= Report Configuration
+set_configuration= Please set the configuration in order for the report module to work properly
+home_explanation= Home refers to the absolute path to the BIRT viewer web application on the server
+directory_explanation= Directory refers to the part of the URL coming after the server part pointing to the BIRT viewer web application
+dataset= Data Set
+actual= Actual
+target= Target
+percent= Percent
+organisation_unit= Organisation unit
+select_dataset_all= Select dataset / View all
+on_time= On time
+data_completeness_configuration= Data Completeness Configuration
+offset_days= Offset days
+weekly= Weekly
+monthly= Monthly
+quarterly= Quarterly
+six_monthly= Six-Monthly
+yearly= Yearly
+two_yearly= Two-Yearly
+generate_workbook= Generate Workbook
+importing_report_tables= Importing report tables
+completeness_configuration_explanation= Number of days refers to the maximum number of days after the end of the reporting month before the data must be submitted
+omit_report_table_explanation= If selecting no report table, the user is responsible for providing the data source table
+reporting_deadline= Reporting deadline
+nr_of_days= Number of days
+select_report_table_none= Select report table / none
+dataset_completeness= Dataset Completeness
+export_dataset_completeness= Export dataset completeness
+available_datasets= Available data sets
+selected_datasets= Selected data sets
+report_parameters= Report parameters
+parent_organisation_unit= Parent organisation unit
+available_dataelements= Available data elements
+select_dataelementgroup_all= Select data element group / View all
+select_category_combo= Select category combo
+selected_dataelements= Selected data elements
+create_indicator_report_table= Create indicator report table
+create_dataelement_report_table= Create data element report table
+dataelements= Data elements
+datasets= Data sets
+parent_organisationunit= Parent organisation unit
+report_table_parameters= Report table parameters
+so_far_this_year= So far this year
+so_far_this_financial_year= So far this financial year
+individual_months_this_year= Individual months this year
+individual_quarters_this_year= Individual quarters this year
+selected_report_tables= Selected report tables
+available_report_tables= Available report tables
+ok= OK
+back= Back
+add_new= Add New
+add_indicator_reporttable= Add Indicator Report Table
+add_dataelement_reporttable= Add Dataelement Report Table
+add_dataelement_category_reporttable= Add Dataelement Category Report Table
+add_dataset_reporttable= Add Dataset Report Table
+preview= Preview
+generate= Generate
+print= Print
+process_completed= Process completed
+please_wait= Please wait
+view= View
+chart= Chart
+create_chart= Create chart
+chart_dimension= Chart dimension
+add_period_chart= Add period chart
+add_organisation_unit_chart= Add organisation unit chart
+create_indicator_by_period_chart= Create indicator by period chart
+create_indicator_by_organisation_unit_chart= Create indicator by organisation unit chart
+dimension= Dimension
+generate_datasource_and_view_chart= Generate datasource and view chart
+view_chart_based_on_existing_datasource= View chart based on existing datasource
+category_option_combos= Category Option Combos
+hide_legend= Hide legend
+vertical_category_labels= Vertical category labels
+horizontal_plot_orientation= Horizontal plot orientation
+chart_type= Chart type
+bar_chart= Bar chart
+line_chart= Line chart
+chart_size= Chart size
+normal= Normal
+wide= Wide
+tall= Tall
+title= Title
+value_y_available_indicators= Value (Y) - Available indicators
+value_y_selected_indicators= Value (Y) - Selected indicators
+category_x_available_organisationunits= Category (X) - Available organisation units
+category_x_selected_organisationunits= Category (X) - Selected organisation units
+category_x_available_periods= Category (X) - Available periods
+category_x_selected_periods= Category (X) - Selected periods
+filter_available_organisationunits= Filter - Available organisation units
+filter_available_periods= Filter - Available periods
+pivot_table= Pivot Table
+indicator_group= Indicator group
+start_date= Start date
+end_date= End date
+period_type= Period type
+organisation_unit_level= Organisation unit level
+select_period_type= Select period type
+select_level= Select level
+org_units= Org units
+get_data= Get data
+pivot= Pivot
+data= Data
+include_regression_line= Include regression line
+include_regression= Include regression
+select = Select
+criteria = Criteria
+this_indicator_and_periods = This indicator and periods
+this_indicator_and_orgunits = This indicator and orgunits
+all_indicator_and_periods = All indicators and periods
+all_indicator_and_orgunits = All indicators and orgunits
+generating_report = Generating report
+use_data_for = Use data for
+selected_unit_only= selected unit only
+add_to_dashboard = Add to dashboard
+confirm_add_to_dashboard = Are you sure want to add this report to the dashboard?
+select_organisation_unit_level = Select organisation unit level
+static_report = Static Report
+specify_url = Please specify a URL
+view_report = View report
+create_new_static_report = Create new static report
+external_url = External URL
+upload_file = Upload file
+file = File
+url = URL
+type = Type
+organisationunit_group_set_list=Organization Unit Group Set
+periods=Periods
+reports=Reports
+yojana_reports_analyser=Yojana Reports Analyser
+organization_unt_groupset_reports_analyser=Organization Unit Group Set Reports Analyser
+ranking_report_form=Ranking Reports Analyser
+select_oug_Unit = Select Organization Unit
+select_period_id = Select Period
+select_dataset =   Select data Set
+add_report = Add Report
+report_details = Report Details
+filter_by_name = Filter By Name
+define_associations = Define Associations
+define_report_associations = Define Report Associations
+select_all_at_level = Select All At Level
+unselect_all_at_level = Unselect All At Level
+confirm_delete_report = Are you sure you want to Remove Report?
+select_all_at_group = Select All At Group
+unselect_all_at_group = Unselect All At Group
+reportmodel = Report Model
+frequency = Frequency
+excelname = Excel Name
+xmlname = Xml Name
+reporttype = Report Type
+hour = Hour
+minute = Minute
+idsp_ra = IDSP Reports Analyser
+back = Back
+select_orgUnitGroup = Select OrgUnit Group
+orgunitgroup = OrgUnit Group
+md_report_ra = MD Report Analyser
+available_indicatorList = Available Indicator List
+selected_IndicatorList = Selected Indicator List
+patient_info = Patient Information
+tracking_report = Tracking Reports
+report_analyser = Report Analyser
+patient_management = Patient Management
+search_by_name_id = Search by Name or ID
+search = Search
+specify_search_criteria = Please specify Name/ID
+search_patients_by_attributes = Search patient by Name/Identifier
+total_result = Total number of results
+search_result_matching_the_search_criteria = Result matches the search criteria
+full_name = Full Name
+gender = Gender
+date_of_birth = Date of Birth
+age = Age
+hierachy_orgunit = Hierarchy Organisation Unit
+enrolled_in_program = Enrolled in Programs
+show_details = Show details
+patient_details = Patient Details
+dob_type = DOB Type
+blood_group = Blood group
+none = None
+identifiers = Identifiers
+patient_system_id = System generated ID
+attributes = Attributes
+no_xls_xml = There is no xml and xls template for selected program
+in_selected_orgU = In Selected Organisation Unit
+available_delist = Available dataelements
+selected_delist = Selected dataelements
+generate_globalXML = Generate Global Config XML
+message = This may take a few seconds
+generate = Generate
+download = Download New RA-Folder
+selected_delist = Selected dataelements
+discharge = Discharge
+followup = Followup
+output_type=Output Type
+report_date=Report Date
\ No newline at end of file

=== added file 'local/in/dhis-web-birtreports/src/main/resources/struts.xml'
--- local/in/dhis-web-birtreports/src/main/resources/struts.xml	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/resources/struts.xml	2014-11-13 07:47:22 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts PUBLIC
+"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+"http://struts.apache.org/dtds/struts-2.0.dtd";>
+<struts>
+    
+    <!-- use the DHIS web portal default -->
+    <include file="dhis-web-commons.xml"/>
+
+    <package name="dhis-web-birtreports" extends="dhis-web-commons" namespace="/dhis-web-birtreports">
+        
+        <action name="index"
+            class="org.hisp.dhis.birtreports.action.ReportsHomePageAction">
+            <result name="success" type="velocity">/main.vm</result>
+            <param name="page">/dhis-web-birtreports/selectReport.vm</param>
+            <param name="menu">/dhis-web-birtreports/menuWithTree.vm</param>
+            <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js</param>
+            <interceptor-ref name="organisationUnitTreeStack"/>
+        </action>
+		
+    </package>
+</struts>

=== added directory 'local/in/dhis-web-birtreports/src/main/webapp'
=== added directory 'local/in/dhis-web-birtreports/src/main/webapp/WEB-INF'
=== added file 'local/in/dhis-web-birtreports/src/main/webapp/WEB-INF/web.xml'
--- local/in/dhis-web-birtreports/src/main/webapp/WEB-INF/web.xml	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/webapp/WEB-INF/web.xml	2014-11-13 07:47:22 +0000
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+  "http://java.sun.com/dtd/web-app_2_3.dtd";>
+<web-app>
+  <display-name>DHIS Birt Reports Engine</display-name>
+  
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>classpath*:/META-INF/dhis/beans.xml</param-value>
+  </context-param>
+  <context-param>
+    <param-name>automaticAccessType</param-name>
+    <param-value>ghostAdmin</param-value>
+  </context-param>
+  
+  <filter>
+    <filter-name>RedirectFilter</filter-name>
+    <filter-class>org.hisp.dhis.servlet.filter.HttpRedirectFilter</filter-class>
+    <init-param>
+      <param-name>redirectPath</param-name>
+      <param-value>dhis-web-birtreports/index.action</param-value>
+    </init-param>
+  </filter>
+  <filter>
+    <filter-name>OpenSessionInViewFilter</filter-name>
+    <filter-class>org.springframework.orm.hibernate4.support.OpenSessionInViewFilter</filter-class>
+  </filter>
+  <filter>
+    <filter-name>springSecurityFilterChain</filter-name>
+    <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+  </filter>
+  <filter>
+    <filter-name>Struts</filter-name>
+    <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+  </filter>
+  
+  <filter-mapping>
+    <filter-name>RedirectFilter</filter-name>
+    <url-pattern>/</url-pattern>
+  </filter-mapping>
+  <filter-mapping>
+    <filter-name>OpenSessionInViewFilter</filter-name>
+    <url-pattern>*.action</url-pattern>
+  </filter-mapping>
+  <filter-mapping>
+    <filter-name>springSecurityFilterChain</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+  <filter-mapping>
+    <filter-name>Struts</filter-name>
+    <url-pattern>*.action</url-pattern>
+  </filter-mapping>
+  <listener>
+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+  </listener>
+  <listener>
+    <listener-class>org.hisp.dhis.system.startup.StartupListener</listener-class>
+  </listener>
+</web-app>

=== added directory 'local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports'
=== added directory 'local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css'
=== added file 'local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/StylesForTags.css'
--- local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/StylesForTags.css	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/StylesForTags.css	2014-11-13 07:47:22 +0000
@@ -0,0 +1,56 @@
+.Heading {
+    font-family: times,arial, georgia, tahoma;
+    font-size: 35px;
+    font-weight: bold;    
+    white-space: nowrap;
+    cursor: default;    
+}
+
+.Normal {
+    font-family: arial, georgia, tahoma;
+    font-size: 10px;    
+    white-space: nowrap;
+    cursor: default; 
+    text-align: center;       
+}
+
+.NormalB {
+    font-family: arial, georgia, tahoma;
+    font-size: 13px;
+    font-weight: bold;
+    white-space: nowrap;
+    cursor: default;    
+}
+
+.TableDataCellStyles {
+    font-family: arial, georgia, tahoma;
+    font-size: 10px;    
+    white-space: nowrap;
+    cursor: default; 
+    text-align: center;
+    border:1px dotted #C0C0C0;
+}
+
+.TableHeadingCellStyles {
+    font-family: arial, georgia, tahoma;
+    font-size: 11px;   
+    white-space: nowrap;
+    cursor: default;     
+}
+
+.DefaultFontStyles {
+    font-family: arial, georgia, tahoma;
+    font-size: 13px;
+    font-weight: bold;   
+    white-space: nowrap;
+    cursor: default;         
+}
+
+.DefaultFontStylesNoBold {
+    font-family: arial, georgia, tahoma;
+    font-size: 13px;    
+    white-space: nowrap;
+    cursor: default;         
+}
+
+

=== added file 'local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/document.js'
--- local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/document.js	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/document.js	2014-11-13 07:47:22 +0000
@@ -0,0 +1,75 @@
+
+function saveDocument()
+{
+    var name = document.getElementById( "name" );
+    
+    /* var url = "validateDocument.action?name=" + name;
+    
+    var request = new Request();
+    request.setResponseTypeXML( 'message' );
+    request.setCallbackSuccess( saveDocumentReceived );
+    request.send( url ); */
+	
+	$.post("validateDocument.action",
+		{
+			name : name
+		},
+		function (data)
+		{
+			saveDocumentReceived(data);
+		},'xml');
+}
+
+function saveDocumentReceived( messageElement )
+{
+    var type = messageElement.getAttribute( 'type' );
+    var message = messageElement.firstChild.nodeValue;
+    
+    if ( type == "input" )
+    {
+        setMessage( message );
+        
+        return false;
+    }
+    else if ( type == "success" )
+    {
+        document.getElementById( "documentForm" ).submit();
+    }
+}
+
+function removeDocument( id )
+{
+    var dialog = window.confirm( i18n_confirm_remove_report );
+    
+    if ( dialog )
+    {
+        window.location.href = "removeDocument.action?id=" + id;
+    }
+}
+
+function addDocumentToDashboard( id )
+{
+    var dialog = window.confirm( i18n_confirm_add_to_dashboard );
+    
+    if ( dialog )
+    {
+        var request = new Request(); 
+        request.send( "addDocumentToDashboard.action?id=" + id );
+    }
+}
+
+function toggleExternal()
+{
+    var external = getListValue( "external" );
+    
+    if ( external == "true" )
+    {
+        document.getElementById( "fileDiv" ).style.display = "none";
+        document.getElementById( "urlDiv" ).style.display = "block";
+    }
+    else
+    {
+        document.getElementById( "fileDiv" ).style.display = "block";
+        document.getElementById( "urlDiv" ).style.display = "none";
+    }
+}

=== added file 'local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/report.js'
--- local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/report.js	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/report.js	2014-11-13 07:47:22 +0000
@@ -0,0 +1,128 @@
+
+var tempUrl = null;
+
+function runAndViewReport( reportId, reportUrl )
+{
+   /* var url = "createTable.action?id=" + reportId + "&mode=report";
+    
+    if ( document.getElementById( "reportingPeriod" ) != null )
+    {
+        url += "&reportingPeriod=" + getListValue( "reportingPeriod" );
+    }
+    
+    if ( document.getElementById( "parentOrganisationUnitId" ) != null )
+    {
+        url += "&parentOrganisationUnitId=" + getListValue( "parentOrganisationUnitId" );
+    }
+    
+    if ( document.getElementById( "organisationUnitId" ) != null )
+    {
+        url += "&organisationUnitId=" + getListValue( "organisationUnitId" );
+    }
+    
+	tempUrl = reportUrl;
+    
+    var request = new Request();
+    request.setCallbackSuccess( runAndViewReportReceived );    
+    request.send( url ); */
+	
+	$.post("createTable.action",
+		{
+			id : reportId,
+			mode : report,
+			reportingPeriod : getListValue( "reportingPeriod" ),
+			parentOrganisationUnitId : getListValue( "parentOrganisationUnitId" ),
+			organisationUnitId : getListValue( "organisationUnitId" )
+		},
+		function (data)
+		{
+			runAndViewReportReceived(data);
+		},'xml');
+}
+
+function runAndViewReportReceived( messageElement )
+{   
+    getReportStatus();
+}
+
+function getReportStatus()
+{   
+    /* var url = "getStatus.action";
+    
+    var request = new Request();
+    request.setResponseTypeXML( "status" );
+    request.setCallbackSuccess( reportStatusReceived );    
+    request.send( url ); */
+	
+	$.post("getStatus.action",
+		{
+		},
+		function (data)
+		{
+			reportStatusReceived(data);
+		},'xml');
+}
+
+function reportStatusReceived( xmlObject )
+{
+    var statusMessage = getElementValue( xmlObject, "statusMessage" );
+    var finished = getElementValue( xmlObject, "finished" );
+    
+    if ( finished == "true" )
+    {
+        setMessage( i18n_process_completed );
+        
+        viewReport( tempUrl );        
+    }
+    else if ( statusMessage == null )
+    {
+        setMessage( i18n_please_wait );
+        
+        waitAndGetReportStatus( 2000 );
+    }
+    else
+    {
+        setMessage( i18n_please_wait + ". " + statusMessage + "..."  );
+        
+        waitAndGetReportStatus( 2000 );
+    }
+}
+
+function waitAndGetReportStatus( millis )
+{
+    setTimeout( "getReportStatus();", millis );
+}
+
+function viewReport( url )
+{
+	var dialog = window.open( url, "_blank", "directories=no, height=800, width=800, \
+		location=no, menubar=no, status=no, toolbar=no, resizable=yes, scrollbars=yes" );
+}
+
+function addReport()
+{
+    selectAllById( "selectedReportTables" );
+    
+    document.getElementById( "reportForm" ).submit();
+}
+
+function removeReport( id )
+{
+	var dialog = window.confirm( i18n_confirm_remove_report );
+	
+	if ( dialog )
+	{
+		window.location.href = "removeReport.action?id=" + id;
+	}
+}
+
+function addToDashboard( id )
+{
+    var dialog = window.confirm( i18n_confirm_add_to_dashboard );
+    
+    if ( dialog )
+    {
+        var request = new Request(); 
+        request.send( "addReportToDashboard.action?id=" + id );
+    }
+}

=== added file 'local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/reportConfiguration.js'
--- local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/reportConfiguration.js	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/reportConfiguration.js	2014-11-13 07:47:22 +0000
@@ -0,0 +1,22 @@
+
+function homeChanged()
+{
+	var homeField = document.getElementById( "home" );
+	var directoryField = document.getElementById( "directory" );
+	
+	var homeValue = homeField.value;
+	
+	var index = homeValue.lastIndexOf( "/" );
+	
+	if ( index == -1 )
+	{
+		index = homeValue.lastIndexOf( "\\" );
+	}
+	
+	if ( index != -1 )
+	{
+	   var defaultDirectory = homeValue.substring( index + 1 );
+	   
+	   directoryField.value = defaultDirectory;
+	}
+}

=== added file 'local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/reportParams.js'
--- local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/reportParams.js	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/reportParams.js	2014-11-13 07:47:22 +0000
@@ -0,0 +1,96 @@
+
+// -----------------------------------------------------------------------------
+// Report params
+// -----------------------------------------------------------------------------
+
+function getOrganisationUnitsParent()
+{
+    var organisationUnitLevel = getListValue( "organisationUnitLevelParent" );
+    
+    if ( organisationUnitLevel != null )
+    {
+       /*  var url = "../dhis-web-commons-ajax/getOrganisationUnits.action?level=" + organisationUnitLevel;
+        
+        var request = new Request();
+        request.setResponseTypeXML( 'organisationUnit' );
+        request.setCallbackSuccess( getOrganisationUnitsParentReceived );
+        request.send( url );   */
+
+		$.post("../dhis-web-commons-ajax/getOrganisationUnits.action",
+			{
+				level : organisationUnitLevel
+			},
+			function (data)
+			{
+				getOrganisationUnitsParentReceived(data);
+			},'xml');		
+    }
+}
+
+function getOrganisationUnitsParentReceived( xmlObject )
+{   
+    var availableOrganisationUnits = document.getElementById( "parentOrganisationUnitId" );
+    
+    clearList( availableOrganisationUnits );
+    
+    var organisationUnits = xmlObject.getElementsByTagName( "organisationUnit" );
+    
+    for ( var i = 0; i < organisationUnits.length; i++ )
+    {
+        var id = organisationUnits[ i ].getElementsByTagName( "id" )[0].firstChild.nodeValue;
+        var organisationUnitName = organisationUnits[ i ].getElementsByTagName( "name" )[0].firstChild.nodeValue;
+        
+        /* var option = document.createElement( "option" );
+        option.value = id;
+        option.text = organisationUnitName;
+        availableOrganisationUnits.add( option, null ); */
+		
+		$("#parentOrganisationUnitId").append("<option value='"+ id +"'>" + organisationUnitName + "</option>");
+    }
+}
+
+function getOrganisationUnitsSingle()
+{
+    var organisationUnitLevel = getListValue( "organisationUnitLevelSingle" );
+    
+    if ( organisationUnitLevel != null )
+    {
+        /* var url = "../dhis-web-commons-ajax/getOrganisationUnits.action?level=" + organisationUnitLevel;
+        
+        var request = new Request();
+        request.setResponseTypeXML( 'organisationUnit' );
+        request.setCallbackSuccess( getOrganisationUnitsSingleReceived );
+        request.send( url );        */
+		
+		$.post("../dhis-web-commons-ajax/getOrganisationUnits.action",
+			{
+				level : organisationUnitLevel
+			},
+			function (data)
+			{
+				getOrganisationUnitsSingleReceived(data);
+			},'xml');	
+    }
+}
+
+function getOrganisationUnitsSingleReceived( xmlObject )
+{   
+    var availableOrganisationUnits = document.getElementById( "organisationUnitId" );
+    
+    clearList( availableOrganisationUnits );
+    
+    var organisationUnits = xmlObject.getElementsByTagName( "organisationUnit" );
+    
+    for ( var i = 0; i < organisationUnits.length; i++ )
+    {
+        var id = organisationUnits[ i ].getElementsByTagName( "id" )[0].firstChild.nodeValue;
+        var organisationUnitName = organisationUnits[ i ].getElementsByTagName( "name" )[0].firstChild.nodeValue;
+        
+        /* var option = document.createElement( "option" );
+        option.value = id;
+        option.text = organisationUnitName;
+        availableOrganisationUnits.add( option, null ); */
+		
+		$("#organisationUnitId").append("<option value='"+ id +"'>" + organisationUnitName + "</option>");
+    }
+}

=== added file 'local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/style.css'
--- local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/style.css	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/style.css	2014-11-13 07:47:22 +0000
@@ -0,0 +1,244 @@
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline;
+}
+
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+  display: block;
+}
+
+body {
+  line-height: 1;
+}
+
+ol, ul {
+  list-style: none;
+}
+
+blockquote, q {
+  quotes: none;
+}
+
+blockquote:before, blockquote:after,
+q:before, q:after {
+  content: '';
+  content: none;
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+.about {
+  margin: 70px auto 40px;
+  padding: 8px;
+  width: 260px;
+  font: 10px/18px 'Lucida Grande', Arial, sans-serif;
+  color: #bbb;
+  text-align: center;
+  text-shadow: 0 -1px rgba(0, 0, 0, 0.3);
+  background: #383838;
+  background: rgba(34, 34, 34, 0.8);
+  border-radius: 4px;
+  background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.3));
+  background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.3));
+  background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.3));
+  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.3));
+  -webkit-box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.2), 0 0 6px rgba(0, 0, 0, 0.4);
+  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.2), 0 0 6px rgba(0, 0, 0, 0.4);
+}
+.about a {
+  color: #eee;
+  text-decoration: none;
+  border-radius: 2px;
+  -webkit-transition: background 0.1s;
+  -moz-transition: background 0.1s;
+  -o-transition: background 0.1s;
+  transition: background 0.1s;
+}
+.about a:hover {
+  text-decoration: none;
+  background: #555;
+  background: rgba(255, 255, 255, 0.15);
+}
+
+.about-links {
+  height: 30px;
+}
+.about-links > a {
+  float: left;
+  width: 50%;
+  line-height: 30px;
+  font-size: 12px;
+}
+
+.about-author {
+  margin-top: 5px;
+}
+.about-author > a {
+  padding: 1px 3px;
+  margin: 0 -1px;
+}
+
+/*
+ * Copyright (c) 2012-2013 Thibaut Courouble
+ * http://www.cssflow.com
+ *
+ * Licensed under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ */
+body {
+  font: 13px/20px 'Lucida Grande', Tahoma, Verdana, sans-serif;
+  color: #404040;
+  background: #93cedf;
+}
+
+.container {
+  margin: 50px auto;
+  width: 500px;
+  text-align: center;
+}
+.container > .dropdown {
+  margin: 0 20px;
+  vertical-align: top;
+}
+
+.dropdown {
+  display: inline-block;
+  position: relative;
+  overflow: hidden;
+  height: 28px;
+  width: 150px;
+  background: #f2f2f2;
+  border: 1px solid;
+  border-color: white #f7f7f7 #f5f5f5;
+  border-radius: 3px;
+  background-image: -webkit-linear-gradient(top, transparent, rgba(0, 0, 0, 0.06));
+  background-image: -moz-linear-gradient(top, transparent, rgba(0, 0, 0, 0.06));
+  background-image: -o-linear-gradient(top, transparent, rgba(0, 0, 0, 0.06));
+  background-image: linear-gradient(to bottom, transparent, rgba(0, 0, 0, 0.06));
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.08);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.08);
+}
+.dropdown:before, .dropdown:after {
+  content: '';
+  position: absolute;
+  z-index: 2;
+  top: 9px;
+  right: 10px;
+  width: 0;
+  height: 0;
+  border: 4px dashed;
+  border-color: #888 transparent;
+  pointer-events: none;
+}
+.dropdown:before {
+  border-bottom-style: solid;
+  border-top: none;
+}
+.dropdown:after {
+  margin-top: 7px;
+  border-top-style: solid;
+  border-bottom: none;
+}
+
+.dropdown-select {
+  position: relative;
+  width: 130%;
+  margin: 0;
+  padding: 6px 8px 6px 10px;
+  height: 28px;
+  line-height: 14px;
+  font-size: 12px;
+  color: #62717a;
+  text-shadow: 0 1px white;
+  /* Fallback for IE 8 */
+  background: #f2f2f2;
+  /* "transparent" doesn't work with Opera */
+  background: rgba(0, 0, 0, 0) !important;
+  border: 0;
+  border-radius: 0;
+  -webkit-appearance: none;
+}
+.dropdown-select:focus {
+  z-index: 3;
+  width: 100%;
+  color: #394349;
+  outline: 2px solid #49aff2;
+  outline: 2px solid -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+.dropdown-select > option {
+  margin: 3px;
+  padding: 6px 8px;
+  text-shadow: none;
+  background: #f2f2f2;
+  border-radius: 3px;
+  cursor: pointer;
+}
+
+/* Fix for IE 8 putting the arrows behind the select element. */
+.lt-ie9 .dropdown {
+  z-index: 1;
+}
+.lt-ie9 .dropdown-select {
+  z-index: -1;
+}
+.lt-ie9 .dropdown-select:focus {
+  z-index: 3;
+}
+
+/* Dirty fix for Firefox adding padding where it shouldn't. */
+@-moz-document url-prefix() {
+  .dropdown-select {
+    padding-left: 6px;
+  }
+}
+
+.dropdown-dark {
+  background: #444;
+  border-color: #111 #0a0a0a black;
+  background-image: -webkit-linear-gradient(top, transparent, rgba(0, 0, 0, 0.4));
+  background-image: -moz-linear-gradient(top, transparent, rgba(0, 0, 0, 0.4));
+  background-image: -o-linear-gradient(top, transparent, rgba(0, 0, 0, 0.4));
+  background-image: linear-gradient(to bottom, transparent, rgba(0, 0, 0, 0.4));
+  -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px rgba(0, 0, 0, 0.2);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px rgba(0, 0, 0, 0.2);
+}
+.dropdown-dark:before {
+  border-bottom-color: #aaa;
+}
+.dropdown-dark:after {
+  border-top-color: #aaa;
+}
+.dropdown-dark .dropdown-select {
+  color: #aaa;
+  text-shadow: 0 1px black;
+  /* Fallback for IE 8 */
+  background: #444;
+}
+.dropdown-dark .dropdown-select:focus {
+  color: #ccc;
+}
+.dropdown-dark .dropdown-select > option {
+  background: #444;
+  text-shadow: 0 1px rgba(0, 0, 0, 0.4);
+}

=== added file 'local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/stylesForReports.css'
--- local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/stylesForReports.css	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/stylesForReports.css	2014-11-13 07:47:22 +0000
@@ -0,0 +1,74 @@
+
+
+.reportheading {
+    font-family: arial, georgia, tahoma;
+    font-size: 17px;
+    font-weight: bold;    
+    white-space: nowrap;
+    cursor: default;    
+}
+
+.reportheadingwithunderline {
+    font-family: arial, georgia, tahoma;
+    font-size: 13px;
+    font-weight: bold;    
+    white-space: nowrap;
+    cursor: default;    
+}
+
+.reportsubheading {
+    font-family: arial, georgia, tahoma;
+    font-size: 15px;
+    font-weight: bold;    
+    white-space: nowrap;
+    cursor: default;    
+}
+
+.tableheading1 {
+    font-family: arial, georgia, tahoma;
+    font-size: 13px;
+    font-weight: bold;    
+    cursor: default;    
+}
+
+.tabledata1 {
+    font-family: arial, georgia, tahoma;
+    font-size: 12px;
+    cursor: default;    
+}
+
+.tableheading2 {
+    font-family: arial, georgia, tahoma;
+    font-size: 10px;
+    font-weight: bold;    
+    cursor: default;    
+}
+
+.tabledata2 {
+    font-family: arial, georgia, tahoma;
+    font-size: 10px;    
+    cursor: default;    
+}
+
+#dropmenudiv{
+            position:absolute;
+            border:1px solid black;
+            border-bottom-width: 0;
+            font:normal 12px Verdana;
+            line-height:18px;
+            z-index:100;
+         }
+
+        #dropmenudiv a{
+            width: 100%;
+            display: block;
+            text-indent: 3px;
+            border-bottom: 1px solid black;
+            padding: 1px 0;
+            text-decoration: none;
+            font-weight: bold;
+        } 
+
+       #dropmenudiv a:hover{ /*hover background color*/
+            background-color: yellow;
+       }

=== added directory 'local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/images'
=== added file 'local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/images/goback.png'
Binary files local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/images/goback.png	1970-01-01 00:00:00 +0000 and local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/images/goback.png	2014-11-13 07:47:22 +0000 differ
=== added directory 'local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/javascript'
=== added file 'local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/menu.vm'
--- local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/menu.vm	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/menu.vm	2014-11-13 07:47:22 +0000
@@ -0,0 +1,1 @@
+<h2>Birt Reports Engine</h2>
\ No newline at end of file

=== added file 'local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/menuWithTree.vm'
--- local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/menuWithTree.vm	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/menuWithTree.vm	2014-11-13 07:47:22 +0000
@@ -0,0 +1,17 @@
+
+<a href="index.action"><h2>Birt Reports Engine</h2></a>
+
+<br/>
+
+#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
+
+<script type="text/javascript">
+
+    function orgUnitHasBeenSelected( orgUnitIds )
+    {
+
+    }
+
+    selection.setListenerFunction( orgUnitHasBeenSelected );
+
+</script>

=== added file 'local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/selectReport.vm'
--- local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/selectReport.vm	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/selectReport.vm	2014-11-13 07:47:22 +0000
@@ -0,0 +1,195 @@
+<html>
+<head>
+    <style type="text/css">
+            /* The CSS */
+        .gradientBoxesWithOuterShadows {
+            height: 200px;
+            width: 400px;
+            padding: 20px;
+            background-color: white;
+
+            /* outer shadows  (note the rgba is red, green, blue, alpha) */
+            -webkit-box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.4);
+            -moz-box-shadow: 0px 1px 6px rgba(23, 69, 88, .5);
+
+            /* rounded corners */
+            -webkit-border-radius: 12px;
+            -moz-border-radius: 7px;
+            border-radius: 7px;
+
+            /* gradients */
+            background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #0bd0ff), color-stop(15%, #0cbbff), color-stop(100%, #0e99ff));
+            background: -moz-linear-gradient(top, #0bd0ff 0%, #0cbbff 55%, #0e99ff 130%);
+        }
+
+        h3 {
+            font: "Lucida Grande";
+        }
+
+        select {
+            padding: 3px;
+            margin: 0;
+            -webkit-border-radius: 4px;
+            -moz-border-radius: 4px;
+            border-radius: 4px;
+            -webkit-box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset;
+            -moz-box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset;
+            box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset;
+            background: #f8f8f8;
+            color: #888;
+            border: none;
+            outline: none;
+            display: inline-block;
+            -webkit-appearance: none;
+            -moz-appearance: none;
+            appearance: none;
+            cursor: pointer;
+        }
+
+        input {
+            padding: 3px;
+            margin: 0;
+            -webkit-border-radius: 4px;
+            -moz-border-radius: 4px;
+            border-radius: 4px;
+            -webkit-box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset;
+            -moz-box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset;
+            box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset;
+            background: #f8f8f8;
+            color: #888;
+            border: none;
+            outline: none;
+            display: inline-block;
+            -webkit-appearance: none;
+            -moz-appearance: none;
+            appearance: none;
+        }
+
+            /* Targetting Webkit browsers only. FF will show the dropdown arrow with so much padding. */
+        @media screen and (-webkit-min-device-pixel-ratio:0) {
+            select {
+                padding-right: 18px
+            }
+        }
+
+        label {
+            position: relative
+        }
+
+        label:after {
+            content: '<>';
+            font: 11px "Consolas", monospace;
+            color: #aaa;
+            -webkit-transform: rotate(90deg);
+            -moz-transform: rotate(90deg);
+            -ms-transform: rotate(90deg);
+            transform: rotate(90deg);
+            right: 8px;
+            top: 2px;
+            padding: 0 0 2px;
+            border-bottom: 1px solid #ddd;
+            position: absolute;
+            pointer-events: none;
+        }
+
+        label:before {
+            content: '';
+            right: 6px;
+            top: 0px;
+            width: 20px;
+            height: 20px;
+            background: #f8f8f8;
+            position: absolute;
+            pointer-events: none;
+            display: block;
+        }
+    </style>
+    <title>DHIS Birt Engine</title>
+    <!--<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3/jquery.min.js";></script>-->
+    <script type="text/javascript" defer="defer">
+        function cascadeSelect(parent, child) {
+            var childOptions = child.find('option:not(.static)');
+            child.data('options', childOptions);
+
+            parent.change(function () {
+                childOptions.remove();
+                child
+                        .append(child.data('options').filter('.sub_' + this.value))
+                        .change();
+            })
+
+            childOptions.not('.static, .sub_' + parent.val()).remove();
+
+        }
+
+        $(function () {
+            cascadeForm = $('.cascadeTest');
+            orgSelect = cascadeForm.find('.orgSelect');
+            terrSelect = cascadeForm.find('.terrSelect');
+
+            cascadeSelect(orgSelect, terrSelect);
+        });
+    </script>
+</head>
+<body>
+<h3>Birt Reports</h3>
+<br>
+<br>
+<center>
+    <div class=gradientBoxesWithOuterShadows>
+        <form action="#" class="cascadeTest">
+
+            <label>
+                Category
+                &nbsp;
+                <select id="typeSelect" name="orgSelect" class="orgSelect" style="width: 300px">
+                    <option value="default">--Select--</option>
+                    #foreach ( $reportTypes in $birtReportTypeObjectList)
+                        <option value="$reportTypes.reportTypeId">$reportTypes.reportTypeName</option>
+                    #end
+                </select>
+            </label>
+            </br>
+            </br>
+            <label>
+                &nbsp;
+                &nbsp;
+                Report
+                &nbsp;
+                <select id="reportSelect" name="terrSelect" class="terrSelect" style="width: 300px">
+                    <option value="sub_default">--Select--</option>
+                    #foreach ( $report in $birtReportOptionsList)
+                        <option value="$report.reportDesignFileName"
+                                class="$report.reportClass">$report.reportName</option>
+                    #end
+                </select>
+            </label>
+        </form>
+
+        <br>
+        <br>
+
+        <input type="button" onclick="getSelectedText('reportSelect');" value=Generate style="width:12em"/>
+    </div>
+</center>
+</body>
+<script>
+    function getSelectedText(elementId) {
+        var elt = document.getElementById(elementId);
+
+        if (elt.selectedIndex == -1)
+            return null;
+
+        alert(document.URL)
+        var currURL = document.URL;
+        var brkURL = currURL.split("dhis-web-birtreports");
+        var absURL = brkURL[0];
+
+        alert(absURL);
+
+        var url = absURL + 'birtviewer/frameset?__report=' + elt.options[elt.selectedIndex].value;
+        var windowName = 'Birt Viewer';
+        window.open(url, windowName, "height=800,width=800");
+    }
+</script>
+</html>
\ No newline at end of file