Correction to check_mandatory (all fields were being returned as 'mandatory').
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3958 248e525c-4dfb-0310-94bc-949c084e9493
This commit is contained in:
@@ -276,11 +276,12 @@ BEGIN
|
|||||||
FOR l_checks IN (SELECT field_name
|
FOR l_checks IN (SELECT field_name
|
||||||
,substr(condition
|
,substr(condition
|
||||||
,1
|
,1
|
||||||
,1)
|
,1) AS condition
|
||||||
,enty_code
|
,enty_code
|
||||||
,error_message
|
,error_message
|
||||||
FROM data_item_roles) LOOP
|
FROM data_item_roles) LOOP
|
||||||
|
|
||||||
|
IF l_checks.condition = 'M' THEN
|
||||||
add_sql(l_sql
|
add_sql(l_sql
|
||||||
,' IF p_rec.ENTY_CODE = ''' || l_checks.enty_code ||
|
,' IF p_rec.ENTY_CODE = ''' || l_checks.enty_code ||
|
||||||
''' AND p_rec.' || l_checks.field_name || ' IS NULL THEN');
|
''' AND p_rec.' || l_checks.field_name || ' IS NULL THEN');
|
||||||
@@ -293,6 +294,7 @@ BEGIN
|
|||||||
,' END IF;');
|
,' END IF;');
|
||||||
add_sql(l_sql
|
add_sql(l_sql
|
||||||
,' ');
|
,' ');
|
||||||
|
END IF;
|
||||||
END LOOP;
|
END LOOP;
|
||||||
|
|
||||||
add_sql(l_sql
|
add_sql(l_sql
|
||||||
@@ -500,15 +502,10 @@ BEGIN
|
|||||||
,' RETURN data_item_roles.condition%TYPE');
|
,' RETURN data_item_roles.condition%TYPE');
|
||||||
add_sql(l_sql
|
add_sql(l_sql
|
||||||
,'IS');
|
,'IS');
|
||||||
add_sql(l_sql
|
|
||||||
,' l_return data_item_roles.condition%TYPE;');
|
|
||||||
|
|
||||||
add_sql(l_sql
|
add_sql(l_sql
|
||||||
,' ');
|
,' ');
|
||||||
|
|
||||||
add_sql(l_sql
|
add_sql(l_sql
|
||||||
,'BEGIN');
|
,'BEGIN');
|
||||||
|
|
||||||
add_sql(l_sql
|
add_sql(l_sql
|
||||||
,' cout_assert.isnotnull(p_field_name,''NULL enquiry FIELD_NAME'');');
|
,' cout_assert.isnotnull(p_field_name,''NULL enquiry FIELD_NAME'');');
|
||||||
|
|
||||||
@@ -519,12 +516,13 @@ BEGIN
|
|||||||
,enty_code
|
,enty_code
|
||||||
,error_message
|
,error_message
|
||||||
FROM data_item_roles) LOOP
|
FROM data_item_roles) LOOP
|
||||||
|
|
||||||
add_sql(l_sql
|
add_sql(l_sql
|
||||||
,' IF p_enty_code = ''' || l_checks.enty_code ||
|
,' IF p_enty_code = ''' || l_checks.enty_code ||
|
||||||
''' AND p_field_name = ''' || l_checks.field_name ||
|
''' AND p_field_name = ''' || l_checks.field_name ||
|
||||||
''' THEN');
|
''' THEN');
|
||||||
add_sql(l_sql
|
add_sql(l_sql
|
||||||
,' l_return := ''' || l_checks.condition || ''';');
|
,' RETURN (''' || l_checks.condition || ''');');
|
||||||
add_sql(l_sql
|
add_sql(l_sql
|
||||||
,' END IF;');
|
,' END IF;');
|
||||||
add_sql(l_sql
|
add_sql(l_sql
|
||||||
@@ -535,7 +533,7 @@ BEGIN
|
|||||||
,' ');
|
,' ');
|
||||||
-- return the overall response
|
-- return the overall response
|
||||||
add_sql(l_sql
|
add_sql(l_sql
|
||||||
,' RETURN l_return;');
|
,' RETURN NULL;');
|
||||||
add_sql(l_sql
|
add_sql(l_sql
|
||||||
,'END check_condition;');
|
,'END check_condition;');
|
||||||
|
|
||||||
@@ -550,16 +548,26 @@ BEGIN
|
|||||||
,' RETURN VARCHAR2');
|
,' RETURN VARCHAR2');
|
||||||
add_sql(l_sql
|
add_sql(l_sql
|
||||||
,'IS');
|
,'IS');
|
||||||
add_sql(l_sql,'BEGIN');
|
add_sql(l_sql
|
||||||
add_sql(l_sql,' RETURN (');
|
,'BEGIN');
|
||||||
add_sql(l_sql,' CASE mip_enquiries_helper.check_condition(p_enty_code, p_field_name)');
|
add_sql(l_sql
|
||||||
add_sql(l_sql,' WHEN ''M'' THEN ''*''');
|
,' RETURN (');
|
||||||
add_sql(l_sql,' WHEN ''O-'' THEN ''+''');
|
add_sql(l_sql
|
||||||
add_sql(l_sql,' WHEN ''O'' THEN '' ''');
|
,' CASE mip_enquiries_helper.check_condition(p_enty_code, p_field_name)');
|
||||||
add_sql(l_sql,' WHEN ''H'' THEN ''H''');
|
add_sql(l_sql
|
||||||
add_sql(l_sql,' END');
|
,' WHEN ''M'' THEN ''*''');
|
||||||
add_sql(l_sql,' );');
|
add_sql(l_sql
|
||||||
add_sql(l_sql,'END label_condition;');
|
,' WHEN ''O-'' THEN ''+''');
|
||||||
|
add_sql(l_sql
|
||||||
|
,' WHEN ''O'' THEN '' ''');
|
||||||
|
add_sql(l_sql
|
||||||
|
,' WHEN ''H'' THEN ''H''');
|
||||||
|
add_sql(l_sql
|
||||||
|
,' END');
|
||||||
|
add_sql(l_sql
|
||||||
|
,' );');
|
||||||
|
add_sql(l_sql
|
||||||
|
,'END label_condition;');
|
||||||
|
|
||||||
add_sql(l_sql
|
add_sql(l_sql
|
||||||
,' ');
|
,' ');
|
||||||
|
|||||||
Reference in New Issue
Block a user