dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #00457
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 138: dhis-web-maintenance-datadictionary:
------------------------------------------------------------
revno: 138
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-03-31 17:36:54 +0200
message:
dhis-web-maintenance-datadictionary:
- Standardised the add/update forms for category etc.
- Removed a bug related to update of category etc.
- Removed "default" category etc. from lists as we don't want users to edit, i18n or remove them.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/Translation.java
dhis-2/dhis-i18n/dhis-i18n-db/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryComboService.java
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/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/AddDataElementCategoryComboAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryComboAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/UpdateDataElementCategoryComboAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm
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/categoryCombo.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/Translation.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/Translation.java 2009-03-14 06:52:24 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/Translation.java 2009-03-31 15:36:54 +0000
@@ -160,6 +160,6 @@
@Override
public String toString()
{
- return "ClassName: " + className + " id: " + id + " locale: " + locale + " property: " + property + " value: " + value;
+ return "[Class name: " + className + " id: " + id + " locale: " + locale + " property: " + property + " value: " + value + "]";
}
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-i18n/dhis-i18n-db/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-i18n/dhis-i18n-db/src/main/resources/META-INF/dhis/beans.xml 2009-03-09 22:33:48 +0000
+++ dhis-2/dhis-i18n/dhis-i18n-db/src/main/resources/META-INF/dhis/beans.xml 2009-03-31 15:36:54 +0000
@@ -169,16 +169,6 @@
</property>
</bean>
- <bean id="I18nDataElementCategoryCombo"
- class="org.hisp.dhis.i18n.I18nObject">
- <property name="className" value="DataElementCategoryCombo"/>
- <property name="propertyNames">
- <list>
- <value>name</value>
- </list>
- </property>
- </bean>
-
<!-- I18nService -->
<bean id="org.hisp.dhis.i18n.I18nService"
@@ -203,7 +193,6 @@
<ref bean="I18nDataSet"/>
<ref bean="I18nDataElementCategory"/>
<ref bean="I18nDataElementCategoryOption"/>
- <ref bean="I18nDataElementCategoryCombo"/>
</list>
</property>
</bean>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryComboService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryComboService.java 2009-03-09 22:33:48 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryComboService.java 2009-03-31 15:36:54 +0000
@@ -32,8 +32,6 @@
import java.util.Map;
import java.util.TreeMap;
-import org.hisp.dhis.i18n.I18nService;
-
/**
* @author Abyot Asalefew
* @version $Id$
@@ -59,13 +57,6 @@
this.dataElementDimensionRowOrderService = dataElementDimensionRowOrderService;
}
- private I18nService i18nService;
-
- public void setI18nService( I18nService service )
- {
- i18nService = service;
- }
-
// -------------------------------------------------------------------------
// DataElementCategoryCombo
// -------------------------------------------------------------------------
@@ -74,15 +65,16 @@
{
int id = dataElementCategoryComboStore.addDataElementCategoryCombo( dataElementCategoryCombo );
- i18nService.addObject( dataElementCategoryCombo );
-
return id;
}
+ public void updateDataElementCategoryCombo( DataElementCategoryCombo dataElementCategoryCombo )
+ {
+ dataElementCategoryComboStore.updateDataElementCategoryCombo( dataElementCategoryCombo );
+ }
+
public void deleteDataElementCategoryCombo( DataElementCategoryCombo dataElementCategoryCombo )
{
- i18nService.removeObject( dataElementCategoryCombo );
-
dataElementCategoryComboStore.deleteDataElementCategoryCombo( dataElementCategoryCombo );
}
@@ -118,11 +110,6 @@
return dataElementCategoryComboStore.getDataElementCategoryComboByName( name );
}
- public void updateDataElementCategoryCombo( DataElementCategoryCombo dataElementCategoryCombo )
- {
- dataElementCategoryComboStore.updateDataElementCategoryCombo( dataElementCategoryCombo );
- }
-
public Collection<DataElementCategory> getOrderCategories( DataElementCategoryCombo dataElementCategoryCombo )
{
Map<Integer, DataElementCategory> categoryMap = new TreeMap<Integer, DataElementCategory>();
=== 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-03-09 22:33:48 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java 2009-03-31 15:36:54 +0000
@@ -79,6 +79,13 @@
return id;
}
+ public void updateDataElementCategory( DataElementCategory dataElementCategory )
+ {
+ dataElementCategoryStore.updateDataElementCategory( dataElementCategory );
+
+ i18nService.verify( dataElementCategory );
+ }
+
public void deleteDataElementCategory( DataElementCategory dataElementCategory )
{
i18nService.removeObject( dataElementCategory );
@@ -118,11 +125,6 @@
return dataElementCategoryStore.getDataElementCategoryByName( name );
}
- public void updateDataElementCategory( DataElementCategory dataElementCategory )
- {
- dataElementCategoryStore.updateDataElementCategory( dataElementCategory );
- }
-
public Collection<DataElementCategoryOption> getOrderedOptions( DataElementCategory category )
{
Map<Integer, DataElementCategoryOption> optionsMap = new TreeMap<Integer, DataElementCategoryOption>();
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2009-03-20 17:08:00 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2009-03-31 15:36:54 +0000
@@ -237,9 +237,7 @@
<property name="dataElementCategoryComboStore"
ref="org.hisp.dhis.dataelement.DataElementCategoryComboStore"/>
<property name="dataElementDimensionRowOrderService"
- ref="org.hisp.dhis.dataelement.DataElementDimensionRowOrderService"/>
- <property name="i18nService"
- ref="org.hisp.dhis.i18n.I18nService"/>
+ ref="org.hisp.dhis.dataelement.DataElementDimensionRowOrderService"/>
</bean>
<bean id="org.hisp.dhis.dataelement.DataElementCategoryOptionService"
@@ -578,7 +576,7 @@
<property name="targetObject" ref="org.hisp.dhis.system.deletion.DeletionManager"/>
<property name="targetMethod" value="addDeletionHandlers"/>
<property name="arguments">
- <list>
+ <list>
<list>
<ref local="org.hisp.dhis.datadictionary.DataDictionaryDeletionHandler"/>
<ref local="org.hisp.dhis.dataelement.DataElementDeletionHandler"/>
@@ -601,7 +599,7 @@
<ref local="org.hisp.dhis.validation.ValidationRuleGroupDeletionHandler"/>
<ref local="org.hisp.dhis.datavalue.DataValueDeletionHandler"/>
</list>
- </list>
+ </list>
</property>
</bean>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryAction.java 2009-03-13 15:24:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryAction.java 2009-03-31 15:36:54 +0000
@@ -138,7 +138,6 @@
}
displayOrder++;
-
}
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryAction.java 2009-03-13 15:24:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryAction.java 2009-03-31 15:36:54 +0000
@@ -132,7 +132,6 @@
if ( columnOrder == null )
{
-
storedDisplayOrder = false;
break;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryAction.java 2009-03-13 15:24:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryAction.java 2009-03-31 15:36:54 +0000
@@ -111,29 +111,18 @@
DataElementCategory dataElementCategory = dataElementCategoryService
.getDataElementCategory( dataElementCategoryId );
- if ( !dataElementCategory.getName().equals( nameField ) )
- {
- dataElementCategory.setName( nameField );
- }
-
+ dataElementCategory.setName( nameField );
+
Set<DataElementCategoryOption> updatedCategoryOptions = new HashSet<DataElementCategoryOption>();
for ( String id : selectedList )
{
- DataElementCategoryOption dataElementCategoryOption = dataElementCategoryOptionService
- .getDataElementCategoryOption( Integer.parseInt( id ) );
-
- updatedCategoryOptions.add( dataElementCategoryOption );
-
+ updatedCategoryOptions.add( dataElementCategoryOptionService.getDataElementCategoryOption( Integer.parseInt( id ) ) );
}
- if( ! dataElementCategory.getCategoryOptions().containsAll(updatedCategoryOptions) )
- {
- dataElementCategory.setCategoryOptions( updatedCategoryOptions );
- }
-
+ dataElementCategory.setCategoryOptions( updatedCategoryOptions );
+
dataElementCategoryService.updateDataElementCategory( dataElementCategory );
-
int displayOrder = 1;
@@ -149,8 +138,7 @@
if ( columnOrder == null )
{
- columnOrder = new DataElementDimensionColumnOrder( dataElementCategory, dataElementCategoryOption,
- displayOrder );
+ columnOrder = new DataElementDimensionColumnOrder( dataElementCategory, dataElementCategoryOption, displayOrder );
dataElementDimensionColumnOrderService.addDataElementDimensionColumnOrder( columnOrder );
}
else
@@ -160,7 +148,6 @@
}
displayOrder++;
-
}
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/AddDataElementCategoryComboAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/AddDataElementCategoryComboAction.java 2009-03-13 15:24:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/AddDataElementCategoryComboAction.java 2009-03-31 15:36:54 +0000
@@ -150,7 +150,6 @@
}
displayOrder++;
-
}
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryComboAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryComboAction.java 2009-03-13 15:24:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryComboAction.java 2009-03-31 15:36:54 +0000
@@ -128,8 +128,7 @@
for ( DataElementCategory category : cateogries )
{
- rowOrder = dataElementDimensionRowOrderService.getDataElementDimensionRowOrder( dataElementCategoryCombo,
- category );
+ rowOrder = dataElementDimensionRowOrderService.getDataElementDimensionRowOrder( dataElementCategoryCombo, category );
if ( rowOrder == null )
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/UpdateDataElementCategoryComboAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/UpdateDataElementCategoryComboAction.java 2009-03-13 15:24:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/UpdateDataElementCategoryComboAction.java 2009-03-31 15:36:54 +0000
@@ -116,11 +116,8 @@
DataElementCategoryCombo dataElementCategoryCombo = dataElementCategoryComboService
.getDataElementCategoryCombo( dataElementCategoryComboId );
- if ( !dataElementCategoryCombo.getName().equals( nameField ) )
- {
- dataElementCategoryCombo.setName( nameField );
- }
-
+ dataElementCategoryCombo.setName( nameField );
+
Set<DataElementCategory> updatedCategories = new HashSet<DataElementCategory>();
for ( String id : selectedList )
@@ -131,14 +128,11 @@
updatedCategories.add( dataElementCategory );
}
- if ( !dataElementCategoryCombo.getCategories().containsAll( updatedCategories) )
- {
- dataElementCategoryCombo.setCategories( updatedCategories );
+ dataElementCategoryCombo.setCategories( updatedCategories );
- dataElementCategoryComboService.updateDataElementCategoryCombo( dataElementCategoryCombo );
+ dataElementCategoryComboService.updateDataElementCategoryCombo( dataElementCategoryCombo );
- dataElementCategoryOptionComboService.generateOptionCombos( dataElementCategoryCombo );
- }
+ dataElementCategoryOptionComboService.generateOptionCombos( dataElementCategoryCombo );
int displayOrder = 1;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.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/addDataElementCategoryComboForm.vm 2009-03-31 15:36:54 +0000
@@ -3,8 +3,6 @@
<form id="addDataElementCategoryComboForm" name="addDataElementCategoryComboForm" action="addDataElementCategoryCombo.action" method="post" onsubmit="submitForm(); return validateAddDataElementCategoryCombo()">
<table id="detailsList">
- <col> ## Labels
- <col> ## Input
<thead>
<tr>
<th colspan="2">$i18n.getString( "details" )</th>
@@ -15,15 +13,13 @@
<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="nameField" name="nameField" style="width:20em"></td>
</tr>
- <tr><td> </td><td> </td></tr>
+ <tr>
+ <td colspan="2" style="height:15px"></td>
+ </tr>
</tbody>
</table>
<table id="dataElementCategorySelectionArea">
- <col> ## Selected DataElementCategories
- <col> ## Actions
- <col> ## only a space
- <col> ## Available DataElementCategories
<thead>
<tr>
<th>$i18n.getString( "available_categories" )</th>
@@ -35,15 +31,13 @@
<tr>
<td>
- <!-- List of all available DataElementCategoryOptions -->
<select size="15" id="availableList" name="availableList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="move( 'availableList' )">
- <!-- Show all available DataElementCategoryOptions -->
#foreach ( $availableDataElementCategory in $dataElementCategories )
<option value="$availableDataElementCategory.id">$encoder.htmlEncode( $availableDataElementCategory.name )</option>
#end
</select>
</td>
- <td valign="top" align="center">
+ <td valign="top" align="center">
<input type="button" value=">" onclick="move( 'availableList' )"><br>
<input type="button" value="<" onclick="move ( 'selectedList' )"> <br> <br>
<a href="#" onclick="moveUp('selectedList')"><img src="../images/move_up.png" border="0" alt=""></a><br><br>
@@ -51,28 +45,16 @@
</td>
<td>
<select id="selectedList" name="selectedList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="move( 'selectedList' )">
- <!-- initially empty -->
</select>
- </td>
-
- </tr>
-
- <tr>
- <td colspan="4">
- <span id="message"></span>
- </td>
- </tr>
-
- <tr>
- <td colspan="4">
- <input type="submit" name="add" value="$i18n.getString( "add" )">
- <!--
- Cancel and go back to the overview
- -->
- <input type="button" name="cancel"
- onclick="window.location.href='categoryCombo.action'" value="$i18n.getString( "cancel" )">
- </td>
- </tr>
+ </td>
+ </tr>
+
</tbody>
</table>
+
+ <p><input type="submit" name="add" value="$i18n.getString( "add" )" style="width:10em"><input
+ type="button" name="cancel" onclick="window.location.href='categoryCombo.action'" value="$i18n.getString( "cancel" )" style="width:10em"></p>
+
</form>
+
+<span id="message"></span>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.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/addDataElementCategoryForm.vm 2009-03-31 15:36:54 +0000
@@ -3,8 +3,6 @@
<form id="addDataElementCategoryForm" name="addDataElementCategoryForm" action="addDataElementCategory.action" method="post" onsubmit="submitForm(); return validateAddDataElementCategory()">
<table id="detailsList">
- <col> ## Labels
- <col> ## Input
<thead>
<tr>
<th colspan="2">$i18n.getString( "details" )</th>
@@ -15,15 +13,13 @@
<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="nameField" name="nameField" style="width:20em"></td>
</tr>
- <tr><td> </td><td> </td></tr>
+ <tr>
+ <td colspan="2" style="height:15px"></td>
+ </tr>
</tbody>
</table>
<table id="dataElementCategoryOptionSelectionArea">
- <col> ## Selected DataElementCategoryOptions
- <col> ## Actions
- <col> ## only a space
- <col> ## Available DataElementCategoryOptions
<thead>
<tr>
<th>$i18n.getString( "available_options" )</th>
@@ -35,9 +31,7 @@
<tr>
<td>
- <!-- List of all available DataElementCategoryOptions -->
<select size="15" id="availableList" name="availableList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="move( 'availableList' )">
- <!-- Show all available DataElementCategoryOptions -->
#foreach ( $availableDataElementCategoryOption in $dataElementCategoryOptions )
<option value="$availableDataElementCategoryOption.id">$encoder.htmlEncode( $availableDataElementCategoryOption.name )</option>
#end
@@ -51,28 +45,16 @@
</td>
<td>
<select id="selectedList" name="selectedList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="move( 'selectedList' )">
- <!-- initially empty -->
</select>
- </td>
-
- </tr>
-
- <tr>
- <td colspan="4">
- <span id="message"></span>
- </td>
- </tr>
-
- <tr>
- <td colspan="4">
- <input type="submit" name="add" value="$i18n.getString( "add" )">
- <!--
- Cancel and go back to the overview
- -->
- <input type="button" name="cancel"
- onclick="window.location.href='category.action'" value="$i18n.getString( "cancel" )">
- </td>
- </tr>
+ </td>
+ </tr>
+
</tbody>
</table>
+
+ <p><input type="submit" name="add" value="$i18n.getString( "add" )" style="width:10em"><input
+ type="button" name="cancel" onclick="window.location.href='category.action'" value="$i18n.getString( "cancel" )" style="width:10em"></p>
+
</form>
+
+<span id="message"></span>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.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/addDataElementCategoryOptionForm.vm 2009-03-31 15:36:54 +0000
@@ -15,12 +15,15 @@
<td><label for="shortName">$i18n.getString( "short_name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="shortName" name="shortName" style="width:20em"></td>
</tr>
+ <tr>
+ <td></td>
+ <td>
+ <input type="submit" value="$i18n.getString( "add" )" style="width:10em"><input
+ type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='categoryOption.action'" style="width:10em">
+ </td>
+ </tr>
</table>
-<p class="cleared">
- <input type="submit" value="$i18n.getString( "add" )" style="width:10em"><input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='categoryOption.action'" style="width:10em">
-</p>
-
</form>
<span id="message"></span>
=== 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 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/category.vm 2009-03-31 15:36:54 +0000
@@ -12,39 +12,31 @@
<tr>
<td></td>
- <td colspan="5" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddDataElementCategoryForm.action'"></td>
+ <td colspan="4" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddDataElementCategoryForm.action'"></td>
</tr>
<tr>
<th>$i18n.getString( "name" )</th>
- <th colspan="5">$i18n.getString( "operations" )</th>
+ <th colspan="4">$i18n.getString( "operations" )</th>
</tr>
<tbody>
#set( $mark = false )
#foreach( $dataElementCategory in $dataElementCategories )
- <tr>
+ #if( $dataElementCategory.id != $defaultCategory.id )
+ <tr>
<td#alternate( $mark )>$encoder.htmlEncode( $dataElementCategory.name )</td>
- <td style="text-align:center"#alternate( $mark )>
- <a href="showUpdateDataElementCategoryForm.action?dataElementCategoryId=$dataElementCategory.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
- </td>
- <td style="text-align:center"#alternate( $mark )>
- <a href="$i18n.getString( "translation_translate" )" title="$i18n.getString( "translation_translate" )" onclick="this.href='javascript:location.href= \'../dhis-web-commons/i18n.action?className=DataElementCategory&objectId=$dataElementCategory.id&returnUrl=\' + location.href'"><img src="../images/i18n.png" alt="$i18n.getString( "translation_translate" )"></a>
- </td>
- #if( $dataElementCategory.id != $defaultCategory.id )
- <td style="text-align:center"#alternate( $mark )>
- <a href="javascript:removeDataElementCategory( '$dataElementCategory.id', '$encoder.jsEncode( $dataElementCategory.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
- </td>
- #end
- <td style="text-align:center"#alternate( $mark )>
- <a href="javascript:showDataElementCategoryDetails( $dataElementCategory.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
- </td>
+ <td style="text-align:center"#alternate( $mark )><a href="showUpdateDataElementCategoryForm.action?dataElementCategoryId=$dataElementCategory.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a></td>
+ <td style="text-align:center"#alternate( $mark )><a href="$i18n.getString( "translation_translate" )" title="$i18n.getString( "translation_translate" )" onclick="this.href='javascript:location.href= \'../dhis-web-commons/i18n.action?className=DataElementCategory&objectId=$dataElementCategory.id&returnUrl=\' + location.href'"><img src="../images/i18n.png" alt="$i18n.getString( "translation_translate" )"></a></td>
+ <td style="text-align:center"#alternate( $mark )><a href="javascript:removeDataElementCategory( '$dataElementCategory.id', '$encoder.jsEncode( $dataElementCategory.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a></td>
+ <td style="text-align:center"#alternate( $mark )><a href="javascript:showDataElementCategoryDetails( $dataElementCategory.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a></td>
</tr>
#if( $mark )
#set( $mark = false )
#else
#set( $mark = true )
#end
+ #end
#end
</tbody>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.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/categoryCombo.vm 2009-03-31 15:36:54 +0000
@@ -4,49 +4,38 @@
<tr>
<td style="vertical-align:top">
<table class="listTable">
- <col> ## Name
- <col width="20">
- <col width="20">
- <col width="20">
- <col width="20">
+ <col>
+ <col width="20">
+ <col width="20">
+ <col width="20">
<tr>
<td></td>
- <td colspan="6" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddDataElementCategoryComboForm.action'"></td>
+ <td colspan="3" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddDataElementCategoryComboForm.action'"></td>
</tr>
<tr>
<th>$i18n.getString( "name" )</th>
- <th colspan="6">$i18n.getString( "operations" )</th>
+ <th colspan="3">$i18n.getString( "operations" )</th>
</tr>
<tbody>
#set( $mark = false )
#foreach( $dataElementCategoryCombo in $dataElementCategoryCombos )
+ #if( $dataElementCategoryCombo.id != $defaultCombo.id )
<tr>
<td#alternate( $mark )>$encoder.htmlEncode( $dataElementCategoryCombo.name )</td>
- <td style="text-align:center"#alternate( $mark )>
- <a href="showUpdateDataElementCategoryComboForm.action?dataElementCategoryComboId=$dataElementCategoryCombo.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
- </td>
- <td style="text-align:center"#alternate( $mark )>
- <a href="$i18n.getString( "translation_translate" )" title="$i18n.getString( "translation_translate" )" onclick="this.href='javascript:location.href= \'../dhis-web-commons/i18n.action?className=DataElementCategoryCombo&objectId=$dataElementCategoryCombo.id&returnUrl=\' + location.href'"><img src="../images/i18n.png" alt="$i18n.getString( "translation_translate" )"></a>
- </td>
- #if( $dataElementCategoryCombo.id != $defaultCombo.id )
- <td style="text-align:center"#alternate( $mark )>
- <a href="javascript:removeDataElementCategoryCombo( '$dataElementCategoryCombo.id', '$encoder.jsEncode( $dataElementCategoryCombo.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
- </td>
- #end
- <td style="text-align:center"#alternate( $mark )>
- <a href="javascript:showDataElementCategoryComboDetails( $dataElementCategoryCombo.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
- </td>
+ <td style="text-align:center"#alternate( $mark )><a href="showUpdateDataElementCategoryComboForm.action?dataElementCategoryComboId=$dataElementCategoryCombo.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a></td>
+ <td style="text-align:center"#alternate( $mark )><a href="javascript:removeDataElementCategoryCombo( '$dataElementCategoryCombo.id', '$encoder.jsEncode( $dataElementCategoryCombo.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a></td>
+ <td style="text-align:center"#alternate( $mark )><a href="javascript:showDataElementCategoryComboDetails( $dataElementCategoryCombo.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a></td>
</tr>
#if( $mark )
#set( $mark = false )
#else
#set( $mark = true )
#end
+ #end
#end
-
</tbody>
</table>
@@ -67,6 +56,5 @@
</table>
<script type="text/javascript">
-
var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete" ) , "'" )';
-</script>
\ No newline at end of file
+</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm 2009-03-13 14:35:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm 2009-03-31 15:36:54 +0000
@@ -22,15 +22,13 @@
<tbody id="list">
#set( $mark = false )
#foreach( $dataElementCategoryOption in $dataElementCategoryOptions )
+ #if( $dataElementCategoryOption.id != $defaultOption.id )
<tr>
<td#alternate( $mark )>$encoder.htmlEncode( $dataElementCategoryOption.name )</td>
- <td style="text-align:center"#alternate( $mark )><a href="showUpdateDataElementCategoryOptionForm.action?dataElementCategoryOptionId=$dataElementCategoryOption.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a></td>
+ <td style="text-align:center"#alternate( $mark )><a href="showUpdateDataElementCategoryOptionForm.action?dataElementCategoryOptionId=$dataElementCategoryOption.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a></td>
<td style="text-align:center"#alternate( $mark )><a href="$i18n.getString( "translation_translate" )" title="$i18n.getString( "translation_translate" )" onclick="this.href='javascript:location.href= \'../dhis-web-commons/i18n.action?className=DataElementCategoryOption&objectId=$dataElementCategoryOption.id&returnUrl=\' + location.href'"><img src="../images/i18n.png" alt="$i18n.getString( "translation_translate" )"></a></td>
-
- #if( $dataElementCategoryOption.id != $defaultOption.id )
- <td style="text-align:center"#alternate( $mark )><a href="javascript:removeDataElementCategoryOption( $dataElementCategoryOption.id, '$encoder.jsEncode( $dataElementCategoryOption.name )', '$encoder.jsEncode( $defaultOption.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a></td>
- #end
- <td style="text-align:center"#alternate( $mark )><a href="javascript:showDataElementCategoryOptionDetails( $dataElementCategoryOption.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a></td>
+ <td style="text-align:center"#alternate( $mark )><a href="javascript:removeDataElementCategoryOption( $dataElementCategoryOption.id, '$encoder.jsEncode( $dataElementCategoryOption.name )', '$encoder.jsEncode( $defaultOption.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a></td>
+ <td style="text-align:center"#alternate( $mark )><a href="javascript:showDataElementCategoryOptionDetails( $dataElementCategoryOption.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a></td>
</tr>
#if( $mark )
#set( $mark = false )
@@ -38,6 +36,7 @@
#set( $mark = true )
#end
#end
+ #end
</tbody>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.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/updateDataElementCategoryComboForm.vm 2009-03-31 15:36:54 +0000
@@ -7,8 +7,6 @@
</div>
<table id="detailsList">
- <col> ## Labels
- <col> ## Input
<thead>
<tr>
<th colspan="2">$i18n.getString( "data_element_category_combo_details" )</th>
@@ -19,14 +17,13 @@
<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="nameField" name="nameField" style="width:20em" value="$encoder.htmlEncode( $dataElementCategoryCombo.name )"></td>
</tr>
- <tr><td> </td><td> </td></tr>
+ <tr>
+ <td colspan="2" style="height:15px"></td>
+ </tr>
</tbody>
</table>
<table id="dataElementCategorySelectionArea">
- <col> ## Selected DataElementCategories
- <col> ## Actions
- <col> ## Available DataElementCategories
<thead>
<tr>
<th>$i18n.getString( "available_categories" )</th>
@@ -42,9 +39,7 @@
</tr>
<tr>
<td>
- <!-- List of all available categories -->
<select size="15" id="availableList" name="availableList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="move( 'availableList' )">
- <!-- Show all available categories -->
#foreach ( $availableDataElementCategory in $allDataElementCategories )
<option value="$availableDataElementCategory.id">$encoder.htmlEncode( $availableDataElementCategory.name )</option>
#end
@@ -65,23 +60,12 @@
</select>
</td>
</tr>
-
- <tr>
- <td colspan="4">
- <p><span id="message"></span></p>
- </td>
- </tr>
-
- <tr>
- <td colspan="4">
- <input type="submit" name="update" value="$i18n.getString( "update" )">
- <!--
- Cancel and go back to the overview
- -->
- <input type="button" name="cancel"
- onclick="window.location.href='categoryCombo.action'" value="$i18n.getString( "cancel" )">
- </td>
- </tr>
</tbody>
</table>
+
+<p><input type="submit" name="update" value="$i18n.getString( "update" )" style="width:10em"><input
+ type="button" name="cancel" onclick="window.location.href='categoryCombo.action'" value="$i18n.getString( "cancel" )" style="width:10em"></p>
+
</form>
+
+<span id="message"></span>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.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/updateDataElementCategoryForm.vm 2009-03-31 15:36:54 +0000
@@ -7,8 +7,6 @@
</div>
<table id="detailsList">
- <col> ## Labels
- <col> ## Input
<thead>
<tr>
<th colspan="2">$i18n.getString( "data_element_category_details" )</th>
@@ -19,14 +17,13 @@
<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="nameField" name="nameField" style="width:20em" value="$encoder.htmlEncode( $dataElementCategory.name )"></td>
</tr>
- <tr><td> </td><td> </td></tr>
+ <tr>
+ <td colspan="2" style="height:15px"></td>
+ </tr>
</tbody>
</table>
- <table id="dataElementCategoryOptionSelectionArea">
- <col> ## Selected DataElementCategoryOptions
- <col> ## Actions
- <col> ## Available DataElementCategoryOptions
+ <table id="dataElementCategoryOptionSelectionArea">
<thead>
<tr>
<th>$i18n.getString( "available_options" )</th>
@@ -42,9 +39,7 @@
</tr>
<tr>
<td>
- <!-- List of all available DataElements -->
<select size="15" id="availableList" name="availableList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="move( 'availableList' )">
- <!-- Show all available DataElements -->
#foreach ( $availableDataElementCategoryOption in $allDataElementCategoryOptions )
<option value="$availableDataElementCategoryOption.id">$encoder.htmlEncode( $availableDataElementCategoryOption.name )</option>
#end
@@ -62,26 +57,14 @@
<option value="$dataElementCategoryOption.id">$encoder.htmlEncode( $dataElementCategoryOption.name )</option>
#end
</select>
- </td>
-
- </tr>
-
- <tr>
- <td colspan="4">
- <p><span id="message"></span></p>
- </td>
- </tr>
-
- <tr>
- <td colspan="4">
- <input type="submit" name="update" value="$i18n.getString( "update" )">
- <!--
- Cancel and go back to the overview
- -->
- <input type="button" name="cancel"
- onclick="window.location.href='category.action'" value="$i18n.getString( "cancel" )">
- </td>
+ </td>
</tr>
</tbody>
</table>
+
+<p><input type="submit" name="update" value="$i18n.getString( "update" )" style="width:10em"><input
+ type="button" name="cancel" onclick="window.location.href='category.action'" value="$i18n.getString( "cancel" )" style="width:10em"></p>
+
</form>
+
+<span id="message"></span>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.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/updateDataElementCategoryOptionForm.vm 2009-03-31 15:36:54 +0000
@@ -22,7 +22,7 @@
<tr>
<td></td>
<td><input type="submit" value="$i18n.getString( "save" )" style="width:10em"><input
- type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='dataElementCategoryOption.action'" style="width:10em"></td>
+ type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='dataElementCategoryOption.action'" style="width:10em"></td>
</tr>
</table>
--
Trunk
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.
