dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #13067
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4130: implemented ajax-load for Detailed Metadata Export
------------------------------------------------------------
revno: 4130
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-07-13 14:50:14 +0200
message:
implemented ajax-load for Detailed Metadata Export
modified:
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetDetailedExportOptionsAction.java
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDetailedMetaDataForm.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-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetDetailedExportOptionsAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetDetailedExportOptionsAction.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetDetailedExportOptionsAction.java 2011-07-13 12:50:14 +0000
@@ -27,88 +27,15 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.hisp.dhis.datadictionary.DataDictionary;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
-import org.hisp.dhis.datadictionary.comparator.DataDictionaryNameComparator;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementGroup;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator;
-import org.hisp.dhis.indicator.Indicator;
-import org.hisp.dhis.indicator.IndicatorGroup;
-import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.comparator.IndicatorGroupNameComparator;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
-
import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
- * @version $Id$
*/
public class GetDetailedExportOptionsAction
implements Action
{
// -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataDictionaryService dataDictionaryService;
-
- public void setDataDictionaryService( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- private IndicatorService indicatorService;
-
- public void setIndicatorService( IndicatorService indicatorService )
- {
- this.indicatorService = indicatorService;
- }
-
- // -------------------------------------------------------------------------
- // Comparator
- // -------------------------------------------------------------------------
-
- private Comparator<Indicator> indicatorComparator;
-
- public void setIndicatorComparator( Comparator<Indicator> indicatorComparator )
- {
- this.indicatorComparator = indicatorComparator;
- }
-
- private Comparator<DataElement> dataElementComparator;
-
- public void setDataElementComparator( Comparator<DataElement> dataElementComparator )
- {
- this.dataElementComparator = dataElementComparator;
- }
-
- // -------------------------------------------------------------------------
- // DisplayPropertyHandler
- // -------------------------------------------------------------------------
-
- private DisplayPropertyHandler displayPropertyHandler;
-
- public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
- {
- this.displayPropertyHandler = displayPropertyHandler;
- }
-
- // -------------------------------------------------------------------------
// Output
// -------------------------------------------------------------------------
@@ -123,41 +50,6 @@
{
this.exportFormat = format;
}
-
- private List<DataDictionary> dataDictionaries;
-
- public List<DataDictionary> getDataDictionaries()
- {
- return dataDictionaries;
- }
-
- private List<DataElement> dataElements;
-
- public List<DataElement> getDataElements()
- {
- return dataElements;
- }
-
- private List<DataElementGroup> dataElementGroups;
-
- public List<DataElementGroup> getDataElementGroups()
- {
- return dataElementGroups;
- }
-
- private List<Indicator> indicators;
-
- public List<Indicator> getIndicators()
- {
- return indicators;
- }
-
- private List<IndicatorGroup> indicatorGroups;
-
- public List<IndicatorGroup> getIndicatorGroups()
- {
- return indicatorGroups;
- }
// -------------------------------------------------------------------------
// Action implementation
@@ -165,23 +57,6 @@
public String execute()
{
- dataDictionaries = new ArrayList<DataDictionary>( dataDictionaryService.getAllDataDictionaries() );
- Collections.sort( dataDictionaries, new DataDictionaryNameComparator() );
-
- dataElements = new ArrayList<DataElement>( dataElementService.getAllDataElements() );
- Collections.sort( dataElements, dataElementComparator );
- displayPropertyHandler.handle( dataElements );
-
- dataElementGroups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() );
- Collections.sort( dataElementGroups, new DataElementGroupNameComparator() );
-
- indicators = new ArrayList<Indicator>( indicatorService.getAllIndicators() );
- Collections.sort( indicators, indicatorComparator );
- displayPropertyHandler.handle( indicators );
-
- indicatorGroups = new ArrayList<IndicatorGroup>( indicatorService.getAllIndicatorGroups() );
- Collections.sort( indicatorGroups, new IndicatorGroupNameComparator() );
-
return SUCCESS;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml 2011-07-13 11:32:13 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml 2011-07-13 12:50:14 +0000
@@ -139,9 +139,6 @@
<bean id="org.hisp.dhis.importexport.action.exp.GetDetailedExportOptionsAction" class="org.hisp.dhis.importexport.action.exp.GetDetailedExportOptionsAction"
scope="prototype">
- <property name="dataDictionaryService" ref="org.hisp.dhis.datadictionary.DataDictionaryService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
</bean>
<bean id="org.hisp.dhis.importexport.action.exp.GetDataElementListAction" class="org.hisp.dhis.importexport.action.exp.GetDataElementListAction"
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDetailedMetaDataForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDetailedMetaDataForm.vm 2011-03-28 14:39:48 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDetailedMetaDataForm.vm 2011-07-13 12:50:14 +0000
@@ -1,121 +1,119 @@
+<script type="text/javascript">
+ jQuery(function() {
+ jQuery("#availableDataElements").dhisAjaxSelect({
+ source: "../dhis-web-commons-ajax-json/getDataElements.action",
+ iterator: "dataElements",
+ connectedTo: 'selectedDataElements',
+ handler: function(item) {
+ var option = jQuery("<option data-id='" + item.groups + "' />");
+ option.text( item.name );
+ option.attr( "value", item.id );
+
+ return option;
+ },
+ filter: {
+ source: "../dhis-web-commons-ajax-json/getDataElementGroups.action",
+ label: 'dataelement group',
+ iterator: "dataElementGroups",
+ handler: function(item) {
+ return "<option data-key='id' data-value='" + item.id + "'>" + item.name + "</option>";
+ }
+ }
+ });
+
+ jQuery("#availableIndicators").dhisAjaxSelect({
+ source: "../dhis-web-commons-ajax-json/getIndicators.action",
+ iterator: "indicators",
+ connectedTo: 'selectedIndicators',
+ handler: function(item) {
+ var option = jQuery("<option data-id='" + item.groups + "' />");
+ option.text( item.name );
+ option.attr( "value", item.id );
+
+ return option;
+ },
+ filter: {
+ source: "../dhis-web-commons-ajax-json/getIndicatorGroups.action",
+ iterator: "indicatorGroups",
+ label: 'indicator group',
+ handler: function(item) {
+ return "<option data-key='id' data-value='" + item.id + "'>" + item.name + "</option>";
+ }
+ }
+ });
+ });
+</script>
<h3>$i18n.getString( "$exportFormat" ) $i18n.getString( "detailed_metadata_export" ) #openHelp( "export" )</h3>
<form id="exportForm" name="exportForm" method="post" action="exportDetailedMetaData.action">
-
<input type="hidden" name="exportFormat" value="$!exportFormat">
-
-<table>
-
- <!-- Data elements -->
-
- <tr>
- <th>$i18n.getString( "available_data_elements" )</th>
- </tr>
- <tr>
- <td>
- <input type="text" id="dataElementFilter" style="width:154px; color:#505050;" onkeyup="filterList( this.value, 'availableDataElements' )" onfocus="clearFilter( 'dataElementFilter', 'availableDataElements' )" value="$i18n.getString( 'filter' )">
- <input type="button" value="$i18n.getString( 'clear' )" style="width:50px" onclick="clearFilter( 'dataElementFilter', 'availableDataElements' )">
- <select id="dataDictionaryDataElementList" name="dataDictionaryDataElementList" onchange="dataElementCriteriaChanged()" style="width:210px">
- <option value="null">[ $i18n.getString( "all_data_dictionary" ) ]</option>
- #foreach( $dictionary in $dataDictionaries )
- <option value="$dictionary.id">$encoder.htmlEncode( $dictionary.name )</option>
- #end
- </select>
- <select id="dataElementGroupList" name="dataElementGroupList" onchange="dataElementCriteriaChanged()" style="width:210px">
- <option value="null">[ $i18n.getString( "all_data_element_group" ) ]</option>
- #foreach( $group in $dataElementGroups )
- <option value="$group.id">$encoder.htmlEncode( $group.name )</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td>
- <select multiple size="7" id="availableDataElements" name="availableDataElements" style="width:640px" ondblclick="moveSelectedById( 'availableDataElements', 'selectedDataElements' )">
- #foreach( $element in $dataElements )
- <option value="$element.id">$encoder.htmlEncode( $element.name )</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td>
- <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableDataElements', 'selectedDataElements' )"><input
- type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableDataElements', 'selectedDataElements' )"><input
- type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedDataElements', 'availableDataElements' )"><input
- type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedDataElements', 'availableDataElements' )">
- </td>
- </tr>
- <tr>
+ <table id="dataElementSelectionArea">
+ <col style="width: 450px"/>
+ <col/>
+ <col style="width: 450px"/>
+ <thead>
+ <tr>
+ <th>$i18n.getString( "available_data_elements" )</th>
+ <th>$i18n.getString( "filter" )</th>
<th>$i18n.getString( "selected_data_elements" )</th>
- </tr>
- <tr>
- <td>
- <select multiple id="selectedDataElements" name="selectedDataElements" style="width:640px; height:102px" ondblclick="moveSelectedById( 'selectedDataElements', 'availableDataElements' )">
- </select>
- </td>
- </tr>
- <tr>
- <td style="height:15px"></td>
- </tr>
-
- <!-- Indicators -->
-
- <tr>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>
+ <select id="availableDataElements" multiple="multiple" style="height: 200px; width: 100%;"></select>
+ </td>
+ <td>
+ <input type="button" value=">" title="$i18n.getString( 'move_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'availableDataElements' );"/><br/>
+ <input type="button" value="<" title="$i18n.getString( 'remove_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'selectedDataElements' );"/><br/>
+ <input type="button" value=">>" title="$i18n.getString('move_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'availableDataElements' );"/><br/>
+ <input type="button" value="<<" title="$i18n.getString('remove_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'selectedDataElements' );"/>
+ </td>
+ <td>
+ <select id="selectedDataElements" name="selectedDataElements" multiple="multiple" style="height: 200px; width: 100%; margin-top: 45px;"></select>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <table id="indicatorSelectionArea">
+ <col style="width: 450px"/>
+ <col/>
+ <col style="width: 450px"/>
+
+ <thead>
+ <tr>
<th>$i18n.getString( "available_indicators" )</th>
- </tr>
- <tr>
- <td>
- <input type="text" id="indicatorFilter" style="width:154px; color:#505050;" onkeyup="filterList( this.value, 'availableIndicators' )" onfocus="clearFilter( 'indicatorFilter', 'availableIndicators' )" value="$i18n.getString( 'filter' )..." />
- <input type="button" value="$i18n.getString( 'clear' )" style="width:50px" onclick="clearFilter( 'indicatorFilter', 'availableIndicators' )" />
- <select id="dataDictionaryIndicatorList" name="dataDictionaryIndicatorList" onchange="indicatorCriteriaChanged()" style="width:210px">
- <option value="null">[ $i18n.getString( "all_data_dictionary" ) ]</option>
- #foreach( $dictionary in $dataDictionaries )
- <option value="$dictionary.id">$encoder.htmlEncode( $dictionary.name )</option>
- #end
- </select>
- <select id="indicatorGroupList" name="indicatorGroupList" onchange="indicatorCriteriaChanged()" style="width:210px">
- <option value="null">[ $i18n.getString( "all_indicator_group" ) ]</option>
- #foreach( $group in $indicatorGroups )
- <option value="$group.id">$encoder.htmlEncode( $group.name )</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td>
- <select multiple size="7" id="availableIndicators" name="availableIndicators" style="width:640px" ondblclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )">
- #foreach( $indicator in $indicators )
- <option value="$indicator.id">$encoder.htmlEncode( $indicator.name )</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td>
- <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )" />
- <input type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableIndicators', 'selectedIndicators' )" />
- <input type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )" />
- <input type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedIndicators', 'availableIndicators' )" />
- </td>
- </tr>
- <tr>
+ <th>$i18n.getString( "filter" )</th>
<th>$i18n.getString( "selected_indicators" )</th>
- </tr>
- <tr>
- <td>
- <select multiple id="selectedIndicators" name="selectedIndicators" style="width:640px; height:102px" ondblclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )">
- </select>
- </td>
- </tr>
-
- <!-- Submit -->
-
- <tr>
- <td><input type="button" value="$i18n.getString( 'export' )" onclick="exportDetailedMetaData()" style="width:120px"></td>
- </tr>
-
-</table>
+ </tr>
+ </thead>
+
+ <tbody>
+ <tr>
+ <td>
+ <select id="availableIndicators" name="availableIndicators" multiple="multiple" style="height: 200px; width: 100%;"></select>
+ </td>
+
+ <td>
+ <input type="button" value=">" title="$i18n.getString( 'move_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'availableIndicators' );"/><br/>
+ <input type="button" value="<" title="$i18n.getString( 'remove_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'selectedIndicators' );"/><br/>
+ <input type="button" value=">>" title="$i18n.getString('move_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'availableIndicators' );"/><br/>
+ <input type="button" value="<<" title="$i18n.getString('remove_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'selectedIndicators' );"/>
+ </td>
+
+ <td>
+ <select id="selectedIndicators" name="selectedIndicators" multiple="multiple" style="height: 200px; width: 100%; margin-top: 45px;"></select>
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <input type="button" value="$i18n.getString( 'export' )" onclick="exportDetailedMetaData()" style="width:120px">
+ </td>
+ </tr>
+ </tbody>
+ </table>
</form>
