dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15396
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-05-25 22:36:40 +0800
message:
  Minor fix for TEI relationship list.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationship.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/trackedEntityInstance.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.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/webapp/dhis-web-caseentry/javascript/activityPlan.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js	2014-05-05 15:31:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js	2014-05-25 14:36:40 +0000
@@ -91,7 +91,7 @@
 	$('#attributeIds option').each(function(i, item) {
 		var valueType = $(item).attr('valueType');
 		var value = $(item).val();
-		if ( valueType == 'bool' || valueType == 'trueOnly' ) {
+		if ( valueType == 'bool' || valueType == 'trueOnly' || valueType == 'trackerAssociate' ) {
 			for (var i = idx; i < json.width; i++) {
 				if( value==json.headers[i].name ){
 					attList.push(i);

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js	2014-05-22 08:03:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js	2014-05-25 14:36:40 +0000
@@ -213,7 +213,7 @@
 	$('#attributeIds option').each(function(i, item) {
 		var valueType = $(item).attr('valueType');
 		var value = $(item).val();
-		if ( valueType == 'bool' || valueType == 'trueOnly' ) {
+		if ( valueType == 'bool' || valueType == 'trueOnly' || valueType == 'trackerAssociate' ) {
 			for ( var i = idx; i < json.width; i++ ) {
 				if( value==json.headers[i].name ){
 					attList.push(i);

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationship.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationship.js	2014-05-25 10:52:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationship.js	2014-05-25 14:36:40 +0000
@@ -171,7 +171,7 @@
 		$('#attributeIds option').each(function(i, item) {
 			var valueType = $(item).attr('valueType');
 			var value = $(item).val();
-			if ( valueType == 'bool' || valueType == 'trueOnly' ) {
+			if ( valueType == 'bool' || valueType == 'trueOnly' || valueType == 'trackerAssociate' ) {
 				for (var i = idx; i < json.width; i++) {
 					if( value==json.headers[i].name ){
 						attList.push(i);

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2014-05-25 10:52:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2014-05-25 14:36:40 +0000
@@ -122,7 +122,7 @@
 	$('#attributeIds option').each(function(i, item) {
 		var valueType = $(item).attr('valueType');
 		var value = $(item).val();
-		if ( valueType == 'bool' || valueType == 'trueOnly' ) {
+		if ( valueType == 'bool' || valueType == 'trueOnly' || valueType == 'trackerAssociate' ) {
 			for (var i = idx; i < json.width; i++) {
 				if( value==json.headers[i].name ){
 					attList.push(i);

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/trackedEntityInstance.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/trackedEntityInstance.js	2014-05-22 08:03:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/trackedEntityInstance.js	2014-05-25 14:36:40 +0000
@@ -289,7 +289,7 @@
 	$('#attributeIds option').each(function(i, item) {
 		var valueType = $(item).attr('valueType');
 		var value = $(item).val();
-		if ( valueType == 'bool' || valueType == 'trueOnly' ) {
+		if ( valueType == 'bool' || valueType == 'trueOnly' || valueType == 'trackerAssociate' ) {
 			for (var i = idx; i < json.width; i++) {
 				if( value==json.headers[i].name ){
 					attList.push(i);

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js	2014-05-08 13:39:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js	2014-05-25 14:36:40 +0000
@@ -107,7 +107,7 @@
 		$('#attributeIds option').each(function(i, item) {
 			var valueType = $(item).attr('valueType');
 			var value = $(item).val();
-			if ( valueType == 'bool' || valueType == 'trueOnly' ) {
+			if ( valueType == 'bool' || valueType == 'trueOnly' || valueType == 'trackerAssociate' ) {
 				for (var i = idx; i < json.width; i++) {
 					if( value==json.headers[i].name ){
 						attList.push(i);

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm	2014-05-25 10:52:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm	2014-05-25 14:36:40 +0000
@@ -19,8 +19,8 @@
 						#set($value=$i18n.getString($attributeValue.value))
 					#end
 					<tr>
-						<td>$!attributeValue.attribute.displayName:</td>
-						<td>$value</td>
+						<td>$!attributeValue.attribute.displayName</td>
+						<td>:$value</td>
 					</tr>
 				#end 
 			</table>
@@ -31,8 +31,8 @@
                
 	<tr>            
 		<th>$i18n.getString( "relationship" )</th>
-		<th>$i18n.getString( "profile" )<th>
-		<th style="text-align:center">$i18n.getString( "operations" )</th>
+		<th>$i18n.getString( "profile" )</th>
+		<th>$i18n.getString( "operations" )</th>
 	</tr>
 	
 	<tbody id="list"> 
@@ -50,14 +50,14 @@
 						<table>
 							#foreach($attributeValue in $relationship.entityInstanceB.attributeValues)
 								#set($value=$attributeValue.value)
-							#if( $attribute.valueType == 'bool')
-								#set($value=$i18n.getString($attributeValue.value))
+								#if( $attribute.valueType == 'bool')
+									#set($value=$i18n.getString($attributeValue.value))
+								#end
+								<tr>
+									<td>$!encoder.htmlEncode( $attributeValue.attribute.displayName )</td>
+									<td>: $value</td>
+								</tr>
 							#end
-							<tr>
-								<td>$!encoder.htmlEncode( $attributeValue.attribute.displayName )</td>
-								<td>: $value</td>
-							</tr>
-						#end
 						</table>
 					</td>
 				#elseif($relationship.entityInstanceB.id == $entityInstance.id )
@@ -67,11 +67,22 @@
 					</td>
 								
 					<td>
-						$!encoder.htmlEncode( $relationship.entityInstanceA.name )
+						<table>
+							#foreach($attributeValue in $relationship.entityInstanceB.attributeValues)
+								#set($value=$attributeValue.value)
+								#if( $attribute.valueType == 'bool')
+									#set($value=$i18n.getString($attributeValue.value))
+								#end
+								<tr>
+									<td>$!encoder.htmlEncode( $attributeValue.attribute.displayName )</td>
+									<td>: $value</td>
+								</tr>
+							#end
+						</table>
 					</td>
 				#end                  
 				
-				<td style="text-align:center">
+				<td>
 					<a href="javascript:manageRepresentative( '$entityInstance.id', $partnerId )" title="$i18n.getString( 'set_as_representative' )"><img src="images/representative.png" alt="$i18n.getString( 'manage_representative' )"></a>
 					<a href="javascript:removeRelationship( '$relationship.id', '$!encoder.jsEncode( $relationship.entityInstanceA.name )', '$encoder.jsEncode( $relationship.relationshipType.aIsToB )', '$!encoder.jsEncode( $relationship.entityInstanceB.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
 				</td>   						

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm	2014-05-08 13:39:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm	2014-05-25 14:36:40 +0000
@@ -28,7 +28,7 @@
 <!-- TAB Header -->
 <div id="addRepresentativeTabs">
 	<ul>
-		<li><a href="#tab-1">$i18n.getString("search_existing_person")</a></li>
+		<li><a href="#tab-1">$i18n.getString("search_existing_tracked_entity_instance")</a></li>
 		<li><a href="#tab-2">$i18n.getString("add_new_tracked_entity_instance")</a></li>
 	</ul>