← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #17893

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7310: Small change UI for relationship.

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 7310
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-06-15 14:11:51 +0700
message:
  Small change UI for relationship.
added:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/images/representative.png
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm
  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/relationshipList.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/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-06-14 13:07:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-06-15 07:11:51 +0000
@@ -119,7 +119,6 @@
 select_relationship=Select Relationship
 please_select_a_representative=Please select a representing relationship
 representative=Representative
-manage_representative=Manage representative
 confirm_delete_relationship=Are you sure you want to delete relationship?
 the_relationship_already_exists=The relationship already exists - choose a different relationship or partner
 please_select_partner=Please select relationship partner
@@ -356,4 +355,9 @@
 clear_filter = Clear filter
 events = Events
 orgunit_groups = Groups
-not_empty = The value must be not empty.
\ No newline at end of file
+not_empty = The value must be not empty.
+seach_available_patients = Seach available persons
+set_as_representative = Set as representative
+set_as_representative_and_copy_attributes_for_the_person = Set as representative and copy attributes for the person
+is_not_representative = Is not representative ?
+save_all = Save all

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm	2012-06-07 09:55:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm	2012-06-15 07:11:51 +0000
@@ -1,9 +1,6 @@
 <script>
 	jQuery('#addRelationshipPatientForm').ready(	function(){
 
-		datePickerValid( 'addRelationshipPatientForm [id=birthDate]' );
-		hideById('addRelationshipPatientForm [id=underAgeDiv]');
-		addEventForPatientForm('addRelationshipPatientForm');
 		checkedDuplicate = false;
 		
 		jQuery("#addRelationshipPatientForm").validate({
@@ -24,6 +21,9 @@
 					}
 				}
 		});
+		
+		hideById('addRelationshipPatientForm [id=underAgeDiv]');
+		addEventForPatientForm('addRelationshipPatientForm');
 	});		
 </script>
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm	2011-09-29 05:04:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm	2012-06-15 07:11:51 +0000
@@ -73,12 +73,12 @@
 	<tr>
 		#if( $partnerIsRepresentative == 'true' )
 		<td>
-			<input type="button" value="$i18n.getString('yes')" onclick="javascript:removeRepresentative( getFieldValue('id'), $partner.id );">
+			<input type="button" value="$i18n.getString('is_not_representative')" onclick="javascript:removeRepresentative( getFieldValue('id'), $partner.id );" style='width:150px;' >
 		</td>
 		#else
 		<td>
-			<input type="button" value="$i18n.getString('yes')" onclick="javascript:saveRepresentative( getFieldValue('id'), $partner.id, false )">
-			<input type="button" value="$i18n.getString('yes_and_attribute')" onclick="javascript:saveRepresentative( getFieldValue('id'), $partner.id, true )">
+			<input type="button" value="$i18n.getString('save')" title="$i18n.getString('set_as_representative')" onclick="javascript:saveRepresentative( getFieldValue('id'), $partner.id, false )" style='width:150px;' >
+			<input type="button" value="$i18n.getString('save_all')" title="$i18n.getString('set_as_representative_and_copy_attributes_for_the_person')" onclick="javascript:saveRepresentative( getFieldValue('id'), $partner.id, true )" style='width:150px;' >
 		</td>    
 		#end
 	</tr>                      

=== added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/images/representative.png'
Binary files dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/images/representative.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/images/representative.png	2012-06-15 07:11:51 +0000 differ
=== 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	2012-03-05 07:32:05 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js	2012-06-15 07:11:51 +0000
@@ -132,10 +132,10 @@
 			patientId: patientId,
 			partnerId: partnerId
 		}).dialog({
-			title: i18n_relationship_management,
+			title: i18n_set_as_representative,
 			maximize: true, 
 			closable: true,
-			modal:true,
+			modal:false,
 			overlay:{background:'#000000', opacity:0.1},
 			width: 400,
 			height: 300

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm	2012-06-07 09:55:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm	2012-06-15 07:11:51 +0000
@@ -48,9 +48,9 @@
 </table>
 
 <div class='button-list'>
-	<input type="button" class='button' value="$i18n.getString( 'add_new' )" onclick="javascript:showAddRelationship('$patient.id')" >
-	<input type="button" class='button' value="$i18n.getString( 'add_new_patient' )" onclick="javascript:showAddRelationshipPatient( '$patient.id',false )" >
-	<input type="button" class='button' value="$i18n.getString( 'back_to_registration' )" onclick="onClickBackBtn();" >
+	<input type="button" style='width:170px;' value="$i18n.getString( 'seach_available_patients' )" onclick="javascript:showAddRelationship('$patient.id')" >
+	<input type="button" style='width:170px;' value="$i18n.getString( 'add_new_patient' )" onclick="javascript:showAddRelationshipPatient( '$patient.id',false )" >
+	<input type="button" style='width:170px;' value="$i18n.getString( 'back_to_registration' )" onclick="onClickBackBtn();" >
 </div>
 
 <table class="list-table listTable">
@@ -87,7 +87,7 @@
 				#end                  
 				
 				<td style="text-align:center">
-					<a href="javascript:manageRepresentative( '$patient.id', $partnerId )" title="$i18n.getString( 'manage_representative' )"><img src="../images/assign.png" alt="$i18n.getString( 'manage_representative' )"></a>
+					<a href="javascript:manageRepresentative( '$patient.id', $partnerId )" title="$i18n.getString( 'set_as_representative' )"><img src="images/representative.png" alt="$i18n.getString( 'manage_representative' )"></a>
 					<a href="javascript:removeRelationship( '$relationship.id', '$encoder.jsEncode( $relationship.patientA.getFullName() )', '$encoder.jsEncode( $relationship.relationshipType.aIsToB )', '$encoder.jsEncode( $relationship.patientB.getFullName() )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
 				</td>   						
 			</tr>
@@ -135,6 +135,6 @@
     var i18n_removing_representative_failed = '$encoder.jsEscape( $i18n.getString( "removing_representative_failed" ) , "'" )';
     var i18n_removing_relationship_failed = '$encoder.jsEscape( $i18n.getString( "removing_relationship_failed" ) , "'" )';        
     var i18n_adding_relationship_failed = '$encoder.jsEscape( $i18n.getString( "adding_relationship_failed" ) , "'" )';
-	var i18n_relationship_management = '$encoder.jsEscape( $i18n.getString( "relationship_management" ) , "'" )';
+	var i18n_set_as_representative = '$encoder.jsEscape( $i18n.getString( "set_as_representative" ) , "'" )';
 </script>
  Thread Previous • Date Previous • • Thread Next