← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #39962

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20226: Program indicator, removed property eventOutputType

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 20226
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-09-18 12:16:02 +0200
message:
  Program indicator, removed property eventOutputType
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/trackedentity/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-08 17:39:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java	2015-09-18 10:16:02 +0000
@@ -32,7 +32,6 @@
 import java.util.regex.Pattern;
 
 import org.hisp.dhis.analytics.AggregationType;
-import org.hisp.dhis.analytics.EventOutputType;
 import org.hisp.dhis.common.BaseDimensionalObject;
 import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.common.DimensionType;
@@ -94,8 +93,6 @@
 
     private String filter;
 
-    private EventOutputType eventOutputType;
-
     /**
      * Number of decimals to use for indicator value, null implies default.
      */
@@ -204,19 +201,6 @@
     @JsonProperty
     @JsonView( { DetailedView.class, ExportView.class } )
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
-    public EventOutputType getEventOutputType()
-    {
-        return eventOutputType;
-    }
-
-    public void setEventOutputType( EventOutputType eventOutputType )
-    {
-        this.eventOutputType = eventOutputType;
-    }
-
-    @JsonProperty
-    @JsonView( { DetailedView.class, ExportView.class } )
-    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
     public Integer getDecimals()
     {
         return decimals;

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java	2015-09-13 17:45:53 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java	2015-09-18 10:16:02 +0000
@@ -305,6 +305,7 @@
         executeSql( "ALTER TABLE programindicator ALTER expression TYPE text" );
         executeSql( "alter table programindicator drop column valuetype" );
         executeSql( "alter table programindicator drop column rootdate" );
+        executeSql( "alter table programindicator drop column eventoutputtype" );
         
         executeSql( "ALTER TABLE programstage ALTER description TYPE text" );
         

=== 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-04 08:57:35 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramIndicator.hbm.xml	2015-09-18 10:16:02 +0000
@@ -32,14 +32,7 @@
 			<param name="type">12</param>
 		</type> 
 	</property>
-    
-    <property name="eventOutputType" length="40">
-		<type name="org.hibernate.type.EnumType">
-			<param name="enumClass">org.hisp.dhis.analytics.EventOutputType</param>
-			<param name="type">12</param>
-		</type> 
-	</property>
-    
+        
     <property name="decimals" />
 
     <property name="displayInForm" />

=== 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-04 08:57:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/AddProgramIndicatorAction.java	2015-09-18 10:16:02 +0000
@@ -30,7 +30,6 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.hisp.dhis.analytics.AggregationType;
-import org.hisp.dhis.analytics.EventOutputType;
 import org.hisp.dhis.program.Program;
 import org.hisp.dhis.program.ProgramIndicator;
 import org.hisp.dhis.program.ProgramIndicatorService;
@@ -128,13 +127,6 @@
         this.aggregationType = aggregationType;
     }
 
-    private String eventOutputType;
-    
-    public void setEventOutputType( String eventOutputType )
-    {
-        this.eventOutputType = eventOutputType;
-    }
-
     private Integer decimals;
 
     public void setDecimals( Integer decimals )
@@ -168,7 +160,6 @@
         indicator.setExpression( StringUtils.trimToNull( expression ) );
         indicator.setFilter( StringUtils.trimToNull( filter ) );
         indicator.setAggregationType( AggregationType.valueOf( aggregationType ) );
-        indicator.setEventOutputType( EventOutputType.valueOf( eventOutputType ) );
         indicator.setDecimals( decimals );
         indicator.setDisplayInForm( displayInForm );
 

=== 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-04 08:57:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/UpdateProgramIndicatorAction.java	2015-09-18 10:16:02 +0000
@@ -30,7 +30,6 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.hisp.dhis.analytics.AggregationType;
-import org.hisp.dhis.analytics.EventOutputType;
 import org.hisp.dhis.program.ProgramIndicator;
 import org.hisp.dhis.program.ProgramIndicatorService;
 
@@ -114,13 +113,6 @@
         this.aggregationType = aggregationType;
     }
 
-    private String eventOutputType;
-    
-    public void setEventOutputType( String eventOutputType )
-    {
-        this.eventOutputType = eventOutputType;
-    }
-
     private Integer decimals;
 
     public void setDecimals( Integer decimals )
@@ -159,7 +151,6 @@
         indicator.setExpression( StringUtils.trimToNull( expression ) );
         indicator.setFilter( StringUtils.trimToNull( filter ) );
         indicator.setAggregationType( AggregationType.valueOf( aggregationType ) );
-        indicator.setEventOutputType( EventOutputType.valueOf( eventOutputType ) );
         indicator.setDecimals( decimals );
         indicator.setDisplayInForm( displayInForm );
 

=== 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-04 08:57:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm	2015-09-18 10:16:02 +0000
@@ -67,16 +67,6 @@
 	            </select>
 	        </td>
 	    </tr>
-	    <tr>
-	    	<td><label for="eventOutputType">$i18n.getString( "event_output_type" )</label></td>
-	    	<td>
-	    		<select id="eventOutputType" name="eventOutputType">
-	    			<option value="EVENT">$i18n.getString( "event" )</option>
-	    			<option value="ENROLLMENT">$i18n.getString( "enrollment" )</option>
-	    			<option value="TRACKED_ENTITY_INSTANCE">$i18n.getString( "tracked_entity_instance" )</option>
-	    		</select>
-	    	</td>
-	    </tr>
 		<tr>
 			<td><label for="decimals">$i18n.getString( "decimals_in_data_output" )</label></td>
 			<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-04 08:57:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm	2015-09-18 10:16:02 +0000
@@ -65,17 +65,7 @@
             <option value="MAX"#if( $programIndicator.aggregationType == 'MAX' ) selected="selected"#end>$i18n.getString( "max" )</option>
             <option value="CUSTOM"#if( $programIndicator.aggregationType == 'CUSTOM' ) selected="selected"#end>$i18n.getString( "custom" )</option>
           </select>
-				</td>
-    </tr>    
-    <tr>
-    	<td><label for="eventOutputType">$i18n.getString( "event_output_type" )</label></td>
-    	<td>
-    		<select id="eventOutputType" name="eventOutputType">
-    			<option value="EVENT"#if( $programIndicator.eventOutputType == 'EVENT' ) selected="selected"#end>$i18n.getString( "event" )</option>
-    			<option value="ENROLLMENT"#if( $programIndicator.eventOutputType == 'ENROLLMENT' ) selected="selected"#end>$i18n.getString( "enrollment" )</option>
-    			<option value="TRACKED_ENTITY_INSTANCE"#if( $programIndicator.eventOutputType == 'TRACKED_ENTITY_INSTANCE' ) selected="selected"#end>$i18n.getString( "tracked_entity_instance" )</option>
-    		</select>
-    	</td>
+		</td>
     </tr>
 	<tr>
 		<td><label for="decimals">$i18n.getString( "decimals_in_data_output" )</label></td>
  Thread Previous • Date Previous • • Thread Next