← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7915: local vn - Fixed bug show the content of currentSelection div more correctly

 

------------------------------------------------------------
revno: 7915
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-08-16 01:21:22 +0700
message:
  local vn - Fixed bug show the content of currentSelection div more correctly
modified:
  local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/javascript/form.js


--
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/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-08-10 08:52:33 +0000
+++ local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/javascript/form.js	2012-08-15 18:21:22 +0000
@@ -232,7 +232,10 @@
 	
 	byId( 'inputCriteria' ).style.width = '504px';
 	byId( 'inputCriteria' ).style.height = '80px';
-    
+
+    $( '#currentPeriod' ).html( i18n_no_period_selected );
+    $( '#currentDataElement' ).html( i18n_no_dataelement_selected );
+	
     clearEntryForm();
 }
 
@@ -250,9 +253,10 @@
 
 function loadForm( dataSetId, value )
 {
-	//hideExportDiv();
 	showLoader();
 
+    $( '#currentDataElement' ).html( i18n_no_dataelement_selected );
+
 	$( '#contentDiv' ).load( 'loadForm.action',
 	{
 		dataSetId : dataSetId,
@@ -374,6 +378,9 @@
 {
     clearEntryForm();
 	
+    $( '#currentPeriod' ).html( i18n_no_period_selected );
+    $( '#currentDataElement' ).html( i18n_no_dataelement_selected );
+
 	clearListById( 'selectedPeriodId' );
 	hideById('attributeDiv');