dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40418
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20498: Removed ProgramIndicator.missingValueReplacement.
------------------------------------------------------------
revno: 20498
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2015-10-04 22:41:27 +0200
message:
Removed ProgramIndicator.missingValueReplacement.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.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/program/hibernate/ProgramIndicator.hbm.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/AddProgramIndicatorAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/UpdateProgramIndicatorAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.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/program/ProgramIndicator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java 2015-09-25 17:51:47 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java 2015-10-04 20:41:27 +0000
@@ -102,12 +102,6 @@
*/
private Integer decimals;
- /**
- * Value to use in expression when data element and attribute values are not
- * present.
- */
- private Integer missingValueReplacement;
-
private Boolean displayInForm;
// -------------------------------------------------------------------------
@@ -224,19 +218,6 @@
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
- public Integer getMissingValueReplacement()
- {
- return missingValueReplacement;
- }
-
- public void setMissingValueReplacement( Integer missingValueReplacement )
- {
- this.missingValueReplacement = missingValueReplacement;
- }
-
- @JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public Boolean getDisplayInForm()
{
return displayInForm;
@@ -262,7 +243,6 @@
expression = programIndicator.getExpression();
filter = programIndicator.getFilter();
decimals = programIndicator.getDecimals();
- missingValueReplacement = programIndicator.getMissingValueReplacement();
displayInForm = programIndicator.getDisplayInForm();
}
else if ( strategy.isMerge() )
@@ -271,7 +251,6 @@
expression = programIndicator.getExpression() == null ? expression : programIndicator.getExpression();
filter = programIndicator.getFilter() == null ? filter : programIndicator.getFilter();
decimals = programIndicator.getDecimals() == null ? decimals : programIndicator.getDecimals();
- missingValueReplacement = programIndicator.getMissingValueReplacement() == null ? missingValueReplacement : programIndicator.getMissingValueReplacement();
displayInForm = programIndicator.getDisplayInForm() == null ? displayInForm : programIndicator.getDisplayInForm();
}
}
=== 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 2015-10-02 08:31:16 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2015-10-04 20:41:27 +0000
@@ -856,6 +856,8 @@
executeSql( "alter table programstage drop column reportdatedescription" );
executeSql( "update programstage set reportdatetouse = 'indicentDate' where reportdatetouse='dateOfIncident'" );
+ executeSql( "alter table programindicator drop column missingvaluereplacement" );
+
// Remove data mart
executeSql( "drop table aggregateddatasetcompleteness" );
executeSql( "drop table aggregateddatasetcompleteness_temp" );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramIndicator.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramIndicator.hbm.xml 2015-09-25 17:51:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramIndicator.hbm.xml 2015-10-04 20:41:27 +0000
@@ -37,8 +37,6 @@
<property name="displayInForm" />
- <property name="missingValueReplacement" column="missingvaluereplacement" />
-
<!-- Access properties -->
<many-to-one name="user" class="org.hisp.dhis.user.User" column="userid" foreign-key="fk_programindicator_userid" />
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/AddProgramIndicatorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/AddProgramIndicatorAction.java 2015-09-25 17:51:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/AddProgramIndicatorAction.java 2015-10-04 20:41:27 +0000
@@ -141,13 +141,6 @@
this.displayInForm = displayInForm;
}
- private Integer missingValueReplacement;
-
- public void setMissingValueReplacement( Integer missingValueReplacement )
- {
- this.missingValueReplacement = missingValueReplacement;
- }
-
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -169,7 +162,6 @@
indicator.setAggregationType( AggregationType.valueOf( aggregationType ) );
indicator.setDecimals( decimals );
indicator.setDisplayInForm( displayInForm );
- indicator.setMissingValueReplacement( missingValueReplacement );
programIndicatorService.addProgramIndicator( indicator );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/UpdateProgramIndicatorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/UpdateProgramIndicatorAction.java 2015-09-25 17:51:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/UpdateProgramIndicatorAction.java 2015-10-04 20:41:27 +0000
@@ -134,13 +134,6 @@
return programId;
}
- private Integer missingValueReplacement;
-
- public void setMissingValueReplacement( Integer missingValueReplacement )
- {
- this.missingValueReplacement = missingValueReplacement;
- }
-
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -160,7 +153,6 @@
indicator.setAggregationType( AggregationType.valueOf( aggregationType ) );
indicator.setDecimals( decimals );
indicator.setDisplayInForm( displayInForm );
- indicator.setMissingValueReplacement( missingValueReplacement );
programIndicatorService.updateProgramIndicator( indicator );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm 2015-09-25 17:51:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm 2015-10-04 20:41:27 +0000
@@ -78,16 +78,6 @@
</td>
<td></td>
</tr>
- <tr>
- <td><label for="missingValueReplacement">$i18n.getString( "missing_value_replacement" )</label></td>
- <td>
- <select id="missingValueReplacement" name="missingValueReplacement">
- <option value="0">0</option>
- <option value="1">1</option>
- <option value="-1">-1</option>
- </select>
- </td>
- </tr>
<tr>
<td><label for="displayInForm">$i18n.getString( "display_in_form" )</label></td>
<td><input type="checkbox" id="displayInForm" name="displayInForm" value="true"></td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm 2015-09-25 17:51:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm 2015-10-04 20:41:27 +0000
@@ -77,16 +77,6 @@
</select>
</td>
</tr>
- <tr>
- <td><label for="missingValueReplacement">$i18n.getString( "missing_value_replacement" )</label></td>
- <td>
- <select id="missingValueReplacement" name="missingValueReplacement">
- <option value="0"#if( $programIndicator.missingValueReplacement == 0 ) selected="selected"#end>0</option>
- <option value="1"#if( $programIndicator.missingValueReplacement == 1 ) selected="selected"#end>1</option>
- <option value="-1"#if( $programIndicator.missingValueReplacement == -1 ) selected="selected"#end>-1</option>
- </select>
- </td>
- </tr>
<tr>
<td><label for="displayInForm">$i18n.getString( "display_in_form" )</label></td>
<td><input type="checkbox" id="displayInForm" name="displayInForm" value="true"#if( $programIndicator.displayInForm ) checked="checked"#end></td>
