dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #02821
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 927: Cosmetic fixes to group set gui.
------------------------------------------------------------
revno: 927
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Thu 2009-10-29 12:27:49 +0100
message:
Cosmetic fixes to group set gui.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/AddDataElementGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/DeleteDataElementGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/ListDataElementGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/OpenUpdateDataElementGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/UpdateDataElementGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/ValidateDataElementGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/AddIndicatorGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/DeleteIndicatorGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ListIndicatorGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/OpenUpdateIndicatorGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/UpdateIndicatorGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ValidateIndicatorGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.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/updateDataElementGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.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/DataElementCategoryService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java 2009-10-20 12:49:32 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java 2009-10-29 11:27:49 +0000
@@ -141,6 +141,13 @@
Collection<DataElementCategoryOption> getDataElementCategoryOptions( Collection<Integer> identifiers );
/**
+ * Retrieves the DataElementCategoryOptions with the given name.
+ * @param name the name.
+ * @return the DataElementCategoryOptions with the given name.
+ */
+ Collection<DataElementCategoryOption> getDataElementCategoryOptionsByName( String name );
+
+ /**
* Returns all DataElementCategoryOptions.
*
* @return a collection of all DataElementCategoryOptions, or an empty collection if there
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java 2009-10-27 15:12:01 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java 2009-10-29 11:27:49 +0000
@@ -194,6 +194,21 @@
return dataElementCategoryOptionStore.get( id );
}
+ public Collection<DataElementCategoryOption> getDataElementCategoryOptionsByName( String name )
+ {
+ Collection<DataElementCategoryOption> categoryOptions = new ArrayList<DataElementCategoryOption>();
+
+ for ( DataElementCategoryOption categoryOption : getAllDataElementCategoryOptions() )
+ {
+ if ( categoryOption.getName().equals( name ) )
+ {
+ categoryOptions.add( categoryOption );
+ }
+ }
+
+ return categoryOptions;
+ }
+
public Collection<DataElementCategoryOption> getDataElementCategoryOptions( Collection<Integer> identifiers )
{
if ( identifiers == null )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementListAction.java 2009-10-26 15:39:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementListAction.java 2009-10-29 11:27:49 +0000
@@ -161,8 +161,6 @@
@SuppressWarnings( "unchecked" )
public String execute()
{
- System.out.println("data dictionary id : " + dataDictionaryId);
-
if ( dataDictionaryId == null ) // None, get current data dictionary
{
dataDictionaryId = dataDictionaryModeManager.getCurrentDataDictionary();
@@ -192,8 +190,6 @@
if ( dataDictionaryId != null && dataElementGroupId == null )
{
- System.out.println("data dictionary id : " + dataDictionaryId);
-
dataElements = new ArrayList<DataElement>( dataDictionaryService.getDataDictionary( dataDictionaryId ).getDataElements() );
}
else if ( dataDictionaryId == null && dataElementGroupId != null )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/AddDataElementGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/AddDataElementGroupSetAction.java 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/AddDataElementGroupSetAction.java 2009-10-29 11:27:49 +0000
@@ -74,7 +74,10 @@
this.selectedDataElementGroupIds = selectedDataElementGroupIds;
}
- @Override
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
public String execute()
throws Exception
{
@@ -86,11 +89,9 @@
for ( String id : this.selectedDataElementGroupIds )
{
-
DataElementGroup dataElementGroup = dataElementService.getDataElementGroup( Integer.parseInt( id ) );
dataElementGroups.add( dataElementGroup );
-
}
dataElementGroupSet.setMembers( dataElementGroups );
@@ -99,5 +100,4 @@
return SUCCESS;
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/DeleteDataElementGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/DeleteDataElementGroupSetAction.java 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/DeleteDataElementGroupSetAction.java 2009-10-29 11:27:49 +0000
@@ -1,11 +1,5 @@
package org.hisp.dhis.dd.action.dataelementgroupset;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.system.deletion.DeletionHandler;
-import org.hisp.dhis.system.deletion.DeletionManager;
-
-import com.opensymphony.xwork2.Action;
-
/*
* Copyright (c) 2004-2007, University of Oslo
* All rights reserved.
@@ -33,6 +27,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.dataelement.DataElementService;
+
+import com.opensymphony.xwork2.Action;
+
/**
* @author Tran Thanh Tri
* @version $Id$
@@ -63,15 +61,14 @@
this.id = id;
}
- @Override
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
public String execute()
- throws Exception
{
-
dataElementService.deleteDataElementGroupSet( dataElementService.getDataElementGroupSet( id ) );
-
return SUCCESS;
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/ListDataElementGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/ListDataElementGroupSetAction.java 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/ListDataElementGroupSetAction.java 2009-10-29 11:27:49 +0000
@@ -37,8 +37,6 @@
import com.opensymphony.xwork2.Action;
-
-
/**
* @author Tran Thanh Tri
* @version $Id$
@@ -68,14 +66,16 @@
return dataElementGroupSets;
}
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
public String execute()
- throws Exception
{
this.dataElementGroupSets = new ArrayList<DataElementGroupSet>( dataElementService.getAllDataElementGroupSets() );
- Collections.sort( this.dataElementGroupSets, new DataElementGroupSetNameComparator() );
+ Collections.sort( dataElementGroupSets, new DataElementGroupSetNameComparator() );
return SUCCESS;
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/OpenUpdateDataElementGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/OpenUpdateDataElementGroupSetAction.java 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/OpenUpdateDataElementGroupSetAction.java 2009-10-29 11:27:49 +0000
@@ -39,7 +39,6 @@
* @author Tran Thanh Tri
* @version $Id$
*/
-
public class OpenUpdateDataElementGroupSetAction
implements Action
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/UpdateDataElementGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/UpdateDataElementGroupSetAction.java 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/UpdateDataElementGroupSetAction.java 2009-10-29 11:27:49 +0000
@@ -43,7 +43,6 @@
public class UpdateDataElementGroupSetAction
implements Action
{
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
@@ -80,7 +79,10 @@
this.selectedDataElementGroupIds = selectedDataElementGroupIds;
}
- @Override
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
public String execute()
throws Exception
{
@@ -92,16 +94,13 @@
for ( String id : selectedDataElementGroupIds )
{
-
DataElementGroup dataElementGroup = dataElementService.getDataElementGroup( Integer.parseInt( id ) );
dataElementGroupSet.getMembers().add( dataElementGroup );
-
}
dataElementService.updateDataElementGroupSet( dataElementGroupSet );
return SUCCESS;
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/ValidateDataElementGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/ValidateDataElementGroupSetAction.java 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/ValidateDataElementGroupSetAction.java 2009-10-29 11:27:49 +0000
@@ -40,7 +40,6 @@
public class ValidateDataElementGroupSetAction
implements Action
{
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
@@ -84,9 +83,11 @@
return message;
}
- @Override
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
public String execute()
- throws Exception
{
if ( name == null )
{
@@ -130,4 +131,4 @@
return SUCCESS;
}
-}
\ No newline at end of file
+}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/AddIndicatorGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/AddIndicatorGroupSetAction.java 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/AddIndicatorGroupSetAction.java 2009-10-29 11:27:49 +0000
@@ -44,7 +44,6 @@
public class AddIndicatorGroupSetAction
implements Action
{
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
@@ -60,8 +59,6 @@
// Input
// -------------------------------------------------------------------------
-
-
private String name;
public void setName( String name )
@@ -76,9 +73,11 @@
this.selectedIndicatorGroups = selectedIndicatorGroups;
}
- @Override
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
public String execute()
- throws Exception
{
IndicatorGroupSet indicatorGroupSet = new IndicatorGroupSet( name );
@@ -88,11 +87,9 @@
for ( String id : this.selectedIndicatorGroups )
{
-
IndicatorGroup indicatorGroup = indicatorService.getIndicatorGroup( Integer.parseInt( id ) );
indicatorGroups.add( indicatorGroup );
-
}
indicatorGroupSet.setMembers( indicatorGroups );
@@ -101,5 +98,4 @@
return SUCCESS;
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/DeleteIndicatorGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/DeleteIndicatorGroupSetAction.java 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/DeleteIndicatorGroupSetAction.java 2009-10-29 11:27:49 +0000
@@ -1,9 +1,5 @@
package org.hisp.dhis.dd.action.indicatorgroupset;
-import org.hisp.dhis.indicator.IndicatorService;
-
-import com.opensymphony.xwork2.Action;
-
/*
* Copyright (c) 2004-2007, University of Oslo
* All rights reserved.
@@ -31,11 +27,14 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.indicator.IndicatorService;
+
+import com.opensymphony.xwork2.Action;
+
/**
* @author Tran Thanh Tri
* @version $Id$
*/
-
public class DeleteIndicatorGroupSetAction
implements Action
{
@@ -61,14 +60,16 @@
this.id = id;
}
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
@Override
public String execute()
throws Exception
{
-
indicatorService.deleteIndicatorGroupSet( indicatorService.getIndicatorGroupSet( id ) );
return SUCCESS;
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ListIndicatorGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ListIndicatorGroupSetAction.java 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ListIndicatorGroupSetAction.java 2009-10-29 11:27:49 +0000
@@ -66,6 +66,10 @@
return indicatorGroupSets;
}
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
public String execute()
throws Exception
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/OpenUpdateIndicatorGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/OpenUpdateIndicatorGroupSetAction.java 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/OpenUpdateIndicatorGroupSetAction.java 2009-10-29 11:27:49 +0000
@@ -84,9 +84,11 @@
this.indicatorGroups = indicatorGroups;
}
- @Override
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
public String execute()
- throws Exception
{
indicatorGroupSet = indicatorService.getIndicatorGroupSet( id );
@@ -94,5 +96,4 @@
return SUCCESS;
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/UpdateIndicatorGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/UpdateIndicatorGroupSetAction.java 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/UpdateIndicatorGroupSetAction.java 2009-10-29 11:27:49 +0000
@@ -80,6 +80,10 @@
this.selectedIndicatorGroups = selectedIndicatorGroups;
}
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
@Override
public String execute()
throws Exception
@@ -101,5 +105,4 @@
return SUCCESS;
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ValidateIndicatorGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ValidateIndicatorGroupSetAction.java 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ValidateIndicatorGroupSetAction.java 2009-10-29 11:27:49 +0000
@@ -27,8 +27,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.dataelement.DataElementGroupSet;
-import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.i18n.I18n;
import org.hisp.dhis.indicator.IndicatorGroupSet;
import org.hisp.dhis.indicator.IndicatorService;
@@ -86,11 +84,12 @@
return message;
}
- @Override
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
public String execute()
- throws Exception
{
-
if ( name == null )
{
message = i18n.getString( "please_enter_name" );
@@ -116,7 +115,6 @@
return ERROR;
}
-
}
else
{
@@ -133,5 +131,4 @@
return SUCCESS;
}
-
-}
\ 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/addDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm 2009-10-29 11:27:49 +0000
@@ -1,4 +1,5 @@
-<h2>$i18n.getString( "add_dataelementgroupset" )</h2>
+
+<h3>$i18n.getString( "add_dataelementgroupset" )</h3>
<form id="addDataElementGroupSet" action="addDataElementGroupSet.action" method="post">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm 2009-10-29 11:27:49 +0000
@@ -1,4 +1,5 @@
-<h2>$i18n.getString( "add_indicatorgroupset" )</h2>
+
+<h3>$i18n.getString( "add_indicatorgroupset" )</h3>
<form id="addIndicatorGroupSet" action="addIndicatorGroupSet.action" method="post">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm 2009-10-29 11:27:49 +0000
@@ -1,6 +1,7 @@
-<h2>$i18n.getString( "data_element_group_set" )</h2>
-
-<table style="min-width:500px;">
+
+<h3>$i18n.getString( "data_element_group_set" )</h3>
+
+<table class="mainPageTable">
<thead>
<tr>
<th>$i18n.getString( "filter_by_name" ) <input type="text" id="dataElementGroupSetFilter" style="width:300px" onkeyup="filterDataElementSet( this.value )"/></th>
@@ -14,7 +15,7 @@
<tbody id="contents">
</tbody>
-</table>
+</table>
<script>
var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element_group" ) , "'")';
@@ -28,6 +29,4 @@
filterDataElementSet( $("#dataElementGroupSetFilter").val() );
-
-
</script>
\ 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/indicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2009-10-29 11:27:49 +0000
@@ -1,4 +1,5 @@
-<h2>$i18n.getString( "data_element_group_set" )</h2>
+
+<h3>$i18n.getString( "indicator_group_set" )</h3>
<table style="min-width:500px;">
<thead>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm 2009-10-29 11:27:49 +0000
@@ -1,4 +1,5 @@
-<h2>$i18n.getString( "update_dataelementgroupset" ) : $dataElementGroupSet.name</h2>
+
+<h3>$i18n.getString( "update_dataelementgroupset" ) : $dataElementGroupSet.name</h3>
<form id="updateDataElementGroupSet" action="updateDataElementGroupSet.action" method="post">
<input type=hidden id="id" name="id" value="$dataElementGroupSet.id"/>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm 2009-10-29 11:27:49 +0000
@@ -1,4 +1,5 @@
-<h2>$i18n.getString( "update_indicatorgroupset" ) : $indicatorGroupSet.name</h2>
+
+<h3>$i18n.getString( "update_indicatorgroupset" ) : $indicatorGroupSet.name</h3>
<form id="updateIndicatorGroupSet" action="updateIndicatorGroupSet.action" method="post">
<input type=hidden id="id" name="id" value="$indicatorGroupSet.id"/>
