← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #07732

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2260: Data Element Category Combo - Fixed bug when do a continuous clicks on 'Move up' and 'Move down' ...

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 2260
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-09-28 11:02:31 +0700
message:
  Data Element Category Combo - Fixed bug when do a continuous clicks on 'Move up' and 'Move down' button will link to the current page (itself). And minor changed.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml
  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/updateDataElementCategoryComboForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties


--
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-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2010-09-08 10:40:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2010-09-28 04:02:31 +0000
@@ -406,4 +406,5 @@
 concept_management								= Concept management
 concept											= Concept
 selected_name									= Selected name
-update_category_option							= Update Category Option
\ No newline at end of file
+update_category_option							= Update Category Option
+move_selected                                   = Move selected
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml	2010-09-24 04:42:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml	2010-09-28 04:02:31 +0000
@@ -973,7 +973,7 @@
 			class="org.hisp.dhis.dd.action.categorycombo.GetDataElementCategoryListAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm</param>
-			<param name="javascripts">javascript/dataElementCategoryList.js,javascript/categoryCombo.js</param>
+			<param name="javascripts">javascript/categoryCombo.js</param>
 			<param name="stylesheets">style/dhis-web-maintenance-datadictionary.css</param>
 			<param name="requiredAuthorities">F_DATAELEMENT_ADD</param>
 		</action>
@@ -1021,7 +1021,7 @@
 			class="org.hisp.dhis.dd.action.categorycombo.GetDataElementCategoryComboAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm</param>
-			<param name="javascripts">javascript/dataElementCategoryList.js,javascript/categoryCombo.js</param>
+			<param name="javascripts">javascript/categoryCombo.js</param>
 			<param name="requiredAuthorities">F_DATAELEMENT_UPDATE</param>
 		</action>
 

=== 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	2010-09-27 12:39:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm	2010-09-28 04:02:31 +0000
@@ -20,7 +20,7 @@
     </thead>
     <tbody>
       <tr>
-        <td><label>$i18n.getString( "name" ) <em title="$i18n.gess="required">*</etString( 'required' )" clam></label></td>
+        <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
         <td><input type="text" id="name" name="name" style="width:20em" maxlength="160" class="{validate:{required:true,minlength:2}}"/></td>
       </tr>      
       <tr>
@@ -41,20 +41,20 @@
       
       <tr>
         <td>
-          <select size="15" id="availableList" name="availableList" multiple="multiple" disabled= "false" style="min-width:20em;height:20em" ondblclick="move('availableList')">
+          <select size="15" id="availableList" name="availableList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="moveSelectedById(this.id, 'selectedList')">
             #foreach ( $availableDataElementCategory in $dataElementCategories )
               <option value="$availableDataElementCategory.id">$encoder.htmlEncode( $availableDataElementCategory.name )</option>
             #end
           </select>
         </td>
 		<td valign="top" align="center">		 
-          <input type="button" value="&gt;" onclick="move( 'availableList' )"><br/>	
-		  <input type="button" value="&lt;" onclick="move ( 'selectedList' )"><br/><br/>  	
-		  <a href="#" onclick="moveUp('selectedList')"><img src="../images/move_up.png" border="0" alt=""/></a><br/><br/>
-		  <a href="#" onclick="moveDown('selectedList')"><img src="../images/move_down.png" border="0" alt=""/></a>		  
+          <input type="button" value="&gt;" onclick="moveSelectedById('availableList', 'selectedList')" title="$i18n.getString( 'move_selected' )"/><br/>	
+		  <input type="button" value="&lt;" onclick="moveSelectedById('selectedList', 'availableList')" title="$i18n.getString( 'remove_selected' )"/><br/><br/>  	
+		  <a onclick="moveUpSelectedOption('selectedList')" title="$i18n.getString( 'move_up' )"><img src="../images/move_up.png" style="border:0;cursor:pointer" alt="$i18n.getString( 'move_up' )"/></a><br/><br/>
+		  <a onclick="moveDownSelectedOption('selectedList')" title="$i18n.getString( 'move_down' )"><img src="../images/move_down.png" style="border:0;cursor:pointer" alt="$i18n.getString( 'move_down' )"/></a>		  
         </td> 
 		<td>
