dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2144
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-09-17 13:52:36 +0700
message:
  Fix bug: In data quality module in data analysis sub module on clicking Follow-up-analysis exception occurred.
modified:
  dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/GetAnalysisAction.java
  dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/dataAnalysis.js


--
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-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/GetAnalysisAction.java'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/GetAnalysisAction.java	2010-07-04 23:55:46 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/GetAnalysisAction.java	2010-09-17 06:52:36 +0000
@@ -147,7 +147,7 @@
     {
         this.standardDeviation = standardDeviation;
     }
-
+    
     // -------------------------------------------------------------------------
     // Output
     // -------------------------------------------------------------------------
@@ -171,7 +171,7 @@
         
         if ( fromDate != null && toDate != null && dataSets != null && organisationUnit != null )
         {
-            periods = periodService.getPeriodsBetweenDates( format.parseDate( fromDate ), format.parseDate( toDate ) ); //TODO improve
+            periods = periodService.getPeriodsBetweenDates( format.parseDate( fromDate ), format.parseDate( toDate ) );
 
             for ( String id : dataSets )
             {
@@ -185,7 +185,7 @@
         }
         
         DataAnalysisService service = serviceProvider.provide( key );
-        
+
         if ( service != null ) // Follow-up analysis has no input params
         {      
             dataValues = service.analyse( unit, dataElements, periods, standardDeviation );

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2010-08-27 12:08:17 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2010-09-17 06:52:36 +0000
@@ -32,9 +32,7 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-validationrule/addValidationRuleForm.vm</param>
       <param name="menu">/dhis-web-validationrule/menu.vm</param>
-      <param name="javascripts">javascript/general.js,javascript/validationForm.js,javascript/expression.js
-      ,../dhis-web-commons/util/validate/jquery.validate.js,../dhis-web-commons/util/jquery.metadata.js
-      ,../dhis-web-commons/util/validate/additional-methods.js,../dhis-web-commons/validationMessages.action</param>
+      <param name="javascripts">javascript/general.js,javascript/validationForm.js,javascript/expression.js</param>
       <param name="stylesheets">style/validationStyle.css</param>
       <param name="requiredAuthorities">F_VALIDATIONRULE_ADD</param>
     </action>    
@@ -74,9 +72,7 @@
     <action name="showUpdateValidationRuleFormChain" class="org.hisp.dhis.validationrule.action.GetValidationRuleAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-validationrule/updateValidationRuleForm.vm</param>
-      <param name="javascripts">javascript/general.js,javascript/validationForm.js,javascript/expression.js
-      ,../dhis-web-commons/util/validate/jquery.validate.js,../dhis-web-commons/util/jquery.metadata.js
-      ,../dhis-web-commons/util/validate/additional-methods.js,../dhis-web-commons/validationMessages.action </param>
+      <param name="javascripts">javascript/general.js,javascript/validationForm.js,javascript/expression.js</param>
       <param name="stylesheets">style/validationStyle.css</param>
       <param name="requiredAuthorities">F_VALIDATIONRULE_UPDATE</param>
     </action>
@@ -120,9 +116,7 @@
     <action name="showAddValidationRuleGroupForm" class="org.hisp.dhis.validationrule.action.validationrulegroup.GetValidationRuleGroupMembersAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-validationrule/addValidationRuleGroupForm.vm</param>
-      <param name="javascripts">javascript/validationRuleGroup.js
-      ,../dhis-web-commons/util/validate/jquery.validate.js,../dhis-web-commons/util/jquery.metadata.js
-      ,../dhis-web-commons/util/validate/additional-methods.js,../dhis-web-commons/validationMessages.action</param>
+      <param name="javascripts">javascript/validationRuleGroup.js</param>
       <param name="requiredAuthorities">F_VALIDATIONRULEGROUP_ADD</param>
     </action>
     
@@ -139,9 +133,7 @@
     <action name="getGroupMembersAndAvailableValidationRules" class="org.hisp.dhis.validationrule.action.validationrulegroup.GetValidationRuleGroupMembersAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-validationrule/updateValidationRuleGroupForm.vm</param>
-      <param name="javascripts">javascript/validationRuleGroup.js
-      ,../dhis-web-commons/util/validate/jquery.validate.js,../dhis-web-commons/util/jquery.metadata.js
-      ,../dhis-web-commons/util/validate/additional-methods.js,../dhis-web-commons/validationMessages.action</param>
+      <param name="javascripts">javascript/validationRuleGroup.js</param>
     </action>
     
     <action name="updateValidationRuleGroup" class="org.hisp.dhis.validationrule.action.validationrulegroup.UpdateValidationRuleGroupAction">      

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/dataAnalysis.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/dataAnalysis.js	2010-07-04 23:55:46 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/dataAnalysis.js	2010-09-17 06:52:36 +0000
@@ -19,7 +19,7 @@
 			"&organisationUnit=" + selectedOrganisationUnit +
 			"&" + getParamString( "dataSets" );
 			
-		if ( $( "#standardDeviation" ) )
+		if ( byId( "standardDeviation" ) != null )
 		{
 			url += "&standardDeviation=" + $( "#standardDeviation" ).val();
 		}