dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3107
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-03-21 11:55:30 +0100
message:
  separated js from templates in dhis-web-caseentry
added:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseAggregationForm.js
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.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-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2011-01-12 02:22:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2011-03-21 10:55:30 +0000
@@ -221,7 +221,7 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-caseentry/caseAggregationForm.vm</param>
       <param name="menu">/dhis-web-caseentry/caseAggregationMenu.vm</param>    
-      <param name="javascripts">javascript/caseagg.js,javascript/date.js</param>      
+      <param name="javascripts">javascript/caseagg.js,javascript/date.js,javascript/caseAggregationForm.js</param>      
     </action>
 	
 	<action name="loadPeriods" class="org.hisp.dhis.caseentry.action.caseaggregation.LoadPeriodsAction">

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm	2011-03-18 12:26:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm	2011-03-21 10:55:30 +0000
@@ -1,37 +1,19 @@
 <script type="text/javascript">
+	var i18n_greater_then_from_date = '$encoder.jsEscape( $i18n.getString( "greater_then_from_date" ) , "'" )';
+	var i18n_please_select = '$encoder.jsEscape( $i18n.getString( "please_select" ) , "'" )';
 	var isSubmit = true;
-
-	jQuery(document).ready(	function(){
-			validation( 'caseAggregationForm', function(form){
-				if(isSubmit) form.submit();
-			}, function(){
-				var periodFrom = $( '#sDateLB' ).val();
-				var periodTo = $( '#eDateLB' ).val();
-				
-				if(periodFrom > periodTo){
-					var i18n_greater_then_from_date = '$encoder.jsEscape( $i18n.getString( "greater_then_from_date" ) , "'" )';
-					byId('warningMessage').innerHTML = i18n_greater_then_from_date;
-					isSubmit = false;
-				}else{
-					isSubmit = true;
-				}
-			})
-	}); 
-
-	var i18n_please_select = '$encoder.jsEscape( $i18n.getString( "please_select" ) , "'" )';
 </script>
 
 <h1> $i18n.getString( "case_aggregation_form" )</h1>
 <hr/>
 <form id="caseAggregationForm" name="caseAggregationForm" action="caseAggregationResult.action" method="post">
 	<table>
-	
 		<tr>
 			<td>
 				$i18n.getString( "dataset_list" )
 			</td>
 			<td>
-				<select id="dataSetId" name="dataSetId" onchange="dataSetSelected()" style="width: 30em" class="{validate:{required:true}}">
+				<select id="dataSetId" name="dataSetId" onchange="dataSetSelected()" style="width: 30em">
 					<option value=''>[$i18n.getString('please_select')]</option>
 					#foreach ( $dataSet in $datasets )
 						<option value='$dataSet.id' title='$dataSet.name'>$dataSet.name</option>
@@ -39,14 +21,14 @@
 				</select>
 			</td>
 		</tr>
-		
+
 		<tr>
 			<td>
 				$i18n.getString( "from" )
 			</td>
 			<td>
 				<input type="button" value="<<" onclick="getPreviousPeriodForStart()" id="previousPeriodForStartBtn" disabled />
-				<select id="sDateLB" name="sDateLB" style="width: 23em" class="{validate:{required:true}}"></select>
+				<select id="sDateLB" name="sDateLB" style="width: 23em"></select>
 				<input type="button" value=">>"  onclick="getNextPeriodForStart()" id="nextPeriodForStartBtn" disabled />
 			</td>
 		</tr>
@@ -57,7 +39,7 @@
 			</td>
 			<td>
 				<input type="button" value="<<" onclick="getPreviousPeriodForEnd()" id="previousPeriodForEndBtn" disabled />
-				<select id="eDateLB" name="eDateLB" style="width: 23em" class="{validate:{required:true}}"></select>
+				<select id="eDateLB" name="eDateLB" style="width: 23em"></select>
 				<input type="button" value=">>"  onclick="getNextPeriodForEnd()" id="nextPeriodForEndBtn" disabled />
 				<i><span id='warningMessage' style="color:red"></span></i>
 			</td>
@@ -83,7 +65,6 @@
 				#organisationUnitSelectionTree( false, true, false )
 			</td>
 		</tr>
-				   
 
 		<tr>
 			<td>

=== added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseAggregationForm.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseAggregationForm.js	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseAggregationForm.js	2011-03-21 10:55:30 +0000
@@ -0,0 +1,30 @@
+jQuery(document).ready(	function() {
+	var rules = {
+		dataSetId: {
+			required:true
+		},
+		sDateLB: {
+			required:true
+		},
+		eDateLB: {
+			required:true
+		}
+	};
+	
+	validation2( 'caseAggregationForm', function(form) {
+		if(isSubmit) form.submit();
+	}, {
+		'beforeValidateHandler': function() {
+			var periodFrom = jQuery( '#sDateLB' ).val();
+			var periodTo = jQuery( '#eDateLB' ).val();
+			
+			if(periodFrom > periodTo){
+				byId('warningMessage').innerHTML = i18n_greater_then_from_date;
+				isSubmit = false;
+			} else {
+				isSubmit = true;
+			}
+		},
+		'rules': rules
+	})
+});