dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1990
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Sat 2010-08-28 14:26:32 +0700
message:
  Add "Remove min-max" function - Finished.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/minMaxValidation.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.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-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml	2010-08-19 09:25:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml	2010-08-28 07:26:32 +0000
@@ -258,6 +258,24 @@
 		</property>
 	</bean>
 
+	<bean
+		id="org.hisp.dhis.dataadmin.action.minmaxvalidation.RemoveMinMaxValueAction"
+		class="org.hisp.dhis.dataadmin.action.minmaxvalidation.RemoveMinMaxValueAction">
+		<property name="organisationUnitSelectionManager">
+			<ref bean="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
+		</property>
+		<property name="dataSetService">
+			<ref bean="org.hisp.dhis.dataset.DataSetService" />
+		</property>
+		<property name="minMaxValuesGenerationService"
+			ref="org.hisp.dhis.minmax.validation.MinMaxValuesGenerationService" />
+		<property name="minMaxDataElementService"
+			ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
+		<property name="systemSettingManager">
+			<ref bean="org.hisp.dhis.options.SystemSettingManager" />
+		</property>
+	</bean>
+	
 	<!-- Min/Max validation - Organisation Unit tree -->
 
 	<bean

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2010-08-24 07:43:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2010-08-28 07:26:32 +0000
@@ -286,6 +286,14 @@
 				getMinMaxValidationParamsChain</result>
 		</action>
 		
+		<action name="removeMinMaxValue"
+			class="org.hisp.dhis.dataadmin.action.minmaxvalidation.RemoveMinMaxValueAction">
+			<result name="success" type="chain">
+				getMinMaxValidationParamsChain</result>
+			<result name="input" type="chain">
+				getMinMaxValidationParamsChain</result>
+		</action>
+		
 		<action name="getMinMaxValidationParamsChain"
 			class="org.hisp.dhis.dataadmin.action.minmaxvalidation.GetMinMaxValidationParamsAction">
 			<interceptor-ref name="organisationUnitTreeStack"/>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/minMaxValidation.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/minMaxValidation.js	2010-04-29 04:33:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/minMaxValidation.js	2010-08-28 07:26:32 +0000
@@ -100,4 +100,14 @@
 
 function saveFactorSuccess(){
 	setMessage( i18n_save_factory_success );
+}
+
+//-----------------------------------------------------------------------------------
+// Organisation Tree
+//-----------------------------------------------------------------------------------
+
+function removeMinMaxValue(){
+	var form = byId("minMaxGeneratingForm");
+	form.action = "removeMinMaxValue.action"
+	form.submit();
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm	2010-07-04 23:55:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm	2010-08-28 07:26:32 +0000
@@ -74,6 +74,7 @@
        <td align="center">&nbsp;</td>
     <td align="center">&nbsp;</td>
     <td align="left"><input type="submit" id="submitButton" style="width:10em" value="$i18n.getString( 'generate' )">
+	<input type="button" onclick="removeMinMaxValue()" id="" style="width:10em" value="$i18n.getString( 'remove' )">
 	  <input type="button"" style="width:10em" onClick="window.location.href='listReportExcel.action'" value="$i18n.getString( 'cancel' )"></td>
   
   </tr>