dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4829
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-10-05 13:56:56 +0700
message:
  Fixed bug: Lacking information when showing details of validation criteria.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonValidationCriteria.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/validationCriteria.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-resources/src/main/webapp/dhis-web-commons/ajax/jsonValidationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonValidationCriteria.vm	2011-09-28 07:11:18 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonValidationCriteria.vm	2011-10-05 06:56:56 +0000
@@ -1,10 +1,10 @@
 { "validationCriteria":
   {
-	"id": "$!validationCriteria.id}",
+	"id": "$!{validationCriteria.id}",
 	"name": "$!encoder.xmlEncode( $validationCriteria.name )",
 	"description": "$!encoder.xmlEncode($validationCriteria.description )",
 	"property": "$!i18n.getString($validationCriteria.property)",
-	"operator": "$!validationCriteria.operator}",
+	"operator": "$!{validationCriteria.operator}",
 	"value": 
 	#if( ${validationCriteria.property} == 'birthDate' )
 	"$!format.formatDate( ${validationCriteria.value} )"

=== 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	2011-09-28 07:11:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js	2011-10-05 06:56:56 +0000
@@ -14,6 +14,7 @@
 function showValidationCriteriaDetails( criteriaId )
 {
 	jQuery.post( 'getValidationCriteria.action', { id: criteriaId }, function ( json ) {
+		setInnerHTML( 'idField', json.validationCriteria.id );
 		setInnerHTML( 'nameField', json.validationCriteria.name );
 		setInnerHTML( 'descriptionField', json.validationCriteria.description );
 		

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm	2011-07-28 02:46:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm	2011-10-05 06:56:56 +0000
@@ -39,18 +39,12 @@
 		<td style="width:20em; padding-left:2em; vertical-align:top">
 			<div id="detailsArea" style="display:none;">
 				<div style="float:right">
-					<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
+					<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
 				</div>				
-				<p><label>$i18n.getString( "name" ):</label><br><span id='nameField'></span></p>
-				<p><label>$i18n.getString( "description" ):</label><br><span id='descriptionField'></span></p>
-				<p><label>$i18n.getString( "criteria" ):</label><br><span id='criteriaField'></span></p>
-			</div>
-
-			<div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
-				<div style="float:right">
-					<a href="javascript:hideWarning()" title="$i18n.getString( "hide_warning" )"><img src="../images/close.png" alt="$i18n.getString( "hide_warning" )"></a>
-				</div>
-				<p><span id="warningField"></span></p>
+				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id='idField'></span></p>
+				<p><label class="bold">$i18n.getString( "name" ):</label><br><span id='nameField'></span></p>
+				<p><label class="bold">$i18n.getString( "description" ):</label><br><span id='descriptionField'></span></p>
+				<p><label class="bold">$i18n.getString( "criteria" ):</label><br><span id='criteriaField'></span></p>
 			</div>
 		</td>
 	</tr>