dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14170
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4699: (wip) Showed details - Data elements and Indicators module.
------------------------------------------------------------
revno: 4699
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-09-27 14:36:07 +0700
message:
(wip) Showed details - Data elements and Indicators module.
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroup.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupSet.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/responseCategory.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/responseCategoryCombo.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/responseConcept.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseDataDictionary.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicatorType.vm
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCategoryCombo.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonConcept.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategory.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorType.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/jsonDataDictionary.vm
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicator.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicator.vm
dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/categoryCombo.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataDictionary.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupSet.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.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
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCategoryCombo.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCategoryCombo.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCategoryCombo.vm 2011-09-27 07:36:07 +0000
@@ -0,0 +1,7 @@
+{ "dataElementCategoryCombo":
+ {
+ "id": "$!{dataElementCategoryCombo.id}",
+ "name": "$encoder.jsonEncode( $!{dataElementCategoryCombo.name} )",
+ "dataElementCategoryCount": "$!{dataElementCategories.size()}"
+ }
+}
\ No newline at end of file
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonConcept.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonConcept.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonConcept.vm 2011-09-27 07:36:07 +0000
@@ -0,0 +1,6 @@
+{ "concept":
+ {
+ "id": "$!{concept.id}",
+ "name": "$encoder.jsonEncode( $!{concept.name} )"
+ }
+}
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategory.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategory.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategory.vm 2011-09-27 07:36:07 +0000
@@ -0,0 +1,7 @@
+{ "dataElementCategory":
+ {
+ "id": "${dataElementCategory.id}" ,
+ "name": "$!encoder.jsonEncode( ${dataElementCategory.name} )",
+ "categoryOptionCount": "${dataElementCategory.categoryOptions.size()}"
+ }
+}
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm 2011-09-27 07:36:07 +0000
@@ -0,0 +1,7 @@
+{ "dataElementGroupSet":
+ {
+ "id": "${dataElementGroupSet.id}" ,
+ "name": "$!encoder.jsonEncode( ${dataElementGroupSet.name} )",
+ "memberCount": "$dataElementGroupSet.members.size()"
+ }
+}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicator.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicator.vm 2010-12-12 19:49:23 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicator.vm 2011-09-27 07:36:07 +0000
@@ -5,13 +5,13 @@
"alternativeName": "$!encoder.jsonEncode( ${indicator.alternativeNamee} )",
"shortName": "$!encoder.jsonEncode( ${indicator.shortName} )",
"code": "$!encoder.jsonEncode( ${indicator.code} )",
+ "description": "$!encoder.xmlEncode( ${indicator.description} )",
"annualized": "${indicator.annualized}",
"indicatorTypeId": "$!{indicator.indicatorType.id}",
+ "indicatorTypeName": "$!encoder.xmlEncode( $!{indicator.indicatorType.name} )",
"numerator": "$!{indicator.numerator}",
"numeratorDescription": "$!encoder.jsonEncode( ${indicator.numeratorDescription} )",
- "numeratorAggregationOperator": "$!{indicator.numeratorAggregationOperator}",
"denominator": "$!{indicator.denominator}",
- "denominatorDescription": "$!encoder.jsonEncode( ${indicator.denominatorDescription} )",
- "denominatorAggregationOperator": "$!{indicator.denominatorAggregationOperator}"
+ "denominatorDescription": "$!encoder.jsonEncode( ${indicator.denominatorDescription} )"
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroupSet.vm 2010-12-12 19:49:23 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroupSet.vm 2011-09-27 07:36:07 +0000
@@ -2,6 +2,6 @@
{
"id": $!{indicatorGroupSet.id},
"name": "$!encoder.jsonEncode( ${indicatorGroupSet.name} )",
- "memberCount": "$memberCount"
+ "memberCount": "$!indicatorGroupSet.members.size()"
}
}
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorType.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorType.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorType.vm 2011-09-27 07:36:07 +0000
@@ -0,0 +1,7 @@
+{ "indicatorType":
+ {
+ "id": "$!{indicatorType.id}",
+ "name": "$encoder.jsonEncode( $!{indicatorType.name} )",
+ "factor": "$!indicatorType.factor"
+ }
+}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicator.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicator.vm 2010-11-29 17:16:41 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicator.vm 2011-09-27 07:36:07 +0000
@@ -11,10 +11,8 @@
<indicatorTypeName>$!encoder.xmlEncode( $indicator.indicatorType.name )</indicatorTypeName>
<numerator>$!encoder.xmlEncode( $indicator.numerator )</numerator>
<numeratorDescription>$!encoder.xmlEncode( $indicator.numeratorDescription )</numeratorDescription>
- <numeratorAggregationOperator>$!encoder.xmlEncode( $indicator.numeratorAggregationOperator )</numeratorAggregationOperator>
<denominator>$!encoder.xmlEncode( $indicator.denominator )</denominator>
<denominatorDescription>$!encoder.xmlEncode( $indicator.denominatorDescription )</denominatorDescription>
- <denominatorAggregationOperator>$!encoder.xmlEncode( $indicator.denominatorAggregationOperator )</denominatorAggregationOperator>
<url>$!encoder.xmlEncode( $indicator.url )</url>
<lastUpdated>$!format.formatDate( $indicator.lastUpdated )</lastUpdated>
</indicator>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2011-09-24 10:19:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2011-09-27 07:36:07 +0000
@@ -519,7 +519,7 @@
</action>
<action name="getDataElementGroup" class="org.hisp.dhis.commons.action.GetDataElementGroupAction">
- <result name="success" type="velocity-xml">
+ <result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonDataElementGroup.vm
</result>
<param name="onExceptionReturn">plainTextError</param>
@@ -532,6 +532,13 @@
<param name="onExceptionReturn">plainTextError</param>
</action>
+ <action name="getDataElementGroupSet" class="org.hisp.dhis.commons.action.GetDataElementGroupSetAction">
+ <result name="success" type="velocity-json">
+ /dhis-web-commons/ajax/jsonDataElementGroupSet.vm
+ </result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+
<action name="getDataElementGroupSets" class="org.hisp.dhis.commons.action.GetDataElementGroupSetsAction">
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonDataElementGroupSets.vm
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml 2011-09-21 12:46:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml 2011-09-27 07:36:07 +0000
@@ -382,9 +382,7 @@
<bean id="org.hisp.dhis.dd.action.indicatortype.GetIndicatorTypeAction" class="org.hisp.dhis.dd.action.indicatortype.GetIndicatorTypeAction"
scope="prototype">
- <property name="indicatorService">
- <ref bean="org.hisp.dhis.indicator.IndicatorService" />
- </property>
+ <property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
</bean>
<bean id="org.hisp.dhis.dd.action.indicatortype.RemoveIndicatorTypeAction" class="org.hisp.dhis.dd.action.indicatortype.RemoveIndicatorTypeAction"
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2011-09-21 12:46:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2011-09-27 07:36:07 +0000
@@ -343,7 +343,6 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/indicatorGroup.vm</param>
<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
- <param name="javascripts">javascript/indicatorGroup.js</param>
<param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
</action>
@@ -361,7 +360,6 @@
<action name="showAddIndicatorGroupForm" class="org.hisp.dhis.dd.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm</param>
- <param name="javascripts">javascript/indicatorGroup.js</param>
<param name="requiredAuthorities">F_INDICATORGROUP_ADD</param>
</action>
@@ -373,7 +371,6 @@
<action name="showUpdateIndicatorGroupForm" class="org.hisp.dhis.dd.action.indicatorgroup.ShowUpdateIndicatorGroupFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm</param>
- <param name="javascripts">javascript/indicatorGroup.js</param>
<param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
</action>
@@ -394,7 +391,6 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm</param>
<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
- <param name="javascripts">javascript/indicatorGroupSet.js</param>
<param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
</action>
@@ -402,7 +398,6 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm</param>
<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
- <param name="javascripts">javascript/indicatorGroupSet.js</param>
<param name="requiredAuthorities">F_INDICATORGROUP_ADD</param>
</action>
@@ -415,7 +410,6 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm</param>
<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
- <param name="javascripts">javascript/indicatorGroupSet.js</param>
</action>
<action name="updateIndicatorGroupSet" class="org.hisp.dhis.dd.action.indicatorgroupset.UpdateIndicatorGroupSetAction">
@@ -450,12 +444,12 @@
</action>
<action name="getIndicatorType" class="org.hisp.dhis.dd.action.indicatortype.GetIndicatorTypeAction">
- <result name="success" type="velocity-xml">
- /dhis-web-maintenance-datadictionary/responseIndicatorType.vm
+ <result name="success" type="velocity-json">
+ /dhis-web-commons/ajax/jsonIndicatorType.vm
</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
-
+
<action name="removeIndicatorType" class="org.hisp.dhis.dd.action.indicatortype.RemoveIndicatorTypeAction">
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm
@@ -512,8 +506,8 @@
</action>
<action name="getDataDictionary" class="org.hisp.dhis.dd.action.datadictionary.GetDataDictionaryAction">
- <result name="success" type="velocity-xml">
- /dhis-web-maintenance-datadictionary/responseDataDictionary.vm
+ <result name="success" type="velocity-json">
+ /dhis-web-maintenance-datadictionary/jsonDataDictionary.vm
</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
@@ -590,8 +584,8 @@
</action>
<action name="getDataElementCategory" class="org.hisp.dhis.dd.action.category.GetDataElementCategoryAction">
- <result name="success" type="velocity-xml">
- /dhis-web-maintenance-datadictionary/multidimensional/responseCategory.vm
+ <result name="success" type="velocity-json">
+ /dhis-web-commons/ajax/jsonDataElementCategory.vm
</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
@@ -658,8 +652,8 @@
</action>
<action name="getDataElementCategoryCombo" class="org.hisp.dhis.dd.action.categorycombo.GetDataElementCategoryComboAction">
- <result name="success" type="velocity-xml">
- /dhis-web-maintenance-datadictionary/multidimensional/responseCategoryCombo.vm
+ <result name="success" type="velocity-json">
+ /dhis-web-commons/ajax/jsonCategoryCombo.vm
</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
@@ -713,8 +707,8 @@
<!-- Concept Name -->
<action name="getConcept" class="org.hisp.dhis.dd.action.concept.GetConceptAction">
- <result name="success" type="velocity-xml">
- /dhis-web-maintenance-datadictionary/multidimensional/responseConcept.vm
+ <result name="success" type="velocity-json">
+ /dhis-web-commons/ajax/jsonConcept.vm
</result>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm 2011-05-12 13:10:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm 2011-09-27 07:36:07 +0000
@@ -2,7 +2,23 @@
jQuery(document).ready(function(){
tableSorter( 'listTable' );
});
+
+ function showIndicatorGroupDetails( indicatorGroupId )
+ {
+ jQuery.get( '../dhis-web-commons-ajax-json/getIndicatorGroup.action',
+ { id: indicatorGroupId }, function( json ) {
+ setInnerHTML( 'nameField', json.indicatorGroup.name );
+ setInnerHTML( 'memberCountField', json.indicatorGroup.memberCount );
+ showDetails();
+ });
+ }
+
+ function removeIndicatorGroup( indicatorGroupId, indicatorGroupName )
+ {
+ removeItem( indicatorGroupId, indicatorGroupName, i18n_confirm_delete, 'removeIndicatorGroup.action' );
+ }
+
var i18n_confirm_delete = '$encoder.jsEscape($i18n.getString( "confirm_delete_indicator_group" ) , "'")';
// Are you sure you want to delete this?
var i18n_adding_indicator_group_failed = '$encoder.jsEscape($i18n.getString( "adding_indicator_group_failed" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2011-05-12 13:10:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2011-09-27 07:36:07 +0000
@@ -3,6 +3,22 @@
tableSorter( 'listTable' );
});
+ function showIndicatorGroupSetDetails( id )
+ {
+ jQuery.post( '../dhis-web-commons-ajax-json/getIndicatorGroupSet.action',
+ { id: id }, function( json ) {
+ setInnerHTML( 'nameField', json.indicatorGroupSet.name );
+ setInnerHTML( 'memberCountField', json.indicatorGroupSet.memberCount );
+
+ showDetails();
+ });
+ }
+
+ function deleteIndicatorGroupSet( groupSetId, groupSetName )
+ {
+ removeItem( groupSetId, groupSetName, i18n_confirm_delete, "deleteIndicatorGroupSet.action" );
+ }
+
var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element_group" ) , "'")';
var i18n_edit = '$encoder.jsEscape( $i18n.getString( "edit" ) , "'")';
var i18n_delete = '$encoder.jsEscape( $i18n.getString( "delete" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm 2011-05-12 13:10:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm 2011-09-27 07:36:07 +0000
@@ -5,18 +5,13 @@
function showIndicatorTypeDetails( indicatorTypeId )
{
- var request = new Request();
- request.setResponseTypeXML( 'indicatorType' );
- request.setCallbackSuccess( indicatorTypeReceived );
- request.send( 'getIndicatorType.action?id=' + indicatorTypeId );
- }
-
- function indicatorTypeReceived( indicatorTypeElement )
- {
- setInnerHTML( 'nameField', getElementValue( indicatorTypeElement, 'name' ) );
- setInnerHTML( 'factorField', getElementValue( indicatorTypeElement, 'factor' ) );
-
- showDetails();
+ jQuery.get( 'getIndicatorType.action', { id: indicatorTypeId },
+ function( json ) {
+ setInnerHTML( 'nameField', json.indicatorType.name );
+ setInnerHTML( 'factorField', json.indicatorType.factor );
+
+ showDetails();
+ });
}
function removeIndicatorType( indicatorTypeId, indicatorTypeName )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/categoryCombo.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/categoryCombo.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/categoryCombo.js 2011-09-27 07:36:07 +0000
@@ -1,18 +1,12 @@
function showDataElementCategoryComboDetails( categoryComboId )
{
- var request = new Request();
- request.setResponseTypeXML( 'dataElementCategoryCombo' );
- request.setCallbackSuccess( dataElementCategoryComboReceived );
- request.send( 'getDataElementCategoryCombo.action?id=' + categoryComboId );
-}
-
-function dataElementCategoryComboReceived( dataElementCategoryComboElement )
-{
- setInnerHTML( 'nameField', getElementValue( dataElementCategoryComboElement, 'name' ) );
- setInnerHTML( 'dataElementCategoryCountField', getElementValue( dataElementCategoryComboElement,
- 'dataElementCategoryCount' ) );
-
- showDetails();
+ jQuery.post( 'getDataElementCategoryCombo.action', { id: categoryComboId },
+ function ( json) {
+ setInnerHTML( 'nameField', json.dataElementCategoryCombo.name );
+ setInnerHTML( 'dataElementCategoryCountField', json.dataElementCategoryCombo.dataElementCategoryCount );
+
+ showDetails();
+ });
}
// -----------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataDictionary.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataDictionary.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataDictionary.js 2011-09-27 07:36:07 +0000
@@ -4,23 +4,18 @@
function showDataDictionaryDetails( dataDictionaryId )
{
- var request = new Request();
- request.setResponseTypeXML( 'dataDictionary' );
- request.setCallbackSuccess( dataDictionaryReceived );
- request.send( 'getDataDictionary.action?id=' + dataDictionaryId );
-}
-
-function dataDictionaryReceived( dataDictionaryElement )
-{
- setInnerHTML( 'nameField', getElementValue( dataDictionaryElement, 'name' ) );
-
- var description = getElementValue( dataDictionaryElement, 'description' );
- setInnerHTML( 'descriptionField', description ? description : '[' + i18n_none + ']' );
-
- var region = getElementValue( dataDictionaryElement, 'region' );
- setInnerHTML( 'regionField', region ? region : '[' + i18n_none + ']' );
-
- showDetails();
+ jQuery.post( 'getDataDictionary.action', { id: dataDictionaryId },
+ function ( json ) {
+ setInnerHTML( 'nameField', json.dataDictionary.name );
+
+ var description = json.dataDictionary.description;
+ setInnerHTML( 'descriptionField', description ? description : '[' + i18n_none + ']' );
+
+ var region = json.dataDictionary.region;
+ setInnerHTML( 'regionField', region ? region : '[' + i18n_none + ']' );
+
+ showDetails();
+ });
}
// -----------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js 2011-09-27 07:36:07 +0000
@@ -16,18 +16,14 @@
function showDataElementGroupDetails( dataElementGroupId )
{
- var request = new Request();
- request.setResponseTypeXML( 'dataElementGroup' );
- request.setCallbackSuccess( dataElementGroupReceived );
- request.send( '../dhis-web-commons-ajax/getDataElementGroup.action?id=' + dataElementGroupId );
-}
-
-function dataElementGroupReceived( dataElementGroupElement )
-{
- setInnerHTML( 'nameField', getElementValue( dataElementGroupElement, 'name' ) );
- setInnerHTML( 'memberCountField', getElementValue( dataElementGroupElement, 'memberCount' ) );
-
- showDetails();
+ jQuery.post( '../dhis-web-commons-ajax-json/getDataElementGroup.action',
+ { id: dataElementGroupId }, function ( json ) {
+
+ setInnerHTML( 'nameField', json.dataElementGroup.name );
+ setInnerHTML( 'memberCountField', json.dataElementGroup.memberCount );
+
+ showDetails();
+ });
}
// -----------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupSet.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupSet.js 2011-09-27 07:36:07 +0000
@@ -43,7 +43,6 @@
function deleteDataElementGroupSet( groupSetId, groupSetName )
{
-
removeItem( groupSetId, groupSetName, i18n_confirm_delete, "deleteDataElementGroupSet.action" );
}
@@ -53,18 +52,11 @@
function showDataElementGroupSetDetails( id )
{
-
- var request = new Request();
- request.setResponseTypeXML( 'dataElementGroupSet' );
- request.setCallbackSuccess( showDetailsCompleted );
- request.send( "../dhis-web-commons-ajax/getDataElementGroupSet.action?id=" + id );
-}
-
-function showDetailsCompleted( dataElementGroupSet )
-{
-
- setInnerHTML( 'nameField', getElementValue( dataElementGroupSet, 'name' ) );
- setInnerHTML( 'memberCountField', getElementValue( dataElementGroupSet, 'memberCount' ) );
-
- showDetails();
+ jQuery.post( '../dhis-web-commons-ajax-json/getDataElementGroupSet.action', { id: id },
+ function ( json ) {
+ setInnerHTML( 'nameField', json.dataElementGroupSet.name );
+ setInnerHTML( 'memberCountField', json.dataElementGroupSet.memberCount );
+
+ showDetails();
+ });
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js 2011-09-26 09:31:56 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js 2011-09-27 07:36:07 +0000
@@ -44,43 +44,38 @@
function showIndicatorDetails( indicatorId )
{
- var request = new Request();
- request.setResponseTypeXML( 'indicator' );
- request.setCallbackSuccess( indicatorReceived );
- request.send( '../dhis-web-commons-ajax/getIndicator.action?id=' + indicatorId );
-}
-
-function indicatorReceived( indicatorElement )
-{
- setInnerHTML( 'nameField', getElementValue( indicatorElement, 'name' ) );
-
- setInnerHTML( 'shortNameField', getElementValue( indicatorElement, 'shortName' ) );
-
- var alternativeName = getElementValue( indicatorElement, 'alternativeName' );
- setInnerHTML( 'alternativeNameField', alternativeName ? alternativeName : '[' + i18n_none + ']' );
-
- var description = getElementValue( indicatorElement, 'description' );
- setInnerHTML( 'descriptionField', description ? description : '[' + i18n_none + ']' );
-
- var annualized = getElementValue( indicatorElement, 'annualized' );
- setInnerHTML( 'annualizedField', annualized == "true" ? i18n_yes : i18n_no );
-
- setInnerHTML( 'indicatorTypeNameField', getElementValue( indicatorElement, 'indicatorTypeName' ) );
-
- var numeratorDescription = getElementValue( indicatorElement, 'numeratorDescription' );
- setInnerHTML( 'numeratorDescriptionField', numeratorDescription ? numeratorDescription : '[' + i18n_none + ']' );
-
- var denominatorDescription = getElementValue( indicatorElement, 'denominatorDescription' );
- setInnerHTML( 'denominatorDescriptionField', denominatorDescription ? denominatorDescription : '[' + i18n_none
- + ']' );
-
- var url = getElementValue( indicatorElement, 'url' );
- setInnerHTML( 'urlField', url ? '<a href="' + url + '">' + url + '</a>' : '[' + i18n_none + ']' );
-
- var lastUpdated = getElementValue( indicatorElement, 'lastUpdated' );
- setInnerHTML( 'lastUpdatedField', lastUpdated ? lastUpdated : '[' + i18n_none + ']' );
-
- showDetails();
+ jQuery.get( '../dhis-web-commons-ajax-json/getIndicator.action',
+ { id: indicatorId }, function( json ) {
+
+ setInnerHTML( 'nameField', json.indicator.name );
+
+ setInnerHTML( 'shortNameField', json.indicator.shortName );
+
+ var alternativeName = json.indicator.alternativeName;
+ setInnerHTML( 'alternativeNameField', alternativeName ? alternativeName : '[' + i18n_none + ']' );
+
+ var description = json.indicator.description;
+ setInnerHTML( 'descriptionField', description ? description : '[' + i18n_none + ']' );
+
+ var annualized = json.indicator.annualized;
+ setInnerHTML( 'annualizedField', annualized == "true" ? i18n_yes : i18n_no );
+
+ setInnerHTML( 'indicatorTypeNameField', json.indicator.indicatorTypeName );
+
+ var numeratorDescription = json.indicator.numeratorDescription;
+ setInnerHTML( 'numeratorDescriptionField', numeratorDescription ? numeratorDescription : '[' + i18n_none + ']' );
+
+ var denominatorDescription = json.indicator.denominatorDescription;
+ setInnerHTML( 'denominatorDescriptionField', denominatorDescription ? denominatorDescription : '[' + i18n_none + ']' );
+
+ var url = json.indicator.url;
+ setInnerHTML( 'urlField', url ? '<a href="' + url + '">' + url + '</a>' : '[' + i18n_none + ']' );
+
+ var lastUpdated = json.indicator.lastUpdated;
+ setInnerHTML( 'lastUpdatedField', lastUpdated ? lastUpdated : '[' + i18n_none + ']' );
+
+ showDetails();
+ });
}
// -----------------------------------------------------------------------------
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroup.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroup.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroup.js 1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-function showIndicatorGroupDetails( indicatorGroupId )
-{
- var request = new Request();
- request.setResponseTypeXML( 'indicatorGroup' );
- request.setCallbackSuccess( indicatorGroupReceived );
- request.send( '../dhis-web-commons-ajax/getIndicatorGroup.action?id=' + indicatorGroupId );
-}
-
-function indicatorGroupReceived( indicatorGroupElement )
-{
- setInnerHTML( 'nameField', getElementValue( indicatorGroupElement, 'name' ) );
- setInnerHTML( 'memberCountField', getElementValue( indicatorGroupElement, 'memberCount' ) );
-
- showDetails();
-}
-
-// -----------------------------------------------------------------------------
-// Remove indicator group
-// -----------------------------------------------------------------------------
-
-function removeIndicatorGroup( indicatorGroupId, indicatorGroupName )
-{
- removeItem( indicatorGroupId, indicatorGroupName, i18n_confirm_delete, 'removeIndicatorGroup.action' );
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupSet.js 2011-06-22 18:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupSet.js 1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-// -----------------------------------------------------------------------------
-// Show Data Element Group Set details
-// -----------------------------------------------------------------------------
-
-function showIndicatorGroupSetDetails( id )
-{
- var request = new Request();
- request.setResponseTypeXML( 'indicatorGroupSet' );
- request.setCallbackSuccess( showDetailsCompleted );
- request.sendAsPost( "id=" + id );
- request.send( "../dhis-web-commons-ajax/getIndicatorGroupSet.action" );
-}
-
-function showDetailsCompleted( indicatorGroupSet )
-{
- setInnerHTML( 'nameField', getElementValue( indicatorGroupSet, 'name' ) );
- setInnerHTML( 'memberCountField', getElementValue( indicatorGroupSet, 'memberCount' ) );
-
- showDetails();
-}
-
-// -----------------------------------------------------------------------------
-// Delete Indicator Group Set
-// -----------------------------------------------------------------------------
-
-function deleteIndicatorGroupSet( groupSetId, groupSetName )
-{
- removeItem( groupSetId, groupSetName, i18n_confirm_delete, "deleteIndicatorGroupSet.action" );
-}
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/jsonDataDictionary.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/jsonDataDictionary.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/jsonDataDictionary.vm 2011-09-27 07:36:07 +0000
@@ -0,0 +1,8 @@
+{ "dataDictionary":
+ {
+ "id": "$!{dataDictionary.id}",
+ "name": "$!encoder.jsonEncode( ${dataDictionary.name} )",
+ "description": "$!encoder.jsonEncode( ${dataDictionary.description} )",
+ "region": "$!encoder.jsonEncode( ${dataDictionary.region} )"
+ }
+}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm 2011-03-18 14:14:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm 2011-09-27 07:36:07 +0000
@@ -2,29 +2,25 @@
jQuery(document).ready(function(){
tableSorter( 'categoryList' );
});
-
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element_category" ) , "'" )';
function showDataElementCategoryDetails( categoryId )
- {
- var request = new Request();
- request.setResponseTypeXML( 'dataElementCategory' );
- request.setCallbackSuccess( dataElementCategoryReceived );
- request.send( 'getDataElementCategory.action?id=' + categoryId );
- }
-
- function dataElementCategoryReceived( categoryElement )
{
- setInnerHTML( 'nameField', getElementValue( categoryElement, 'name' ) );
- setInnerHTML( 'categoryOptionsCountField', getElementValue( categoryElement, 'categoryOptionCount' ) );
-
- showDetails();
+ jQuery.post( 'getDataElementCategory.action', { id: categoryId } ,
+ function ( json ) {
+
+ setInnerHTML( 'nameField', json.dataElementCategory.name );
+ setInnerHTML( 'categoryOptionsCountField', json.dataElementCategory.categoryOptionCount );
+
+ showDetails();
+ });
}
function removeDataElementCategory( categoryId, categoryName )
{
removeItem( categoryId, categoryName, i18n_confirm_delete, 'removeDataElementCategory.action' );
}
+
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element_category" ) , "'" )';
</script>
<h3>$i18n.getString( "data_element_category_management" ) #openHelp( "dataElementCategory" )</h3>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm 2011-03-18 14:14:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm 2011-09-27 07:36:07 +0000
@@ -15,17 +15,10 @@
function showConceptDetails( conceptId )
{
- var request = new Request();
- request.setResponseTypeXML( 'concept' );
- request.setCallbackSuccess( conceptReceived );
- request.send( 'getConcept.action?id=' + conceptId );
- }
-
- function conceptReceived( conceptElement )
- {
- setInnerHTML( 'nameField', getElementValue( conceptElement, 'name' ) );
-
- showDetails();
+ jQuery.post( 'getConcept.action', { id : conceptId }, function( json ) {
+ setInnerHTML( 'nameField', json.concept.name );
+ showDetails();
+ });
}
// -----------------------------------------------------------------------------
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/responseCategory.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/responseCategory.vm 2010-02-12 12:22:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/responseCategory.vm 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-<dataElementCategory>
- <id>$dataElementCategory.id</id>
- <name>$encoder.xmlEncode( $dataElementCategory.name )</name>
- <conceptName>$encoder.xmlEncode( $dataElementCategory.conceptName )</conceptName>
- <categoryOptionCount>$dataElementCategory.categoryOptions.size()</categoryOptionCount>
-</dataElementCategory>
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/responseCategoryCombo.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/responseCategoryCombo.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/responseCategoryCombo.vm 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-<dataElementCategoryCombo>
- <id>$dataElementCategoryCombo.id</id>
- <name>$encoder.xmlEncode( $dataElementCategoryCombo.name )</name>
- <dataElementCategoryCount>$dataElementCategories.size()</dataElementCategoryCount>
-</dataElementCategoryCombo>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/responseConcept.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/responseConcept.vm 2010-09-04 07:26:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/responseConcept.vm 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<concept>
- <id>$concept.id</id>
- <name>$encoder.xmlEncode( $concept.name )</name>
-</concept>
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseDataDictionary.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseDataDictionary.vm 2009-05-25 09:18:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseDataDictionary.vm 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataDictionary>
- <id>$dataDictionary.id</id>
- <name>$!encoder.xmlEncode( $dataDictionary.name )</name>
- <description>$!encoder.xmlEncode( $dataDictionary.description )</description>
- <region>$!encoder.xmlEncode( $dataDictionary.region )</region>
-</dataDictionary>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicatorType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicatorType.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicatorType.vm 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<indicatorType>
- <id>$indicatorType.id</id>
- <name>$encoder.xmlEncode( $indicatorType.name )</name>
- <factor>$indicatorType.factor</factor>
-</indicatorType>
