dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13472
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-12-30 09:57:37 +0700
message:
  Allow to search persons by identifiers/attributes in Multiple Individual records functionality.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.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/multiDataEntry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js	2013-10-10 09:04:12 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js	2013-12-30 02:57:37 +0000
@@ -53,7 +53,7 @@
         var lastDays = jQuery.datepicker.formatDate(dateFormat, new Date(y, m, d - eval(scheduledVisitDays)));
 
         var searchTexts = "stat_" + getFieldValue('programIdAddPatient') + "_" + lastDays + "_" + today + "_"
-            + getFieldValue('orgunitId') + "_false_4_3";
+            + getFieldValue('orgunitId') + "_false_" + getFieldValue('statusEvent');
 
         getPatientList(searchTexts);
     }
@@ -64,7 +64,6 @@
 	hideById('listPatientDiv');
 	hideById('advanced-search');
 	hideById('contentDataRecord');
-	setFieldValue('statusEvent', "4");
     var programId = getFieldValue('programIdAddPatient');
 
     var data = {};

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm	2013-12-18 06:05:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm	2013-12-30 02:57:37 +0000
@@ -17,6 +17,7 @@
 		showById('dueDateTR');
 		showById('programStageAddPatientTR');
 		showById('scheduleVisitTR');
+		showById('advancedSearchBtn');
 		
 		jQuery("#searchObjectId [value=prg]").remove();
 		registration = false;