From 12a9006816d073bb23c63ffed807273c953afd9e Mon Sep 17 00:00:00 2001 From: John Date: Fri, 30 Sep 2011 12:53:13 +0000 Subject: [PATCH] Don't open all PDFs if printing All Procedures Fixed logic so that Single RO Values don't fail in MSWord --- PROMS/VEPROMS User Interface/DlgPrintProcedure.cs | 3 ++- PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index 07d69682..9034fc6e 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -57,7 +57,8 @@ namespace VEPROMS btnCreatePDF.Text = "Create PDFs"; HandleDocVersionSettings(); PrepForAllOrOne(false); - cbxOpenAfterCreate2.Checked = dvi.DocVersionConfig.Print_AlwaysViewPDFAfterCreate; + // don't open all PDFs if doing All Procedures + //cbxOpenAfterCreate2.Checked = dvi.DocVersionConfig.Print_AlwaysViewPDFAfterCreate; } private void PrepForAllOrOne(bool oneProcedure) { diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs index 531727e4..a2269ee4 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs @@ -801,7 +801,7 @@ namespace VEPROMS.CSLA.Library { rochild? child = GetRoChildByAccPagID(accPageID, spDefault, igDefault); if (child == null) return null; - if(((rochild)child).children.Length > 0) + if (((rochild)child).children != null && ((rochild)child).children.Length > 0) return ((rochild)child).children[0].value; string val = ((rochild)child).value; if (val != null) return val; @@ -811,7 +811,7 @@ namespace VEPROMS.CSLA.Library { rochild? child = GetRoChildByAccPagID(accPageID, spDefault, igDefault); if (child == null) return null; - if (((rochild)child).children.Length > 0) + if (((rochild)child).children != null && ((rochild)child).children.Length > 0) return ((rochild)child).children[0].type; return ((rochild)child).type; return null; @@ -820,7 +820,7 @@ namespace VEPROMS.CSLA.Library { rochild? child = GetRoChildByAccPagID(accPageID, spDefault, igDefault); if (child == null) return null; - if (((rochild)child).children.Length > 0) + if (((rochild)child).children != null && ((rochild)child).children.Length > 0) return ((rochild)child).children[0].roid; return ((rochild)child).roid; return null;