dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #31174
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15860: Remove active property of DataElement object.
------------------------------------------------------------
revno: 15860
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-06-26 17:29:30 +0800
message:
Remove active property of DataElement object.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.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/dataelement/hibernate/DataElement.hbm.xml
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/CsvObjectUtils.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementGroupMemberConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementImporter.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElement.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElements.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/compareToExistingForm.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/responseDataElementList.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/dataelement/DataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java 2014-06-16 05:13:31 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java 2014-06-26 09:29:30 +0000
@@ -114,11 +114,6 @@
protected transient String displayFormName;
/**
- * If this DataElement is active or not (enabled or disabled).
- */
- private boolean active;
-
- /**
* The domain of this DataElement; e.g. DataElementDomainType.aggregate or
* DataElementDomainType.TRACKER.
*/
@@ -470,19 +465,6 @@
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
- public boolean isActive()
- {
- return active;
- }
-
- public void setActive( boolean active )
- {
- this.active = active;
- }
-
- @JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public DataElementDomain getDomainType()
{
return domainType;
@@ -702,7 +684,6 @@
DataElement dataElement = (DataElement) other;
formName = dataElement.getFormName() == null ? formName : dataElement.getFormName();
- active = dataElement.isActive();
zeroIsSignificant = dataElement.isZeroIsSignificant();
domainType = dataElement.getDomainType() == null ? domainType : dataElement.getDomainType();
type = dataElement.getType() == null ? type : dataElement.getType();
=== 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 2014-06-23 19:13:26 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-06-26 09:29:30 +0000
@@ -726,6 +726,8 @@
upgradeCompleteDataSetRegistrationsWithAttributeOptionCombo();
upgradeMapViewsToAnalyticalObject();
upgradeTranslations();
+
+ executeSql( "ALTER TABLE dataelement DROP COLUMN active" );
log.info( "Tables updated" );
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml 2014-06-15 13:20:39 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml 2014-06-26 09:29:30 +0000
@@ -22,8 +22,6 @@
<property name="formName" length="230" />
- <property name="active" not-null="true" />
-
<property name="type" column="valuetype" length="16" not-null="true" />
<property name="numberType" column="numbertype" length="16" />
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/CsvObjectUtils.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/CsvObjectUtils.java 2014-06-16 13:31:32 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/CsvObjectUtils.java 2014-06-26 09:29:30 +0000
@@ -153,8 +153,7 @@
object.setShortName( getSafe( values, 3, object.getName(), 50 ) );
object.setDescription( getSafe( values, 4, null, null ) );
object.setFormName( getSafe( values, 5, null, 230 ) );
- object.setActive( true );
-
+
String domainType = getSafe( values, 6, DataElementDomain.AGGREGATE.getValue(), 16 );
object.setDomainType( DataElementDomain.fromValue( domainType ) );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementRowHandler.java 2014-06-16 05:13:31 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementRowHandler.java 2014-06-26 09:29:30 +0000
@@ -78,7 +78,6 @@
{
final DataElement dataElement = (DataElement) object;
- dataElement.setActive( true );
dataElement.setDomainType( DataElementDomain.AGGREGATE );
dataElement.setZeroIsSignificant( false );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementConverter.java 2014-06-16 05:13:31 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementConverter.java 2014-06-26 09:29:30 +0000
@@ -275,7 +275,6 @@
element.setName( values.get( FIELD_NAME ) );
element.setShortName( values.get( FIELD_SHORT_NAME ) );
element.setDescription( Dhis14ParsingUtils.removeNewLine( values.get( FIELD_DESCRIPTION ) ) );
- element.setActive( true );
element.setDomainType( DataElementDomain.AGGREGATE );
element.setZeroIsSignificant( false );
element.setType( Dhis14ObjectMappingUtil.getDataElementTypeMap().get(
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementGroupMemberConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementGroupMemberConverter.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementGroupMemberConverter.java 2014-06-26 09:29:30 +0000
@@ -38,7 +38,6 @@
import org.hisp.dhis.importexport.ExportParams;
import org.hisp.dhis.importexport.ImportParams;
import org.hisp.dhis.importexport.XMLConverter;
-import static org.hisp.dhis.importexport.dhis14.util.Dhis14TypeHandler.convertBooleanToDhis14;
/**
* @author Lars Helge Overland
@@ -54,8 +53,6 @@
private static final String FIELD_DATAELEMENT_ID = "DataElementID";
- private static final String FIELD_ACTIVE = "Active";
-
private DataElementService dataElementService;
// -------------------------------------------------------------------------
@@ -94,7 +91,6 @@
writer.writeElement( FIELD_GROUP_ID, String.valueOf( group.getId() ) );
writer.writeElement( FIELD_DATAELEMENT_ID, String.valueOf( element.getId() ) );
- writer.writeElement( FIELD_ACTIVE, convertBooleanToDhis14( element.isActive() ) );
writer.closeElement();
}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementConverter.java 2014-06-15 13:20:39 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementConverter.java 2014-06-26 09:29:30 +0000
@@ -62,7 +62,6 @@
private static final String FIELD_NAME = "name";
private static final String FIELD_SHORT_NAME = "shortName";
private static final String FIELD_DESCRIPTION = "description";
- private static final String FIELD_ACTIVE = "active";
private static final String FIELD_TYPE = "type";
private static final String FIELD_DOMAIN_TYPE = "domainType";
private static final String FIELD_AGGREGATION_OPERATOR = "aggregationOperator";
@@ -130,7 +129,6 @@
writer.writeElement( FIELD_SHORT_NAME, element.getShortName() );
writer.writeElement( FIELD_CODE, element.getCode() ); // historic positioning from v1.2
writer.writeElement( FIELD_DESCRIPTION, element.getDescription() );
- writer.writeElement( FIELD_ACTIVE, String.valueOf( element.isActive() ) );
writer.writeElement( FIELD_TYPE, element.getType() );
writer.writeElement( FIELD_DOMAIN_TYPE, element.getDomainType().getValue() );
writer.writeElement( FIELD_AGGREGATION_OPERATOR, element.getAggregationOperator() );
@@ -170,7 +168,6 @@
}
element.setDescription( values.get( FIELD_DESCRIPTION ) );
- element.setActive( Boolean.parseBoolean( values.get( FIELD_ACTIVE ) ) );
element.setType( values.get( FIELD_TYPE ) );
element.setDomainType( DataElementDomain.fromValue(values.get( FIELD_DOMAIN_TYPE ) ) );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementImporter.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementImporter.java 2014-06-26 09:29:30 +0000
@@ -77,7 +77,6 @@
match.setShortName( object.getShortName() );
match.setCode( object.getCode() );
match.setDescription( object.getDescription() );
- match.setActive( object.isActive() );
match.setType( object.getType() );
match.setDomainType( object.getDomainType() );
match.setAggregationOperator( object.getAggregationOperator() );
@@ -122,10 +121,6 @@
{
return false;
}
- if ( object.isActive() != existing.isActive() )
- {
- return false;
- }
if ( !object.getType().equals( existing.getType() ) )
{
return false;
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java 2014-06-15 13:20:39 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java 2014-06-26 09:29:30 +0000
@@ -96,7 +96,6 @@
statementBuilder.setColumn( "shortname" );
statementBuilder.setColumn( "code" );
statementBuilder.setColumn( "description" );
- statementBuilder.setColumn( "active" );
statementBuilder.setColumn( "valuetype" );
statementBuilder.setColumn( "domaintype" );
statementBuilder.setColumn( "aggregationtype" );
@@ -112,7 +111,6 @@
statementBuilder.setValue( dataElement.getShortName() );
statementBuilder.setValue( dataElement.getCode() );
statementBuilder.setValue( dataElement.getDescription() );
- statementBuilder.setValue( dataElement.isActive() );
statementBuilder.setValue( dataElement.getType() );
statementBuilder.setValue( dataElement.getDomainType().name() );
statementBuilder.setValue( dataElement.getAggregationOperator() );
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java 2014-06-26 09:29:30 +0000
@@ -92,7 +92,6 @@
sheet.addCell( new Label( column++, row, element.getShortName(), FORMAT_TEXT ) );
sheet.addCell( new Label( column++, row, element.getCode(), FORMAT_TEXT ) );
sheet.addCell( new Label( column++, row, element.getDescription(), FORMAT_TEXT ) );
- sheet.addCell( new Label( column++, row, getBoolean().get( element.isActive() ), FORMAT_TEXT ) );
sheet.addCell( new Label( column++, row, getType().get( element.getType() ), FORMAT_TEXT ) );
sheet.addCell( new Label( column++, row, getAggregationOperator().get( element.getAggregationOperator() ),
FORMAT_TEXT ) );
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java 2014-06-26 09:29:30 +0000
@@ -401,10 +401,7 @@
table.addCell( getItalicCell( i18n.getString( "description" ) ) );
table.addCell( getTextCell( element.getDescription() ) );
}
-
- table.addCell( getItalicCell( i18n.getString( "active" ) ) );
- table.addCell( getTextCell( i18n.getString( getBoolean().get( element.isActive() ) ) ) );
-
+
if ( nullIfEmpty( element.getType() ) != null )
{
table.addCell( getItalicCell( i18n.getString( "value_type" ) ) );
=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2014-06-16 05:13:31 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2014-06-26 09:29:30 +0000
@@ -420,7 +420,6 @@
dataElement.setShortName( "DataElementShort" + uniqueCharacter );
dataElement.setCode( "DataElementCode" + uniqueCharacter );
dataElement.setDescription( "DataElementDescription" + uniqueCharacter );
- dataElement.setActive( true );
dataElement.setType( DataElement.VALUE_TYPE_INT );
dataElement.setDomainType( DataElementDomain.AGGREGATE );
dataElement.setAggregationOperator( DataElement.AGGREGATION_OPERATOR_SUM );
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm 2014-06-12 16:08:03 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm 2014-06-26 09:29:30 +0000
@@ -7,7 +7,6 @@
"shortName": "$!encoder.jsonEncode( ${dataElement.displayShortName} )",
"code": "$!encoder.jsonEncode( ${dataElement.code} )",
"description": "$!encoder.jsonEncode( ${dataElement.displayDescription} )",
- "active": "$!{dataElement.active}",
"type": "$!{dataElement.type}",
"valueType": "$!{dataElement.type}",
"domainType": "${dataElement.getDomainTypeNullSafe()}",
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElement.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElement.vm 2012-01-22 11:28:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElement.vm 2014-06-26 09:29:30 +0000
@@ -6,7 +6,6 @@
<alternativeName>$!encoder.xmlEncode( $dataElement.alternativeName )</alternativeName>
<code>$!encoder.xmlEncode( $dataElement.code )</code>
<description>$!encoder.xmlEncode( $dataElement.displayDescription )</description>
- <active>$dataElement.active</active>
<domainType>$dataElement.getDomainTypeNullSafe()</domainType>
<valueType>$dataElement.type</valueType>
<aggregationOperator>$dataElement.aggregationOperator</aggregationOperator>
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElements.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElements.vm 2013-02-01 08:56:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElements.vm 2014-06-26 09:29:30 +0000
@@ -8,7 +8,6 @@
<alternativeName>$!encoder.xmlEncode( $dataElement.alternativeName )</alternativeName>
<code>$!encoder.xmlEncode( $dataElement.code )</code>
<description>$!encoder.xmlEncode( $dataElement.displayDescription )</description>
- <active>$dataElement.active</active>
<domainType>$dataElement.getDomainTypeNullSafe()</domainType>
<type>$dataElement.type</type>
<aggregationOperator>$dataElement.aggregationOperator</aggregationOperator>
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/compareToExistingForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/compareToExistingForm.vm 2012-07-24 04:04:14 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/compareToExistingForm.vm 2014-06-26 09:29:30 +0000
@@ -51,7 +51,6 @@
#compareProperty( $importObject.object.shortName $importObject.compareObject.shortName "short_name" )
#compareProperty( $importObject.object.code $importObject.compareObject.code "code" )
#compareProperty( $importObject.object.description $importObject.compareObject.description "description" )
- #compareBoolProperty( $importObject.object.active $importObject.compareObject.active "active" )
<tr>
<td#compare( $importObject.object.type $importObject.compareObject.type )>$i18n.getString( "type" )</td>
@@ -114,7 +113,6 @@
#compareProperty( $importObject.object.shortName $importObject.compareObject.shortName "short_name" )
#compareProperty( $importObject.object.code $importObject.compareObject.code "code" )
- #compareBoolProperty( $importObject.object.active $importObject.compareObject.active "active" )
#compareProperty( $importObject.object.comment $importObject.compareObject.comment "comment" )
#compareProperty( $importObject.object.geoCode $importObject.compareObject.geoCode "geo_code" )
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm 2012-07-24 04:04:14 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm 2014-06-26 09:29:30 +0000
@@ -53,7 +53,6 @@
#displayProperty( "short_name" $importObject.object.shortName )
#displayProperty( "code" $importObject.object.code )
#displayProperty( "description" $importObject.object.description )
- #displayBoolProperty( "active" $importObject.object.active )
<tr>
<td>$i18n.getString( "type" )</td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java 2014-06-15 13:20:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java 2014-06-26 09:29:30 +0000
@@ -281,7 +281,6 @@
dataElement.setCode( code );
dataElement.setDescription( description );
dataElement.setFormName( formName );
- dataElement.setActive( true );
dataElement.setDomainType( DataElementDomain.fromValue( domainType ) );
dataElement.setType( valueType );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java 2014-06-15 13:20:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java 2014-06-26 09:29:30 +0000
@@ -157,13 +157,6 @@
this.formName = formName;
}
- private boolean active;
-
- public void setActive( boolean active )
- {
- this.active = active;
- }
-
private String domainType;
public void setDomainType( String domainType )
@@ -317,7 +310,6 @@
dataElement.setCode( code );
dataElement.setDescription( description );
dataElement.setFormName( formName );
- dataElement.setActive( active );
dataElement.setDomainType( DataElementDomain.fromValue( domainType ) );
dataElement.setType( valueType );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2014-06-15 13:20:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2014-06-26 09:29:30 +0000
@@ -99,7 +99,6 @@
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
<p><label>$i18n.getString( "short_name" ):</label><br/><span id="shortNameField"></span></p>
<p><label>$i18n.getString( "description" ):</label><br/><span id="descriptionField"></span></p>
- <p><label>$i18n.getString( "active" ):</label><br/><span id="activeField"></span></p>
<p><label>$i18n.getString( "domain_type" ):</label><br/><span id="domainTypeField"></span></p>
<p><label>$i18n.getString( "value_type" ):</label><br/><span id="typeField"></span></p>
<p><label>$i18n.getString( "aggregation_operator" ):</label><br/><span id="aggregationOperatorField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm 2014-06-15 13:20:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm 2014-06-26 09:29:30 +0000
@@ -75,17 +75,6 @@
<td><label for="formName">$i18n.getString( "form_name" )</label></td>
<td><input type="text" id="formName" name="formName" value="$!encoder.htmlEncode( $!dataElement.formName )"></td>
</tr>
- #if( $update )
- <tr>
- <td><label for="active">$i18n.getString( "active" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td>
- <select id="active" name="active">
- <option value="true" #if( $!dataElement.active ) selected="selected" #end>$i18n.getString( "yes" )</option>
- <option value="false" #if( !$!dataElement.active ) selected="selected" #end>$i18n.getString( "no" )</option>
- </select>
- </td>
- </tr>
- #end
<tr>
<td><label for="domainType">$i18n.getString( "domain_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2014-06-15 13:20:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2014-06-26 09:29:30 +0000
@@ -82,9 +82,6 @@
var description = json.dataElement.description;
setInnerHTML('descriptionField', description ? description : '[' + i18n_none + ']');
- var active = json.dataElement.active;
- setInnerHTML('activeField', active == 'true' ? i18n_yes : i18n_no);
-
var typeMap = {
'int': i18n_number,
'bool': i18n_yes_no,
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/responseDataElementList.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/responseDataElementList.vm 2009-09-05 09:34:43 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/responseDataElementList.vm 2014-06-26 09:29:30 +0000
@@ -8,7 +8,6 @@
<alternativeName>$!encoder.xmlEncode( $dataElement.alternativeName )</alternativeName>
<code>$!encoder.xmlEncode( $dataElement.code )</code>
<description>$!encoder.xmlEncode( $dataElement.description )</description>
- <active>$dataElement.active</active>
<type>$dataElement.type</type>
</dataElement>
#end
