dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4849
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-10-06 13:42:42 +0700
message:
  Remove unused div ( Patient management form ).
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.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/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2011-10-06 06:10:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2011-10-06 06:42:42 +0000
@@ -6,8 +6,7 @@
 	
 	hideById('searchPatientDiv');
 	hideById('listPatientDiv');
-	hideById('addPatientDiv');
-	hideById('updatePatientDiv');
+	hideById('editPatientDiv');
 	hideById('enrollmentDiv');
 	hideById('listRelationshipDiv');
 	hideById('addRelationshipDiv');
@@ -146,7 +145,7 @@
 	$.ajax({
 		type: "POST",
 		url: 'validatePatient.action',
-		data: getParamsForDiv('addPatientDiv'),
+		data: getParamsForDiv('editPatientDiv'),
 		success:addValidationCompleted
      });	
 }
@@ -374,16 +373,15 @@
 function showAddPatientForm()
 {
 	hideById('listPatientDiv');
-	setInnerHTML('updatePatientDiv', '');
 	
 	hideById('selectDiv');
 	hideById('searchPatientDiv');
 				
 	jQuery('#loaderDiv').show();
-	jQuery('#addPatientDiv').load('showAddPatientForm.action'
+	jQuery('#editPatientDiv').load('showAddPatientForm.action'
 		, function()
 		{
-			showById('addPatientDiv');
+			showById('editPatientDiv');
 			jQuery('#loaderDiv').hide();
 		});
 	
@@ -394,7 +392,7 @@
 	$.ajax({
       type: "POST",
       url: 'addPatient.action',
-      data: getParamsForDiv('addPatientDiv'),
+      data: getParamsForDiv('editPatientDiv'),
       success: function(json) {
 		var type = json.response;
 		showProgramEnrollmentSelectForm( json.message );
@@ -411,18 +409,18 @@
 function showUpdatePatientForm( patientId )
 {
 	hideById('listPatientDiv');
-	setInnerHTML('addPatientDiv', '');
+	setInnerHTML('editPatientDiv', '');
 	
 	hideById('selectDiv');
 	hideById('searchPatientDiv');
 				
 	jQuery('#loaderDiv').show();
-	jQuery('#updatePatientDiv').load('showUpdatePatientForm.action',
+	jQuery('#editPatientDiv').load('showUpdatePatientForm.action',
 		{
 			id:patientId
 		}, function()
 		{
-			showById('updatePatientDiv');
+			showById('editPatientDiv');
 			jQuery('#searchPatientsDiv').dialog('close');
 			jQuery('#loaderDiv').hide();
 		});
@@ -435,7 +433,7 @@
 	$.ajax({
       type: "POST",
       url: 'updatePatient.action',
-      data: getParamsForDiv('updatePatientDiv'),
+      data: getParamsForDiv('editPatientDiv'),
       success: function( json ) {
 		showProgramEnrollmentSelectForm( getFieldValue('id') );
       }
@@ -449,8 +447,7 @@
 function showProgramEnrollmentSelectForm( patientId )
 {
 	hideById('listPatientDiv');
-	hideById('addPatientDiv');
-	hideById('updatePatientDiv');
+	hideById('editPatientDiv');
 	
 	hideById('selectDiv');
 	hideById('searchPatientDiv');
@@ -553,8 +550,7 @@
 function showUnenrollmentSelectForm( patientId )
 {
 	hideById('listPatientDiv');
-	hideById('addPatientDiv');
-	hideById('updatePatientDiv');
+	hideById('editPatientDiv');
 	
 	hideById('selectDiv');
 	hideById('searchPatientDiv');
@@ -684,8 +680,7 @@
 	showById('searchPatientDiv');
 	showById('listPatientDiv');
 	
-	hideById('addPatientDiv');
-	hideById('updatePatientDiv');
+	hideById('editPatientDiv');
 	hideById('enrollmentDiv');
 	hideById('listRelationshipDiv');
 	hideById('addRelationshipDiv');
@@ -693,8 +688,7 @@
 
 function loadPatientList()
 {
-	hideById('addPatientDiv');
-	hideById('updatePatientDiv');
+	hideById('editPatientDiv');
 	hideById('enrollmentDiv');
 	hideById('listRelationshipDiv');
 	hideById('addRelationshipDiv');
@@ -721,8 +715,7 @@
 function loadAllPatients()
 {
 	hideById('listPatientDiv');
-	hideById('addPatientDiv');
-	hideById('updatePatientDiv');
+	hideById('editPatientDiv');
 	
 	jQuery('#loaderDiv').show();
 	contentDiv = 'listPatientDiv';

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js	2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js	2011-10-06 06:42:42 +0000
@@ -28,8 +28,7 @@
 	hideById( 'searchPatientDiv' );
 	hideById( 'listPatientDiv' );
 	hideById( 'listRelationshipDiv' );
-	setInnerHTML('addPatientDiv', '');
-	setInnerHTML('updatePatientDiv', '');
+	setInnerHTML('editPatientDiv', '');
 	
 	jQuery('#loaderDiv').show();
 	jQuery('#addRelationshipDiv').load('showAddRelationshipPatient.action',

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2011-10-06 04:38:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2011-10-06 06:42:42 +0000
@@ -52,8 +52,7 @@
 </div>
 
 <div id='listPatientDiv'></div> <!-- List searching patients -->
-<div id='addPatientDiv'></div> <!-- Add Patient Form -->
-<div id='updatePatientDiv'></div> <!-- Update Patient Form -->
+<div id='editPatientDiv'></div> <!-- Add Patient Form -->
 <div id='resultSearchDiv' style='font-size:13px'></div> <!-- List searching patients -->
 <div id='enrollmentDiv'></div> <!-- Program Enrollment Form -->
 <div id='listRelationshipDiv'></div> <!-- List relationship -->