dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6956
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-05-16 15:45:16 +0700
message:
  local vn - Fixed GUI for entry params.
added:
  local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/images/
  local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/images/arrow_down.png
modified:
  local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/javascript/form.js
  local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/select.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

=== added directory 'local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/images'
=== added file 'local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/images/arrow_down.png'
Binary files local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/images/arrow_down.png	1970-01-01 00:00:00 +0000 and local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/images/arrow_down.png	2012-05-16 08:45:16 +0000 differ
=== modified file 'local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/javascript/form.js'
--- local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/javascript/form.js	2012-05-15 06:05:09 +0000
+++ local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/javascript/form.js	2012-05-16 08:45:16 +0000
@@ -71,6 +71,18 @@
  * download updated forms from server
  */
 
+function hideExportDiv()
+{
+	hideById( 'inputCriteria' );
+	showById( 'showButtonDiv' );
+}
+
+function showExportDiv()
+{
+	showById( 'inputCriteria' );
+	hideById( 'showButtonDiv' );
+}
+ 
 function organisationUnitSelectedHospitals( orgUnits, orgUnitNames )
 {
 	clearEntryForm();
@@ -205,7 +217,9 @@
 
 function loadForm( dataSetId, value )
 {
+	hideExportDiv();
 	showLoader();
+
 	$( '#contentDiv' ).load( 'loadForm.action', {
 		dataSetId : dataSetId,
 		value: value

=== modified file 'local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/select.vm'
--- local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/select.vm	2012-05-10 16:18:43 +0000
+++ local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/select.vm	2012-05-16 08:45:16 +0000
@@ -53,14 +53,17 @@
 <div id="actions">	
     <input type="button" value="$i18n.getString( 'run_validation' )" onclick="validate()" id="validationButton" style="width:150px;" disabled="disabled"/>
 </div>
-<input type='button' id='showDataBtn' value='$i18n.getString( "show_data" )' onclick="showById('inputCriteria'); hideById('showDataBtn');" style='display:none;'>
+
+<div id="showButtonDiv" style="display:none">
+	<a title="$i18n.getString( 'hide_params' )" href="javascript:showExportDiv();">
+	<img width="16" height="16" title="$i18n.getString( 'show_export_params' )" src="images/arrow_down.png"/></a>
+</div>
 
 <div class="inputCriteria" id='inputCriteria' style="width:620px;height:270px;">
 <input type='hidden' id='dataSetId' name='dataSetId'>
 <table>
 	<tr>
 		<td><label class='bold' for="selectedOrganisationUnit">$i18n.getString( "organisation_unit" )</label>
-		<td colspan='2' align='right'><img src='../images/hide_active.png' style='cursor: pointer;' onclick="hideById('inputCriteria'); showById('showDataBtn');">
 	</tr>
 	<tr>
 		<td>
@@ -95,7 +98,14 @@
 			<select id='subDataSetId' name='subDataSetId' onchange='javascript:loadDepartmentFormSelected();' /></select>
 		</td>
 	</tr>
-	
+
+	<tr>
+		<td colspan="2" align="right">
+			<a title="$i18n.getString( 'hide_params' )" href="javascript:hideExportDiv();">
+			<img width="16" height="16" title="$i18n.getString( 'hide_export_params' )" src="../images/up_left.png"/></a>
+		</td>
+    </tr>
+
 </table>
 </div>