Fix for 244, also fixed potential issue with Required metering pressure the validations are conditional on there being no in-line error messages already, that way the validations that check if the fields are numbers prevent the numeric comparison failing and webMIP raising an ugly error.

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3673 248e525c-4dfb-0310-94bc-949c084e9493

Screens/f155.sql

@@ -13,7 +13,7 @@ prompt  APPLICATION 155 - webmip
 -- Application Export:
 --   Application:     155
 --   Name:            webmip
---   Date and Time:   09:53 Friday February 22, 2008
+--   Date and Time:   11:31 Friday February 22, 2008
 --   Exported By:     PRIESTJ
 --   Flashback:       0
 --   Export Type:     Application Export
@@ -28,7 +28,7 @@ prompt  APPLICATION 155 - webmip
 --   Pages:                54
 --     Items:             338
 --     Computations:        1
---     Validations:       242
+--     Validations:       244
 --     Processes:          91
 --     Regions:            78
 --     Buttons:           118
@@ -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 => '20080222095310',
+  p_checksum_salt_last_reset => '20080222113114',
   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=> '20080222095310',
+  p_last_upd_yyyymmddhh24miss=> '20080222113114',
   p_required_roles=> wwv_flow_utilities.string_to_table2(''));
  
  
@@ -2199,6 +2199,19 @@ wwv_flow_api.create_app_comments (
   p_app_version=>'');
 end;
 /
+begin
+wwv_flow_api.create_app_comments (
+  p_id=>41391628119651588 + wwv_flow_api.g_id_offset,
+  p_flow_id=>wwv_flow.g_flow_id,
+  p_pages=>'30',
+  p_app_comment=>'Added condition to hide the "Copy" enquiry link when viewing the report as a CS user.',
+  p_updated_on=>'2008.02.22.09:55:51',
+  p_updated_by=>'MULLENM',
+  p_created_on=>'2008.02.22.09:55:51',
+  p_created_by=>'MULLENM',
+  p_app_version=>'');
+end;
+/
  
 --application/pages/page_00000
 prompt  ...PAGE 0: system
@@ -9406,7 +9419,7 @@ wwv_flow_api.create_page(
   p_step_template => '',
   p_required_patch=> null + wwv_flow_api.g_id_offset,
   p_last_updated_by => 'MULLENM',
-  p_last_upd_yyyymmddhh24miss => '20080222095247',
+  p_last_upd_yyyymmddhh24miss => '20080222095313',
   p_page_is_public_y_n=> 'N',
   p_protection_level=> 'C',
   p_page_comment  => '');
@@ -10827,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 => '20080222093733',
+  p_last_upd_yyyymmddhh24miss => '20080222113051',
   p_page_is_public_y_n=> 'N',
   p_protection_level=> 'C',
   p_page_comment  => '');
@@ -18323,6 +18336,7 @@ wwv_flow_api.create_page_validation(
 'end if;',
   p_validation_type => 'FUNC_BODY_RETURNING_ERR_TEXT',
   p_error_message => '',
+  p_validation_condition_type=> 'NOT_DISPLAYING_INLINE_VALIDATION_ERRORS',
   p_associated_item=> 26603910634798262 + wwv_flow_api.g_id_offset,
   p_error_display_location=>'INLINE_WITH_FIELD_AND_NOTIFICATION',
   p_validation_comment=> '');
@@ -18380,6 +18394,58 @@ end;
 /
 
  
