dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14175
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4704: Put indicatorGroup.js and indicatorGroupSet.js files back to trunk.
------------------------------------------------------------
revno: 4704
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-09-27 15:14:59 +0700
message:
Put indicatorGroup.js and indicatorGroupSet.js files back to trunk.
added:
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
modified:
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
--
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/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2011-09-27 07:36:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2011-09-27 08:14:59 +0000
@@ -343,6 +343,7 @@
<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>
@@ -360,6 +361,7 @@
<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>
@@ -371,6 +373,7 @@
<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>
@@ -391,6 +394,7 @@
<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>
@@ -398,6 +402,7 @@
<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>
@@ -410,6 +415,7 @@
<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">
=== 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-09-27 07:36:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm 2011-09-27 08:14:59 +0000
@@ -3,22 +3,6 @@
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-09-27 07:36:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2011-09-27 08:14:59 +0000
@@ -3,22 +3,6 @@
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" ) , "'")';
=== 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 2011-09-27 08:14:59 +0000
@@ -0,0 +1,23 @@
+// -----------------------------------------------------------------------------
+// Show Indicator Group details
+// -----------------------------------------------------------------------------
+
+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();
+ });
+}
+
+// -----------------------------------------------------------------------------
+// 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 2011-09-27 08:14:59 +0000
@@ -0,0 +1,23 @@
+// -----------------------------------------------------------------------------
+// Show Indicator Group Set details
+// -----------------------------------------------------------------------------
+
+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();
+ });
+}
+
+// -----------------------------------------------------------------------------
+// Delete Indicator Group Set
+// -----------------------------------------------------------------------------
+
+function deleteIndicatorGroupSet( groupSetId, groupSetName )
+{
+ removeItem( groupSetId, groupSetName, i18n_confirm_delete, "deleteIndicatorGroupSet.action" );
+}
