=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-11-09 15:36:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-11-12 15:26:14 +0000
@@ -9,8 +9,7 @@
-
-
+
@@ -53,7 +52,7 @@
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm 2012-11-02 04:25:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm 2012-11-12 15:26:14 +0000
@@ -67,6 +67,7 @@
$i18n.getString('no_aggregate_date_values_are_added_or_update_in_other_facilities')
#else
+
$i18n.getString('no_aggregate_date_values_are_added_or_update_in_all_facilities')
#end
-
+$programStageInstance.organisationUnit.name
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2012-11-09 15:15:25 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2012-11-12 15:26:14 +0000
@@ -5,7 +5,7 @@
hideById('advanced-search');
hideById('listDiv');
showById('mainLinkLbl');
- setFieldValue("filter", false);
+ setFieldValue("listAll", true);
setFieldValue("startDate", '');
setFieldValue("endDate", '');
jQuery('#advancedSearchTB [name=searchText]').val('');
@@ -101,7 +101,6 @@
enableCriteriaDiv();
validateSearchEvents( true );
- setFieldValue('isShowEventList', true);
});
}
@@ -137,6 +136,7 @@
function autocompletedFilterField( idField, searchObjectId )
{
var input = jQuery( "#" + idField );
+ input.css("width","237px");
input.autocomplete({
delay: 0,
minLength: 0,
@@ -207,7 +207,7 @@
function validateSearchEvents( listAll )
{
var flag = true;
- if( !listAll )
+ if( listAll=="false" )
{
if( getFieldValue('startDate')=="" || getFieldValue('endDate')=="" ){
showWarningMessage( i18n_specify_a_date );
@@ -237,7 +237,7 @@
{
hideById('dataEntryInfor');
hideById('listDiv');
- setFieldValue('isShowEventList', listAll );
+ setFieldValue('listAll', listAll );
var params = '';
jQuery( '#displayInReports option' ).each( function( i, item ){
@@ -245,7 +245,7 @@
params += '&searchingValues=de_' + input.val() + '_false_';
});
- if(listAll){
+ if(listAll=='true'){
params += '&startDate=';
params += '&endDate=';
}
@@ -395,7 +395,7 @@
showById('selectDiv');
showById('searchDiv');
showById('listDiv');
- searchEvents( getFieldValue('isShowEventList') );
+ searchEvents( getFieldValue('listAll') );
}
function showAddEventForm()
@@ -498,17 +498,18 @@
showById('advanced-search');
hideById('minimized-advanced-search');
disable('advancedBtn');
- setFieldValue('filter', true);
}
function removeAllOption()
{
enable('advancedBtn');
setFieldValue('filter', false);
- jQuery('#advancedBtn').val(i18n_add_filter);
jQuery('#advancedBtn').attr("isShown", false);
jQuery( '#advancedSearchTB tr' ).each( function( i, row ){
- if(i==0){
+ if(i>2){
+ jQuery(this).remove();
+ }
+ else if(i==2){
jQuery( this ).find(':input').each( function( idx, item ){
var input = jQuery( item );
if( input.attr('type') != 'button'){
@@ -516,10 +517,9 @@
}
});
}
- else{
- jQuery(this).remove();
- }
});
+ jQuery('#searchObjectId').val("");
+ jQuery('#searchText').val("");
hideById('advanced-search');
hideById('minimized-advanced-search');
searchEvents( false );