dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11539
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-07-30 10:56:26 +0700
message:
  Minor fix in relationship form.
modified:
  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/relationshipPatients.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/relationshipPatient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js	2013-07-29 05:32:58 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js	2013-07-30 03:56:26 +0000
@@ -71,11 +71,11 @@
     }
     else if ( type == 'error' )
     {
-        showErrorMessage( i18n_adding_patient_failed + ':' + '\n' + message );
+        setHeaderMessage( i18n_adding_patient_failed + ':' + '\n' + message );
     }
     else if ( type == 'input' )
     {
-        showWarningMessage( message );
+        setHeaderMessage( message );
     }
     else if( type == 'duplicate' )
     {
@@ -242,11 +242,11 @@
 	}
 	else if( type == 'error' )
 	{
-		showErrorMessage( i18n_searching_patient_failed + ':' + '\n' + message );
+		setHeaderMessage( i18n_searching_patient_failed + ':' + '\n' + message );
 	}
 	else if( type == 'input' )
 	{
-		showWarningMessage( message );
+		setHeaderMessage( message );
 	}
 }
 
@@ -254,11 +254,11 @@
 {
 	var relationshipTypeId = jQuery( '#relationshipSelectForm [id=relationshipTypeId] option:selected' ).val();	
 	if( relationshipTypeId==''){
-		showWarningMessage( i18n_please_select_relationship_type );
+		setHeaderMessage( i18n_please_select_relationship_type );
 		return;
 	}
 	if( partnerId==null){
-		showWarningMessage( i18n_please_select_a_patient_for_setting_relationship );
+		setHeaderMessage( i18n_please_select_a_patient_for_setting_relationship );
 		return;
 	}
 	addRelationship(partnerId);
@@ -287,13 +287,13 @@
 			
 			if( type == 'success' ){
 				jQuery('#searchRelationshipDiv [id=tr' + partnerId + ']').css("background-color","#C0C0C0")
-				showSuccessMessage( i18n_save_success );
+				setHeaderMessage( i18n_save_success );
 			}	
 			else if( type == 'error' ){
-				showErrorMessage( i18n_adding_relationship_failed + ':' + '\n' + message );
+				setHeaderMessage( i18n_adding_relationship_failed + ':' + '\n' + message );
 			}
 			else if( type == 'input' ){
-				showWarningMessage( message );
+				setHeaderMessage( message );
 			}
 		}
 	}); 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipPatients.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipPatients.vm	2013-06-17 06:44:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipPatients.vm	2013-07-30 03:56:26 +0000
@@ -52,7 +52,7 @@
 			
 			<td>
 			  <a href="javascript:isDashboard=true;showPatientDashboardForm( '$patient.id' )" title='$i18n.getString( "patient_dashboard" )'><img src="../images/enroll.png"></a>
-			  <a href="javascript:validateAddRelationship($patient.id);" value="$i18n.getString( 'assign_relationship' )" ><img src="../images/relationship.png"></a>
+			  <a href="javascript:validateAddRelationship($patient.id);" title="$i18n.getString( 'assign_relationship' )" ><img src="../images/relationship.png" ></a>
 			  <a href="javascript:showPatientHistory('$patient.id')" title='$i18n.getString( "patient_details_and_history" )'><img src="../images/information.png"></a>
 			</td>