=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/maintenance/PerformMaintenanceAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/maintenance/PerformMaintenanceAction.java 2015-08-30 14:21:41 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/maintenance/PerformMaintenanceAction.java 2015-10-03 11:12:19 +0000 @@ -33,7 +33,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hisp.dhis.analytics.AnalyticsTableService; -import org.hisp.dhis.completeness.DataSetCompletenessService; import org.hisp.dhis.dataelement.DataElementCategoryService; import org.hisp.dhis.maintenance.MaintenanceService; import org.hisp.dhis.organisationunit.OrganisationUnitService; @@ -77,13 +76,6 @@ this.maintenanceService = maintenanceService; } - private DataSetCompletenessService completenessService; - - public void setCompletenessService( DataSetCompletenessService completenessService ) - { - this.completenessService = completenessService; - } - private CurrentUserService currentUserService; public void setCurrentUserService( CurrentUserService currentUserService ) @@ -126,13 +118,6 @@ this.zeroValues = zeroValues; } - private boolean dataSetCompleteness; - - public void setDataSetCompleteness( boolean dataSetCompleteness ) - { - this.dataSetCompleteness = dataSetCompleteness; - } - private boolean prunePeriods; public void setPrunePeriods( boolean prunePeriods ) @@ -204,13 +189,6 @@ log.info( "Cleared zero values" ); } - if ( dataSetCompleteness ) - { - completenessService.deleteDataSetCompleteness(); - - log.info( "'" + username + "': Cleared data completeness" ); - } - if ( prunePeriods ) { maintenanceService.prunePeriods(); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml 2015-09-24 07:35:03 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml 2015-10-03 11:12:19 +0000 @@ -9,7 +9,6 @@ class="org.hisp.dhis.dataadmin.action.maintenance.PerformMaintenanceAction" scope="prototype"> - === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/maintenance.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/maintenance.js 2015-08-30 14:21:41 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/maintenance.js 2015-10-03 11:12:19 +0000 @@ -1,7 +1,6 @@ function performMaintenance() { var clearAnalytics = $("#clearAnalytics").is(":checked"); var zeroValues = $("#zeroValues").is(":checked"); - var dataSetCompleteness = $("#dataSetCompleteness").is(":checked"); var prunePeriods = $("#prunePeriods").is(":checked"); var removeExpiredInvitations = $("#removeExpiredInvitations").is(":checked"); var dropSqlViews = $("#dropSqlViews").is(":checked"); @@ -9,14 +8,13 @@ var updateCategoryOptionCombos = $("#updateCategoryOptionCombos").is(":checked"); var updateOrganisationUnitPaths = $("#updateOrganisationUnitPaths").is(":checked"); - if( clearAnalytics || zeroValues || dataSetCompleteness || + if( clearAnalytics || zeroValues || prunePeriods || removeExpiredInvitations || dropSqlViews || createSqlViews || updateCategoryOptionCombos || updateOrganisationUnitPaths ) { setHeaderWaitMessage(i18n_performing_maintenance); var params = "clearAnalytics=" + clearAnalytics + "&zeroValues=" + zeroValues + - "&dataSetCompleteness=" + dataSetCompleteness + "&prunePeriods=" + prunePeriods + "&removeExpiredInvitations=" + removeExpiredInvitations + "&dropSqlViews=" + dropSqlViews + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/maintenanceForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/maintenanceForm.vm 2015-08-30 14:21:41 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/maintenanceForm.vm 2015-10-03 11:12:19 +0000 @@ -17,11 +17,6 @@

- - -

- -