dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15607
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-06-10 15:56:21 +0800
message:
  Clean up
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/AddRepresentativeAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationship.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceDashboard.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.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/java/org/hisp/dhis/caseentry/action/trackedentity/AddRepresentativeAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/AddRepresentativeAction.java	2014-06-10 07:41:19 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/AddRepresentativeAction.java	2014-06-10 07:56:21 +0000
@@ -95,7 +95,7 @@
         // ---------------------------------------------------------------------
 
         HttpServletRequest request = ServletActionContext.getRequest();
-        System.out.println( "\n\n === \n attributeService : " + attributeService );
+
         Collection<TrackedEntityAttribute> attributes = attributeService.getAllTrackedEntityAttributes();
 
         Set<TrackedEntityAttributeValue> entityInstanceAttributeValues = new HashSet<TrackedEntityAttributeValue>();

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2014-06-10 07:41:19 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2014-06-10 07:56:21 +0000
@@ -220,20 +220,6 @@
 	return params;
 }
 
-// ----------------------------------------------------------------------------
-// Show death field in person re form
-// ----------------------------------------------------------------------------
-
-function isDeathOnChange() {
-	var isDeath = byId('isDead').checked;
-	setFieldValue('deathDate', '');
-	if (isDeath) {
-		showById('deathDateTR');
-	} else {
-		hideById('deathDateTR');
-	}
-}
-
 // ----------------------------------------------------------------
 // Get Params form Div
 // ----------------------------------------------------------------
@@ -1567,7 +1553,7 @@
 function dashboardHistoryToggle(evt) {
 	$('#dashboardHistoryDiv').toggle();
 }
-function viewPersonProgram(displayedDiv, hidedDiv) {
+function viewTEIProgram(displayedDiv, hidedDiv) {
 	showById(displayedDiv);
 	hideById(hidedDiv);
 }
@@ -1904,7 +1890,7 @@
 }
 
 // --------------------------------------------------------------------------
-// Advanced-search person
+// Advanced-search TEI
 // --------------------------------------------------------------------------
 
 function advancedSearchOnclick() {

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationship.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationship.js	2014-05-25 14:36:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationship.js	2014-06-10 07:56:21 +0000
@@ -26,7 +26,7 @@
 
 
 //remove value of all the disabled identifier fields
-//an identifier field is disabled when its value is inherited from another person ( underAge is true ) 
+//an identifier field is disabled when its value is inherited from another TEI ( underAge is true ) 
 //we don't save inherited identifiers. Only save the representative id.
 function removeRelationshipDisabledIdentifier()
 {

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js	2014-05-25 04:29:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js	2014-06-10 07:56:21 +0000
@@ -210,7 +210,7 @@
 }
 
 // --------------------------------------------------------
-// Check an available person allowed to enroll a program
+// Check an available TEI allowed to enroll a program
 // --------------------------------------------------------
 
 function validateAllowEnrollment( entityInstanceId, programId  )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js	2014-06-10 07:41:19 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js	2014-06-10 07:56:21 +0000
@@ -63,7 +63,7 @@
 		data : params,
 		dataType : "json",
 		success : function(json) {
-			showTEIs( "searchForm div[id=listPersons]", json );
+			showTEIs( "searchForm div[id=listTEI]", json );
 		}
 	});
 }

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceDashboard.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceDashboard.vm	2014-04-20 02:45:01 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceDashboard.vm	2014-06-10 07:56:21 +0000
@@ -64,7 +64,7 @@
 	<div class="link-area" id="activeDiv" name="activeDiv">
 		<p class='header'>
 			$i18n.getString("active_programs")
-			&#8226; <a href='javascript:viewPersonProgram( "completedDiv","activeDiv" )'>$i18n.getString("completed_programs")</a>
+			&#8226; <a href='javascript:viewTEIProgram( "completedDiv","activeDiv" )'>$i18n.getString("completed_programs")</a>
 			
 			#if( $auth.hasAccess( "dhis-web-caseentry", "showProgramEnrollmentForm" ) )
 			&#8226; <a href='javascript:showProgramEnrollmentForm( "$entityInstance.id" )'>$i18n.getString("enroll")</a>
@@ -139,7 +139,7 @@
 	
 	<div class="link-area" id="completedDiv" name="completedDiv" style="display:none;">
 		<p class="header">
-			<a href='javascript:viewPersonProgram( "activeDiv","completedDiv" )'>$i18n.getString("active_programs")</a>
+			<a href='javascript:viewTEIProgram( "activeDiv","completedDiv" )'>$i18n.getString("active_programs")</a>
 			&#8226; $i18n.getString("completed_programs")
 			&#8226; <a href='javascript:showProgramEnrollmentForm( "$entityInstance.id" )'>$i18n.getString("enroll")</a>
 			<br>&nbsp;

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm	2014-05-25 14:36:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm	2014-06-10 07:56:21 +0000
@@ -32,7 +32,7 @@
 		<li><a href="#tab-2">$i18n.getString("add_new_tracked_entity_instance")</a></li>
 	</ul>
 
-	<!-- Search Person TAB -->
+	<!-- Search TEI TAB -->
 	<div id="tab-1">
 		<form id="searchForm" name="searchForm" method="post" >
 			<table>
@@ -69,13 +69,13 @@
 				</tr>
 			</table>
 
-			<div id="listPersons">
+			<div id="listTEI">
 			</div>
 
 		</form>
 	</div>
 
-	<!-- Add Person form TAB -->
+	<!-- Add TEI form TAB -->
 	<div id="tab-2">
 		<form id="addRepresentativeForm" name="addRepresentativeForm" action="addRepresentative.action" method="post">
 			<table id="formContainer">
@@ -101,9 +101,6 @@
 				</tr>
 			</table>
 		</form>
-
-		<div id="listPersonsDuplicate">
-		</div>
 	</div>
 </div>