← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2673: Bug Fixed in Dataanalyser

 

------------------------------------------------------------
revno: 2673
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2011-01-20 20:23:49 +0530
message:
  Bug Fixed in Dataanalyser
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
  local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml
  local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForSA.vm
  local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/surveyAnalysisFront.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 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2011-01-20 02:57:30 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2011-01-20 14:53:49 +0000
@@ -66,7 +66,7 @@
 dhis-web-dataentry-national = Linelisting Data Entry
 dhis-web-validationrule-local-in = Validation Analysis
 dhis-web-mapping = GIS
-dhis-web-survey = Survey 
+dhis-web-survey = Survey - Target
 dhis-web-excel-reporting = Excel Reports
 dhis-web-mobile = Mobiles
 dhis-web-maintenance-in = Configuration

=== modified file 'local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml	2011-01-17 06:56:53 +0000
+++ local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml	2011-01-20 14:53:49 +0000
@@ -834,7 +834,7 @@
 			<ref bean="org.hisp.dhis.user.UserStore"/>
 		</property>
 	    <property name="jdbcTemplate" ref="jdbcTemplate"/>
-		<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService"/>
+		<!--<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService"/>-->
 	</bean>
 	
 	<!-- DataStatus Orgnisationunit GroupSet Wise-->

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForSA.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForSA.vm	2010-12-29 07:47:36 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForSA.vm	2011-01-20 14:53:49 +0000
@@ -17,6 +17,8 @@
 
 function orgUnitHasBeenSelected( orgUnitIds )
 {    
+	//document.getElementById("ouIDTB"). value = orgUnitIds;
+	//alert( document.getElementById("ouIDTB"). value );
 	if(orgUnitIds == null || orgUnitIds == "" )
 	{
 		return;

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/surveyAnalysisFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/surveyAnalysisFront.vm	2010-12-23 07:23:23 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/surveyAnalysisFront.vm	2011-01-20 14:53:49 +0000
@@ -53,7 +53,7 @@
 								#end
 							</select>
 						</td>
-						<td class="NormalB">&nbsp;</td>             
+						<td class="NormalB">&nbsp;</td>         
 						<td class="NormalB">    
 							$i18n.getString( "ga_to" )<br>
 							<select id="eDateLB" name="eDateLB">
@@ -79,7 +79,7 @@
 					<tr>
 						<td class="NormalB">	
 							$i18n.getString( "aa_orgunit" ) : <br />
-                        	<input type="text" name="ouNameTB" id="ouNameTB" size="20">  
+                        	<input type="text" name="ouNameTB" id="ouNameTB" size="20" disabled>
 	                   	</td>
 	                   	<td class="NormalB">&nbsp;</td>
 	                    <td class="NormalB">