=== 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
- $!attributeValue.attribute.displayName: |
- $value |
+ $!attributeValue.attribute.displayName |
+ :$value |
#end
@@ -31,8 +31,8 @@
$i18n.getString( "relationship" ) |
- $i18n.getString( "profile" ) |
- | $i18n.getString( "operations" ) |
+ $i18n.getString( "profile" ) |
+ $i18n.getString( "operations" ) |
@@ -50,14 +50,14 @@
#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
+
+ $!encoder.htmlEncode( $attributeValue.attribute.displayName ) |
+ : $value |
+
#end
-
- $!encoder.htmlEncode( $attributeValue.attribute.displayName ) |
- : $value |
-
- #end
#elseif($relationship.entityInstanceB.id == $entityInstance.id )
@@ -67,11 +67,22 @@
- $!encoder.htmlEncode( $relationship.entityInstanceA.name )
+
+ #foreach($attributeValue in $relationship.entityInstanceB.attributeValues)
+ #set($value=$attributeValue.value)
+ #if( $attribute.valueType == 'bool')
+ #set($value=$i18n.getString($attributeValue.value))
+ #end
+
+ $!encoder.htmlEncode( $attributeValue.attribute.displayName ) |
+ : $value |
+
+ #end
+
|
#end
-
+ |
|
=== 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 @@