+begin
+ 
+wwv_flow_api.create_page_validation(
+  p_id => 41450809671939625 + wwv_flow_api.g_id_offset,
+  p_flow_id => wwv_flow.g_flow_id,
+  p_flow_step_id => 32,
+  p_validation_name => 'QMAX <= 999999',
+  p_validation_sequence=> 1770,
+  p_validation => 'if :P32_QMAX > 999999 then'||chr(10)||
+'   return ''Maximum value allowed 999999'';'||chr(10)||
+'else'||chr(10)||
+'   return null;'||chr(10)||
+'end if;',
+  p_validation_type => 'REGULAR_EXPRESSION',
+  p_error_message => 'Maximum value allowed 999999',
+  p_validation_condition_type=> 'NOT_DISPLAYING_INLINE_VALIDATION_ERRORS',
+  p_associated_item=> 26615123286798270 + wwv_flow_api.g_id_offset,
+  p_error_display_location=>'INLINE_WITH_FIELD_AND_NOTIFICATION',
+  p_validation_comment=> '');
+ 
+null;
+ 
+end;
+/
+
+ 
+begin
+ 
+wwv_flow_api.create_page_validation(
+  p_id => 41451604954947694 + wwv_flow_api.g_id_offset,
+  p_flow_id => wwv_flow.g_flow_id,
+  p_flow_step_id => 32,
+  p_validation_name => 'QMIN<= 999999',
+  p_validation_sequence=> 1780,
+  p_validation => 'if :P32_QMIN > 999999 then'||chr(10)||
+'   return ''Maximum value allowed 999999'';'||chr(10)||
+'else'||chr(10)||
+'   return null;'||chr(10)||
+'end if;',
+  p_validation_type => 'FUNC_BODY_RETURNING_ERR_TEXT',
+  p_error_message => '',
+  p_validation_condition_type=> 'NOT_DISPLAYING_INLINE_VALIDATION_ERRORS',
+  p_associated_item=> 26613331508798269 + wwv_flow_api.g_id_offset,
+  p_error_display_location=>'INLINE_WITH_FIELD_AND_NOTIFICATION',
+  p_validation_comment=> '');
+ 
+null;
+ 
+end;
+/
+
+ 
 begin
  
 declare
@@ -44372,56 +44438,94 @@ 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)||
-' va';
-
-c1:=c1||'r vElementList = null;'||chr(10)||
+' var 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 vAjaxRequest = null;'||chr(10)||
+' var vAjaxRe';
+
+c1:=c1||'quest = 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)||
+''||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)||
 ''||chr(10)||
 ' vElementList = window.document.getElementsByTagName("div");'||chr(10)||
 ' for (i=0; i < vElementList.length; i++)'||chr(10)||
 ' {'||chr(10)||
 '  vElement = vElementList[i];'||chr(10)||
 ' '||chr(10)||
-'  if (vElement';
-
-c1:=c1||'.className == "ErrorPageMessage")'||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)||
 '    vElement.innerHTML = '''';'||chr(10)||
-'    vOraErrorStack = vErrorStack.split("ORA-");'||chr(10)||
-'    for(var j=1; j < vOraErrorStack.length; j++) {'||chr(10)||
+'    vOraErrorStack = vErr';
+
+c1:=c1||'orStack.split("ORA-");'||chr(10)||
+'    for(var j=0; 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)||
-'      vAjaxReque';
-
-c1:=c1||'st.add(p_err_item,vOraError);'||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)||
 '      } else {'||chr(10)||
-'        vMyMsg = vMyMsg + ''ORA-''+vOraError.substring(0) + ''<br>'' ;'||chr(10)||
+'        vMyMsg';
+
+c1:=c1||' = vMyMsg + ''ORA-''+vOraError.substring(0) + ''<br>'' ;'||chr(10)||
 '      }'||chr(10)||
 '    }'||chr(10)||
-'    document.getElementById(''ORA'').innerHTML = vMyMsg;'||chr(10)||
+'    vOraMessage.value = vMyMsg;'||chr(10)||
 '  }'||chr(10)||
 ' }'||chr(10)||
 '}'||chr(10)||
 '</script>'||chr(10)||
 ''||chr(10)||
-'<body onload="MyErrorPage(''ORA_ERR_CODE'',''getErrorMsg'')" #ONLOAD#>#FORM';
-
-c1:=c1||'_OPEN#'||chr(10)||
+'<body onload="MyErrorPage(''ORA_ERR_CODE'',''getErrorMsg'')" #ONLOAD#>#FORM_OPEN#'||chr(10)||
 ''||chr(10)||
 '';
 
@@ -44459,18 +44563,18 @@ c3:=c3||'<div id="UKSubNav" class="reg">'||chr(10)||
 '<div id="colLeft">'||chr(10)||
 '<div id="navTier" class="w180">#REGION_POSITION_08#</div>'||chr(10)||
 '</div>'||chr(10)||
-'<div id="colMid">'||chr(10)||
+' <div id="colMid">'||chr(10)||
 '#BOX_BODY#'||chr(10)||
 '</div>'||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##NOTIFICAT';
+'<div class="t4messages">#GLOBAL_NOTIFICATION##SUCCESS_MESSAGE##NOTIFICA';
 
-c3:=c3||'ION_MESSAGE#</div>'||chr(10)||
+c3:=c3||'TION_MESSAGE#</div>'||chr(10)||
 '</div>'||chr(10)||
 '</div>'||chr(10)||
 ''||chr(10)||
-''||chr(10)||
+'1'||chr(10)||
 ''||chr(10)||
 '';