=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm 2013-06-21 05:29:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm 2013-08-28 08:14:59 +0000
@@ -64,7 +64,7 @@
#end
#elseif($hasOptionSet=='true')
-
+
#elseif($programStageDataElement.dataElement.type=='username')
#else
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2013-08-08 06:20:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2013-08-28 08:14:59 +0000
@@ -997,13 +997,14 @@
{
var input = jQuery( "#" + idField );
input.parent().width( input.width() + 50 );
- var dataElementUid = input.attr('id').split('-')[1];
-
+ var dataElementUid = input.attr('id').split('-')[1];
+ var optionSetUid = input.data('optionset-uid');
+
input.autocomplete({
delay: 0,
minLength: 0,
source: function( request, response ){
- searchOptionSet( dataElementUid, input.val(), response );
+ searchOptionSet( optionSetUid, input.val(), response );
},
minLength: 0,
select: function( event, ui ) {
@@ -1015,12 +1016,15 @@
}
input.val( fieldValue );
+
if ( !unSave ) {
saveVal( dataElementUid );
}
input.autocomplete( "close" );
},
change: function( event, ui ) {
+ console.log(ui.item);
+
if ( !ui.item ) {
var matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( $(this).val() ) + "$", "i" ),
valid = false;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm 2013-06-21 05:29:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm 2013-08-28 08:14:59 +0000
@@ -76,7 +76,7 @@
#end
#elseif($hasOptionSet=='true')
-
+
#elseif($programStageDataElement.dataElement.type=='username')
#else