From c88caefe5d6e7500dd4c97bfff9c83ced10a85aa Mon Sep 17 00:00:00 2001 From: John Jenko Date: Tue, 7 May 2024 14:32:57 -0400 Subject: [PATCH 1/3] B2024-029 A newer version of Component One Flex Grid caused issues when creating a new table in PROMS. We are reverting back to the prior version of Flex Grid. --- PROMS/VEPROMS User Interface/Properties/licenses.licx | 2 ++ PROMS/VEPROMS User Interface/VEPROMS.gclicx | 1 + PROMS/VEPROMS User Interface/VEPROMS_UI.csproj | 7 +------ .../Volian.Controls.Library/Properties/licenses.licx | 2 ++ .../Volian.Controls.Library.csproj | 11 ++--------- .../Volian.Controls.Library.gclicx | 1 + PROMS/Volian.Print.Library/Properties/licenses.licx | 2 ++ .../Volian.Print.Library/Volian.Print.Library.csproj | 7 +------ .../Volian.Print.Library/Volian.Print.Library.gclicx | 1 + 9 files changed, 13 insertions(+), 21 deletions(-) diff --git a/PROMS/VEPROMS User Interface/Properties/licenses.licx b/PROMS/VEPROMS User Interface/Properties/licenses.licx index e69de29b..7606ef69 100644 --- a/PROMS/VEPROMS User Interface/Properties/licenses.licx +++ b/PROMS/VEPROMS User Interface/Properties/licenses.licx @@ -0,0 +1,2 @@ +C1.Win.C1FlexGrid.C1FlexGrid, C1.Win.C1FlexGrid.2 +C1.Win.C1SpellChecker.C1SpellChecker, C1.Win.C1SpellChecker.2 diff --git a/PROMS/VEPROMS User Interface/VEPROMS.gclicx b/PROMS/VEPROMS User Interface/VEPROMS.gclicx index 4d76eff6..23b01fa4 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS.gclicx +++ b/PROMS/VEPROMS User Interface/VEPROMS.gclicx @@ -1 +1,2 @@ da3d5d14-691f-4908-aa3c-fd3239734232;-8584908724854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MjQyNzYxODZYWFhYWFhYWDAzNg,Sk9ITi1XSU4xMA,RmFsc2U,ODg0Mw,RmFsc2U,MA,MA,djIwMjQuMQ,,;PxeAWRi6mhDqvUMfJhk9Tniu/8ZnOLQv64hLh05xWM+MPyBs3yYfs3vEn5TLW779QNr1k8F6tV3gOAoLG+JSPZoG3NXmdTe6LJya05W+zWyb0H+jj2ReXN2dNR9fbZNDd3ClAeuzNpsM0pw62aYpOe2Tp6fx9gOFx1/0g8g4/8g +da3d5d14-691f-4908-aa3c-fd3239734232;-8584865524854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,NjE5MDczODdYWFhYWFhYWDA1Mw,Q0hSSVM,RmFsc2U,ODg5NA,RmFsc2U,MA,MA,djIwMjQuMQ,,;luo/kWHt4XRAYR+3s8m8QoRagBcvXLv0mHvCYU2VCIeACFord4tdtTGmSUvmGhEmUiAd7YvaTlDlFrlni6CWaVlxa1mdbWuWsNVUkRnyJZ8kOAt1A+3SGfHecCsqotTW7apXjwW5qXLZ/fcgutioe7xaXgniFQysshTdUWt26T8 diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj index 11057df4..64d6b612 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj +++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj @@ -99,12 +99,7 @@ false - - ..\VEPROMS\packages\C1.Win.8.0.20233.631\lib\net48\C1.Win.4.8.dll - - - ..\VEPROMS\packages\C1.Win.C1FlexGrid.4.8.20233.631\lib\net48\C1.Win.C1FlexGrid.4.8.dll - + ..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll diff --git a/PROMS/Volian.Controls.Library/Properties/licenses.licx b/PROMS/Volian.Controls.Library/Properties/licenses.licx index e69de29b..7606ef69 100644 --- a/PROMS/Volian.Controls.Library/Properties/licenses.licx +++ b/PROMS/Volian.Controls.Library/Properties/licenses.licx @@ -0,0 +1,2 @@ +C1.Win.C1FlexGrid.C1FlexGrid, C1.Win.C1FlexGrid.2 +C1.Win.C1SpellChecker.C1SpellChecker, C1.Win.C1SpellChecker.2 diff --git a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj index 62f3cbe6..8a80731b 100644 --- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj +++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj @@ -87,15 +87,8 @@ False ..\..\..\..\3rdPartyLibraries\Edraw\AxInterop.EDWordLib.dll - - ..\VEPROMS\packages\C1.Win.8.0.20233.631\lib\net48\C1.Win.4.8.dll - - - ..\VEPROMS\packages\C1.Win.C1FlexGrid.4.8.20233.631\lib\net48\C1.Win.C1FlexGrid.4.8.dll - - - ..\VEPROMS\packages\C1.Win.C1SpellChecker.4.8.20233.631\lib\net48\C1.Win.C1SpellChecker.4.8.dll - + + ..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll diff --git a/PROMS/Volian.Controls.Library/Volian.Controls.Library.gclicx b/PROMS/Volian.Controls.Library/Volian.Controls.Library.gclicx index e2beeb1e..2eb2425c 100644 --- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.gclicx +++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.gclicx @@ -1 +1,2 @@ da3d5d14-691f-4908-aa3c-fd3239734232;-8584914772854775808;Vm9saWFuLkNvbnRyb2xzLkxpYnJhcnkuZGxs;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MDEwODE5MjdYWFhYWFhYWDA1Mg,Sk9ITi1XSU4xMA,RmFsc2U,ODQzNA,RmFsc2U,MA,MA,djIwMjIuMw,,;c7VmK7aSALscK1Nd/lI1cS3mms+p4j4Fsa2LgKQ1JmeSkNKq5X8LWx2NLOHITkvv+3IbbTQcVPnGa7hKiEDHlfH3thfwEvtzoqprZSXMOYfNPiXTPIIYPNb6L31Qq7AGiogvw+dMD9o/AiUWt4Q7a5SRmYU+PbrlNAXVISIzndw +da3d5d14-691f-4908-aa3c-fd3239734232;-8584865524854775808;Vm9saWFuLkNvbnRyb2xzLkxpYnJhcnkuZGxs;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,NjE5MDczODdYWFhYWFhYWDA1Mw,Q0hSSVM,RmFsc2U,ODg5NA,RmFsc2U,MA,MA,djIwMjQuMQ,,;luo/kWHt4XRAYR+3s8m8QoRagBcvXLv0mHvCYU2VCIeACFord4tdtTGmSUvmGhEmUiAd7YvaTlDlFrlni6CWaVlxa1mdbWuWsNVUkRnyJZ8kOAt1A+3SGfHecCsqotTW7apXjwW5qXLZ/fcgutioe7xaXgniFQysshTdUWt26T8 diff --git a/PROMS/Volian.Print.Library/Properties/licenses.licx b/PROMS/Volian.Print.Library/Properties/licenses.licx index e69de29b..7606ef69 100644 --- a/PROMS/Volian.Print.Library/Properties/licenses.licx +++ b/PROMS/Volian.Print.Library/Properties/licenses.licx @@ -0,0 +1,2 @@ +C1.Win.C1FlexGrid.C1FlexGrid, C1.Win.C1FlexGrid.2 +C1.Win.C1SpellChecker.C1SpellChecker, C1.Win.C1SpellChecker.2 diff --git a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj index 2bda4ef7..0eefd34f 100644 --- a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj +++ b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj @@ -65,12 +65,7 @@ false - - ..\VEPROMS\packages\C1.Win.8.0.20233.631\lib\net48\C1.Win.4.8.dll - - - ..\VEPROMS\packages\C1.Win.C1FlexGrid.4.8.20233.631\lib\net48\C1.Win.C1FlexGrid.4.8.dll - + ..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll diff --git a/PROMS/Volian.Print.Library/Volian.Print.Library.gclicx b/PROMS/Volian.Print.Library/Volian.Print.Library.gclicx index 6162fdb0..5c0be60b 100644 --- a/PROMS/Volian.Print.Library/Volian.Print.Library.gclicx +++ b/PROMS/Volian.Print.Library/Volian.Print.Library.gclicx @@ -1 +1,2 @@ da3d5d14-691f-4908-aa3c-fd3239734232;-8584914772854775808;Vm9saWFuLlByaW50LkxpYnJhcnkuZGxs;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MDEwODE5MjdYWFhYWFhYWDA1Mg,Sk9ITi1XSU4xMA,RmFsc2U,ODQzNA,RmFsc2U,MA,MA,djIwMjIuMw,,;c7VmK7aSALscK1Nd/lI1cS3mms+p4j4Fsa2LgKQ1JmeSkNKq5X8LWx2NLOHITkvv+3IbbTQcVPnGa7hKiEDHlfH3thfwEvtzoqprZSXMOYfNPiXTPIIYPNb6L31Qq7AGiogvw+dMD9o/AiUWt4Q7a5SRmYU+PbrlNAXVISIzndw +da3d5d14-691f-4908-aa3c-fd3239734232;-8584865524854775808;Vm9saWFuLlByaW50LkxpYnJhcnkuZGxs;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,NjE5MDczODdYWFhYWFhYWDA1Mw,Q0hSSVM,RmFsc2U,ODg5NA,RmFsc2U,MA,MA,djIwMjQuMQ,,;luo/kWHt4XRAYR+3s8m8QoRagBcvXLv0mHvCYU2VCIeACFord4tdtTGmSUvmGhEmUiAd7YvaTlDlFrlni6CWaVlxa1mdbWuWsNVUkRnyJZ8kOAt1A+3SGfHecCsqotTW7apXjwW5qXLZ/fcgutioe7xaXgniFQysshTdUWt26T8 -- 2.47.2 From 10c25dbe448a7e60635d2a382cfbc6db2a7a6d5f Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 8 May 2024 09:00:58 -0400 Subject: [PATCH 2/3] C2024-007 When link information is created in a PDF during print, the link information includes the PDF file name of where the link is referencing. Logic was added to include any file prefix or suffix to the PDF file name that is saved in the link information so the Adobe can locate the file and open it when the use clicks on the link in the PDF. --- PROMS/Volian.Print.Library/Rtf2iTextSharp.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PROMS/Volian.Print.Library/Rtf2iTextSharp.cs b/PROMS/Volian.Print.Library/Rtf2iTextSharp.cs index 3c1d2a18..3b46a8c3 100644 --- a/PROMS/Volian.Print.Library/Rtf2iTextSharp.cs +++ b/PROMS/Volian.Print.Library/Rtf2iTextSharp.cs @@ -396,7 +396,10 @@ namespace Volian.Print.Library } else if (_Ti != null && !from.IsInSupInfo) // Remote Go To. Added SupInfo check for B2020 bugs (see above) { - chk.SetRemoteGoto(_Ti.MyItemToID.MyProcedure.DisplayNumber.Replace("/", "_") + ".pdf", string.Format("ItemID={0}", tiDefault.ItemID)); + // C2024-009 add PDF file prefix and suffix if available to the PDF file name in the transition reference. + DocVersionConfig dvc = _Ti.MyItemToID.MyProcedure.MyDocVersion.DocVersionConfig; + string remotePDFName = dvc.Print_PDFFilePrefix + _Ti.MyItemToID.MyProcedure.DisplayNumber.Replace("/", "_") + dvc.Print_PDFFileSuffix + ".pdf"; + chk.SetRemoteGoto(remotePDFName, string.Format("ItemID={0}", tiDefault.ItemID)); chk.SetBackground(new Color(System.Drawing.Color.PeachPuff)); } } -- 2.47.2 From 5edaf3060150a44946579b25c78b0d35ab898680 Mon Sep 17 00:00:00 2001 From: Kathy Ruffing Date: Wed, 8 May 2024 12:07:11 -0400 Subject: [PATCH 3/3] B2024-026: page number transitions duplicate page number --- PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index f8f12d94..15a2d82c 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -1229,7 +1229,8 @@ namespace VEPROMS.CSLA.Library default: //F2024-048 use a hard space (\\u160;) instead of a space in the page number text // to keep that text together on the page - tb.Append(string.Format(" (Page{0}{1})", "\\u160;", tb._ToItem.PageNumber + 1)); + //B2024-026: hard space unicode ends with '?' not ';' + tb.Append(string.Format(" (Page{0}{1})", "\\u160?", tb._ToItem.PageNumber + 1)); break; } } -- 2.47.2