=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2014-03-23 18:26:50 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2014-04-09 04:27:35 +0000 @@ -87,6 +87,7 @@ final String KEY_OPENID_PROVIDER = "keyOpenIdProvider"; final String KEY_OPENID_PROVIDER_LABEL = "keyOpenIdProviderLabel"; final String KEY_CAN_GRANT_OWN_USER_AUTHORITY_GROUPS = "keyCanGrantOwnUserAuthorityGroups"; + final String KEY_HIDE_UNAPPROVED_DATA_IN_ANALYTICS = "keyHideUnapprovedDataInAnalytics"; final String DEFAULT_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY = "lastMonth"; final String DEFAULT_FLAG = "dhis2"; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetApprovalSettingsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetApprovalSettingsAction.java 2014-03-28 10:13:01 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetApprovalSettingsAction.java 2014-04-09 04:27:35 +0000 @@ -30,6 +30,9 @@ import com.opensymphony.xwork2.Action; import org.hisp.dhis.dataapproval.DataApprovalLevel; import org.hisp.dhis.dataapproval.DataApprovalLevelService; +import org.hisp.dhis.setting.SystemSettingManager; + +import static org.hisp.dhis.setting.SystemSettingManager.*; import java.util.List; @@ -43,6 +46,13 @@ // Dependencies // ------------------------------------------------------------------------- + private SystemSettingManager systemSettingManager; + + public void setSystemSettingManager( SystemSettingManager systemSettingManager ) + { + this.systemSettingManager = systemSettingManager; + } + private DataApprovalLevelService dataApprovalLevelService; public void setDataApprovalLevelService( DataApprovalLevelService dataApprovalLevelService ) @@ -54,6 +64,13 @@ // Output // ------------------------------------------------------------------------- + private boolean keyHideUnapprovedDataInAnalytics; + + public boolean getKeyHideUnapprovedDataInAnalytics() + { + return keyHideUnapprovedDataInAnalytics; + } + private List dataApprovalLevels; public List getDataApprovalLevels() @@ -74,6 +91,8 @@ public String execute() { + keyHideUnapprovedDataInAnalytics = (Boolean) systemSettingManager.getSystemSetting( KEY_HIDE_UNAPPROVED_DATA_IN_ANALYTICS, false ); + dataApprovalLevels = dataApprovalLevelService.getAllDataApprovalLevels(); approvalLevelService = dataApprovalLevelService; === added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetApprovalSettingsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetApprovalSettingsAction.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetApprovalSettingsAction.java 2014-04-09 04:27:35 +0000 @@ -0,0 +1,88 @@ +package org.hisp.dhis.settings.action.system; + +/* + * Copyright (c) 2004-2014, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import com.opensymphony.xwork2.Action; +import org.hisp.dhis.i18n.I18n; +import org.hisp.dhis.setting.SystemSettingManager; +import org.springframework.beans.factory.annotation.Autowired; + +import static org.hisp.dhis.setting.SystemSettingManager.*; + +/** + * @author Jim Grace + */ +public class SetApprovalSettingsAction + implements Action +{ + @Autowired + private SystemSettingManager systemSettingManager; + + // ------------------------------------------------------------------------- + // Input + // ------------------------------------------------------------------------- + + private Boolean hideUnapprovedDataInAnalytics; + + public void setHideUnapprovedDataInAnalytics( Boolean hideUnapprovedDataInAnalytics ) + { + this.hideUnapprovedDataInAnalytics = hideUnapprovedDataInAnalytics; + } + + // ------------------------------------------------------------------------- + // Output + // ------------------------------------------------------------------------- + + private String message; + + public String getMessage() + { + return message; + } + + private I18n i18n; + + public void setI18n( I18n i18n ) + { + this.i18n = i18n; + } + + // ------------------------------------------------------------------------- + // Action implementation + // ------------------------------------------------------------------------- + + public String execute() + { + systemSettingManager.saveSystemSetting( KEY_HIDE_UNAPPROVED_DATA_IN_ANALYTICS, hideUnapprovedDataInAnalytics ); + + message = i18n.getString( "settings_updated" ); + + return SUCCESS; + } +} === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml 2014-04-03 16:03:26 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml 2014-04-09 04:27:35 +0000 @@ -70,9 +70,14 @@ + + + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2014-03-30 22:10:43 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2014-04-09 04:27:35 +0000 @@ -32,6 +32,7 @@ email=Email approval=Approval message=Message +hide_unapproved_data_in_analytics=Hide unapproved data in analytics data_approval_levels=Data approval levels organisation_unit_level=Organisation unit level select_level=Select level === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml 2014-03-31 11:43:23 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml 2014-04-09 04:27:35 +0000 @@ -93,6 +93,13 @@ F_SYSTEM_SETTING + + + /dhis-web-commons/ajax/jsonResponseSuccess.vm + plainTextError + F_SYSTEM_SETTING + + /main.vm /dhis-web-maintenance-settings/addApprovalLevel.vm === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemApprovalSettings.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemApprovalSettings.vm 2014-04-07 15:26:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemApprovalSettings.vm 2014-04-09 04:27:35 +0000 @@ -1,3 +1,16 @@ + #sharingDialog() @@ -14,6 +27,13 @@

$i18n.getString( "approval_settings" ) #openHelp( "systemApprovalSettings" )

+
+ + +
+ +
+