=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/attributeFormDiv.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/attributeFormDiv.vm 2014-05-22 08:35:21 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/attributeFormDiv.vm 2014-05-22 14:02:57 +0000 @@ -1,14 +1,14 @@ #if($program) #set($attributes = $program.attributes) #end + #foreach($_attribute in $attributes ) #if($program) #set($attribute = $_attribute.attribute) #end - #set( $attributeValue = '') #set($mandatory=$!_attribute.mandatory) - + #end
#set( $value='' ) @@ -37,20 +37,20 @@ #elseif( $attribute.valueType == "phoneNumber" ) - #if($attributeValue=='') - #set($attributeValue=$!phoneNumberAreaCode) + #if($value=='') + #set($value=$!phoneNumberAreaCode) #end - + #elseif( $attribute.valueType == "trackerAssociate" ) #elseif( $attribute.valueType == "age" || $attribute.valueType == "number" ) - + #else #end @@ -58,3 +58,12 @@
+ + === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2014-05-22 08:35:21 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2014-05-22 14:02:57 +0000 @@ -1157,6 +1157,21 @@ } else if (type == 'input') { setMessage(json.message); } + $("[id=tab-2] :input").each(function() { + var input = $(this); + var id = 'dashboard_' + input.attr('id'); + setInnerHTML(id, input.val()); + }); + $('#identifierAndAttributeDiv :input').each(function() { + var input = $(this); + var id = input.attr('id'); + if( input.val() != "" ){ + setInnerHTML('value_' + id, input.val()); + showById('row_' + id); + } + var input = $(this); + jQuery("#tab-2 [id=" + id + "]").val(input.val()); + }); $('#loaderDiv').hide(); } });