dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18034
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7440: added system setting for offline orgunit level, will be used in ouwt to indicate the highest leve...
------------------------------------------------------------
revno: 7440
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-06-27 19:54:45 +0300
message:
added system setting for offline orgunit level, will be used in ouwt to indicate the highest level it should offline orgunits for (default to highest level)
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetGeneralSettingsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java
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/org/hisp/dhis/settings/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java 2012-06-27 16:54:45 +0000
@@ -30,6 +30,7 @@
import java.io.Serializable;
import org.hisp.dhis.dataelement.DataElementGroup;
+import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.period.YearlyPeriodType;
import org.hisp.dhis.user.UserGroup;
@@ -53,6 +54,8 @@
private UserGroup completenessRecipients;
+ private OrganisationUnitLevel offlineOrganisationUnitLevel;
+
private DataElementGroup infrastructuralDataElements;
private PeriodType infrastructuralPeriodType;
@@ -104,6 +107,16 @@
this.completenessRecipients = completenessRecipients;
}
+ public void setOfflineOrganisationUnitLevel( OrganisationUnitLevel offlineOrganisationUnitLevel )
+ {
+ this.offlineOrganisationUnitLevel = offlineOrganisationUnitLevel;
+ }
+
+ public OrganisationUnitLevel getOfflineOrganisationUnitLevel()
+ {
+ return offlineOrganisationUnitLevel;
+ }
+
public DataElementGroup getInfrastructuralDataElements()
{
return infrastructuralDataElements;
=== 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 2012-04-27 17:03:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2012-06-27 16:54:45 +0000
@@ -69,7 +69,7 @@
final String KEY_ORGUNITGROUPSET_AGG_LEVEL = "orgUnitGroupSetAggregationLevel";
final String KEY_SMS_CONFIG = "SMS_CONFIG";
final String KEY_CACHE_STRATEGY = "keyCacheStrategy";
-
+
final int DEFAULT_MAX_NUMBER_OF_ATTEMPTS = 20;
final int DEFAULT_TIMEFRAME_MINUTES = 1;
final double DEFAULT_FACTOR_OF_DEVIATION = 2.0;
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml 2011-10-07 11:48:18 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml 2012-06-27 16:54:45 +0000
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
<hibernate-mapping>
<class name="org.hisp.dhis.configuration.Configuration" table="configuration">
@@ -10,17 +10,20 @@
<generator class="native" />
</id>
- <many-to-one name="feedbackRecipients" class="org.hisp.dhis.user.UserGroup"
- column="feedbackrecipientsid" foreign-key="fk_configuration_feedback_recipients"/>
-
- <many-to-one name="completenessRecipients" class="org.hisp.dhis.user.UserGroup"
- column="completenessrecipientsid" foreign-key="fk_configuration_completeness_recipients"/>
-
- <many-to-one name="infrastructuralDataElements" class="org.hisp.dhis.dataelement.DataElementGroup"
- column="infrastructuraldataelementsid" foreign-key="fk_configuration_infrastructural_dataelements"/>
-
- <many-to-one name="infrastructuralPeriodType" class="org.hisp.dhis.period.PeriodType"
- column="infrastructuralperiodtypeid" foreign-key="fk_configuration_infrastructural_periodtype"/>
+ <many-to-one name="feedbackRecipients" class="org.hisp.dhis.user.UserGroup"
+ column="feedbackrecipientsid" foreign-key="fk_configuration_feedback_recipients" />
+
+ <many-to-one name="completenessRecipients" class="org.hisp.dhis.user.UserGroup"
+ column="completenessrecipientsid" foreign-key="fk_configuration_completeness_recipients" />
+
+ <many-to-one name="offlineOrganisationUnitLevel" class="org.hisp.dhis.organisationunit.OrganisationUnitLevel"
+ column="offlineorgunitlevelid" foreign-key="fk_configuration_offline_orgunit_level" />
+
+ <many-to-one name="infrastructuralDataElements" class="org.hisp.dhis.dataelement.DataElementGroup"
+ column="infrastructuraldataelementsid" foreign-key="fk_configuration_infrastructural_dataelements" />
+
+ <many-to-one name="infrastructuralPeriodType" class="org.hisp.dhis.period.PeriodType"
+ column="infrastructuralperiodtypeid" foreign-key="fk_configuration_infrastructural_periodtype" />
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetGeneralSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetGeneralSettingsAction.java 2012-03-05 16:37:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetGeneralSettingsAction.java 2012-06-27 16:54:45 +0000
@@ -27,23 +27,25 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
+import com.opensymphony.xwork2.Action;
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.configuration.Configuration;
import org.hisp.dhis.configuration.ConfigurationService;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
+import org.hisp.dhis.organisationunit.comparator.OrganisationUnitLevelComparator;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.user.UserGroup;
import org.hisp.dhis.user.UserGroupService;
import org.hisp.dhis.user.comparator.UserGroupComparator;
-import com.opensymphony.xwork2.Action;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
/**
* @author Lars Helge Overland
@@ -84,6 +86,13 @@
this.userGroupService = userGroupService;
}
+ private OrganisationUnitService organisationUnitService;
+
+ public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
+ {
+ this.organisationUnitService = organisationUnitService;
+ }
+
// -------------------------------------------------------------------------
// Output
// -------------------------------------------------------------------------
@@ -96,12 +105,24 @@
}
private UserGroup completenessRecipients;
-
+
public UserGroup getCompletenessRecipients()
{
return completenessRecipients;
}
+ private OrganisationUnitLevel offlineOrganisationUnitLevel;
+
+ public OrganisationUnitLevel getOfflineOrganisationUnitLevel()
+ {
+ return offlineOrganisationUnitLevel;
+ }
+
+ public void setOfflineOrganisationUnitLevel( OrganisationUnitLevel offlineOrganisationUnitLevel )
+ {
+ this.offlineOrganisationUnitLevel = offlineOrganisationUnitLevel;
+ }
+
private Collection<String> aggregationStrategies;
public Collection<String> getAggregationStrategies()
@@ -130,6 +151,13 @@
return userGroups;
}
+ private List<OrganisationUnitLevel> organisationUnitLevels;
+
+ public List<OrganisationUnitLevel> getOrganisationUnitLevels()
+ {
+ return organisationUnitLevels;
+ }
+
private Configuration configuration;
public Configuration getConfiguration()
@@ -148,7 +176,17 @@
feedbackRecipients = configurationService.getConfiguration().getFeedbackRecipients();
completenessRecipients = configurationService.getConfiguration().getCompletenessRecipients();
-
+
+ offlineOrganisationUnitLevel = configurationService.getConfiguration().getOfflineOrganisationUnitLevel();
+
+ if ( offlineOrganisationUnitLevel == null )
+ {
+ // default to highest level
+ // TODO what do we do if the orgunit level hierarchy hasn't been created yet?
+ int size = organisationUnitService.getOrganisationUnitLevels().size();
+ offlineOrganisationUnitLevel = organisationUnitService.getOrganisationUnitLevelByLevel( size );
+ }
+
dataElementGroups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() );
Collections.sort( dataElementGroups, IdentifiableObjectNameComparator.INSTANCE );
@@ -159,6 +197,10 @@
Collections.sort( userGroups, new UserGroupComparator() );
+ organisationUnitLevels = organisationUnitService.getOrganisationUnitLevels();
+
+ Collections.sort( organisationUnitLevels, new OrganisationUnitLevelComparator() );
+
return SUCCESS;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java 2012-03-12 12:33:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java 2012-06-27 16:54:45 +0000
@@ -27,22 +27,18 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import static org.hisp.dhis.setting.SystemSettingManager.KEY_COMPLETENESS_OFFSET;
-import static org.hisp.dhis.setting.SystemSettingManager.KEY_DISABLE_DATAENTRYFORM_WHEN_COMPLETED;
-import static org.hisp.dhis.setting.SystemSettingManager.KEY_FACTOR_OF_DEVIATION;
-import static org.hisp.dhis.setting.SystemSettingManager.KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART;
-import static org.hisp.dhis.setting.SystemSettingManager.KEY_CACHE_STRATEGY;
-
+import com.opensymphony.xwork2.Action;
import org.hisp.dhis.configuration.Configuration;
import org.hisp.dhis.configuration.ConfigurationService;
import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.i18n.I18n;
-import org.hisp.dhis.setting.SystemSettingManager;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
+import org.hisp.dhis.setting.SystemSettingManager;
import org.hisp.dhis.user.UserGroupService;
-import com.opensymphony.xwork2.Action;
+import static org.hisp.dhis.setting.SystemSettingManager.*;
/**
* @author Lars Helge Overland
@@ -90,12 +86,19 @@
this.periodService = periodService;
}
+ private OrganisationUnitService organisationUnitService;
+
+ public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
+ {
+ this.organisationUnitService = organisationUnitService;
+ }
+
// -------------------------------------------------------------------------
// Output
// -------------------------------------------------------------------------
private String cacheStrategy;
-
+
public void setCacheStrategy( String cacheStrategy )
{
this.cacheStrategy = cacheStrategy;
@@ -142,7 +145,7 @@
{
this.feedbackRecipients = feedbackRecipients;
}
-
+
private Integer completenessRecipients;
public void setCompletenessRecipients( Integer completenessRecipients )
@@ -150,6 +153,13 @@
this.completenessRecipients = completenessRecipients;
}
+ private Integer offlineOrganisationUnitLevel;
+
+ public void setOfflineOrganisationUnitLevel( Integer offlineOrganisationUnitLevel )
+ {
+ this.offlineOrganisationUnitLevel = offlineOrganisationUnitLevel;
+ }
+
private Integer completenessOffset;
public void setCompletenessOffset( Integer completenessOffset )
@@ -194,7 +204,15 @@
{
configuration.setCompletenessRecipients( userGroupService.getUserGroup( completenessRecipients ) );
}
-
+
+ System.err.println( "Setting offline1: " + offlineOrganisationUnitLevel );
+
+ if ( offlineOrganisationUnitLevel != null )
+ {
+ System.err.println( "Setting offline2: " + offlineOrganisationUnitLevel );
+ configuration.setOfflineOrganisationUnitLevel( organisationUnitService.getOrganisationUnitLevel( offlineOrganisationUnitLevel ) );
+ }
+
if ( infrastructuralDataElements != null )
{
configuration.setInfrastructuralDataElements( dataElementService
@@ -210,7 +228,7 @@
configurationService.setConfiguration( configuration );
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 2012-03-05 16:37:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml 2012-06-27 16:54:45 +0000
@@ -1,54 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="
+ xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
<!-- System settings -->
- <bean id="org.hisp.dhis.settings.action.system.GetGeneralSettingsAction" class="org.hisp.dhis.settings.action.system.GetGeneralSettingsAction"
- scope="prototype">
+ <bean id="org.hisp.dhis.settings.action.system.GetGeneralSettingsAction"
+ class="org.hisp.dhis.settings.action.system.GetGeneralSettingsAction"
+ scope="prototype">
<property name="configurationService" ref="org.hisp.dhis.configuration.ConfigurationService" />
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
+ <property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
<property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
+ <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
</bean>
- <bean id="org.hisp.dhis.settings.action.system.SetGeneralSettingsAction" class="org.hisp.dhis.settings.action.system.SetGeneralSettingsAction"
- scope="prototype">
+ <bean id="org.hisp.dhis.settings.action.system.SetGeneralSettingsAction"
+ class="org.hisp.dhis.settings.action.system.SetGeneralSettingsAction"
+ scope="prototype">
<property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
<property name="configurationService" ref="org.hisp.dhis.configuration.ConfigurationService" />
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
+ <property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
<property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
+ <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
</bean>
- <bean id="org.hisp.dhis.settings.action.system.GetAppearanceSettingsAction" class="org.hisp.dhis.settings.action.system.GetAppearanceSettingsAction"
- scope="prototype">
+ <bean id="org.hisp.dhis.settings.action.system.GetAppearanceSettingsAction"
+ class="org.hisp.dhis.settings.action.system.GetAppearanceSettingsAction"
+ scope="prototype">
<property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
<property name="moduleManager" ref="org.hisp.dhis.webportal.module.ModuleManager" />
<property name="styleManager" ref="org.hisp.dhis.setting.StyleManager" />
</bean>
- <bean id="org.hisp.dhis.settings.action.system.SetAppearanceSettingsAction" class="org.hisp.dhis.settings.action.system.SetAppearanceSettingsAction"
- scope="prototype">
+ <bean id="org.hisp.dhis.settings.action.system.SetAppearanceSettingsAction"
+ class="org.hisp.dhis.settings.action.system.SetAppearanceSettingsAction"
+ scope="prototype">
<property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
<property name="styleManager" ref="org.hisp.dhis.setting.StyleManager" />
</bean>
- <bean id="org.hisp.dhis.settings.action.system.GetSMTPSettingsAction" class="org.hisp.dhis.settings.action.system.GetSMTPSettingsAction"
- scope="prototype">
- <property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
+ <bean id="org.hisp.dhis.settings.action.system.GetSMTPSettingsAction"
+ class="org.hisp.dhis.settings.action.system.GetSMTPSettingsAction"
+ scope="prototype">
+ <property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
</bean>
- <bean id="org.hisp.dhis.settings.action.system.SetSMTPSettingsAction" class="org.hisp.dhis.settings.action.system.SetSMTPSettingsAction"
- scope="prototype">
- <property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
+ <bean id="org.hisp.dhis.settings.action.system.SetSMTPSettingsAction"
+ class="org.hisp.dhis.settings.action.system.SetSMTPSettingsAction"
+ scope="prototype">
+ <property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
</bean>
<!-- User settings -->
-
- <bean id="org.hisp.dhis.settings.action.user.GetGeneralSettingsAction" class="org.hisp.dhis.settings.action.user.GetGeneralSettingsAction"
- scope="prototype">
+
+ <bean id="org.hisp.dhis.settings.action.user.GetGeneralSettingsAction"
+ class="org.hisp.dhis.settings.action.user.GetGeneralSettingsAction"
+ scope="prototype">
<property name="resourceBundleManager">
<ref bean="org.hisp.dhis.i18n.resourcebundle.ResourceBundleManager" />
</property>
@@ -66,8 +75,9 @@
</property>
</bean>
- <bean id="org.hisp.dhis.settings.action.user.SetGeneralSettingsAction" class="org.hisp.dhis.settings.action.user.SetGeneralSettingsAction"
- scope="prototype">
+ <bean id="org.hisp.dhis.settings.action.user.SetGeneralSettingsAction"
+ class="org.hisp.dhis.settings.action.user.SetGeneralSettingsAction"
+ scope="prototype">
<property name="localeManager">
<ref bean="org.hisp.dhis.i18n.locale.LocaleManager" />
</property>
@@ -78,16 +88,18 @@
<ref bean="org.hisp.dhis.setting.StyleManager" />
</property>
</bean>
-
- <bean id="org.hisp.dhis.settings.action.user.GetMessageSettingsAction" class="org.hisp.dhis.settings.action.user.GetMessageSettingsAction"
- scope="prototype">
+
+ <bean id="org.hisp.dhis.settings.action.user.GetMessageSettingsAction"
+ class="org.hisp.dhis.settings.action.user.GetMessageSettingsAction"
+ scope="prototype">
<property name="userSettingService">
<ref bean="org.hisp.dhis.user.UserSettingService" />
</property>
</bean>
- <bean id="org.hisp.dhis.settings.action.user.SetMessageSettingsAction" class="org.hisp.dhis.settings.action.user.SetMessageSettingsAction"
- scope="prototype">
+ <bean id="org.hisp.dhis.settings.action.user.SetMessageSettingsAction"
+ class="org.hisp.dhis.settings.action.user.SetMessageSettingsAction"
+ scope="prototype">
<property name="userSettingService">
<ref bean="org.hisp.dhis.user.UserSettingService" />
</property>
=== 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 2012-05-03 16:28:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2012-06-27 16:54:45 +0000
@@ -102,4 +102,5 @@
cache_strategy=Cache strategy
no_cache=No cache
cache_until_6am_tomorrow=Cache until 6 AM tomorrow
-cache_for_two_weeks=Cache for two weeks
\ No newline at end of file
+cache_for_two_weeks=Cache for two weeks
+offline_orgunit_level=Offline Organisation Unit Level
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm 2012-04-16 12:26:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm 2012-06-27 16:54:45 +0000
@@ -6,7 +6,8 @@
infrastructuralDataElements: getFieldValue( 'infrastructuralDataElements' ),
infrastructuralPeriodType: getFieldValue( 'infrastructuralPeriodType' ),
feedbackRecipients: getFieldValue( 'feedbackRecipients' ),
- completenessRecipients: getFieldValue( 'completenessRecipients' ),
+ completenessRecipients: getFieldValue( 'completenessRecipients' ),
+ offlineOrganisationUnitLevel: getFieldValue( 'offlineOrganisationUnitLevel' ),
omitIndicatorsZeroNumeratorDataMart: jQuery( '#omitIndicatorsZeroNumeratorDataMart' ).is( ':checked' ),
disableDataEntryWhenCompleted: jQuery( '#disableDataEntryWhenCompleted' ).is( ':checked' ),
factorDeviation: getFieldValue( 'factorDeviation' ),
@@ -78,6 +79,17 @@
</select>
</p>
+<!-- offline_orgunit_level -->
+<h4>$i18n.getString( "offline_orgunit_level" )</h4>
+
+<p>
+<select id="offlineOrganisationUnitLevel" name="offlineOrganisationUnitLevel" style="width:30em">
+ #foreach ( $organisationUnitLevel in $organisationUnitLevels )
+ <option value="$organisationUnitLevel.id" #if( $organisationUnitLevel.id == $!offlineOrganisationUnitLevel.id)selected="selected"#end>$encoder.htmlEncode( $organisationUnitLevel.name )</option>
+ #end
+</select>
+</p>
+
<!-- omit_indicators_zero_numerator_data_mart -->
<h4>$i18n.getString( "omit_indicators_zero_numerator_data_mart" )</h4>
