dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16100
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-07-12 19:00:25 +0700
message:
  Fixed bug - Show warning-message if there isn't any value of attribute entered in TEI advanced search function.
modified:
  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/programEnrollmentForm.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/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2014-07-11 05:28:48 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2014-07-12 12:00:25 +0000
@@ -118,18 +118,15 @@
 function validateAdvancedSearch( page ) {
 	hideById('listEntityInstanceDiv');
 	var flag = true;
-	if (getFieldValue('startDate') == ''
-			&& getFieldValue('endDate') == '') {
-		if (getFieldValue('searchByProgramStage') == "false"
-				|| (getFieldValue('searchByProgramStage') == "true" && jQuery('#advancedSearchTB tr').length > 1)) {
-			jQuery("#searchDiv :input").each(function(i, item) {
-				var elementName = $(this).attr('name');
-				if (elementName == 'searchText' && jQuery(item).val() == '') {
-					showWarningMessage(i18n_specify_search_criteria);
-					flag = false;
-				}
-			});
-		}
+	if (getFieldValue('searchByProgramStage') == "false"
+			|| (getFieldValue('searchByProgramStage') == "true" && jQuery('#advancedSearchTB tr').length > 1)) {
+		jQuery("#searchDiv :input").each(function(i, item) {
+			var elementName = $(this).attr('name');
+			if (elementName == 'searchText' && jQuery(item).val() == '') {
+				showWarningMessage(i18n_specify_search_criteria);
+				flag = false;
+			}
+		});
 	}
 
 	if (flag) {

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2014-07-12 03:19:12 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2014-07-12 12:00:25 +0000
@@ -181,6 +181,8 @@
 			jQuery("#incompleteProgram").attr('disabled', true);
 		#end
 	});
+
+	$('#tabs').tabs();
 	
 	$("#tabs").tabs().on('tabsactivate', function (event, ui) {
 		if( ui.newPanel.selector == '#tab-3' ){