dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2186
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-09-21 16:36:42 +0530
message:
  Add Global Tree loading feature in Survey module and Minor bug fixed in Dashboard
modified:
  local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisFront.vm
  local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/surveyAssociations.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 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisFront.vm	2010-09-04 13:07:00 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisFront.vm	2010-09-21 11:06:42 +0000
@@ -176,7 +176,7 @@
               <br />
             </td>
             <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-            <td align="right" class="NormalB"> $i18n.getString( "ga_to" )<br>
+            <td class="NormalB"> $i18n.getString( "ga_to" )<br>
               <select id="eDateLB" name="eDateLB">
 		#foreach($period in $monthlyPeriods)
                 <option value="$period.id">$simpleDateFormat.format($period.endDate)</option>

=== modified file 'local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/surveyAssociations.vm'
--- local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/surveyAssociations.vm	2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/surveyAssociations.vm	2010-09-21 11:06:42 +0000
@@ -8,47 +8,17 @@
 	<input type="hidden" name="surveyId" value="$surveyId">
   </div>
   <table id="selectionTable">
-	<tr>
-	  <td>
-		<input type="button" value="$i18n.getString( "remove_all" )" onclick="window.location.href='unselectAll.action?surveyId=$surveyId'" style="width:12em">
-     	<input type="button" value="$i18n.getString( "select_all_at_level" )" onclick="selectAllAtLevel( $surveyId )" style="width:12em">
-		<select id="levelList" name="levelList" style="width:12em">
-			#foreach( $level in $levels )
-				<option value="$level.level" #if ( $selectLevel == $level.level )selected="selcted"#end>$encoder.htmlEncode( $level.name )</option>
-			#end
-		</select>
-		<input type="button" value="$i18n.getString( "unselect_all_at_level" )" onclick="unselectAllAtLevel( $surveyId )" style="width:12em">
-	  </td>
-	</tr>
     <tr>
       <td>
-        <div id="selectionTree" style="width:50em;height:30em;overflow:auto;border:1px solid #cccccc"></div>
-
-        <script type="text/javascript">
-          selectionTreeSelection.setMultipleSelectionAllowed( true );
-          selectionTreeSelection.setOnSelectFunction( treeClicked );
-          selectionTreeSelection.setListenerFunction( selectCompleted );
-          selectionTree.buildSelectionTree();
-        </script>
-        
+        #organisationUnitSelectionTree( false, true, false )
       </td>
     </tr>
-
     <tr>
       <td>
-        <input type="submit" id="submitButton" value="$i18n.getString( "save" )" style="width:10em"><input type="button"
-            onclick="window.location.href='index.action'" value="$i18n.getString( "cancel" )" style="width:10em">
+        <input type="submit" id="submitButton" value="$i18n.getString( "save" )" style="width:10em">
+        <input type="button" onclick="window.location.href='index.action'" value="$i18n.getString( "cancel" )" style="width:10em">
       </td>
     </tr>
   </table>
 
 </form>
-
-<span id="message"></span>
-
-<script type="text/javascript">
-
-  var levelMustBeInt = '$encoder.jsEncode( $i18n.getString( "level_must_be_int" ) )';
-  var i18n_loading = '$encoder.jsEncode( $i18n.getString( "loading" ) )';
-
-</script>