dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #03777
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1256: add system setting disable data entry when data set completed and add authority for change system...
------------------------------------------------------------
revno: 1256
committer: Tran Thanh Tri <Tran Thanh Tri@compaq>
branch nick: trunk
timestamp: Mon 2009-12-21 12:32:40 +0700
message:
add system setting disable data entry when data set completed and add authority for change system setting
modified:
dhis-2/dhis-options/src/main/java/org/hisp/dhis/options/SystemSettingManager.java
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.vm
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetSystemSettingsAction.java
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_vi_VN.properties
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/webapp/dhis-web-maintenance-settings/systemSettings.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties
--
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-options/src/main/java/org/hisp/dhis/options/SystemSettingManager.java'
--- dhis-2/dhis-options/src/main/java/org/hisp/dhis/options/SystemSettingManager.java 2009-09-14 19:02:15 +0000
+++ dhis-2/dhis-options/src/main/java/org/hisp/dhis/options/SystemSettingManager.java 2009-12-21 05:32:40 +0000
@@ -53,6 +53,8 @@
final String KEY_GIS_LONGITUDE = "longitude";
final String KEY_GIS_LATITUDE = "latitude";
+
+ final String KEY_DISABLE_DATAENTRYFORM_WHEN_COMPLETED = "dataEntryFormCompleted";
void saveSystemSetting( String name, Serializable value );
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java 2009-09-14 16:00:37 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java 2009-12-21 05:32:40 +0000
@@ -34,6 +34,7 @@
import static org.hisp.dhis.options.SystemSettingManager.KEY_START_MODULE;
import static org.hisp.dhis.options.SystemSettingManager.KEY_ZERO_VALUE_SAVE_MODE;
import static org.hisp.dhis.options.SystemSettingManager.KEY_REPORT_FRAMEWORK;
+import static org.hisp.dhis.options.SystemSettingManager.KEY_DISABLE_DATAENTRYFORM_WHEN_COMPLETED;
import java.util.HashMap;
import java.util.Map;
@@ -86,6 +87,7 @@
map.put( KEY_ZERO_VALUE_SAVE_MODE, systemSettingManager.getSystemSetting( KEY_ZERO_VALUE_SAVE_MODE, false ) );
map.put( KEY_FORUM_INTEGRATION, systemSettingManager.getSystemSetting( KEY_FORUM_INTEGRATION, false ) );
map.put( KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART, systemSettingManager.getSystemSetting( KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART, false ) );
+ map.put( KEY_DISABLE_DATAENTRYFORM_WHEN_COMPLETED, systemSettingManager.getSystemSetting( KEY_DISABLE_DATAENTRYFORM_WHEN_COMPLETED, false ) );
invocation.getStack().push( map );
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2009-12-11 21:25:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2009-12-21 05:32:40 +0000
@@ -58,9 +58,7 @@
dhis-web-dataentry-national = Linelisting Data Entry
dhis-web-validationrule-local-in = Validation Analysis
dhis-web-mapping = GIS
-dhis-web-vn-report = Excel Reports
dhis-web-survey = Survey
-dhis-web-chr-form = Child Health Record
dhis-web-excel-reporting = Excel Reports
dhis-web-mobile = Mobiles
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties 2009-12-17 07:15:16 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties 2009-12-21 05:32:40 +0000
@@ -39,7 +39,7 @@
dhis-web-maintenance-organisationunit = \u0110\u01a1n v\u1ecb
dhis-web-maintenance-user = Ng\u01b0\u1eddi d\u00f9ng
dhis-web-maintenance-dataadmin = Qu\u1ea3n tr\u1ecb d\u1eef li\u1ec7u
-dhis-web-maintenance-settings = Settings
+dhis-web-maintenance-settings = C\u00e0i \u0111\u1eb7t
dhis-web-dataentry = Nh\u1eadp d\u1eef li\u1ec7u
dhis-web-importexport = Sao l\u01b0u d\u1eef li\u1ec7u
dhis-web-datamart = T\u1ed5ng h\u1ee3p d\u1eef li\u1ec7u
@@ -48,7 +48,6 @@
dhis-web-gis = B\u1ea3n \u0111\u1ed3
dhis-web-reporting = B\u00e1o c\u00e1o
dhis-web-openhealth-integration = Ph\u00e2n t\u00edch d\u1eef li\u1ec7u
-dhis-web-vn-report = B\u00e1o c\u00e1o
dhis-web-datastatus = Tr\u1ea1ng th\u00e1i d\u1eef li\u1ec7u
dhis-web-excel-reporting = B\u00e1o c\u00e1o excel
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.vm 2009-12-09 12:01:02 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.vm 2009-12-21 05:32:40 +0000
@@ -7,6 +7,8 @@
#parse( "/dhis-web-dataentry/select.vm" )
+<div id="entryform">
+
#if ( $customDataEntryFormExists && !$useDefaultForm )
#foreach( $optionCombo in $orderdCategoryOptionCombos )
@@ -171,7 +173,7 @@
#end
</table>
#end
-
+</div>
#parse( "/dhis-web-dataentry/completeRegistration.vm" )
<script type="text/javascript">
@@ -196,4 +198,24 @@
#set( $count = $count + 1 )
#end
}
+ #if( $registration || $periods.size() == 0 )
+ changeInputTextStatus(true);
+ #end
+
+ function changeInputTextStatus( disabled ){
+
+ if($dataEntryFormCompleted){
+ var entryform = document.getElementById("entryform");
+
+ var inputList = entryform.getElementsByTagName('input');
+ for(var i=0;i<inputList.length;i++){
+ var input = inputList[i];
+
+ input.disabled = disabled;
+
+ }
+ }
+
+ }
+
</script>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2009-12-09 12:01:02 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2009-12-21 05:32:40 +0000
@@ -303,6 +303,7 @@
document.getElementById( "undoButton" ).disabled = false;
document.getElementById( "dateField" ).disabled = true;
document.getElementById( "dateDiv" ).style.display = "none";
+ changeInputTextStatus( true );
}
function undoCompleteDataSet()
@@ -325,4 +326,5 @@
document.getElementById( "undoButton" ).disabled = true;
document.getElementById( "dateField" ).disabled = false;
document.getElementById( "dateDiv" ).style.display = "inline";
+ changeInputTextStatus( false );
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetSystemSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetSystemSettingsAction.java 2009-09-14 16:00:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetSystemSettingsAction.java 2009-12-21 05:32:40 +0000
@@ -34,6 +34,7 @@
import static org.hisp.dhis.options.SystemSettingManager.KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART;
import static org.hisp.dhis.options.SystemSettingManager.KEY_START_MODULE;
import static org.hisp.dhis.options.SystemSettingManager.KEY_ZERO_VALUE_SAVE_MODE;
+import static org.hisp.dhis.options.SystemSettingManager.KEY_DISABLE_DATAENTRYFORM_WHEN_COMPLETED;
import org.hisp.dhis.options.SystemSettingManager;
@@ -60,14 +61,14 @@
// -------------------------------------------------------------------------
// Output
// -------------------------------------------------------------------------
-
+
private String applicationTitle;
public void setApplicationTitle( String applicationTitle )
{
this.applicationTitle = applicationTitle;
}
-
+
private String flag;
public void setFlag( String flag )
@@ -83,7 +84,7 @@
}
private String reportFramework;
-
+
public void setReportFramework( String reportFramework )
{
this.reportFramework = reportFramework;
@@ -95,50 +96,60 @@
{
this.zeroValueSaveMode = zeroValueSaveMode;
}
-
+
private Boolean forumIntegration;
public void setForumIntegration( Boolean forumIntegration )
{
this.forumIntegration = forumIntegration;
}
-
+
private Boolean omitIndicatorsZeroNumeratorDataMart;
public void setOmitIndicatorsZeroNumeratorDataMart( Boolean omitIndicatorsZeroNumeratorDataMart )
{
this.omitIndicatorsZeroNumeratorDataMart = omitIndicatorsZeroNumeratorDataMart;
}
-
+
+ private boolean disableDataEntryWhenCompleted;
+
+ public void setDisableDataEntryWhenCompleted( boolean disableDataEntryWhenCompleted )
+ {
+ this.disableDataEntryWhenCompleted = disableDataEntryWhenCompleted;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
-
+
public String execute()
{
if ( applicationTitle != null && applicationTitle.trim().length() == 0 )
{
applicationTitle = null;
}
-
+
if ( flag != null && flag.equals( "NO_FLAG" ) )
{
flag = null;
}
-
+
if ( startModule != null && startModule.equals( "NO_START_PAGE" ) )
{
startModule = null;
}
-
- systemSettingManager.saveSystemSetting( KEY_APPLICATION_TITLE, applicationTitle );
+
+ systemSettingManager.saveSystemSetting( KEY_APPLICATION_TITLE, applicationTitle );
systemSettingManager.saveSystemSetting( KEY_FLAG, flag );
systemSettingManager.saveSystemSetting( KEY_START_MODULE, startModule );
systemSettingManager.saveSystemSetting( KEY_REPORT_FRAMEWORK, reportFramework );
systemSettingManager.saveSystemSetting( KEY_ZERO_VALUE_SAVE_MODE, zeroValueSaveMode );
systemSettingManager.saveSystemSetting( KEY_FORUM_INTEGRATION, forumIntegration );
- systemSettingManager.saveSystemSetting( KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART, omitIndicatorsZeroNumeratorDataMart );
-
+ systemSettingManager.saveSystemSetting( KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART,
+ omitIndicatorsZeroNumeratorDataMart );
+ systemSettingManager
+ .saveSystemSetting( KEY_DISABLE_DATAENTRYFORM_WHEN_COMPLETED, disableDataEntryWhenCompleted );
+
return SUCCESS;
}
}
=== 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 2009-11-29 15:09:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2009-12-21 05:32:40 +0000
@@ -87,4 +87,5 @@
birt = BIRT
jasper = Jasper Reports
intro_user_settings = Customize the system with user specific settings for locale, sort order, display property, style and more.
-intro_system_settings = Customize the system behavior with regard to reporting framework, start page, title, flag and more.
\ No newline at end of file
+intro_system_settings = Customize the system behavior with regard to reporting framework, start page, title, flag and more.
+disable_dataentry_when_dataset_completed = Disable data entry when data set completed.
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_vi_VN.properties 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_vi_VN.properties 2009-12-21 05:32:40 +0000
@@ -1,36 +1,37 @@
#Resource generated by I18n Resource Editor
#Sun Jul 15 15:02:40 GMT+07:00 2007
-set_title_color=M\u00E0u c\u1EE7a d\u00F2ng ti\u00EAu \u0111\u1EC1
-code=M\u00E3
-delete_background_color_in_menu=X\u00F3a m\u00E0u n\u1EC1n c\u1EE7a tr\u00ECnh \u0111\u01A1n
-shortname=T\u00EAn vi\u1EBFt t\u1EAFt
-store_title_color=L\u01B0u m\u00E0u c\u1EE7a d\u00F2ng ti\u00EAu \u0111\u1EC1
-set_background_color_in_menu=M\u00E0u n\u1EC1n c\u1EE7a tr\u00ECnh \u0111\u01A1n
-delete_top_background_color=X\u00F3a m\u00E0u n\u1EC1n ph\u00EDa tr\u00EAn
-set_menu_element_colour=M\u00E0u c\u1EE7a tr\u00ECnh \u0111\u01A1n
-choose_db_language=Ch\u1ECDn ng\u00F4n ng\u1EEF c\u01A1 s\u1EDF d\u1EEF li\u1EC7u
-store_menu_element_colour=L\u01B0u m\u00E0y c\u1EE7a tr\u00ECnh \u0111\u01A1n
-delete_menu_element_colour=X\u00F3a m\u00E0u c\u1EE7a c\u00E1c th\u00E0nh ph\u1EA7n tr\u00ECnh \u0111\u01A1n
-store=L\u01B0u
-choose_sort_order=Ch\u1ECDn th\u1EE9 t\u1EF1 s\u1EAFp x\u1EBFp
-alternativename=T\u00EAn thay th\u1EBF
-set_title=Ti\u00EAu \u0111\u1EC1 ch\u01B0\u01A1ng tr\u00ECnh
-welcome_to=Ch\u00E0o m\u1EEBng \u0111\u1EBFn v\u1EDBi
-set_top_background_color=M\u00E0u n\u1EC1n ph\u00EDa tr\u00EAn
-delete_left_background_color=X\u00F3a m\u00E0u n\u1EC1n b\u00EAn tr\u00E1i
-user_settings=C\u00E0i \u0111\u1EB7t ng\u01B0\u1EDDi d\u00F9ng
-delete_title_color=X\u00F3a m\u00E0u c\u1EE7a d\u00F2ng ti\u00EAu \u0111\u1EC1
-delete_active_menu_element_color=X\u00F3a m\u00E0u c\u1EE7a tr\u00ECnh \u0111\u01A1n k\u00EDch ho\u1EA1t
-store_active_menu_element_color=L\u01B0u m\u00E0u c\u1EE7a tr\u00ECnh \u0111\u01A1n \u0111\u01B0\u1EE3c k\u00EDch ho\u1EA1t
-dhis-web-maintenance-settings=C\u00E0i \u0111\u1EB7t
-store_left_background_color=L\u01B0u m\u00E0u n\u1EC1n b\u00EAn tr\u00E1i
-set_active_menu_element_color=M\u00E0u c\u1EE7a tr\u00ECnh \u0111\u01A1n k\u00EDch ho\u1EA1t
-help=Tr\u1EE3 gi\u00FAp
-store_background_color_in_menu=L\u01B0u m\u00E0u n\u1EC1n c\u1EE7a tr\u00ECnh \u0111\u01A1n
-choose_display_property=Ch\u1ECDn ch\u1EBF \u0111\u1ED9 hi\u1EC3n th\u1ECB
-store_top_background_color=L\u01B0u m\u00E0u n\u1EC1n ph\u00EDa tr\u00EAn
-system_settings=C\u00E0i \u0111\u1EB7t h\u1EC7 th\u1ED1ng
-store_title=L\u01B0u m\u00E0u c\u1EE7a ti\u00EAu \u0111\u1EC1
-set_left_background_color=M\u00E0u n\u1EC1n b\u00EAn tr\u00E1i
-choose_language=Ch\u1ECDn ng\u00F4n ng\u1EEF
-name=T\u00EAn
+set_title_color=M\u00e0u c\u1ee7a d\u00f2ng ti\u00eau \u0111\u1ec1
+code=M\u00e3
+delete_background_color_in_menu=X\u00f3a m\u00e0u n\u1ec1n c\u1ee7a tr\u00ecnh \u0111\u01a1n
+shortname=T\u00ean vi\u1ebft t\u1eaft
+store_title_color=L\u01b0u m\u00e0u c\u1ee7a d\u00f2ng ti\u00eau \u0111\u1ec1
+set_background_color_in_menu=M\u00e0u n\u1ec1n c\u1ee7a tr\u00ecnh \u0111\u01a1n
+delete_top_background_color=X\u00f3a m\u00e0u n\u1ec1n ph\u00eda tr\u00ean
+set_menu_element_colour=M\u00e0u c\u1ee7a tr\u00ecnh \u0111\u01a1n
+choose_db_language=Ch\u1ecdn ng\u00f4n ng\u1eef c\u01a1 s\u1edf d\u1eef li\u1ec7u
+store_menu_element_colour=L\u01b0u m\u00e0y c\u1ee7a tr\u00ecnh \u0111\u01a1n
+delete_menu_element_colour=X\u00f3a m\u00e0u c\u1ee7a c\u00e1c th\u00e0nh ph\u1ea7n tr\u00ecnh \u0111\u01a1n
+store=L\u01b0u
+choose_sort_order=Ch\u1ecdn th\u1ee9 t\u1ef1 s\u1eafp x\u1ebfp
+alternativename=T\u00ean thay th\u1ebf
+set_title=Ti\u00eau \u0111\u1ec1 ch\u01b0\u01a1ng tr\u00ecnh
+welcome_to=Ch\u00e0o m\u1eebng \u0111\u1ebfn v\u1edbi
+set_top_background_color=M\u00e0u n\u1ec1n ph\u00eda tr\u00ean
+delete_left_background_color=X\u00f3a m\u00e0u n\u1ec1n b\u00ean tr\u00e1i
+user_settings=C\u00e0i \u0111\u1eb7t ng\u01b0\u1eddi d\u00f9ng
+delete_title_color=X\u00f3a m\u00e0u c\u1ee7a d\u00f2ng ti\u00eau \u0111\u1ec1
+delete_active_menu_element_color=X\u00f3a m\u00e0u c\u1ee7a tr\u00ecnh \u0111\u01a1n k\u00edch ho\u1ea1t
+store_active_menu_element_color=L\u01b0u m\u00e0u c\u1ee7a tr\u00ecnh \u0111\u01a1n \u0111\u01b0\u1ee3c k\u00edch ho\u1ea1t
+dhis-web-maintenance-settings=C\u00e0i \u0111\u1eb7t
+store_left_background_color=L\u01b0u m\u00e0u n\u1ec1n b\u00ean tr\u00e1i
+set_active_menu_element_color=M\u00e0u c\u1ee7a tr\u00ecnh \u0111\u01a1n k\u00edch ho\u1ea1t
+help=Tr\u1ee3 gi\u00fap
+store_background_color_in_menu=L\u01b0u m\u00e0u n\u1ec1n c\u1ee7a tr\u00ecnh \u0111\u01a1n
+choose_display_property=Ch\u1ecdn ch\u1ebf \u0111\u1ed9 hi\u1ec3n th\u1ecb
+store_top_background_color=L\u01b0u m\u00e0u n\u1ec1n ph\u00eda tr\u00ean
+system_settings=C\u00e0i \u0111\u1eb7t h\u1ec7 th\u1ed1ng
+store_title=L\u01b0u m\u00e0u c\u1ee7a ti\u00eau \u0111\u1ec1
+set_left_background_color=M\u00e0u n\u1ec1n b\u00ean tr\u00e1i
+choose_language=Ch\u1ecdn ng\u00f4n ng\u1eef
+name=T\u00ean
+disable_dataentry_when_dataset_completed = Kh\u00f4ng cho thay \u0111\u1ed5i d\u1eef li\u1ec7u khi t\u1eadp h\u1ee3p d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c khai b\u00e1o ho\u00e0n ch\u1ec9nh.
=== 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 2009-11-03 09:05:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml 2009-12-21 05:32:40 +0000
@@ -21,6 +21,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-settings/systemSettings.vm</param>
<param name="menu">/dhis-web-maintenance-settings/settingsMenu.vm</param>
+ <param name="requiredAuthorities">F_SYSTEM_SETTING</param>
</action>
<action name="setSystemSettings" class="org.hisp.dhis.settings.action.system.SetSystemSettingsAction">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemSettings.vm 2009-09-14 16:00:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemSettings.vm 2009-12-21 05:32:40 +0000
@@ -56,6 +56,12 @@
<input type="checkbox" id="omitIndicatorsZeroNumeratorDataMart" name="omitIndicatorsZeroNumeratorDataMart" value="true" #if( $omitIndicatorsZeroNumeratorDataMart )checked="checked"#end>
</p>
+<h4>$i18n.getString( "disable_dataentry_when_dataset_completed" )</h4>
+
+<p>
+<input type="checkbox" id="disableDataEntryWhenCompleted" name="disableDataEntryWhenCompleted" value="true" #if( $dataEntryFormCompleted )checked="checked"#end>
+</p>
+
<p><input type="submit" value="$i18n.getString( "save" )" style="width:10em"></p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2009-12-09 15:49:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2009-12-21 05:32:40 +0000
@@ -108,6 +108,7 @@
F_PROGRAMSTAGE_ADD = Add Program Stage
F_PROGRAMSTAGE_UPDATE = Update Program Stage
F_PROGRAMSTAGE_DELETE = Delete Program Stage
+F_SYSTEM_SETTING = Change system settings
#-- User module ---------------------------------------------------------------#
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties 2009-09-25 06:10:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties 2009-12-21 05:32:40 +0000
@@ -119,4 +119,5 @@
M_dhis-web-openhealth-integration = Xem module open health
M_dhis-web-excel-reporting = Xem module b\u00e1o c\u00e1o excel
F_EXCEL_REPORT_ADMINISTRATION = Qu\u1ea3n tr\u1ecb module b\u00e1o c\u00e1o excel
-excel_reporting = B\u00e1o c\u00e1o Excels
\ No newline at end of file
+excel_reporting = B\u00e1o c\u00e1o Excels
+F_SYSTEM_SETTING = Thay \u0111\u1ed5i c\u00e0i \u0111\u1eb7t h\u1ec7 th\u1ed1ng
\ No newline at end of file
