=== 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-06-30 08:02:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/trackedEntityInstance.js 2015-02-26 13:29:03 +0000
@@ -258,9 +258,9 @@
// Header
var title = "";
- if (getFieldValue('programIdAddTrackedEntity') != "") {
+ if (getFieldValue('program') != "") {
var status = jQuery('#statusEnrollment option:selected').text();
- var programName = jQuery('#programIdAddTrackedEntity option:selected')
+ var programName = jQuery('#program option:selected')
.text();
title = i18n_for + " " + status + " " + i18n_enrollments_in + " "
+ programName + " " + i18n_program;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/caseaggregation.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/caseaggregation.js 2014-08-11 13:54:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/caseaggregation.js 2015-02-26 13:29:03 +0000
@@ -209,10 +209,11 @@
var deSumId = jQuery('#deSumId');
deSumId.append("");
for( i in json.dataElements ) {
- dataElements.append("");
- dataElementBackups.append("");
+ var id = json.dataElements[i].localid;
+ dataElements.append("");
+ dataElementBackups.append("");
if( json.dataElements[i].type == 'int' ) {
- deSumId.append("");
+ deSumId.append("");
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonTrackedEntityDataElements.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonTrackedEntityDataElements.vm 2014-11-12 06:31:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonTrackedEntityDataElements.vm 2015-02-26 13:29:03 +0000
@@ -3,6 +3,7 @@
#foreach( ${dataElement} in $!{dataElements} )
{
"id": "${dataElement.uid}",
+ "localid": "${dataElement.id}",
"name": "$!encoder.jsonEncode( ${dataElement.name} )",
"code": "$!encoder.jsonEncode( ${dataElement.code} )",
"type": "${dataElement.type}",