From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 3 Aug 2006 19:09:22 +0000 (+0000)
Subject: required surveys are now required for new users
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ffe0efd6662cd931a4fb2096ad466209431c4d31;p=evergreen%2Fpines.git

required surveys are now required for new users


git-svn-id: svn://svn.open-ils.org/ILS/trunk@5255 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/xul/staff_client/server/patron/ue.js b/Open-ILS/xul/staff_client/server/patron/ue.js
index 2b40112c6b..c7447bfda1 100644
--- a/Open-ILS/xul/staff_client/server/patron/ue.js
+++ b/Open-ILS/xul/staff_client/server/patron/ue.js
@@ -383,30 +383,26 @@ function uEditGetErrorStrings() {
 		}
 	);
 
-
 	/* munge up something for all of the required surveys 
 		(which are not registered with the fields) */
-
-	/* AWAITS POLICY DECISION */
-
-	/*
 	var rows = $('ue_survey_table').getElementsByTagName('tr');
-	for( var r in rows ) {
-
-		var row = rows[r];
-		var sel = $n(row, 'ue_survey_answer');
-		if(!sel) continue;
-		var qstn = row.getAttribute('question');
-
-		if(qstn) {
-			qstn		= surveyQuestionsCache[qstn];
-			survey	= surveysCache[qstn.survey()];
-			var val	= getSelectorVal(sel);
-			if(!val && survey.required() && survey.required() != 'f')
-				errors.push($('ue_bad_survey').innerHTML);
+	if( patron.isnew() ) {
+		for( var r in rows ) {
+	
+			var row = rows[r];
+			var sel = $n(row, 'ue_survey_answer');
+			if(!sel) continue;
+			var qstn = row.getAttribute('question');
+	
+			if(qstn) {
+				qstn		= surveyQuestionsCache[qstn];
+				survey	= surveysCache[qstn.survey()];
+				var val	= getSelectorVal(sel);
+				if(!val && isTrue(survey.required()))
+					errors.push($('ue_bad_survey').innerHTML + ' : ' + qstn.question());
+			}
 		}
 	}
-	*/
 
 	/* ------------------------------------------------------------ */
 
diff --git a/Open-ILS/xul/staff_client/server/patron/ue_ui.js b/Open-ILS/xul/staff_client/server/patron/ue_ui.js
index 85afc6fa8a..d6c237477c 100644
--- a/Open-ILS/xul/staff_client/server/patron/ue_ui.js
+++ b/Open-ILS/xul/staff_client/server/patron/ue_ui.js
@@ -254,11 +254,8 @@ function uEditInsertSurveyQuestion( row, survey, question ) {
 
 	surveyQuestionsCache[question.id()] = question;
 
-	/* XXX
-	if( survey.required() && survey.required() != 'f' ) {
+	if( patron.isnew() && isTrue(survey.required()) ) 
 		addCSSClass(selector, 'invalid_value');
-	}
-	*/
 
 	selector.onchange = function() {
 
@@ -277,14 +274,12 @@ function uEditInsertSurveyQuestion( row, survey, question ) {
 
 		var val = getSelectorVal(selector);
 
-		/* XXX
-		if( survey.required() && survey.required() != 'f' ) {
+		if( patron.isnew() && isTrue(survey.required()) ) {
 			if(val)
 				removeCSSClass(selector, 'invalid_value');
 			else 
 				addCSSClass(selector, 'invalid_value');
 		}
-		*/
 
 		if(!val) return;