From 059886e06a99708272de3765aae747a833c8dbc2 Mon Sep 17 00:00:00 2001
From: PriestJ <PriestJ@248e525c-4dfb-0310-94bc-949c084e9493>
Date: Fri, 22 Feb 2008 13:23:19 +0000
Subject: [PATCH] Fix for #250

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3674 248e525c-4dfb-0310-94bc-949c084e9493
---
 Screens/f155.sql | 112 ++++++++++++++++++++---------------------------
 1 file changed, 48 insertions(+), 64 deletions(-)

diff --git a/Screens/f155.sql b/Screens/f155.sql
index fbdfd24..b64128c 100644
--- a/Screens/f155.sql
+++ b/Screens/f155.sql
@@ -13,7 +13,7 @@ prompt  APPLICATION 155 - webmip
 -- Application Export:
 --   Application:     155
 --   Name:            webmip
---   Date and Time:   11:31 Friday February 22, 2008
+--   Date and Time:   13:20 Friday February 22, 2008
 --   Exported By:     PRIESTJ
 --   Flashback:       0
 --   Export Type:     Application Export
@@ -145,7 +145,7 @@ wwv_flow_api.create_flow(
   p_default_region_template=> 24740611526526770 + wwv_flow_api.g_id_offset,
   p_error_template    => 38911722486594102 + wwv_flow_api.g_id_offset,
   p_page_protection_enabled_y_n=> 'N',
-  p_checksum_salt_last_reset => '20080222113114',
+  p_checksum_salt_last_reset => '20080222132042',
   p_home_link         => 'f?p=&APP_ID.:1',
   p_box_width         => '98%',
   p_flow_language     => 'en-gb',
@@ -187,7 +187,7 @@ wwv_flow_api.create_flow(
   p_substitution_string_01 => 'SYSTEM_ENVIRONMENT',
   p_substitution_value_01  => '(Development)',
   p_last_updated_by => 'PRIESTJ',
-  p_last_upd_yyyymmddhh24miss=> '20080222113114',
+  p_last_upd_yyyymmddhh24miss=> '20080222132042',
   p_required_roles=> wwv_flow_utilities.string_to_table2(''));
  
  
@@ -10840,7 +10840,7 @@ wwv_flow_api.create_page(
   p_required_role => 16097609166220701+ wwv_flow_api.g_id_offset,
   p_required_patch=> null + wwv_flow_api.g_id_offset,
   p_last_updated_by => 'PRIESTJ',
-  p_last_upd_yyyymmddhh24miss => '20080222113051',
+  p_last_upd_yyyymmddhh24miss => '20080222131915',
   p_page_is_public_y_n=> 'N',
   p_protection_level=> 'C',
   p_page_comment  => '');
@@ -12061,8 +12061,13 @@ wwv_flow_api.create_page_item(
   p_source=>'REQUIRED_SVCP_CODE',
   p_source_type=> 'DB_COLUMN',
   p_display_as=> 'COMBOBOX_WITH_SUBMIT',
-  p_lov => 'select DESCRIPTION display_value, CODE return_value '||chr(10)||
-'from SERVICE_PRESSURES',
+  p_lov => 'if :P32_ENTY_CODE = ''STD INSTALL'' or :P32_ENTY_CODE = ''STD EXCHANGE'' or :P32_ENTY_CODE = ''STD REMOVE'' then '||chr(10)||
+' return ''select DESCRIPTION display_value, CODE return_value '||chr(10)||
+'from SERVICE_PRESSURES where not CODE = ''''IP'''''';'||chr(10)||
+'else'||chr(10)||
+' return ''select DESCRIPTION display_value, CODE return_value '||chr(10)||
+'from SERVICE_PRESSURES'';'||chr(10)||
+'end if;',
   p_lov_columns=> 1,
   p_lov_display_null=> 'YES',
   p_lov_translated=> 'N',
@@ -44438,88 +44443,67 @@ c1:=c1||'"hskpnav" title="Log out of the system" accesskey="2">Logout</a>&nbsp;|
 ''||chr(10)||
 '<script type="text/javascript">'||chr(10)||
 ''||chr(10)||
-'// getElementById Special to handle quirky browsers'||chr(10)||
-'// ';
-
-c1:=c1||'most will use getElementById()'||chr(10)||
-'function getElementById_s(id){'||chr(10)||
-'var obj = null;'||chr(10)||
-'if(document.getElementById){'||chr(10)||
-'/* Prefer the widely supported W3C DOM method, if'||chr(10)||
-'available:-'||chr(10)||
-'*/'||chr(10)||
-'obj = document.getElementById(id);'||chr(10)||
-'}else if(document.all){'||chr(10)||
-'/* Branch to use document.all on document.all only'||chr(10)||
-'browsers. Requires that IDs are unique to the page'||chr(10)||
-'and do not coincide with NAME attributes on other'||chr(10)||
-'eleme';
-
-c1:=c1||'nts:-'||chr(10)||
-'*/'||chr(10)||
-'obj = document.all[id];'||chr(10)||
-'}'||chr(10)||
-'/* If no appropriate element retrieval mechanism exists on'||chr(10)||
-'this browser this function always returns null:-'||chr(10)||
-'*/'||chr(10)||
-'return obj;'||chr(10)||
-'}'||chr(10)||
-''||chr(10)||
 'function MyErrorPage(p_err_item,p_err_process)'||chr(10)||
 '{'||chr(10)||
 ''||chr(10)||
-' var vElementList = null;'||chr(10)||
+' va';
+
+c1:=c1||'r vElementList = null;'||chr(10)||
 ' var vElement     = null;'||chr(10)||
 ' var vErrorStack  = null;'||chr(10)||
 ' var vOraErrorStack = null;'||chr(10)||
 ' var vOraError    = null;'||chr(10)||
 ' var vOraCode     = null;'||chr(10)||
-' var vAjaxRe';
-
-c1:=c1||'quest = null;'||chr(10)||
+' var vAjaxRequest = null;'||chr(10)||
 ' var vAjaxResult  = null;'||chr(10)||
 ' var vMyMsg       = '''';'||chr(10)||
 ''||chr(10)||
-'/* var vOraMessage   = getElementById_s(''ORA'');*/'||chr(10)||
-''||chr(10)||
 'if (!document.getElementById)'||chr(10)||
-' alert("Your rotten browser doesn''t support getElementById");'||chr(10)||
+' return;'||chr(10)||
 ''||chr(10)||
-'var vOraMessage   = document.getElementById(''ORA'');'||chr(10)||
-'if (!vOraMessage.innerHTML)'||chr(10)||
-' alert("Your rotten browser doesn''t support innerHTML");'||chr(10)||
-''||chr(10)||
-'vOraMessage.value = ''Will this appear?'';';
-
-c1:=c1||''||chr(10)||
+'if (!document.createElement)'||chr(10)||
+' return;'||chr(10)||
 ''||chr(10)||
 ' vElementList = window.document.getElementsByTagName("div");'||chr(10)||
-' for (i=0; i < vElementList.length; i++)'||chr(10)||
+' for (i=0; ';
+
+c1:=c1||'i < vElementList.length; i++)'||chr(10)||
 ' {'||chr(10)||
 '  vElement = vElementList[i];'||chr(10)||
 ' '||chr(10)||
 '  if (vElement.className == "ErrorPageMessage")'||chr(10)||
 '  {'||chr(10)||
-'alert(''Found an element with className="ErrorPageMessage"'');'||chr(10)||
-'    vErrorStack = (vErrorStack ==null?"":vErrorStack+"<br/>")+vElement.innerHTML;'||chr(10)||
+'    vErrorStack = (vErrorStack ==null?"":vErrorStack)+vElement.innerHTML;'||chr(10)||
 '    vElement.innerHTML = '''';'||chr(10)||
-'    vOraErrorStack = vErr';
-
-c1:=c1||'orStack.split("ORA-");'||chr(10)||
-'    for(var j=0; j < vOraErrorStack.length; j++) {'||chr(10)||
+'    vOraErrorStack = vErrorStack.split("ORA-");'||chr(10)||
+'    for(var j=1; j < vOraErrorStack.length; j++) {'||chr(10)||
 '      vOraError = vOraErrorStack[j];'||chr(10)||
-'      vAjaxRequest = new htmldb_Get(null,&APP_ID.,''APPLICATION_PROCESS=''+p_err_process,0);'||chr(10)||
+'      vAjaxRequest = new htmldb_G';
+
+c1:=c1||'et(null,&APP_ID.,''APPLICATION_PROCESS=''+p_err_process,0);'||chr(10)||
 '      vAjaxRequest.add(p_err_item,vOraError);'||chr(10)||
 '      vAjaxResult = vAjaxRequest.get();'||chr(10)||
 '      if (vAjaxResult) {'||chr(10)||
-'        vMyMsg = vMyMsg + vAjaxResult + ''<br>'' ;'||chr(10)||
+'        vMyMsg = vMyMsg + vAjaxResult;'||chr(10)||
 '      } else {'||chr(10)||
-'        vMyMsg';
-
-c1:=c1||' = vMyMsg + ''ORA-''+vOraError.substring(0) + ''<br>'' ;'||chr(10)||
+'        vMyMsg = vMyMsg + vOraError.substring(0);'||chr(10)||
 '      }'||chr(10)||
 '    }'||chr(10)||
-'    vOraMessage.value = vMyMsg;'||chr(10)||
+'if (document.getElementById && document.createElement) {'||chr(10)||
+'   var divA = document.getElementById(''ErrorOu';
+
+c1:=c1||'tputDiv'');'||chr(10)||
+'   var oH = document.createElement(''h1'');'||chr(10)||
+'   oH.appendChild(document.createTextNode(''Validation failed because:''));'||chr(10)||
+'   var oP = document.createElement(''p'');'||chr(10)||
+'   oP.id = ''FriendlyError'';'||chr(10)||
+'   oP.appendChild(document.createTextNode(vMyMsg));'||chr(10)||
+'   // Insert the heading as the first child of the element'||chr(10)||
+'   divA.insertBefore(oP, divA.firstChild);'||chr(10)||
+'   divA.insertBefore(oH, divA.firstChild);';
+
+c1:=c1||''||chr(10)||
+'   }'||chr(10)||
 '  }'||chr(10)||
 ' }'||chr(10)||
 '}'||chr(10)||
@@ -44564,18 +44548,18 @@ c3:=c3||'<div id="UKSubNav" class="reg">'||chr(10)||
 '<div id="navTier" class="w180">#REGION_POSITION_08#</div>'||chr(10)||
 '</div>'||chr(10)||
 ' <div id="colMid">'||chr(10)||
+'<div id="ErrorOutputDiv"></div>'||chr(10)||
 '#BOX_BODY#'||chr(10)||
 '</div>'||chr(10)||
+''||chr(10)||
 '<div id="colRight">'||chr(10)||
 '<h1 class="podTitle"><img src="#WORKSPACE_IMAGES#exclaim.gif" alt=""/>Important Messages</h1>'||chr(10)||
-'<div class="t4messages">#GLOBAL_NOTIFICATION##SUCCESS_MESSAGE##NOTIFICA';
+'<div class="t4messages">#GLOBAL_NOTI';
 
-c3:=c3||'TION_MESSAGE#</div>'||chr(10)||
+c3:=c3||'FICATION##SUCCESS_MESSAGE##NOTIFICATION_MESSAGE#</div>'||chr(10)||
 '</div>'||chr(10)||
 '</div>'||chr(10)||
 ''||chr(10)||
-'1'||chr(10)||
-''||chr(10)||
 '';
 
 wwv_flow_api.create_template(