dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12705
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3967: implemented ajax-load in add/update dataset section
------------------------------------------------------------
revno: 3967
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-06-20 18:34:40 +0300
message:
implemented ajax-load in add/update dataset section
modified:
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetSectionDataElementsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.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-commons/src/main/java/org/hisp/dhis/commons/action/GetSectionDataElementsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetSectionDataElementsAction.java 2011-06-20 15:02:46 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetSectionDataElementsAction.java 2011-06-20 15:34:40 +0000
@@ -41,6 +41,9 @@
import org.hisp.dhis.dataset.Section;
import org.hisp.dhis.paging.ActionPagingSupport;
+/**
+ * @author mortenoh
+ */
public class GetSectionDataElementsAction
extends ActionPagingSupport<DataElement>
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm 2011-03-17 12:08:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm 2011-06-20 15:34:40 +0000
@@ -1,4 +1,25 @@
<script type="text/javascript" src="javascript/addSection.js"></script>
+<script type="text/javascript">
+ jQuery(document).ready( function(){
+ jQuery("#availableList").dhisAjaxSelect({
+ source: "../dhis-web-commons-ajax-json/getSectionDataElements.action",
+ iterator: 'dataElements',
+ sortSelected: false,
+ connectedTo: 'selectedList',
+ handler: function(item) {
+ var option = jQuery("<option />");
+ option.text( item.name );
+ option.attr( "value", item.id );
+
+ return option;
+ },
+ params: {
+ 'dataSetId': $dataSet.id,
+ 'categoryComboId': $categoryCombo.id
+ }
+ });
+ });
+</script>
<h3>$i18n.getString( "add_section" ) #openHelp( "dataset_sections_edit" )</h3>
@@ -30,49 +51,46 @@
</table>
<table id="dataElementSelectionArea">
- <col/> ## Available DataElements
- <col/> ## Actions
- <col/> ## Selected DataElements
+ <col style="width: 450px"/>
+ <col/>
+ <col style="width: 450px"/>
+ <col/>
+
<thead>
<tr>
<th>$i18n.getString( "available_data_elements" )</th>
- <th>$i18n.getString( "filter" )</th>
+ <th></th>
<th>$i18n.getString( "selected_data_elements" )</th>
</tr>
</thead>
+
<tbody>
<tr>
- <td><input type="text" id="availableDataElementsFilter" onkeyup="filterList( this.value, 'availableList' )" style="min-width:26em"/></td>
- <td align="center">[$i18n.getString( "name" )]</td>
- <td></td>
- </tr>
- <tr>
- <td>
- <select size="15" id="availableList" name="availableList" multiple="multiple" style="min-width:25em;height:20em" ondblclick="moveSelected( this, document.getElementById( 'selectedList' ) )">
- #foreach ( $availableDataElement in $dataElements )
- <option value="$availableDataElement.id">$encoder.htmlEncode( $availableDataElement.name )</option>
- #end
- </select>
- </td>
- <td>
- <input type="button" value=">" title="$i18n.getString( 'move_selected' )" style="width:50px" onclick="moveSelectedById( 'availableList', 'selectedList');"/><br/>
- <input type="button" value="<" title="$i18n.getString( 'remove_selected' )" style="width:50px" onclick="moveSelectedById( 'selectedList', 'availableList');"/><br/>
- <input type="button" value=">>" title="$i18n.getString('move_all')" style="width:50px" onclick="moveAllById( 'availableList', 'selectedList' );"/><br/>
- <input type="button" value="<<" title="$i18n.getString('remove_all')" style="width:50px" onclick="moveAllById( 'selectedList', 'availableList' );"/>
- </td>
+ <td>
+ <select id="availableList" name="availableList" multiple="multiple" style="height: 200px; width: 100%;"></select>
+ </td>
+
+ <td style="text-align:center">
+ <input type="button" value=">" title="$i18n.getString( 'move_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'availableList' );"/><br/>
+ <input type="button" value="<" title="$i18n.getString( 'remove_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'selectedList' );"/><br/>
+ <input type="button" value=">>" title="$i18n.getString('move_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'availableList' );"/><br/>
+ <input type="button" value="<<" title="$i18n.getString('remove_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'selectedList' );"/>
+ </td>
+
<td>
- <select id="selectedList" name="selectedList" multiple="multiple" style="min-width:25em;height:20em" ondblclick="moveSelected( this, document.getElementById( 'availableList' ) )">
- </select>
+ <select id="selectedList" name="selectedList" multiple="multiple" style="height: 200px; width: 100%; margin-top: 22px;"></select>
</td>
+
<td style="width:30px; text-align:center">
<a href="javascript:moveUpSelectedOption( 'selectedList' )"><img src="../images/move_up.png"></a><br/><br/>
<a href="javascript:moveDownSelectedOption( 'selectedList' )"><img src="../images/move_down.png"></a><br/><br/>
</td>
</tr>
+
<tr>
- <td colspan="3">
- <input type="submit" value="$i18n.getString( 'save' )"/>
- <input type="button" onclick="window.location.href='section.action'" value="$i18n.getString( 'cancel' )"/>
+ <td colspan="4">
+ <input type="submit" value="$i18n.getString( 'save' )" />
+ <input type="button" onclick="window.location.href='section.action'" value="$i18n.getString( 'cancel' )" />
</td>
</tr>
</tbody>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm 2011-03-17 12:08:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm 2011-06-20 15:34:40 +0000
@@ -1,4 +1,25 @@
<script type="text/javascript" src="javascript/editSection.js"></script>
+<script type="text/javascript">
+ jQuery(document).ready( function(){
+ jQuery("#availableList").dhisAjaxSelect({
+ source: "../dhis-web-commons-ajax-json/getSectionDataElements.action",
+ iterator: 'dataElements',
+ sortSelected: false,
+ connectedTo: 'selectedList',
+ handler: function(item) {
+ var option = jQuery("<option />");
+ option.text( item.name );
+ option.attr( "value", item.id );
+
+ return option;
+ },
+ params: {
+ 'dataSetId': $dataSet.id,
+ 'categoryComboId': $categoryCombo.id
+ }
+ });
+ });
+</script>
<h3>$i18n.getString( "edit_section" )</h3>
@@ -32,69 +53,51 @@
</table>
<table id="dataElementSelectionArea">
- <col/> ## Available DataElements
- <col/> ## Actions
- <col/> ## Selected DataElements
+ <col style="width: 450px"/>
+ <col/>
+ <col style="width: 450px"/>
+ <col/>
+
<thead>
<tr>
<th>$i18n.getString( "available_data_elements" )</th>
- <th>$i18n.getString( "filter" )</th>
+ <th></th>
<th>$i18n.getString( "selected_data_elements" )</th>
</tr>
</thead>
+
<tbody>
-
- <tr>
- <td>
- <select id="dataElementGroupSelect" name="dataElementGroupSelect" style="min-width:26.5em"
- onchange="javascript:filterByDataElementGroupForSection( this.options[this.selectedIndex].value )">
- <option value="ALL" selected="selected">$i18n.getString( "all" )</option>
- #foreach ( $dataElementGroup in $dataElementGroups )
- <option value="$dataElementGroup.id">$encoder.htmlEncode( $dataElementGroup.name )</option>
- #end
- </select>
- </td>
- <td align="center">[$i18n.getString( "group" )]</td>
- <td></td>
- </tr>
-
- <tr>
- <td><input type="text" id="availableDataElementsFilter" onkeyup="filterList( this.value, 'availableList' )" style="min-width:26em"/></td>
- <td align="center">[$i18n.getString( "name" )]</td>
- <td></td>
- </tr>
-
- <tr>
- <td>
- <select size="15" id="availableList" name="availableList" multiple="multiple" style="min-width:25em;height:20em" ondblclick="moveSelected( this, byId( 'selectedList' ) )">
- #foreach ( $availableDataElement in $dataElementOfDataSet )
- <option value="$availableDataElement.id"> $availableDataElement.name</option>
- #end
- </select>
- </td>
- <td>
- <input type="button" value=">" title="$i18n.getString( 'move_selected' )" style="width:50px" onclick="moveSelectedById( 'availableList', 'selectedList');"/><br/>
- <input type="button" value="<" title="$i18n.getString( 'remove_selected' )" style="width:50px" onclick="moveSelectedById( 'selectedList', 'availableList');"/><br/>
- <input type="button" value=">>" title="$i18n.getString('move_all')" style="width:50px" onclick="moveAllById( 'availableList', 'selectedList' );"/><br/>
- <input type="button" value="<<" title="$i18n.getString('remove_all')" style="width:50px" onclick="moveAllById( 'selectedList', 'availableList' );"/>
- </td>
+ <tr>
+ <td>
+ <select id="availableList" name="availableList" multiple="multiple" style="height: 200px; width: 100%;"></select>
+ </td>
+
+ <td style="text-align:center">
+ <input type="button" value=">" title="$i18n.getString( 'move_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'availableList' );"/><br/>
+ <input type="button" value="<" title="$i18n.getString( 'remove_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'selectedList' );"/><br/>
+ <input type="button" value=">>" title="$i18n.getString('move_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'availableList' );"/><br/>
+ <input type="button" value="<<" title="$i18n.getString('remove_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'selectedList' );"/>
+ </td>
+
<td>
- <select id="selectedList" name="selectedList" multiple="multiple" style="min-width:25em;height:20em" ondblclick="moveSelected( this, byId( 'availableList' ) )">
+ <select id="selectedList" name="selectedList" multiple="multiple" style="height: 200px; width: 100%; margin-top: 22px;">
#foreach ( $dataElement in $section.dataElements )
<option value="$dataElement.id">$dataElement.name</option>
#end
- </select>
+ </select>
</td>
+
<td style="width:30px; text-align:center">
<a href="javascript:moveUpSelectedOption( 'selectedList' )"><img src="../images/move_up.png"/></a><br/><br/>
<a href="javascript:moveDownSelectedOption( 'selectedList' )"><img src="../images/move_down.png"/></a><br/><br/>
</td>
+
</tr>
<tr>
- <td colspan="3">
- <input type="submit" name="save" value="$i18n.getString( 'save' )"/><input type="button"
- onclick="window.location.href='section.action'" value="$i18n.getString( 'cancel' )"/>
+ <td colspan="4">
+ <input type="submit" name="save" value="$i18n.getString( 'save' )" />
+ <input type="button" onclick="window.location.href='section.action'" value="$i18n.getString( 'cancel' )" />
</td>
</tr>
</tbody>
