F2025-004 Customer requested the addition of a Two Column Attachment section type

good for testing phase

PROMS/Formats/frmFormatCopy.Designer.cs

@@ -33,6 +33,8 @@ namespace Formats
 			this.btnCopyFormats = new DevComponents.DotNetBar.ButtonX();
 			this.btnBrowse = new DevComponents.DotNetBar.ButtonX();
 			this.buttonX2 = new DevComponents.DotNetBar.ButtonX();
+			this.labelX2 = new DevComponents.DotNetBar.LabelX();
+			this.LstBxExcludeFiles = new DevComponents.DotNetBar.ListBoxAdv();
 			this.SuspendLayout();
 			// 
 			// txbxPROMSFormatsPath
@@ -64,7 +66,7 @@ namespace Formats
 			// 
 			this.btnCopyFormats.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.btnCopyFormats.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnCopyFormats.Location = new System.Drawing.Point(152, 68);
+			this.btnCopyFormats.Location = new System.Drawing.Point(232, 156);
 			this.btnCopyFormats.Name = "btnCopyFormats";
 			this.btnCopyFormats.Size = new System.Drawing.Size(84, 27);
 			this.btnCopyFormats.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -88,7 +90,7 @@ namespace Formats
 			// 
 			this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.buttonX2.Location = new System.Drawing.Point(329, 68);
+			this.buttonX2.Location = new System.Drawing.Point(409, 156);
 			this.buttonX2.Name = "buttonX2";
 			this.buttonX2.Size = new System.Drawing.Size(75, 23);
 			this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -96,17 +98,52 @@ namespace Formats
 			this.buttonX2.Text = "Exit";
 			this.buttonX2.Click += new System.EventHandler(this.buttonX2_Click);
 			// 
-			// Form1
+			// labelX2
+			// 
+			// 
+			// 
+			// 
+			this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.labelX2.Location = new System.Drawing.Point(12, 41);
+			this.labelX2.Name = "labelX2";
+			this.labelX2.Size = new System.Drawing.Size(200, 23);
+			this.labelX2.TabIndex = 5;
+			this.labelX2.Text = "Excluding Format Files that Start with:";
+			// 
+			// LstBxExcludeFiles
+			// 
+			this.LstBxExcludeFiles.AutoScroll = true;
+			// 
+			// 
+			// 
+			this.LstBxExcludeFiles.BackgroundStyle.Class = "ListBoxAdv";
+			this.LstBxExcludeFiles.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.LstBxExcludeFiles.CausesValidation = false;
+			this.LstBxExcludeFiles.CheckStateMember = null;
+			this.LstBxExcludeFiles.ContainerControlProcessDialogKey = true;
+			this.LstBxExcludeFiles.DragDropSupport = true;
+			this.LstBxExcludeFiles.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.LstBxExcludeFiles.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+			this.LstBxExcludeFiles.Location = new System.Drawing.Point(57, 70);
+			this.LstBxExcludeFiles.Name = "LstBxExcludeFiles";
+			this.LstBxExcludeFiles.ShowToolTips = false;
+			this.LstBxExcludeFiles.Size = new System.Drawing.Size(134, 76);
+			this.LstBxExcludeFiles.TabIndex = 6;
+			this.LstBxExcludeFiles.Text = "listBoxAdv1";
+			// 
+			// frmFormatCopy
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(496, 107);
+			this.ClientSize = new System.Drawing.Size(496, 191);
+			this.Controls.Add(this.LstBxExcludeFiles);
+			this.Controls.Add(this.labelX2);
 			this.Controls.Add(this.buttonX2);
 			this.Controls.Add(this.btnBrowse);
 			this.Controls.Add(this.btnCopyFormats);
 			this.Controls.Add(this.labelX1);
 			this.Controls.Add(this.txbxPROMSFormatsPath);
-			this.Name = "Form1";
+			this.Name = "frmFormatCopy";
 			this.Text = "Form1";
 			this.ResumeLayout(false);
 
@@ -119,6 +156,8 @@ namespace Formats
 		private DevComponents.DotNetBar.ButtonX btnCopyFormats;
 		private DevComponents.DotNetBar.ButtonX btnBrowse;
 		private DevComponents.DotNetBar.ButtonX buttonX2;
+		private DevComponents.DotNetBar.LabelX labelX2;
+		private DevComponents.DotNetBar.ListBoxAdv LstBxExcludeFiles;
 	}
 }
 

PROMS/Formats/frmFormatCopy.cs

@@ -14,7 +14,11 @@ namespace Formats
 		public frmFormatCopy()
 		{
 			InitializeComponent();
-			SetDefaults();
+			foreach (string excludeThis in excludeThese)
+			{
+				LstBxExcludeFiles.Items.Add(excludeThis);
+			}
+				SetDefaults();
 		}
 
 		private void SetDefaults()
@@ -92,10 +96,11 @@ namespace Formats
 			if (!txbxPROMSFormatsPath.Text.EndsWith(@"\")) txbxPROMSFormatsPath.Text += @"\";
 		}
 
+		public string[] excludeThese = { "WPS", "WPB", "VCBEPP" };
+
 		private bool ExcludeFromCopy(string fn)
 		{
 			// don't copy formats whos file name starts with..
-			string[] excludeThese = { "WPS", "WEP", "WPB", "VCBEPP" };
 			foreach (string excludeThis in excludeThese)
 				if (fn.ToUpper().StartsWith(excludeThis)) return true;
 			return false;

PROMS/Formats/frmFormatCopy.resx

@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>

PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs

@@ -805,7 +805,21 @@ namespace VEPROMS.CSLA.Library
 							}
  						}
 					}
-
+					// B2025-020 Null Reference fix. Added check for valid index into the TransitionTypeList
+					if (!forceConvertToText)
+					{
+						if (traninfo.TranType >= itemInfo.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList.Count)
+						{
+							forceConvertToText = true;
+							TranFixCount++;
+							itemInfo.MyContent.FixTransitionText(traninfo, itemInfo, "Reason for Change: Transition type is not available");
+							using (Content content = Content.Get(itemInfo.MyContent.ContentID)) 
+							{
+								content.FixTransitionText(traninfo, true);
+								content.Save();
+							}
+						}
+					}
 					if (!forceConvertToText)
 					{
 						if (itemInfo.MyProcedure.ItemID != traninfo.MyItemToID.MyProcedure.ItemID)  //different proc

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -983,19 +983,22 @@ namespace Volian.Controls.Library
 									SectionInfo si2 = (tn as VETreeNode).VEObject as SectionInfo;
 									if (si2.MyDocVersion.MultiUnitCount > 1)
 									{
-										MenuItem mps = new MenuItem("Print Section");
-										int k = 0;
-										foreach (string s in si2.MyDocVersion.UnitNames)
+										if (!si2.IsSubsection)
 										{
-											k++;
-											MenuItem mp = mps.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
-											mp.Tag = k;
+											MenuItem mps = new MenuItem("Print Section");
+											int k = 0;
+											foreach (string s in si2.MyDocVersion.UnitNames)
+											{
+												k++;
+												MenuItem mp = mps.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
+												mp.Tag = k;
+											}
+											cm.MenuItems.Add(mps);
 										}
-										cm.MenuItems.Add(mps);
 									}
 									else
 									{
-										cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
+										if(!si2.IsSubsection) cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
 									}
 								}
 							}