dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #06360
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2009: Added nbits reports
------------------------------------------------------------
revno: 2009
committer: Namrata
branch nick: trunk
timestamp: Sat 2010-06-19 15:17:35 +0530
message:
Added nbits reports
modified:
local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-reports-national/src/main/resources/struts.xml
local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menu.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
=== modified file 'local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml 2010-06-16 13:16:16 +0000
+++ local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml 2010-06-19 09:47:35 +0000
@@ -1556,63 +1556,68 @@
</bean>
<!-- NBITS : Portal Reports -->
-
- <bean id="org.hisp.dhis.reports.portal.action.PortalReportsFormAction"
- class="org.hisp.dhis.reports.portal.action.PortalReportsFormAction"
- scope="prototype">
- <property name="reportService">
- <ref bean="org.hisp.dhis.reports.util.ReportService"/>
- </property>
- <property name="periodService">
- <ref bean="org.hisp.dhis.period.PeriodService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.reports.portal.action.PortalReportsResultAction"
- class="org.hisp.dhis.reports.portal.action.PortalReportsResultAction"
- scope="prototype">
- <property name="statementManager" ref="statementManager"/>
- <property name="reportService">
- <ref bean="org.hisp.dhis.reports.util.ReportService"/>
- </property>
- <property name="organisationUnitService">
- <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
- </property>
- <property name="aggregationService">
- <ref bean="org.hisp.dhis.aggregation.AggregationService"/>
- </property>
- <property name="indicatorService">
- <ref bean="org.hisp.dhis.indicator.IndicatorService"/>
- </property>
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
- </property>
- <property name="dataElementCategoryOptionComboService">
- <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
- </property>
- <property name="periodService">
- <ref bean="org.hisp.dhis.period.PeriodService"/>
- </property>
- <property name="programService" ref="org.hisp.dhis.program.ProgramService"/>
- <property name="programInstanceService"
- ref="org.hisp.dhis.program.ProgramInstanceService"/>
- <property name="patientDataValueService"
- ref="org.hisp.dhis.patientdatavalue.PatientDataValueService"/>
- <property name="patientAttributeValueService"
- ref="org.hisp.dhis.patientattributevalue.PatientAttributeValueService"/>
- <property name="patientAttributeService"
- ref="org.hisp.dhis.patient.PatientAttributeService"/>
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService"/>
- <property name="patientIdentifierService"
- ref="org.hisp.dhis.patient.PatientIdentifierService"/>
- <property name="programStageInstanceService"
- ref="org.hisp.dhis.program.ProgramStageInstanceService"/>
- <property name="programStageService"
- ref="org.hisp.dhis.program.ProgramStageService"/>
- <property name="programStageDataElementService"
- ref="org.hisp.dhis.program.ProgramStageDataElementService"/>
- <property name="patientIdentifierTypeService"
- ref="org.hisp.dhis.patient.PatientIdentifierTypeService"/>
- </bean>
-
+
+ <bean
+ id="org.hisp.dhis.reports.portal.action.PortalReportsFormAction"
+ class="org.hisp.dhis.reports.portal.action.PortalReportsFormAction"
+ scope="prototype">
+ <property name="reportService">
+ <ref bean="org.hisp.dhis.reports.util.ReportService"/>
+ </property>
+ <property name="periodService">
+ <ref bean="org.hisp.dhis.period.PeriodService"/>
+ </property>
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.reports.portal.action.PortalReportsResultAction"
+ class="org.hisp.dhis.reports.portal.action.PortalReportsResultAction"
+ scope="prototype">
+ <property name="statementManager" ref="statementManager"/>
+ <property name="reportService">
+ <ref bean="org.hisp.dhis.reports.util.ReportService"/>
+ </property>
+ <property name="organisationUnitService">
+ <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+ </property>
+ <property name="aggregationService">
+ <ref bean="org.hisp.dhis.aggregation.AggregationService"/>
+ </property>
+ <property name="indicatorService">
+ <ref bean="org.hisp.dhis.indicator.IndicatorService"/>
+ </property>
+ <property name="dataElementService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
+ </property>
+ <property name="dataElementCategoryOptionComboService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
+ </property>
+ <property name="periodService">
+ <ref bean="org.hisp.dhis.period.PeriodService"/>
+ </property>
+ <property name="programService"
+ ref="org.hisp.dhis.program.ProgramService"/>
+ <property name="programInstanceService"
+ ref="org.hisp.dhis.program.ProgramInstanceService"/>
+ <property name="patientDataValueService"
+ ref="org.hisp.dhis.patientdatavalue.PatientDataValueService"/>
+ <property name="patientAttributeValueService"
+ ref="org.hisp.dhis.patientattributevalue.PatientAttributeValueService"/>
+ <property name="patientAttributeService"
+ ref="org.hisp.dhis.patient.PatientAttributeService"/>
+ <property name="patientService"
+ ref="org.hisp.dhis.patient.PatientService"/>
+ <property name="patientIdentifierService"
+ ref="org.hisp.dhis.patient.PatientIdentifierService"/>
+ <property name="programStageInstanceService"
+ ref="org.hisp.dhis.program.ProgramStageInstanceService"/>
+ <property name="programStageService"
+ ref="org.hisp.dhis.program.ProgramStageService"/>
+ <property name="programStageDataElementService"
+ ref="org.hisp.dhis.program.ProgramStageDataElementService" />
+ <property name="patientIdentifierTypeService"
+ ref="org.hisp.dhis.patient.PatientIdentifierTypeService" />
+ </bean>
+
+
</beans>
=== modified file 'local/in/dhis-web-reports-national/src/main/resources/struts.xml'
--- local/in/dhis-web-reports-national/src/main/resources/struts.xml 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-reports-national/src/main/resources/struts.xml 2010-06-19 09:47:35 +0000
@@ -56,7 +56,69 @@
<param name="bufferSize">1024</param>
</result>
</action>
-
+
+ <!-- ActivityPlan Reports -->
+ <action name="activePlanReportsAnalyser"
+ class="org.hisp.dhis.reports.activeplan.action.ActivePlanReportsFormAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-reports/activePlanReportsForm.vm</param>
+ <param name="menu">/dhis-web-reports/menuWithTreeForActivePlan.vm</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/reports.js,javascript/hashtable.js</param>
+ <param name="stylesheets">css/StylesForTags.css</param>
+ <interceptor-ref name="organisationUnitTreeStack"/>
+ </action>
+
+ <action name="generateActivePlanReport"
+ class="org.hisp.dhis.reports.activeplan.action.ActivePlanReportsResultAction">
+ <result name="success" type="stream">
+ <param name="contentType">application/vnd.ms-excel</param>
+ <param name="inputName">inputStream</param>
+ <param name="contentDisposition">filename="${fileName}"</param>
+ <param name="bufferSize">1024</param>
+ </result>
+ </action>
+
+ <action name="activePlanFeedbackReportsAnalyser"
+ class="org.hisp.dhis.reports.activeplan.action.ActivePlanFeedBackFormAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-reports/activePlanFeedBackForm.vm</param>
+ <param name="menu">/dhis-web-reports/menuWithTreeForActivePlan.vm</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/reports.js,javascript/hashtable.js</param>
+ <param name="stylesheets">css/StylesForTags.css</param>
+ <interceptor-ref name="organisationUnitTreeStack"/>
+ </action>
+
+ <action name="generateActivePlanFeedbackReport"
+ class="org.hisp.dhis.reports.activeplan.action.ActivePlanFeedBackResultAction">
+ <result name="success" type="stream">
+ <param name="contentType">application/vnd.ms-excel</param>
+ <param name="inputName">inputStream</param>
+ <param name="contentDisposition">filename="${fileName}"</param>
+ <param name="bufferSize">1024</param>
+ </result>
+ </action>
+
+ <!-- Portal Reports -->
+ <action name="portalReportsAnalyser"
+ class="org.hisp.dhis.reports.portal.action.PortalReportsFormAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-reports/portalReportForm.vm</param>
+ <param name="menu">/dhis-web-reports/menuWithTreeForPortalReport.vm</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/calendar/calendar.js,../dhis-web-commons/calendar/calendar-lang.js,../dhis-web-commons/calendar/calendar-setup.js,../dhis-web-commons/lists/lists.js,javascript/reports.js,javascript/hashtable.js</param>
+ <param name="stylesheets">css/StylesForTags.css</param>
+ <interceptor-ref name="organisationUnitTreeStack"/>
+ </action>
+
+ <action name="generatePortalReport"
+ class="org.hisp.dhis.reports.portal.action.PortalReportsResultAction">
+ <result name="success" type="stream">
+ <param name="contentType">application/vnd.ms-excel</param>
+ <param name="inputName">inputStream</param>
+ <param name="contentDisposition">filename="${fileName}"</param>
+ <param name="bufferSize">1024</param>
+ </result>
+ </action>
+
<!-- Auto Reports -->
<action name="autoReportAnalyser"
class="org.hisp.dhis.reports.auto.action.GenerateAutoReportAnalyserFormAction">
=== modified file 'local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menu.vm'
--- local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menu.vm 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menu.vm 2010-06-19 09:47:35 +0000
@@ -16,6 +16,10 @@
-->
<li><a href = "progressReportAnalyser.action">Periodwise Progress Reports</a></li>
<li><a href = "ouWiseProgressReportAnalyser.action">Orgunitwise Progress Reports</a></li>
+ <li><a href = "activePlanReportsAnalyser.action">NBITS Reports</a></li>
+ <li><a href = "portalReportsAnalyser.action">NBITS Portal Reports</a></li>
+
+
<!--
<li><a href = "advancedReportAnalyser.action">Advanced Reports</a></li>
<li><a href = "TwentyPointReportsAnalyser.action">Twenty Point Reports</a></li>
