dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19136
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8231: Removed system setting for data set completeness recipients
------------------------------------------------------------
revno: 8231
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-09-24 16:34:31 +0200
message:
Removed system setting for data set completeness recipients
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.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/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 2012-06-27 16:54:45 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java 2012-09-24 14:34:31 +0000
@@ -52,8 +52,6 @@
private UserGroup feedbackRecipients;
- private UserGroup completenessRecipients;
-
private OrganisationUnitLevel offlineOrganisationUnitLevel;
private DataElementGroup infrastructuralDataElements;
@@ -97,16 +95,6 @@
this.feedbackRecipients = feedbackRecipients;
}
- public UserGroup getCompletenessRecipients()
- {
- return completenessRecipients;
- }
-
- public void setCompletenessRecipients( UserGroup completenessRecipients )
- {
- this.completenessRecipients = completenessRecipients;
- }
-
public void setOfflineOrganisationUnitLevel( OrganisationUnitLevel offlineOrganisationUnitLevel )
{
this.offlineOrganisationUnitLevel = offlineOrganisationUnitLevel;
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java 2012-05-30 08:41:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java 2012-09-24 14:34:31 +0000
@@ -156,7 +156,7 @@
public int sendCompletenessMessage( CompleteDataSetRegistration registration )
{
- UserGroup userGroup = configurationService.getConfiguration().getCompletenessRecipients();
+ UserGroup userGroup = new UserGroup(); //TODO
DataSet dataSet = registration.getDataSet();
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2012-09-19 16:14:28 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2012-09-24 14:34:31 +0000
@@ -120,6 +120,7 @@
executeSql( "ALTER TABLE indicator DROP COLUMN numeratoraggregationtype" );
executeSql( "ALTER TABLE indicator DROP COLUMN denominatoraggregationtype" );
executeSql( "ALTER TABLE dataset DROP COLUMN locked" );
+ executeSql( "ALTER TABLE configuration DROP COLUMN completenessrecipientsid" );
executeSql( "DROP INDEX crosstab" );
=== 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 2012-06-27 16:54:45 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml 2012-09-24 14:34:31 +0000
@@ -13,9 +13,6 @@
<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" />
=== 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-06-27 16:54:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetGeneralSettingsAction.java 2012-09-24 14:34:31 +0000
@@ -104,13 +104,6 @@
return feedbackRecipients;
}
- private UserGroup completenessRecipients;
-
- public UserGroup getCompletenessRecipients()
- {
- return completenessRecipients;
- }
-
private OrganisationUnitLevel offlineOrganisationUnitLevel;
public OrganisationUnitLevel getOfflineOrganisationUnitLevel()
@@ -175,8 +168,6 @@
feedbackRecipients = configurationService.getConfiguration().getFeedbackRecipients();
- completenessRecipients = configurationService.getConfiguration().getCompletenessRecipients();
-
offlineOrganisationUnitLevel = configurationService.getConfiguration().getOfflineOrganisationUnitLevel();
if ( offlineOrganisationUnitLevel == null )
=== 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-09-11 03:54:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java 2012-09-24 14:34:31 +0000
@@ -146,13 +146,6 @@
this.feedbackRecipients = feedbackRecipients;
}
- private Integer completenessRecipients;
-
- public void setCompletenessRecipients( Integer completenessRecipients )
- {
- this.completenessRecipients = completenessRecipients;
- }
-
private Integer offlineOrganisationUnitLevel;
public void setOfflineOrganisationUnitLevel( Integer offlineOrganisationUnitLevel )
@@ -200,11 +193,6 @@
configuration.setFeedbackRecipients( userGroupService.getUserGroup( feedbackRecipients ) );
}
- if ( completenessRecipients != null )
- {
- configuration.setCompletenessRecipients( userGroupService.getUserGroup( completenessRecipients ) );
- }
-
if ( offlineOrganisationUnitLevel != null )
{
configuration.setOfflineOrganisationUnitLevel( organisationUnitService.getOrganisationUnitLevel( offlineOrganisationUnitLevel ) );
=== 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-09-11 01:58:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm 2012-09-24 14:34:31 +0000
@@ -6,7 +6,6 @@
infrastructuralDataElements: getFieldValue( 'infrastructuralDataElements' ),
infrastructuralPeriodType: getFieldValue( 'infrastructuralPeriodType' ),
feedbackRecipients: getFieldValue( 'feedbackRecipients' ),
- completenessRecipients: getFieldValue( 'completenessRecipients' ),
offlineOrganisationUnitLevel: getFieldValue( 'offlineOrganisationUnitLevel' ),
omitIndicatorsZeroNumeratorDataMart: jQuery( '#omitIndicatorsZeroNumeratorDataMart' ).is( ':checked' ),
disableDataEntryWhenCompleted: jQuery( '#disableDataEntryWhenCompleted' ).is( ':checked' ),
@@ -67,18 +66,6 @@
</select>
</p>
-<!-- completeness_recipients -->
-<h4>$i18n.getString( "completeness_recipients" )</h4>
-
-<p>
-<select id="completenessRecipients" name="completenessRecipients" style="width:30em">
- <option value="-1">$i18n.getString( "no_completeness_recipients" )</option>
- #foreach ( $group in $userGroups )
- <option value="$group.id" #if( $group.id == $!completenessRecipients.id )selected="selected"#end>$encoder.htmlEncode( $group.name )</option>
- #end
-</select>
-</p>
-
<!-- max_levels_to_offline -->
<h4>$i18n.getString( "max_levels_to_offline" )</h4>
