From a5ca7187c7dc66b02b5eda65bf94c5c32f8220d2 Mon Sep 17 00:00:00 2001 From: Kathy Ruffing Date: Thu, 19 Oct 2023 09:14:09 -0400 Subject: [PATCH 1/5] B2023-103: Improve User Interface for Incoming Transitions --- .../DisplaySearch.Designer.cs | 14 ----------- .../Volian.Controls.Library/DisplaySearch.cs | 23 ++++++++++++++++--- PROMS/Volian.Controls.Library/vlnTreeView.cs | 7 +++++- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index 19776863..3d4532d4 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -1094,20 +1094,6 @@ namespace Volian.Controls.Library // cbxSrchTypeUsage // this.cbxSrchTypeUsage.BackColor = System.Drawing.Color.Transparent; - // - this.btnTranCvtAllToTxt.Enabled = false; - this.btnTranCvtAllToTxt.Location = new System.Drawing.Point(6, 63); - this.btnTranCvtAllToTxt.Name = "btnTranCvtAllToTxt"; - this.btnTranCvtAllToTxt.Size = new System.Drawing.Size(109, 22); - this.superTooltip1.SetSuperTooltip(this.btnTranCvtAllToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert All Incoming Transitions To Text", "", "Converts all of the transitions in the results list to text unless the user does " + - "not have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90))); - this.btnTranCvtAllToTxt.TabIndex = 1; - this.btnTranCvtAllToTxt.Text = "Convert All To Text"; - this.btnTranCvtAllToTxt.UseVisualStyleBackColor = true; - this.btnTranCvtAllToTxt.Click += new System.EventHandler(this.btnTranCvtAllToTxt_Click); - // - // lblSrchIncTran - // this.cbxSrchTypeUsage.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbxSrchTypeUsage.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.cbxSrchTypeUsage.Dock = System.Windows.Forms.DockStyle.Bottom; diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index b41df472..10ab6520 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -628,6 +628,11 @@ namespace Volian.Controls.Library AddMessageForEmptyAnnotations(); cmbResultsStyle.SelectedIndex = 1; //display step locations in results DisplayResults(); + //If any transitions are listed after the Convert, Admin Tools/Links/Refresh Transitions can be used to fix incorrect links. This will eliminate any in the list. + // B2023-103 if any items are left in search list, there may be bad transition link data - put out a message box + if (fromTranCvtBtn) + FlexibleMessageBox.Show(this, "If items remain in the list after performing Convert All to Text, running Admin Tools/Links/Refresh Transitions will clear the list.", + "Convert Transitions to Text", MessageBoxButtons.OK); } else { @@ -1178,8 +1183,11 @@ namespace Volian.Controls.Library } else { - DialogResult ans = FlexibleMessageBox.Show("Are you sure you want to convert the transitions to text?", - "Convert Transition to Text", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + // B2023-103 add spinner (WaitCursor) and also, change FlexibleMessageBox to regular MessageBox since restore of cursor to + // wait cursor did not work after FlexibleMessageBox + Cursor savcursor = Cursor; + DialogResult ans = MessageBox.Show(this, "Are you sure you want to convert the transitions to text?", "Convert Transitions to Text", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + this.Cursor = savcursor; if (ans == DialogResult.No) return null; } @@ -1254,6 +1262,8 @@ namespace Volian.Controls.Library // C2020-033: For items in list, do the actual conversion of the Incoming Transition to text private void TranCvtToTxt(List itmsEditable) { + // B2023-103 Add wait cursor (and remove at end) + this.Cursor = Cursors.WaitCursor; ItemInfo trII = SearchIncTransII; if (trII != null) @@ -1301,6 +1311,7 @@ namespace Volian.Controls.Library } } + this.Cursor = Cursors.Default; } #region (ProgressBar) @@ -3322,9 +3333,15 @@ namespace Volian.Controls.Library // C2020-033: Convert All (that have permissions) Incoming Transitions to text private void btnTranCvtAllToTxt_Click(object sender, EventArgs e) { + Cursor = Cursors.WaitCursor; List itmsEditable = TranCvtCheckPermission(true); // Get list based on permissions - if (itmsEditable == null || itmsEditable.Count == 0) return; + if (itmsEditable == null || itmsEditable.Count == 0) + { + Cursor = Cursors.Default; + return; + } TranCvtToTxt(itmsEditable); + Cursor = Cursors.Default; fromTranCvtBtn = true; UpdateSearchIncTransResults(); // B2021-009: Research after convert transitions to text fromTranCvtBtn = false; diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 2dc17685..9e8ce687 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -1942,7 +1942,12 @@ namespace Volian.Controls.Library case "Incoming Transitions": // C2020-033: Support the menu item to bring up Search/Incoming Transitions panel VETreeNode tnx = SelectedNode as VETreeNode; ItemInfo iii = tnx.VEObject as ItemInfo; - if (iii != null) OnSearchIncTransIn(this, new vlnTreeItemInfoEventArgs(iii)); + if (iii != null) + { + this.Cursor = Cursors.WaitCursor; // B2023-103 add spinner when searching for incoming transitions + OnSearchIncTransIn(this, new vlnTreeItemInfoEventArgs(iii)); + this.Cursor = Cursors.Default; + } break; case "Properties..."://Show the properties for the selected node SetLastValues((VETreeNode)SelectedNode); -- 2.47.2 From 8233f1531533df5c60dfa2287ba8d37a49f313c8 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 25 Oct 2023 09:36:38 -0400 Subject: [PATCH 2/5] F2023-138 For all of the used Barakah formats, set the color of the ECI footer text to Red and changed the font size to 12pt and font style to Bold --- PROMS/Formats/fmtall/BNPP1Newall.xml | Bin 230180 -> 229686 bytes PROMS/Formats/fmtall/BNPP1all.xml | Bin 185700 -> 186820 bytes PROMS/Formats/fmtall/BNPP2all.xml | Bin 197438 -> 199400 bytes PROMS/Formats/fmtall/BNPPalrall.xml | Bin 240026 -> 237928 bytes PROMS/Formats/fmtall/BNPPbckall.xml | Bin 164180 -> 165020 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/BNPP1Newall.xml b/PROMS/Formats/fmtall/BNPP1Newall.xml index a7d1d915c07ad995e0724c1d64edb1631264125d..a2c3ca031105a44e2295bfecc4d17478523888b7 100644 GIT binary patch delta 1288 zcmZ3|#<#7Buc3u;3lqn6MziUGY|N&z3Jf6(sSFhiB@E6C`3yNgT*P3@pu`Xa6iu0) zSkEjvxj}|wx?UqQ$87?~-E9Vi{PMXl!4gz`TcJdXh4;8TolSVfu$lOf1t|o-$cT zlU^)1Z2zFe{DE(Jfeo|5_Hz!*Y0Lu~CJxhq?oj}xYO(2mT$%eA)3V}>(zF{)G1K|3F$qlHaGOaDCTz7` z=O)t@PT~|>FzYhtPS00iR-P^=%&ay2jz6>3_ME3o9TLRpH=Fj9$!U5)Ftf$hKISlX z5;Sdh<6>UGMuLXv2UM8Vw&w{mD{&C1Yx@RS<~1zDDVCf5A&!}4`mD!HLO?G`Y@ejU z+{ZEf$P2W<1%-LU^bePqSf)#9GouE)*>(qg<_~ iVBW51$2^spIOl-ERc@*Xv)FVV7v{e0b6l8b*#H0|fzb#6 diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml index 61b94b588d5476118167534219665f638c432d25..bfecc9ad7e5e82d7a6d8c77ae2afbfd864fe3823 100644 GIT binary patch delta 947 zcmaE|iu=fB?uHh|Elhtrrw7etGLu(e2w_NNs9-2zaAwG7$N}Oa23rOth9ID53WL(* zi7L|5&9a$frUxZ6rA+TDU`k=Mm~L3ZWG+j*K9}uNyqR`!($7MN=`zhsPSd}wV$#~~ z7tS~RPYZh{GwtAD eG$l3Nr%Zo02bgI-6_A+Ez{yu``?tAFdFB8Bb?Yqv delta 440 zcmX@Infu8q?uHh|Elhtr8O^5$x-gkee~`hXHeH~KDQxs(rYE=n#b6S8 z+ZBA6c5xD|UTb>7bS8=E4{DgSw%bH79grYPXIwFp7dweMw*&3G!A7d453Nis93*Oj v`0m;SrYsiXb#4cS%MOm|i~N|(;DH-9U0@+F)aB-*hdLw_w+Ad@DlrEDo+g%% diff --git a/PROMS/Formats/fmtall/BNPP2all.xml b/PROMS/Formats/fmtall/BNPP2all.xml index ef7863640a8498b97b1716395a49203b1c93bac6..a7107dd67adcb80e1ef5782caa7240feec4ba437 100644 GIT binary patch delta 1814 zcmdnj#`9t-PeTji7A6Co=}87mX0i$lAq=Su6$~W|&J6hsIY3;*V9TJy5CjxWnOrC$ zJ)I?tNn-K>X13`{VN5C0(wI1=_bp(GVYHZjP?gDCniSm*(+d_dIZdB&lqqR@h8|M| z+kiPiA%jU|`zbS~GR}c@f|e6g*T6a9-8Cky=__t9@l9`7#q@9c0Y9cL@qr4D?Z7CR zFknHky{(w(2>ZbKy_RVU$AH^Z~KhVLPx8{4{Vy s--n+}R?~O=X5!lp%=9b+m*%53GjR-5ewUjrvXAK%WBT^L`awO+Vnk6gEA;i794!Lpqbd^b4v$F|b5~ z7L(TY06iudcH-4f2da0P{^0^s(RK$5CJ9b5bee2`=ggEvs?P1Z{Fx3&kYSz3_77Q1 zH6&Yiu8ipjIpHEQ9cZ1{cDY8TE)Ei1yPd0tDT{?PO$yWP<}#^F&-=>cv0Y&@(*xq2 zEHqt#gNbE3&s-)CQXM+|#9t}JX$(amzx_Z($j$%JdE0Ols2&RG8gB z4p5uErjJ=YIO=@zWI7+qyqr^dQ`vp1XWz2N99F!i~ruzU(w(T#R Sm}>+E&>1q@kHj-y^8^5nai6XL delta 750 zcmaEHh;P4Mg(MN`X6<0|VIiz;S{bv*^amA8D%%_OGnI%D*04S722%rY~?{)|!5yi&<^^tJh2p2pxLU3xb)WrWf2};(&(|C8z?brfFw<} zCwya?#xXsFpIHD^2B9rt`T;he4^j0^2kP^f9?;L6Ha#GhiDmmeMrILq@{Dnt4vY|y z>DMMR+igF<&0Hi64;dod4{`_8fO`(iI@{lAGVc;#Rb<_tX0i$lAq=Su6$~W|&J6hsIY3;*V9TJy5CjxWnSSvC zqx$p-_Dn+47nw7qO#k4^l)`8+y)cT&loX8)+a0u-zDUr~!s$Q@owjqiG1;)w-BuZY nrZ_s6+DxX?9GKLm3pg|RP2b?klrnvt6O+Jn0c|EVn7G#T z2X0JG+xc{uHc1exWjjzy9XqkAAr>46V2UGFi^g`FD5ghjq*>6A%yfWgE!z`vm~12f Dy}wiR -- 2.47.2 From 30330c175ec58a3ba10c127605613e1ba907b75b Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 25 Oct 2023 13:45:37 -0400 Subject: [PATCH 3/5] F2023-138 continuation - missed a spot in the Alarm format --- PROMS/Formats/fmtall/BNPPalrall.xml | Bin 237928 -> 238092 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml index d2bc0874941bfc44ce3036118313128ac564f26c..932a023d737308f921ac5f79c831bddf46980c2a 100644 GIT binary patch delta 44 zcmV+{0Mq~I!VZkY4uFIKv;v@ym%s@FHn;F518@SD5ZD4nm#$m`IENsT0=FQN14s{? CT@ZZ$ delta 71 zcmeAxHNEa3liYNH SxlAhUJ(HNW_e^4L;0FNdUK*qT -- 2.47.2 From 7834cf634f1b65c664db126204a4a55bc93590d6 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 25 Oct 2023 16:32:01 -0400 Subject: [PATCH 4/5] =?UTF-8?q?F2023-139=20Replaced=20hardcoded=20?= =?UTF-8?q?=E2=80=9CStep=20Description=20Table=E2=80=9D=20the=20section=20?= =?UTF-8?q?title=20and=20removed=20the=20section=20number=20that=20was=20p?= =?UTF-8?q?receding=20the=20step=20numbers=20in=20the=20background=20docum?= =?UTF-8?q?ent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/BNPPbckall.xml | Bin 165020 -> 164816 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/BNPPbckall.xml b/PROMS/Formats/fmtall/BNPPbckall.xml index 9d714928ad5df8c9686971229bb440641a0d17be..614869928b5e316513132e5a85134fdacbba42e5 100644 GIT binary patch delta 159 zcmbQ!$#tQft6>Xc*MjLRYZ;}c-&(>bGM#BHqs;VEYZ=dMf3T2|g&QQ3u)Sq1qYn#+ zDKnjC6QdoRrLuk1CdM^IlGO~s46Y2$3?U4j4E_v$3_d_!7!dnRUl_|Iy?ufzQ-wYO WMbm+ba<&IJG4-)*w~1m(&;kH&xGx$2 delta 372 zcmcc6&NZi#t6>Xc*8SK=BX;M+PSb9|qU$yH%Ll^-0k&9jK#v`UOoU Sw(S!fnL1du7eq28XaN8%hFOyU -- 2.47.2 From 128b5d81cc585c76de8adfe480dae7127daedeac Mon Sep 17 00:00:00 2001 From: Kathy Ruffing Date: Wed, 1 Nov 2023 08:00:05 -0400 Subject: [PATCH 5/5] B2023-108: Crash during import of procedure set --- PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs index e5b7f956..f19d491a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs @@ -613,7 +613,8 @@ namespace VEPROMS.CSLA.Library return retval; } string newvalue = value; - newvalue = newvalue.Replace("{", @"\{").Replace("}", @"\}"); + // B2023-108: Added check for null reference + if (newvalue != null) newvalue = newvalue.Replace("{", @"\{").Replace("}", @"\}"); string findLink = @""; MatchCollection ms = Regex.Matches(Text, findLink); //string lookFor = string.Format(@"", rousg.ROUsageID); -- 2.47.2