dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 106
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Mon 2009-03-23 17:46:44 +0100
message:
  dhis-web-maintenance-dataset: Fixed bug #342076 need swapping textarea
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/AddSectionAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/EditSectionAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SortOrderSection.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortOrderSection.vm

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/AddSectionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/AddSectionAction.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/AddSectionAction.java	2009-03-23 16:46:44 +0000
@@ -200,12 +200,9 @@
         Section section = new Section();
 
         section.setName( sectionName );
-
         section.setLabel( sectionLabel );
-
         section.setSortOrder( 0 );
-
-        section.setDataSet( dataSetService.getDataSet( dataSetId.intValue() ) );
+        section.setDataSet( dataSetService.getDataSet( dataSetId ) );
 
         for ( String id : selectedList )
         {

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/EditSectionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/EditSectionAction.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/EditSectionAction.java	2009-03-23 16:46:44 +0000
@@ -144,7 +144,6 @@
         for ( Section s : sections )
         {
             dataElementOfDataSet.removeAll( s.getDataElements() );
-
         }
 
         return SUCCESS;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SortOrderSection.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SortOrderSection.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SortOrderSection.java	2009-03-23 16:46:44 +0000
@@ -134,7 +134,7 @@
         {
             Section temp = sectionService.getSection( Integer.parseInt( id ) );
             temp.setSortOrder( i++ );
-            System.out.println( temp.getSortOrder() );
+            
             sectionService.updateSection( temp );
         }
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortOrderSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortOrderSection.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortOrderSection.vm	2009-03-23 16:46:44 +0000
@@ -23,34 +23,32 @@
   <table id="dataElementSelectionArea">
     <col> ## Selected DataElements
     <col> ## Actions
-    <col> ## Filter
     <col> ## Available DataElements
     <thead>
       <tr>
+        <th>$i18n.getString( "available_sections" )</th>
+        <th></th>
         <th>$i18n.getString( "selected_sections" )</th>
-        <th></th>
-        <th></th>
-        <th>$i18n.getString( "available_sections" )</th>
       </tr>
     </thead>
     <tbody>
       <tr>
         <td>
-          <select id="selectedList" name="selectedList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="move( 'selectedList' )">
-          </select>
-        </td>
-        <td valign="top">
-          <input type="button" value="&lt;" title="$i18n.getString('move_selected')" onclick="move( 'availableList' )">
-          <br>
-          <input type="button" value="&gt;" title="$i18n.getString('remove_selected')" onclick="move ( 'selectedList' )">        </td>
-        <td></td>
-        <td>
           <select size="15" id="availableList" name="availableList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="move( 'availableList' )">
             #foreach ( $section in $sections )
               <option value="$section.id">$encoder.htmlEncode( $section.name )</option>
             #end
           </select>
         </td>
+        <td valign="top">
+          <input type="button" value="&gt;" title="$i18n.getString('move_selected')" onclick="move( 'availableList' )">
+          <br>
+          <input type="button" value="&lt;" title="$i18n.getString('remove_selected')" onclick="move ( 'selectedList' )">
+        </td>
+        <td>
+          <select id="selectedList" name="selectedList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="move( 'selectedList' )">
+          </select>
+        </td>
       </tr>
 
       <tr>



--
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.