dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #10913
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3013: Removed check for compulsory dataelement/indicator group sets in integrity check as there is no s...
------------------------------------------------------------
revno: 3013
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-03-13 06:02:23 +0100
message:
Removed check for compulsory dataelement/indicator group sets in integrity check as there is no such thing anymore
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataintegrity/DataIntegrityService.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/dataintegrity/GetDataIntegrityAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataIntegrityForm.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/dataintegrity/DataIntegrityService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataintegrity/DataIntegrityService.java 2010-11-29 17:16:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataintegrity/DataIntegrityService.java 2011-03-13 05:02:23 +0000
@@ -65,12 +65,6 @@
Collection<DataElement> getDataElementsWithoutGroups();
/**
- * Gets all data elements which are not members of one or more groups
- * which enter into a compulsory group set.
- */
- Collection<DataElement> getDataElementsViolatingCompulsoryGroupSets();
-
- /**
* Gets all data elements units which are members of more than one group
* which enter into an exclusive group set.
*/
@@ -126,12 +120,6 @@
SortedMap<Indicator, String> getInvalidIndicatorDenominators();
/**
- * Gets all indicators which are not members of one or more groups
- * which enter into a compulsory group set.
- */
- Collection<Indicator> getIndicatorsViolatingCompulsoryGroupSets();
-
- /**
* Gets all indicators units which are members of more than one group
* which enter into an exclusive group set.
*/
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java 2010-11-29 17:16:41 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java 2011-03-13 05:02:23 +0000
@@ -188,30 +188,6 @@
}
@Override
- public Collection<DataElement> getDataElementsViolatingCompulsoryGroupSets()
- {
- Collection<DataElementGroupSet> groupSets = dataElementService.getAllDataElementGroupSets();
-
- Collection<DataElement> dataElements = dataElementService.getAllDataElements();
-
- Set<DataElement> targets = new HashSet<DataElement>();
-
- for ( DataElement de : dataElements )
- {
- for ( DataElementGroupSet groupSet : groupSets )
- {
- if ( !CollectionUtils.containsAny( groupSet.getMembers(), de.getGroups() ) )
- {
- targets.add( de );
- }
- }
- }
-
- return targets;
-
- }
-
- @Override
public Collection<DataElement> getDataElementsViolatingExclusiveGroupSets()
{
Collection<DataElementGroupSet> groupSets = dataElementService.getAllDataElementGroupSets();
@@ -345,29 +321,6 @@
}
@Override
- public Collection<Indicator> getIndicatorsViolatingCompulsoryGroupSets()
- {
- Collection<IndicatorGroupSet> groupSets = indicatorService.getAllIndicatorGroupSets();
-
- Collection<Indicator> indicators = indicatorService.getAllIndicators();
-
- Set<Indicator> targets = new HashSet<Indicator>();
-
- for ( Indicator in : indicators)
- {
- for ( IndicatorGroupSet groupSet : groupSets )
- {
- if ( !CollectionUtils.containsAny( groupSet.getMembers(), in.getGroups() ) )
- {
- targets.add( in );
- }
- }
- }
-
- return targets;
- }
-
- @Override
public Collection<Indicator> getIndicatorsViolatingExclusiveGroupSets()
{
Collection<IndicatorGroupSet> groupSets = indicatorService.getAllIndicatorGroupSets();
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/dataintegrity/GetDataIntegrityAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/dataintegrity/GetDataIntegrityAction.java 2011-01-20 11:39:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/dataintegrity/GetDataIntegrityAction.java 2011-03-13 05:02:23 +0000
@@ -91,13 +91,6 @@
return dataElementsWithoutGroups;
}
- private List<DataElement> dataElementsViolatingCompulsoryGroupSets;
-
- public List<DataElement> getDataElementsViolatingCompulsoryGroupSets()
- {
- return dataElementsViolatingCompulsoryGroupSets;
- }
-
private List<DataElement> dataElementsViolatingExclusiveGroupSets;
public List<DataElement> getDataElementsViolatingExclusiveGroupSets()
@@ -154,13 +147,6 @@
return invalidIndicatorDenominators;
}
- private List<Indicator> indicatorsViolatingCompulsoryGroupSets;
-
- public List<Indicator> getIndicatorsViolatingCompulsoryGroupSets()
- {
- return indicatorsViolatingCompulsoryGroupSets;
- }
-
private List<Indicator> indicatorsViolatingExclusiveGroupSets;
public List<Indicator> getIndicatorsViolatingExclusiveGroupSets()
@@ -240,7 +226,6 @@
dataElementsWithoutDataSet = new ArrayList<DataElement>( dataIntegrityService.getDataElementsWithoutDataSet() );
dataElementsWithoutGroups = new ArrayList<DataElement>( dataIntegrityService.getDataElementsWithoutGroups() );
dataElementsAssignedToDataSetsWithDifferentPeriodTypes = dataIntegrityService.getDataElementsAssignedToDataSetsWithDifferentPeriodTypes();
- dataElementsViolatingCompulsoryGroupSets = new ArrayList<DataElement>( dataIntegrityService.getDataElementsViolatingCompulsoryGroupSets() );
dataElementsViolatingExclusiveGroupSets = new ArrayList<DataElement>( dataIntegrityService.getDataElementsViolatingExclusiveGroupSets() );
log.info( "Checked data elements" );
@@ -254,7 +239,6 @@
indicatorsWithoutGroups = new ArrayList<Indicator>( dataIntegrityService.getIndicatorsWithoutGroups() );
invalidIndicatorNumerators = dataIntegrityService.getInvalidIndicatorNumerators();
invalidIndicatorDenominators = dataIntegrityService.getInvalidIndicatorDenominators();
- indicatorsViolatingCompulsoryGroupSets = new ArrayList<Indicator>( dataIntegrityService.getIndicatorsViolatingCompulsoryGroupSets() );
indicatorsViolatingExclusiveGroupSets = new ArrayList<Indicator>( dataIntegrityService.getIndicatorsViolatingExclusiveGroupSets() );
log.info( "Checked indicators" );
@@ -283,12 +267,10 @@
Collections.sort( dataElementsWithoutDataSet, new DataElementNameComparator() );
Collections.sort( dataElementsWithoutGroups, new DataElementNameComparator() );
- Collections.sort( dataElementsViolatingCompulsoryGroupSets, new DataElementNameComparator() );
Collections.sort( dataElementsViolatingExclusiveGroupSets, new DataElementNameComparator() );
Collections.sort( dataSetsNotAssignedToOrganisationUnits, new DataSetNameComparator() );
Collections.sort( sectionsWithInvalidCategoryCombinations, new SectionOrderComparator() );
Collections.sort( indicatorsWithoutGroups, new IndicatorNameComparator() );
- Collections.sort( indicatorsViolatingCompulsoryGroupSets, new IndicatorNameComparator() );
Collections.sort( indicatorsViolatingExclusiveGroupSets, new IndicatorNameComparator() );
Collections.sort( organisationUnitsWithCyclicReferences, new OrganisationUnitNameComparator() );
Collections.sort( orphanedOrganisationUnits, new OrganisationUnitNameComparator() );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataIntegrityForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataIntegrityForm.vm 2010-11-29 17:16:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataIntegrityForm.vm 2011-03-13 05:02:23 +0000
@@ -14,7 +14,6 @@
#integrityItem( $i18n.getString( "data_elements_without_data_set" ) "dataElementsWithoutDataSet" )
#integrityItem( $i18n.getString( "data_elements_without_groups" ) "dataElementsWithoutGroups" )
-#integrityItem( $i18n.getString( "data_elements_violating_compulsory_group_sets" ) "dataElementsViolatingCompulsoryGroupSets" )
#integrityItem( $i18n.getString( "data_elements_violating_exclusive_group_sets" ) "dataElementsViolatingExclusiveGroupSets" )
#integrityItem( $i18n.getString( "data_elements_assigned_to_period_types_with_different_period_types" ) "dataElementsAssignedToDataSetsWithDifferentPeriodTypes" )
#integrityItem( $i18n.getString( "data_sets_not_assigned_to_organisation_units" ) "dataSetsNotAssignedToOrganisationUnits" )
@@ -23,7 +22,6 @@
#integrityItem( $i18n.getString( "indicators_without_groups" ) "indicatorsWithoutGroups" )
#integrityItem( $i18n.getString( "invalid_indicator_numerators" ) "invalidIndicatorNumerators" )
#integrityItem( $i18n.getString( "invalid_indicator_denominators" ) "invalidIndicatorDenominators" )
-#integrityItem( $i18n.getString( "indicators_violating_compulsory_group_sets" ) "indicatorsViolatingCompulsoryGroupSets" )
#integrityItem( $i18n.getString( "indicators_violating_exclusive_group_sets" ) "indicatorsViolatingExclusiveGroupSets" )
#integrityItem( $i18n.getString( "organisation_units_with_cyclic_references" ) "organisationUnitsWithCyclicReferences" )
#integrityItem( $i18n.getString( "orphaned_organisation_units" ) "orphanedOrganisationUnits" )