-          <select id="selectedList" name="selectedList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="move('selectedList')">
+          <select id="selectedList" name="selectedList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="moveSelectedById(this.id, 'availableList')">
           </select>
         </td>
       </tr>
@@ -62,7 +62,7 @@
         <td></td>
 		<td></td> 
 		<td>
-			<select id="selectedCategories" name="selectedCategories" class="{validate:{required:true}}" style="display:none"/>			
+			<select id="selectedCategories" name="selectedCategories" class="{validate:{required:true}}" style="display:none"></select>
 		</td>
       </tr>
 

=== 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	2010-09-27 12:39:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm	2010-09-28 04:02:31 +0000
@@ -48,7 +48,7 @@
       </tr>
       <tr>       
 		<td>
-          <select size="15" id="availableList" name="availableList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="move('availableList')">
+          <select size="15" id="availableList" name="availableList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="moveSelectedById(this.id, 'selectedList')">
             #foreach ( $availableDataElementCategory in $allDataElementCategories )
               <option value="$availableDataElementCategory.id">$encoder.htmlEncode( $availableDataElementCategory.name )</option>
             #end
@@ -56,13 +56,13 @@
         </td>
        </td>
 		 <td valign="top" align="center">		 
-          <input type="button" value="&gt;" onclick="move( 'availableList' )"/><br/>	
-		  <input type="button" value="&lt;" onclick="move ( 'selectedList' )"/><br/><br/>
-		  <a href="#" onclick="moveUp('selectedList')"><img src="../images/move_up.png" border="0" alt=""/></a><br/><br/>
-		  <a href="#" onclick="moveDown('selectedList')"><img src="../images/move_down.png" border="0" alt=""/></a>		  
+          <input type="button" value="&gt;" onclick="moveSelectedById('availableList', 'selectedList')" title="$i18n.getString( 'move_selected' )"/><br/>	
+		  <input type="button" value="&lt;" onclick="moveSelectedById('selectedList', 'availableList')" title="$i18n.getString( 'remove_selected' )"/><br/><br/>
+		  <a onclick="moveUpSelectedOption('selectedList')" title="$i18n.getString( 'move_up' )"><img src="../images/move_up.png" style="border:0;cursor:pointer" alt="$i18n.getString( 'move_up' )"/></a><br/><br/>
+		  <a onclick="moveDownSelectedOption('selectedList')" title="$i18n.getString( 'move_down' )"><img src="../images/move_down.png" style="border:0;cursor:pointer" alt="$i18n.getString( 'move_down' )"/></a>		  
         </td> 
 		<td>
-          <select id="selectedList" name="selectedList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="move('selectedList')">
+          <select id="selectedList" name="selectedList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="moveSelectedById(this.id, 'availableList')">
             #foreach ( $dataElementCategory in $dataElementCategories )
               <option value="$dataElementCategory.id">$encoder.htmlEncode( $dataElementCategory.name )</option>
             #end
@@ -73,7 +73,7 @@
         <td></td>
 		<td></td> 
 		<td>
-			<select id="selectedCategories" name="selectedCategories" class="{validate:{required:true}}" style="display:none"/>			
+			<select id="selectedCategories" name="selectedCategories" class="{validate:{required:true}}" style="display:none"></select>
 		</td>
       </tr>
     </tbody>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2010-09-07 05:24:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2010-09-28 04:02:31 +0000
@@ -131,9 +131,9 @@
 new                                                         = Add new
 rename                                                      = Rename
 choose_dataset                                              = Select dataset first
-add_success                                                 = Add success
-delete_success                                              = Delete success
-rename_success                                              = Rename success
+add_success                                                 = Add successfully
+delete_success                                              = Delete successfully
+rename_success                                              = Rename successfully
 rename_failed                                               = Rename failed
 select														= [Select]
 save_success												= Save successfully
  Thread Previous • Date Previous • • Thread Next