dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7930
committer: Samta <samta-bajpayee@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2012-08-18 06:34:21 +0100
message:
  Daily Food Situation Report
modified:
  local/in/dhis-web-reports-national/src/main/resources/org/hisp/dhis/reports/i18n_module.properties
  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/org/hisp/dhis/reports/i18n_module.properties'
--- local/in/dhis-web-reports-national/src/main/resources/org/hisp/dhis/reports/i18n_module.properties	2012-07-26 09:20:56 +0000
+++ local/in/dhis-web-reports-national/src/main/resources/org/hisp/dhis/reports/i18n_module.properties	2012-08-18 05:34:21 +0000
@@ -342,4 +342,6 @@
 download = Download New RA-Folder
 selected_delist = Selected dataelements
 discharge = Discharge
-followup = Followup
\ No newline at end of file
+followup = Followup
+output_type=Output Type
+report_date=Report Date
\ No newline at end of file

=== modified file 'local/in/dhis-web-reports-national/src/main/resources/struts.xml'
--- local/in/dhis-web-reports-national/src/main/resources/struts.xml	2012-07-26 09:20:56 +0000
+++ local/in/dhis-web-reports-national/src/main/resources/struts.xml	2012-08-18 05:34:21 +0000
@@ -1087,5 +1087,18 @@
             <param name="onExceptionReturn">plainTextError</param>
         </action>
 
+		<!-- Daily Food Situation Reports -->
+    <action name="dailyFoodReportAnalyser" class="org.hisp.dhis.reports.action.NoAction">
+        <result name="success" type="velocity">/main.vm</result>
+        <param name="menu">/dhis-web-reports/menu.vm</param>
+        <param name="page">/dhis-web-reports/dailyFoodSituationForm.vm</param>        
+    </action>
+		
+	<action name="generateDailyFoodReport" class="org.hisp.dhis.reports.dailyfood.action.GenerateDailyFoodReportAction">
+        <result name="success" type="velocity">/main.vm</result>
+        <param name="menu">/dhis-web-reports/menu.vm</param>
+        <param name="page">/dhis-web-reports/welcome.vm</param>        
+    </action>
+		
     </package>
 </struts>

=== 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	2012-07-24 12:38:31 +0000
+++ local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menu.vm	2012-08-18 05:34:21 +0000
@@ -13,6 +13,7 @@
 <ul>
 	<li>Report Analysis</li>
 	<ul>
+	    <li><a href = "dailyFoodReportAnalyser.action">Daily Food Situation Reports</a></li>
 		#if( $auth.hasAccess( "dhis-web-reports", "upwardReportAnalyser") )
 			<li><a href = "upwardReportAnalyser.action">GOI Reports</a></li>
 		#end