dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1911
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-08-09 16:06:18 +0700
message:
  Data Integrity Check - Added missing properties for responseDataIntegrity.vm file and updated i18n for languages.
  Including: "dataElementsViolatingCompulsoryGroupSets", "dataElementsViolatingExclusiveGroupSets", "indicatorsViolatingCompulsoryGroupSets", "indicatorsViolatingExclusiveGroupSets".
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/NoAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseDataIntegrity.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-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/NoAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/NoAction.java	2010-05-05 09:17:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/NoAction.java	2010-08-09 09:06:18 +0000
@@ -31,9 +31,7 @@
 
 /**
  * @author Lars Helge Overland
- * @version $Id$
- * @modifier Dang Duy Hieu
- * @since 2010-05-04
+ * @version $Id NoAction.java Dang Duy Hieu May 04, 2010$
  */
 public class NoAction
     implements Action

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-08-09 03:57:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-08-09 09:06:18 +0000
@@ -289,4 +289,9 @@
 unselect_all_in_group_saved											= Unselect All at Group Saved
 information_successfully_locked										= Data Successfully Locked
 information_successfully_unlocked									= Data Successfully Unlocked
-organisation_unit_not_selected										= Please select an organisation unit 
\ No newline at end of file
+organisation_unit_not_selected										= Please select an organisation unit
+header_field                                                        = Field No.
+close                                                               = Close
+append                                                              = Append
+resourcetable_at_position                                           = Resource table at the position
+unselected_yet                                                      = un-selected yet
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties	2010-08-09 03:57:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties	2010-08-09 09:06:18 +0000
@@ -267,4 +267,9 @@
 descending                                                          = Gi\u1ea3m d\u1ea7n
 properties_welformed                                                = Ch\u1ec9 nh\u1eadp k\u00fd t\u1ef1 Alphabet, S\u1ed1(0-9), D\u1ea5u *, (, ) v\u00e0 kho\u1ea3ng tr\u1eafng
 syntax_error_parameter_required                                     = L\u1ed7i c\u00fa ph\u00e1p - Thi\u1ebfu d\u1ea5u ngo\u1eb7c ho\u1eb7c \u0111\u1ed1i s\u1ed1 cho bi\u1ec3u th\u1ee9c
-cannot_remove_any_more                                              = Kh\u00f4ng th\u1ec3 x\u00f3a th\u00eam g\u00ec n\u1eefa
\ No newline at end of file
+cannot_remove_any_more                                              = Kh\u00f4ng th\u1ec3 x\u00f3a th\u00eam g\u00ec n\u1eefa
+header_field                                                        = C\u1ed9t th\u1ee9
+close                                                               = \u0110\u00f3ng
+append                                                              = Th\u00eam c\u1ed9t
+resourcetable_at_position                                           = B\u1ea3ng Resource t\u1ea1i v\u1ecb tr\u00ed th\u1ee9
+unselected_yet                                                      = Ch\u01b0a \u0111\u01b0\u1ee3c ch\u1ecdn
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseDataIntegrity.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseDataIntegrity.vm	2010-03-19 04:15:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseDataIntegrity.vm	2010-08-09 09:06:18 +0000
@@ -40,12 +40,16 @@
 {
     #violation( "dataElementsWithoutDataSet" $dataElementsWithoutDataSet ),
     #violation( "dataElementsWithoutGroups" $dataElementsWithoutGroups ),    
+    #violation( "dataElementsViolatingCompulsoryGroupSets" $dataElementsViolatingCompulsoryGroupSets ),    
+    #violation( "dataElementsViolatingExclusiveGroupSets" $dataElementsViolatingExclusiveGroupSets ),    
     #violationWithMapList( "dataElementsAssignedToDataSetsWithDifferentPeriodTypes" $dataElementsAssignedToDataSetsWithDifferentPeriodTypes ),    
     #violation( "dataSetsNotAssignedToOrganisationUnits" $dataSetsNotAssignedToOrganisationUnits ),
     #violationWithCollection( "indicatorsWithIdenticalFormulas" $indicatorsWithIdenticalFormulas ),
     #violation( "indicatorsWithoutGroups" $indicatorsWithoutGroups ),    
     #violationWithMap( "invalidIndicatorNumerators" $invalidIndicatorNumerators ),
     #violationWithMap( "invalidIndicatorDenominators" $invalidIndicatorDenominators ),        
+    #violation( "indicatorsViolatingCompulsoryGroupSets" $indicatorsViolatingCompulsoryGroupSets ),        
+    #violation( "indicatorsViolatingExclusiveGroupSets" $indicatorsViolatingExclusiveGroupSets ),        
     #violation( "organisationUnitsWithCyclicReferences" $organisationUnitsWithCyclicReferences ),
     #violation( "orphanedOrganisationUnits" $orphanedOrganisationUnits ),
     #violation( "organisationUnitsWithoutGroups" $organisationUnitsWithoutGroups ),