dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40745
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20715: Data element UI, fixed bug with domain type
------------------------------------------------------------
revno: 20715
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-10-15 12:22:39 +0200
message:
Data element UI, fixed bug with domain type
modified:
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/dataElementForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js
--
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-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 2015-09-15 09:54:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java 2015-10-15 10:22:39 +0000
@@ -220,7 +220,7 @@
dataElement.setCode( StringUtils.trimToNull( code ) );
dataElement.setDescription( StringUtils.trimToNull( description ) );
dataElement.setFormName( StringUtils.trimToNull( formName ) );
- dataElement.setDomainType( DataElementDomain.fromValue( domainType ) );
+ dataElement.setDomainType( DataElementDomain.valueOf( domainType ) );
dataElement.setValueType( ValueType.valueOf( valueType ) );
dataElement.setAggregationType( AggregationType.valueOf( aggregationType ) );
dataElement.setUrl( url );
=== 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 2015-09-15 09:54:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java 2015-10-15 10:22:39 +0000
@@ -241,7 +241,7 @@
dataElement.setCode( StringUtils.trimToNull( code ) );
dataElement.setDescription( StringUtils.trimToNull( description ) );
dataElement.setFormName( StringUtils.trimToNull( formName ) );
- dataElement.setDomainType( DataElementDomain.fromValue( domainType ) );
+ dataElement.setDomainType( DataElementDomain.valueOf( domainType ) );
dataElement.setValueType( ValueType.valueOf( valueType ) );
dataElement.setAggregationType( AggregationType.valueOf( aggregationType ) );
dataElement.setUrl( url );
=== 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 2015-10-15 10:11:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm 2015-10-15 10:22:39 +0000
@@ -79,8 +79,8 @@
<td><label for="domainType">$i18n.getString( "domain_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<select id="domainType" name="domainType" onchange='domainTypeChange(this.value)'>
- <option value="aggregate" #if( $!dataElement.getDomainTypeNullSafe() == 'aggregate' ) selected="selected" #end>$i18n.getString( "aggregate" )</option>
- <option value="tracker" #if( $!dataElement.getDomainTypeNullSafe() == 'tracker' ) selected="selected" #end>$i18n.getString( "tracker" )</option>
+ <option value="AGGREGATE" #if( $!dataElement.domainType == 'AGGREGATE' ) selected="selected" #end>$i18n.getString( "aggregate" )</option>
+ <option value="TRACKER" #if( $!dataElement.domainType == 'TRACKER' ) selected="selected" #end>$i18n.getString( "tracker" )</option>
</select>
</td>
</tr>
@@ -138,7 +138,7 @@
<tr>
<td><label for="selectedCategoryComboId">$i18n.getString( "category_combo" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select id="selectedCategoryComboId" #if( $!dataElement.getDomainTypeNullSafe()=='tracker') disabled #end>>
+ <select id="selectedCategoryComboId" #if( $!dataElement.domainType == 'TRACKER' ) disabled #end>>
#foreach( $dataElementCategoryCombo in $!dataElementCategoryCombos )
<option value="$!dataElementCategoryCombo.id" #if( $!dataElementCategoryCombo.id == $!dataElement.categoryCombo.id ) selected="selected" #end>$!encoder.htmlEncode( $!dataElementCategoryCombo.displayName )</option>
#end
=== 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 2015-09-16 08:29:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2015-10-15 10:22:39 +0000
@@ -140,7 +140,7 @@
}
function domainTypeChange( domainType ) {
- if( domainType == 'aggregate' ) {
+ if( domainType == 'AGGREGATE' ) {
enable('selectedCategoryComboId');
}
else {