dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8628
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-10-22 13:34:53 +0700
message:
  Small change ui for validation criteria.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/scheduleSendMessage.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.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-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm	2012-05-29 15:37:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm	2012-10-22 06:34:53 +0000
@@ -35,6 +35,8 @@
 					</select>
 				</td>
 			   <td>
+				<!-- Displayed when no criteria is selected -->
+				<input type="text" style="width:16em" id='emptyCriteria'>
 				
 				<!-- gender -->
 				<div id="genderDiv" style="display:none">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js	2012-05-29 15:37:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js	2012-10-22 06:34:53 +0000
@@ -41,22 +41,22 @@
 function showDivValue(){
 	
 	var propertyName = byId('property').value;
-	
 	hideDiv();
-	
 	if(propertyName != '')
 	{
-		 var div = byId(propertyName + 'Div');
-		 div.style.display = 'block';
-		 
-		 if( propertyName == 'gender' || 
+		hideById('emptyCriteria');
+		
+		var div = byId(propertyName + 'Div');
+		div.style.display = 'block';
+		if( propertyName == 'gender' || 
 			propertyName == 'dobType' ){
 				
 			byId('operator').selectedIndex = 1;
 			disable('operator');
-		 }else{
+		}
+		else{
 			enable('operator');
-		 }
+		}
 	 }
 }
 
@@ -66,6 +66,7 @@
 	hideById('integerValueOfAgeDiv');
 	hideById('birthDateDiv');
 	hideById('dobTypeDiv');	
+	showById('emptyCriteria');
 }
 
 function fillValue( value ){

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/scheduleSendMessage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/scheduleSendMessage.vm	2012-10-12 07:34:56 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/scheduleSendMessage.vm	2012-10-22 06:34:53 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString('schedule_message') #openHelp( "schedule_sending_message" )</h3>
+<h3>$i18n.getString('scheduling_message') #openHelp( "schedule_sending_message" )</h3>
 <table>
 	<tbody>
 		<tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm	2012-05-29 15:37:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm	2012-10-22 06:34:53 +0000
@@ -37,6 +37,10 @@
 							</td>
 
 							<td>
+							
+							<!-- Displayed when no criteria is selected -->
+							<input type="text" style="width:16em" id='emptyCriteria'>
+				
 							<!-- gender -->
 							<div id="genderDiv" style="display:none">
 								<select id='genderValue' name='genderValue' onChange="fillValue(this.value);" style="width: 16em">