dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7691
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-07-24 17:59:44 +0700
message:
  Donnot load Tabular report form with empty database.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.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 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-07-24 07:37:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-07-24 10:59:44 +0000
@@ -10,25 +10,20 @@
 						maxLevels: r.levels.length
 					}
 				};
-				for (var program in r.programs) {
-					obj.system.program = [];
-					for (var i = 0; i < r.programs.length; i++) {
-						obj.system.program.push({id: r.programs[i].id, name: r.programs[i].name, type: r.programs[i].type });
-					}
-				}
-				
-				for (var orgunitGroup in r.orgunitGroups) {
-					obj.system.orgunitGroup = [];
-					for (var i = 0; i < r.orgunitGroups.length; i++) {
-						obj.system.orgunitGroup.push({id: r.orgunitGroups[i].id, name: r.orgunitGroups[i].name });
-					}
-				}
-				
-				for (var level in r.levels) {
-					obj.system.level = [];
-					for (var i = 0; i < r.levels.length; i++) {
-						obj.system.level.push({value: r.levels[i].value, name: r.levels[i].name});
-					}
+				
+				obj.system.program = [];
+				for (var i = 0; i < r.programs.length; i++) {
+					obj.system.program.push({id: r.programs[i].id, name: r.programs[i].name, type: r.programs[i].type });
+				}
+				
+				obj.system.orgunitGroup = [];
+				for (var i = 0; i < r.orgunitGroups.length; i++) {
+					obj.system.orgunitGroup.push({id: r.orgunitGroups[i].id, name: r.orgunitGroups[i].name });
+				}
+				
+				obj.system.level = [];
+				for (var i = 0; i < r.levels.length; i++) {
+					obj.system.level.push({value: r.levels[i].value, name: r.levels[i].name});
 				}
 				
 				return obj;
@@ -3033,7 +3028,7 @@
                 if (TR.datatable.datatable) {
                     TR.datatable.datatable.setHeight( TR.util.viewport.getSize().y - 68 );
                 }
-            }
+            } 
         }
     });
     

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2012-07-13 02:46:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2012-07-24 10:59:44 +0000
@@ -7,16 +7,16 @@
 			<input type="text" id='orgunitName' readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( 'please_select_village' )]" #end >
 		</td>
 		<td rowspan='2' valign='bottom'>
-			<input type="button" class='large-button' id='listPatientBtn' value="$i18n.getString( 'list_all_patients' )" onclick="javascript:listAllPatient();" #if($organisationUnit) #else disabled #end>
-			<input type="button" id='addPatientBtn' name='addPatientBtn' class='large-button' value='$i18n.getString( "add_new" )' onclick="showAddPatientForm();">
-			<input type="button" value='$i18n.getString( "advanced_search" )' onclick="jQuery('#advanced-search').toggle();">
+			<input type="button" class='large-button' id='listPatientBtn' value="$i18n.getString( 'list_all_patients' )" onclick="javascript:listAllPatient();" disabled >
+			<input type="button" id='addPatientBtn' name='addPatientBtn' class='large-button' value='$i18n.getString( "add_new" )' onclick="showAddPatientForm();" disabled >
+			<input type="button" value='$i18n.getString( "advanced_search" )' onclick="jQuery('#advanced-search').toggle();" disabled >
 		</td>
 	</tr> 
 	<tr id='programAddPatientTR'class='hidden'>
 		<td>$i18n.getString('program')</td>
 		<td>
 			<select id='programIdAddPatient' name='programIdAddPatient'>
-				<option value=''>[$i18n.getString("please_select")]</option>
+				<option value='' type='2'>[$i18n.getString("please_select")]</option>
 				#foreach($program in $programs)
 					<option value="$program.id" type='$program.type'>$program.name</option>
 				#end