=== 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 2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm 2010-11-20 08:23:34 +0000
@@ -66,30 +66,4 @@
jQuery(document).ready(function(){
tableSorter( 'listTable' );
});
-
- function showIndicatorGroupDetails( indicatorGroupId )
- {
- var request = new Request();
- request.setResponseTypeXML( 'indicatorGroup' );
- request.setCallbackSuccess( indicatorGroupReceived );
- request.send( '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' );
- }
-
=== 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 2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2010-11-20 08:23:34 +0000
@@ -66,38 +66,5 @@
var i18n_information = '$encoder.jsEscape( $i18n.getString( "show_details" ) , "'")';
jQuery(document).ready(function(){
tableSorter( 'listTable' );
- });
-
- // -----------------------------------------------------------------------------
- // Delete Indicator Group Set
- // -----------------------------------------------------------------------------
-
- function deleteIndicatorGroupSet( groupSetId, groupSetName ){
-
- removeItem( groupSetId, groupSetName, i18n_confirm_delete, "deleteIndicatorGroupSet.action" );
- }
-
- // -----------------------------------------------------------------------------
- // 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( "showIndicatorGroupSetDetails.action");
-
- }
-
- function showDetailsCompleted( indicatorGroupSet ){
-
- setInnerHTML( 'nameField', getElementValue( indicatorGroupSet, 'name' ) );
- setInnerHTML( 'memberCountField', getElementValue( indicatorGroupSet, 'memberCount' ) );
-
- showDetails();
- }
-
-
+ });
\ 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/javascript/dataElement.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2010-11-07 12:01:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2010-11-20 08:23:34 +0000
@@ -50,7 +50,7 @@
var request = new Request();
request.setResponseTypeXML( 'dataElement' );
request.setCallbackSuccess( dataElementReceived );
- request.send( 'getDataElement.action?id=' + dataElementId );
+ request.send( '../dhis-web-commons-ajax/getDataElement.action?id=' + dataElementId );
}
function dataElementReceived( dataElementElement )
=== 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 2010-11-02 13:02:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js 2010-11-20 08:23:34 +0000
@@ -17,7 +17,7 @@
var request = new Request();
request.setResponseTypeXML( 'dataElementGroup' );
request.setCallbackSuccess( dataElementGroupReceived );
- request.send( 'getDataElementGroup.action?id=' + dataElementGroupId );
+ request.send( '../dhis-web-commons-ajax/getDataElementGroup.action?id=' + dataElementGroupId );
}
function dataElementGroupReceived( dataElementGroupElement )
@@ -60,7 +60,6 @@
function searchDataElementGroupPaging(currentPage, pageSize)
{
-
var params = 'key=' + getFieldValue( 'key' );
params += '¤tPage=' + currentPage;
params += '&pageSize=' + pageSize;
=== 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 2010-09-01 16:55:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupSet.js 2010-11-20 08:23:34 +0000
@@ -55,10 +55,9 @@
var request = new Request();
request.setResponseTypeXML( 'dataElementGroupSet' );
request.setCallbackSuccess( showDetailsCompleted );
- request.send( "showDataElementGroupSetDetails.action?id=" + id);
+ request.send( "../dhis-web-commons-ajax/getDataElementGroupSet.action?id=" + id);
}
-
function showDetailsCompleted( dataElementGroupSet ){
setInnerHTML( 'nameField', getElementValue( dataElementGroupSet, 'name' ) );
=== 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 2010-09-01 16:55:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js 2010-11-20 08:23:34 +0000
@@ -21,7 +21,7 @@
var request = new Request();
request.setResponseTypeXML( 'indicator' );
request.setCallbackSuccess( indicatorReceived );
- request.send( 'getIndicator.action?id=' + indicatorId );
+ request.send( '../dhis-web-commons-ajax/getIndicator.action?id=' + indicatorId );
}
function indicatorReceived( indicatorElement )
=== added 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 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/javascript/indicatorGroup.js 2010-11-20 08:23:34 +0000
@@ -0,0 +1,25 @@
+
+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' );
+}
=== added 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 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/javascript/indicatorGroupSet.js 2010-11-20 08:23:34 +0000
@@ -0,0 +1,30 @@
+
+// -----------------------------------------------------------------------------
+// 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" );
+}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseDataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseDataElement.vm 2010-08-24 09:14:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseDataElement.vm 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-
-
- $dataElement.id
- $encoder.xmlEncode( $dataElement.name )
- $encoder.xmlEncode( $dataElement.shortName )
- $!encoder.xmlEncode( $dataElement.alternativeName )
- $!encoder.xmlEncode( $dataElement.code )
- $!encoder.xmlEncode( $dataElement.description )
- $dataElement.active
- $dataElement.getDomainTypeNullSafe()
- $dataElement.type
- $dataElement.aggregationOperator
- $!encoder.xmlEncode( $dataElement.url )
- $!format.formatDate( $dataElement.lastUpdated )
- $!encoder.xmlEncode( $dataElement.categoryCombo.name )
-
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseDataElementGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseDataElementGroup.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/responseDataElementGroup.vm 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-
-
- $dataElementGroup.id
- $encoder.xmlEncode( $dataElementGroup.name )
- $memberCount
-
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseDataElementGroupSet.vm 2009-10-30 07:06:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseDataElementGroupSet.vm 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-
-
- $dataElementGroupSet.id
- $encoder.xmlEncode( $dataElementGroupSet.name )
- $dataElementGroupSet.members.size()
-
\ 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/responseIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicator.vm 2010-10-13 05:20:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicator.vm 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-
-
- $indicator.id
- $encoder.xmlEncode( $indicator.name )
- $encoder.xmlEncode( $indicator.shortName )
- $!encoder.xmlEncode( $indicator.alternativeName )
- $!encoder.xmlEncode( $indicator.code )
- $!encoder.xmlEncode( $indicator.description )
- $indicator.annualized
- $encoder.xmlEncode( $indicatorTypeName )
- $encoder.xmlEncode( $indicator.numeratorDescription )
- $encoder.xmlEncode( $indicator.denominatorDescription )
- $!encoder.xmlEncode( $indicator.url )
- $!format.formatDate( $indicator.lastUpdated )
-
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicatorGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicatorGroup.vm 2009-03-13 14:32:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicatorGroup.vm 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-
-
- $indicatorGroup.id
- $encoder.xmlEncode( $indicatorGroup.name )
- $memberCount
-
- #foreach( $member in $!indicatorGroup.members )
-
- $member.id
- $encoder.xmlEncode( $member.name )
-
- #end
-
-
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicatorGroupSet.vm 2009-10-30 07:06:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/responseIndicatorGroupSet.vm 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-
-
- $indicatorGroupSet.id
- $encoder.xmlEncode( $indicatorGroupSet.name )
- $indicatorGroupSet.members.size()
-
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2010-10-21 11:06:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2010-11-20 08:23:34 +0000
@@ -101,16 +101,7 @@
status.vm
plainTextError
-
-
-
-
-
- /dhis-web-maintenance-dataset/responseDataSetObject.vm
- plainTextError
-
-
+
$dataSet.id
$encoder.xmlEncode( $dataSet.name )
+ $!encoder.xmlEncode( $dataSet.shortName )
$i18n.getString( $dataSet.periodType.name )
$dataSetDataElements.size()
#if(!$dataEntryForm) #else $encoder.xmlEncode( $dataEntryForm.name )#end