diff --git a/PROMS/Formats/fmtall/BNPP1Newall.xml b/PROMS/Formats/fmtall/BNPP1Newall.xml
index 1e86a983..468b33e0 100644
Binary files a/PROMS/Formats/fmtall/BNPP1Newall.xml and b/PROMS/Formats/fmtall/BNPP1Newall.xml differ
diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml
index 48fa3d86..cb366256 100644
Binary files a/PROMS/Formats/fmtall/BNPP1all.xml and b/PROMS/Formats/fmtall/BNPP1all.xml differ
diff --git a/PROMS/Formats/fmtall/BNPP2all.xml b/PROMS/Formats/fmtall/BNPP2all.xml
index 5c07739b..047aca34 100644
Binary files a/PROMS/Formats/fmtall/BNPP2all.xml and b/PROMS/Formats/fmtall/BNPP2all.xml differ
diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml
index 932a023d..d785ad41 100644
Binary files a/PROMS/Formats/fmtall/BNPPalrall.xml and b/PROMS/Formats/fmtall/BNPPalrall.xml differ
diff --git a/PROMS/Formats/fmtall/BNPPbckall.xml b/PROMS/Formats/fmtall/BNPPbckall.xml
index 658518a2..15195ae0 100644
Binary files a/PROMS/Formats/fmtall/BNPPbckall.xml and b/PROMS/Formats/fmtall/BNPPbckall.xml differ
diff --git a/PROMS/Formats/fmtall/BNPPsamall.xml b/PROMS/Formats/fmtall/BNPPsamall.xml
index c67c9c8d..1e3215b3 100644
Binary files a/PROMS/Formats/fmtall/BNPPsamall.xml and b/PROMS/Formats/fmtall/BNPPsamall.xml differ
diff --git a/PROMS/Formats/fmtall/CPLAall.xml b/PROMS/Formats/fmtall/CPLAall.xml
index 60326212..2040ee28 100644
Binary files a/PROMS/Formats/fmtall/CPLAall.xml and b/PROMS/Formats/fmtall/CPLAall.xml differ
diff --git a/PROMS/Formats/fmtall/CPLall.xml b/PROMS/Formats/fmtall/CPLall.xml
index c0b73adf..8b7eebbf 100644
Binary files a/PROMS/Formats/fmtall/CPLall.xml and b/PROMS/Formats/fmtall/CPLall.xml differ
diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml
index d28cf81a..e5b18008 100644
Binary files a/PROMS/Formats/fmtall/VEGP1all.xml and b/PROMS/Formats/fmtall/VEGP1all.xml differ
diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml
index cfe8ce09..da5cca77 100644
Binary files a/PROMS/Formats/fmtall/VEGP2all.xml and b/PROMS/Formats/fmtall/VEGP2all.xml differ
diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql
index b85e31f3..d8640387 100644
--- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql
+++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql
@@ -22148,8 +22148,84 @@ AS
[Folders].[FormatID]=@FormatID
RETURN
+ GO
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListUnlinkedItems]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+ DROP PROCEDURE [vesp_ListUnlinkedItems];
+GO
+
+ /*****************************************************************************
+ Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+ Copyright 2024 - Volian Enterprises, Inc. All rights reserved.
+ *****************************************************************************/
+ /*
+ ==========================================================================================================
+ Author: Kathy Ruffing
+ Create Date: 03/27/2024
+ Description: B2024-018: Gets list of procedures/sections/steps for possible enhanced linking
+ ==========================================================================================================
+ */
+Create Procedure[dbo].[vesp_ListUnlinkedItems]
+(
+ @ItemID int,
+ @EnhType int
+)
+WITH EXECUTE AS OWNER
+AS
+BEGIN
+DECLARE @ParItemID int
+ DECLARE @EItemID int
+ set @EItemID = (select top 1 VIS.EItemID from vefn_AllSiblingItems(@ItemID)--Find All Siblings
+ outer apply vefn_GetNewEnhancedData(ItemID,@EnhType) VIS -- That are Linked
+ where EitemID is not null)
+ if @EItemID is null
+ BEGIN
+ select @EItemID = epp.ItemID
+ from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID)))SPP -- FindParent
+ JOIN ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID
+ outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent
+ JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID
+ JOIN PARTS EPP ON EPP.ContentID = EII.ContentID and SPP.FromType = epp.FromType -- Get first Child
+ END
+ if @EItemID is null -- B2024-018: If not found at the current level, check at the parent level
+ BEGIN
+
+ select @ParItemID = dbo.ve_getparentitem(@ItemID)
+ select @EItemID = epp.ItemID
+ from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ParItemID)))SPP -- FindParent
+ JOIN ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID
+ outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent
+ JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID
+ JOIN PARTS EPP ON EPP.ContentID = EII.ContentID --and SPP.FromType = epp.FromType (had to remove types may be proc/sect)
+
+ END
+ if @EItemID is null
+ BEGIN
+ select @EItemID = DV2.ItemID from (select *,cast(config as xml) xconfig from DocVersions
+ where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID))) SDV -- Source DocVersion
+ cross apply (select * from vefn_GetEnhancedDocVersions(SDV.VersionID) where @EnhType = Type) EDV -- Enhanced DocVersion
+ Join DocVersions DV2 ON DV2.VersionID = EDV.VersionID -- First Procedure
+ END
+ Select ItemID,PreviousID,II.ContentID,II.[DTS],II.[UserID],II.[LastChanged],
+ (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=[II].[ItemID]) [AnnotationCount],
+ (SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=[II].[ItemID]) [DocVersionCount],
+ (SELECT COUNT(*) FROM [Items] [Children] WHERE [Children].[PreviousID]=[II].[ItemID]) [NextCount],
+ (SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=[II].[ItemID]) [PartCount],
+ (SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=[II].[ItemID]) [Transition_RangeIDCount],
+ (SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=[II].[ItemID]) [Transition_ToIDCount]
+ from Items II
+ Left Join Entries EE ON II.ContentID = EE.ContentID
+ where ItemID In (select SIB.ItemID from vefn_AllSiblingItems(@EItemID) SIB
+ outer apply vefn_GetNewEnhancedData(ItemID,0) VIE
+ Where VIE.EItemID is null)
+ and EE.ContentID is null
+END
+Go
+
+ IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Succeeded'
+ ELSE PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Error on Creation'
+ GO
-----------------------------------------------------------------------------
/*
---------------------------------------------------------------------------
@@ -22184,8 +22260,8 @@ BEGIN TRY -- Try Block
DECLARE @RevDate varchar(255)
DECLARE @RevDescription varchar(255)
- set @RevDate = '10/03/2023 11:00 AM'
- set @RevDescription = 'C2023-017: Added logic to filter the format list when selecting a format to be applied to a section'
+ set @RevDate = '03/27/2024 11:00 AM'
+ set @RevDescription = 'B2024-018: Enhanced link issue with sub-sections in source but not in enhanced'
Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription
PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription
diff --git a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs
index 74acc049..66391440 100644
--- a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs
+++ b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs
@@ -44,8 +44,9 @@ using System.Runtime.InteropServices;
// Revision DHH (day - no leading zero, two digit hour - military time
//
// ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
-[assembly: AssemblyVersion("2.1.2403.413")]
-[assembly: AssemblyFileVersion("2.1.2403.413")]
+[assembly: AssemblyVersion("2.1.2403.2209")]
+[assembly: AssemblyFileVersion("2.1.2403.2209")]
+
diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs
index 5937d022..67a8a068 100644
--- a/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs
+++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs
@@ -30,8 +30,8 @@ namespace VEPROMS
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmVersionsProperties));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
this.ppBtnCancel = new System.Windows.Forms.Button();
this.ppBtnOK = new System.Windows.Forms.Button();
this.ppBtnDefaultChgBar = new DevComponents.DotNetBar.ButtonX();
@@ -95,17 +95,14 @@ namespace VEPROMS
this.ppLblDefSettingsInfo = new System.Windows.Forms.Label();
this.dlgROFolder = new System.Windows.Forms.FolderBrowserDialog();
this.tcVersions = new DevComponents.DotNetBar.TabControl();
- this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel();
- this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components);
- this.tcpRefereceObjects = new DevComponents.DotNetBar.TabControlPanel();
- this.ppBtnRoToSql = new System.Windows.Forms.Button();
- this.tbRoDb = new System.Windows.Forms.TextBox();
- this.ppBtnRoDbBrowse = new System.Windows.Forms.Button();
- this.btnRoDbProperties = new DevComponents.DotNetBar.ButtonX();
- this.cmbRoDb = new System.Windows.Forms.ComboBox();
- this.ppGpbxUpROvals = new DevComponents.DotNetBar.Controls.GroupPanel();
- this.tiRefObjs = new DevComponents.DotNetBar.TabItem(this.components);
this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel();
+ this.gpxMOSLandLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
+ this.ppCmbxMOSLandcornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
+ this.tbxMOSLandyloc = new DevComponents.DotNetBar.Controls.TextBoxX();
+ this.tbxMOSLandxloc = new DevComponents.DotNetBar.Controls.TextBoxX();
+ this.lblMOSLandcorner = new System.Windows.Forms.Label();
+ this.lblMOSLandyloc = new System.Windows.Forms.Label();
+ this.lblMOSLandxloc = new System.Windows.Forms.Label();
this.ppChbxMOSview = new DevComponents.DotNetBar.Controls.CheckBoxX();
this.gpxMOSLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
this.ppCmbxMOScornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
@@ -124,6 +121,16 @@ namespace VEPROMS
this.ppCmbxMOSformat = new DevComponents.DotNetBar.Controls.ComboBoxEx();
this.lblMOSformat = new System.Windows.Forms.Label();
this.tiMergedOutputSettings = new DevComponents.DotNetBar.TabItem(this.components);
+ this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel();
+ this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components);
+ this.tcpRefereceObjects = new DevComponents.DotNetBar.TabControlPanel();
+ this.ppBtnRoToSql = new System.Windows.Forms.Button();
+ this.tbRoDb = new System.Windows.Forms.TextBox();
+ this.ppBtnRoDbBrowse = new System.Windows.Forms.Button();
+ this.btnRoDbProperties = new DevComponents.DotNetBar.ButtonX();
+ this.cmbRoDb = new System.Windows.Forms.ComboBox();
+ this.ppGpbxUpROvals = new DevComponents.DotNetBar.Controls.GroupPanel();
+ this.tiRefObjs = new DevComponents.DotNetBar.TabItem(this.components);
this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
this.ppChbxEnhancedAllowMods = new System.Windows.Forms.CheckBox();
this.btnUnlinkDocVersion = new System.Windows.Forms.Button();
@@ -210,25 +217,19 @@ namespace VEPROMS
this.ROPrefixBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.PDFLocationBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
this.formatInfoListBindingSource = new System.Windows.Forms.BindingSource(this.components);
- this.gpxMOSLandLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
- this.ppCmbxMOSLandcornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
- this.tbxMOSLandyloc = new DevComponents.DotNetBar.Controls.TextBoxX();
- this.tbxMOSLandxloc = new DevComponents.DotNetBar.Controls.TextBoxX();
- this.lblMOSLandcorner = new System.Windows.Forms.Label();
- this.lblMOSLandyloc = new System.Windows.Forms.Label();
- this.lblMOSLandxloc = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.imageCodecInfoBindingSource)).BeginInit();
this.ppGpbxUserSpecCB.SuspendLayout();
this.ppGpbxUserSpecTxt.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tcVersions)).BeginInit();
this.tcVersions.SuspendLayout();
+ this.tabControlPanel2.SuspendLayout();
+ this.gpxMOSLandLocation.SuspendLayout();
+ this.gpxMOSLocation.SuspendLayout();
+ this.gpxMOSfont.SuspendLayout();
this.tcpGeneral.SuspendLayout();
this.tcpRefereceObjects.SuspendLayout();
this.ppGpbxUpROvals.SuspendLayout();
- this.tabControlPanel2.SuspendLayout();
- this.gpxMOSLocation.SuspendLayout();
- this.gpxMOSfont.SuspendLayout();
this.tabControlPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bsEnhanced)).BeginInit();
@@ -247,7 +248,6 @@ namespace VEPROMS
this.panVerBtns.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).BeginInit();
- this.gpxMOSLandLocation.SuspendLayout();
this.SuspendLayout();
//
// ppBtnCancel
@@ -1102,9 +1102,9 @@ namespace VEPROMS
this.tcVersions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.tcVersions.BackColor = System.Drawing.Color.Transparent;
this.tcVersions.CanReorderTabs = true;
- this.tcVersions.Controls.Add(this.tabControlPanel2);
- this.tcVersions.Controls.Add(this.tcpGeneral);
this.tcVersions.Controls.Add(this.tcpRefereceObjects);
+ this.tcVersions.Controls.Add(this.tcpGeneral);
+ this.tcVersions.Controls.Add(this.tabControlPanel2);
this.tcVersions.Controls.Add(this.tabControlPanel1);
this.tcVersions.Controls.Add(this.tcpApplicability);
this.tcVersions.Controls.Add(this.tabControlPanel5);
@@ -1130,173 +1130,6 @@ namespace VEPROMS
this.tcVersions.TabsVisible = false;
this.tcVersions.Text = "tabControl1";
//
- // tcpGeneral
- //
- this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
- this.tcpGeneral.Controls.Add(this.ppCmbxProcSetType);
- this.tcpGeneral.Controls.Add(this.ppRTxtName);
- this.tcpGeneral.Controls.Add(this.label9);
- this.tcpGeneral.Controls.Add(this.ppRTxtProcSetRev);
- this.tcpGeneral.Controls.Add(this.lblProcSetRev);
- this.tcpGeneral.Controls.Add(this.label4);
- this.tcpGeneral.Controls.Add(this.label3);
- this.tcpGeneral.Controls.Add(this.ppRTxtTitle);
- this.tcpGeneral.Controls.Add(this.ppTxtBxUserID);
- this.tcpGeneral.Controls.Add(this.ppDTPicker);
- this.tcpGeneral.Controls.Add(this.label2);
- this.tcpGeneral.Controls.Add(this.label1);
- this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty;
- this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tcpGeneral.Location = new System.Drawing.Point(0, 22);
- this.tcpGeneral.Margin = new System.Windows.Forms.Padding(2);
- this.tcpGeneral.Name = "tcpGeneral";
- this.tcpGeneral.Padding = new System.Windows.Forms.Padding(2);
- this.tcpGeneral.Size = new System.Drawing.Size(625, 311);
- this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
- this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
- this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
- this.tcpGeneral.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
- this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
- | DevComponents.DotNetBar.eBorderSide.Bottom)));
- this.tcpGeneral.Style.GradientAngle = 90;
- this.tcpGeneral.TabIndex = 1;
- this.tcpGeneral.TabItem = this.tiGeneral;
- //
- // tiGeneral
- //
- this.tiGeneral.AttachedControl = this.tcpGeneral;
- this.tiGeneral.Name = "tiGeneral";
- this.tiGeneral.Text = "General";
- //
- // tcpRefereceObjects
- //
- this.tcpRefereceObjects.Controls.Add(this.ppBtnRoToSql);
- this.tcpRefereceObjects.Controls.Add(this.tbRoDb);
- this.tcpRefereceObjects.Controls.Add(this.ppBtnRoDbBrowse);
- this.tcpRefereceObjects.Controls.Add(this.btnRoDbProperties);
- this.tcpRefereceObjects.Controls.Add(this.cmbRoDb);
- this.tcpRefereceObjects.Controls.Add(this.ppGpbxUpROvals);
- this.tcpRefereceObjects.Controls.Add(this.label6);
- this.tcpRefereceObjects.DisabledBackColor = System.Drawing.Color.Empty;
- this.tcpRefereceObjects.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tcpRefereceObjects.Location = new System.Drawing.Point(0, 22);
- this.tcpRefereceObjects.Margin = new System.Windows.Forms.Padding(2);
- this.tcpRefereceObjects.Name = "tcpRefereceObjects";
- this.tcpRefereceObjects.Padding = new System.Windows.Forms.Padding(2);
- this.tcpRefereceObjects.Size = new System.Drawing.Size(625, 311);
- this.tcpRefereceObjects.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
- this.tcpRefereceObjects.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
- this.tcpRefereceObjects.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
- this.tcpRefereceObjects.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
- this.tcpRefereceObjects.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
- | DevComponents.DotNetBar.eBorderSide.Bottom)));
- this.tcpRefereceObjects.Style.GradientAngle = 90;
- this.tcpRefereceObjects.TabIndex = 2;
- this.tcpRefereceObjects.TabItem = this.tiRefObjs;
- this.tcpRefereceObjects.Enter += new System.EventHandler(this.tabpage_Enter);
- //
- // ppBtnRoToSql
- //
- this.ppBtnRoToSql.Location = new System.Drawing.Point(337, 146);
- this.ppBtnRoToSql.Name = "ppBtnRoToSql";
- this.ppBtnRoToSql.Size = new System.Drawing.Size(163, 46);
- this.ppBtnRoToSql.TabIndex = 48;
- this.ppBtnRoToSql.Text = "Migrate Data to Sql";
- this.ppBtnRoToSql.UseVisualStyleBackColor = true;
- this.ppBtnRoToSql.Visible = false;
- this.ppBtnRoToSql.Click += new System.EventHandler(this.ppBtnRoToSql_Click);
- //
- // tbRoDb
- //
- this.tbRoDb.Enabled = false;
- this.tbRoDb.Location = new System.Drawing.Point(80, 13);
- this.tbRoDb.Margin = new System.Windows.Forms.Padding(2);
- this.tbRoDb.Name = "tbRoDb";
- this.tbRoDb.Size = new System.Drawing.Size(318, 20);
- this.tbRoDb.TabIndex = 20;
- //
- // ppBtnRoDbBrowse
- //
- this.ppBtnRoDbBrowse.Location = new System.Drawing.Point(406, 34);
- this.ppBtnRoDbBrowse.Margin = new System.Windows.Forms.Padding(2);
- this.ppBtnRoDbBrowse.Name = "ppBtnRoDbBrowse";
- this.ppBtnRoDbBrowse.Size = new System.Drawing.Size(51, 20);
- this.ppBtnRoDbBrowse.TabIndex = 22;
- this.ppBtnRoDbBrowse.Text = "Browse...";
- this.ppBtnRoDbBrowse.UseVisualStyleBackColor = true;
- this.ppBtnRoDbBrowse.Click += new System.EventHandler(this.ppBtnRoDbBrowse_Click);
- //
- // btnRoDbProperties
- //
- this.btnRoDbProperties.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
- this.btnRoDbProperties.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
- this.btnRoDbProperties.Image = ((System.Drawing.Image)(resources.GetObject("btnRoDbProperties.Image")));
- this.btnRoDbProperties.Location = new System.Drawing.Point(406, 10);
- this.btnRoDbProperties.Margin = new System.Windows.Forms.Padding(2);
- this.btnRoDbProperties.Name = "btnRoDbProperties";
- this.btnRoDbProperties.Size = new System.Drawing.Size(33, 23);
- this.btnRoDbProperties.TabIndex = 21;
- this.btnRoDbProperties.Click += new System.EventHandler(this.btnRoDbProperties_Click);
- //
- // cmbRoDb
- //
- this.cmbRoDb.FormattingEnabled = true;
- this.cmbRoDb.Location = new System.Drawing.Point(80, 13);
- this.cmbRoDb.Margin = new System.Windows.Forms.Padding(2);
- this.cmbRoDb.Name = "cmbRoDb";
- this.cmbRoDb.Size = new System.Drawing.Size(318, 21);
- this.cmbRoDb.TabIndex = 47;
- this.cmbRoDb.SelectedIndexChanged += new System.EventHandler(this.cmbRoDb_SelectedIndexChanged);
- //
- // ppGpbxUpROvals
- //
- this.ppGpbxUpROvals.BackColor = System.Drawing.Color.Transparent;
- this.ppGpbxUpROvals.CanvasColor = System.Drawing.SystemColors.Control;
- this.ppGpbxUpROvals.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
- this.ppGpbxUpROvals.Controls.Add(this.ppBtnResetRoVals);
- this.ppGpbxUpROvals.Controls.Add(this.ppBtnUpRoVals);
- this.ppGpbxUpROvals.DisabledBackColor = System.Drawing.Color.Empty;
- this.ppGpbxUpROvals.Location = new System.Drawing.Point(34, 69);
- this.ppGpbxUpROvals.Margin = new System.Windows.Forms.Padding(2);
- this.ppGpbxUpROvals.Name = "ppGpbxUpROvals";
- this.ppGpbxUpROvals.Size = new System.Drawing.Size(112, 162);
- //
- //
- //
- this.ppGpbxUpROvals.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
- this.ppGpbxUpROvals.Style.BackColorGradientAngle = 90;
- this.ppGpbxUpROvals.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
- this.ppGpbxUpROvals.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
- this.ppGpbxUpROvals.Style.BorderBottomWidth = 1;
- this.ppGpbxUpROvals.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
- this.ppGpbxUpROvals.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
- this.ppGpbxUpROvals.Style.BorderLeftWidth = 1;
- this.ppGpbxUpROvals.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
- this.ppGpbxUpROvals.Style.BorderRightWidth = 1;
- this.ppGpbxUpROvals.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
- this.ppGpbxUpROvals.Style.BorderTopWidth = 1;
- this.ppGpbxUpROvals.Style.CornerDiameter = 4;
- this.ppGpbxUpROvals.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
- this.ppGpbxUpROvals.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
- this.ppGpbxUpROvals.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
- this.ppGpbxUpROvals.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
- //
- //
- //
- this.ppGpbxUpROvals.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ppGpbxUpROvals.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ppGpbxUpROvals.TabIndex = 46;
- this.ppGpbxUpROvals.Text = "RO Values";
- //
- // tiRefObjs
- //
- this.tiRefObjs.AttachedControl = this.tcpRefereceObjects;
- this.tiRefObjs.Name = "tiRefObjs";
- this.tiRefObjs.Text = "Referenced Objects";
- //
// tabControlPanel2
//
this.tabControlPanel2.Controls.Add(this.gpxMOSLandLocation);
@@ -1324,6 +1157,128 @@ namespace VEPROMS
this.tabControlPanel2.TabIndex = 30;
this.tabControlPanel2.TabItem = this.tiMergedOutputSettings;
//
+ // gpxMOSLandLocation
+ //
+ this.gpxMOSLandLocation.BackColor = System.Drawing.Color.Transparent;
+ this.gpxMOSLandLocation.CanvasColor = System.Drawing.SystemColors.Control;
+ this.gpxMOSLandLocation.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+ this.gpxMOSLandLocation.Controls.Add(this.ppCmbxMOSLandcornerLoc);
+ this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandyloc);
+ this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandxloc);
+ this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandcorner);
+ this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandyloc);
+ this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandxloc);
+ this.gpxMOSLandLocation.DisabledBackColor = System.Drawing.Color.Empty;
+ this.gpxMOSLandLocation.Location = new System.Drawing.Point(284, 164);
+ this.gpxMOSLandLocation.Margin = new System.Windows.Forms.Padding(2);
+ this.gpxMOSLandLocation.Name = "gpxMOSLandLocation";
+ this.gpxMOSLandLocation.Size = new System.Drawing.Size(209, 98);
+ //
+ //
+ //
+ this.gpxMOSLandLocation.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+ this.gpxMOSLandLocation.Style.BackColorGradientAngle = 90;
+ this.gpxMOSLandLocation.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+ this.gpxMOSLandLocation.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+ this.gpxMOSLandLocation.Style.BorderBottomWidth = 1;
+ this.gpxMOSLandLocation.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.gpxMOSLandLocation.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+ this.gpxMOSLandLocation.Style.BorderLeftWidth = 1;
+ this.gpxMOSLandLocation.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+ this.gpxMOSLandLocation.Style.BorderRightWidth = 1;
+ this.gpxMOSLandLocation.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+ this.gpxMOSLandLocation.Style.BorderTopWidth = 1;
+ this.gpxMOSLandLocation.Style.CornerDiameter = 4;
+ this.gpxMOSLandLocation.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+ this.gpxMOSLandLocation.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+ this.gpxMOSLandLocation.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+ this.gpxMOSLandLocation.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+ //
+ //
+ //
+ this.gpxMOSLandLocation.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.gpxMOSLandLocation.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.gpxMOSLandLocation.TabIndex = 7;
+ this.gpxMOSLandLocation.Text = "Landscape Location";
+ //
+ // ppCmbxMOSLandcornerLoc
+ //
+ this.ppCmbxMOSLandcornerLoc.DisplayMember = "Text";
+ this.ppCmbxMOSLandcornerLoc.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+ this.ppCmbxMOSLandcornerLoc.FormattingEnabled = true;
+ this.ppCmbxMOSLandcornerLoc.ItemHeight = 16;
+ this.ppCmbxMOSLandcornerLoc.Location = new System.Drawing.Point(59, 53);
+ this.ppCmbxMOSLandcornerLoc.Margin = new System.Windows.Forms.Padding(2);
+ this.ppCmbxMOSLandcornerLoc.Name = "ppCmbxMOSLandcornerLoc";
+ this.ppCmbxMOSLandcornerLoc.Size = new System.Drawing.Size(144, 22);
+ this.ppCmbxMOSLandcornerLoc.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ppCmbxMOSLandcornerLoc.TabIndex = 9;
+ this.ppCmbxMOSLandcornerLoc.WatermarkText = "corner location";
+ //
+ // tbxMOSLandyloc
+ //
+ //
+ //
+ //
+ this.tbxMOSLandyloc.Border.Class = "TextBoxBorder";
+ this.tbxMOSLandyloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.tbxMOSLandyloc.Location = new System.Drawing.Point(62, 30);
+ this.tbxMOSLandyloc.Margin = new System.Windows.Forms.Padding(2);
+ this.tbxMOSLandyloc.Name = "tbxMOSLandyloc";
+ this.tbxMOSLandyloc.PreventEnterBeep = true;
+ this.tbxMOSLandyloc.Size = new System.Drawing.Size(75, 20);
+ this.tbxMOSLandyloc.TabIndex = 8;
+ //
+ // tbxMOSLandxloc
+ //
+ //
+ //
+ //
+ this.tbxMOSLandxloc.Border.Class = "TextBoxBorder";
+ this.tbxMOSLandxloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.tbxMOSLandxloc.Location = new System.Drawing.Point(62, 10);
+ this.tbxMOSLandxloc.Margin = new System.Windows.Forms.Padding(2);
+ this.tbxMOSLandxloc.Name = "tbxMOSLandxloc";
+ this.tbxMOSLandxloc.PreventEnterBeep = true;
+ this.tbxMOSLandxloc.Size = new System.Drawing.Size(75, 20);
+ this.tbxMOSLandxloc.TabIndex = 7;
+ //
+ // lblMOSLandcorner
+ //
+ this.lblMOSLandcorner.AutoSize = true;
+ this.lblMOSLandcorner.BackColor = System.Drawing.Color.Transparent;
+ this.lblMOSLandcorner.Location = new System.Drawing.Point(14, 54);
+ this.lblMOSLandcorner.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.lblMOSLandcorner.Name = "lblMOSLandcorner";
+ this.lblMOSLandcorner.Size = new System.Drawing.Size(41, 13);
+ this.lblMOSLandcorner.TabIndex = 6;
+ this.lblMOSLandcorner.Text = "Corner:";
+ //
+ // lblMOSLandyloc
+ //
+ this.lblMOSLandyloc.AutoSize = true;
+ this.lblMOSLandyloc.BackColor = System.Drawing.Color.Transparent;
+ this.lblMOSLandyloc.Location = new System.Drawing.Point(14, 32);
+ this.lblMOSLandyloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.lblMOSLandyloc.Name = "lblMOSLandyloc";
+ this.lblMOSLandyloc.Size = new System.Drawing.Size(34, 13);
+ this.lblMOSLandyloc.TabIndex = 5;
+ this.lblMOSLandyloc.Text = "Y (in):";
+ //
+ // lblMOSLandxloc
+ //
+ this.lblMOSLandxloc.AutoSize = true;
+ this.lblMOSLandxloc.BackColor = System.Drawing.Color.Transparent;
+ this.lblMOSLandxloc.Location = new System.Drawing.Point(14, 10);
+ this.lblMOSLandxloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.lblMOSLandxloc.Name = "lblMOSLandxloc";
+ this.lblMOSLandxloc.Size = new System.Drawing.Size(34, 13);
+ this.lblMOSLandxloc.TabIndex = 4;
+ this.lblMOSLandxloc.Text = "X (in):";
+ //
// ppChbxMOSview
//
this.ppChbxMOSview.BackColor = System.Drawing.Color.Transparent;
@@ -1613,6 +1568,174 @@ namespace VEPROMS
this.tiMergedOutputSettings.Name = "tiMergedOutputSettings";
this.tiMergedOutputSettings.Text = "Merged Output Settings";
//
+ // tcpGeneral
+ //
+ this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+ this.tcpGeneral.Controls.Add(this.ppCmbxProcSetType);
+ this.tcpGeneral.Controls.Add(this.ppRTxtName);
+ this.tcpGeneral.Controls.Add(this.label9);
+ this.tcpGeneral.Controls.Add(this.ppRTxtProcSetRev);
+ this.tcpGeneral.Controls.Add(this.lblProcSetRev);
+ this.tcpGeneral.Controls.Add(this.label4);
+ this.tcpGeneral.Controls.Add(this.label3);
+ this.tcpGeneral.Controls.Add(this.ppRTxtTitle);
+ this.tcpGeneral.Controls.Add(this.ppTxtBxUserID);
+ this.tcpGeneral.Controls.Add(this.ppDTPicker);
+ this.tcpGeneral.Controls.Add(this.label2);
+ this.tcpGeneral.Controls.Add(this.label1);
+ this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty;
+ this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tcpGeneral.Location = new System.Drawing.Point(0, 22);
+ this.tcpGeneral.Margin = new System.Windows.Forms.Padding(2);
+ this.tcpGeneral.Name = "tcpGeneral";
+ this.tcpGeneral.Padding = new System.Windows.Forms.Padding(2);
+ this.tcpGeneral.Size = new System.Drawing.Size(625, 311);
+ this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
+ this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
+ this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+ this.tcpGeneral.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
+ this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
+ | DevComponents.DotNetBar.eBorderSide.Bottom)));
+ this.tcpGeneral.Style.GradientAngle = 90;
+ this.tcpGeneral.TabIndex = 1;
+ this.tcpGeneral.TabItem = this.tiGeneral;
+ //
+ // tiGeneral
+ //
+ this.tiGeneral.AttachedControl = this.tcpGeneral;
+ this.tiGeneral.Name = "tiGeneral";
+ this.tiGeneral.Text = "General";
+ //
+ // tcpRefereceObjects
+ //
+ this.tcpRefereceObjects.Controls.Add(this.ppBtnRoToSql);
+ this.tcpRefereceObjects.Controls.Add(this.tbRoDb);
+ this.tcpRefereceObjects.Controls.Add(this.ppBtnRoDbBrowse);
+ this.tcpRefereceObjects.Controls.Add(this.btnRoDbProperties);
+ this.tcpRefereceObjects.Controls.Add(this.cmbRoDb);
+ this.tcpRefereceObjects.Controls.Add(this.ppGpbxUpROvals);
+ this.tcpRefereceObjects.Controls.Add(this.label6);
+ this.tcpRefereceObjects.DisabledBackColor = System.Drawing.Color.Empty;
+ this.tcpRefereceObjects.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tcpRefereceObjects.Location = new System.Drawing.Point(0, 22);
+ this.tcpRefereceObjects.Margin = new System.Windows.Forms.Padding(2);
+ this.tcpRefereceObjects.Name = "tcpRefereceObjects";
+ this.tcpRefereceObjects.Padding = new System.Windows.Forms.Padding(2);
+ this.tcpRefereceObjects.Size = new System.Drawing.Size(625, 311);
+ this.tcpRefereceObjects.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
+ this.tcpRefereceObjects.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
+ this.tcpRefereceObjects.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+ this.tcpRefereceObjects.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
+ this.tcpRefereceObjects.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
+ | DevComponents.DotNetBar.eBorderSide.Bottom)));
+ this.tcpRefereceObjects.Style.GradientAngle = 90;
+ this.tcpRefereceObjects.TabIndex = 2;
+ this.tcpRefereceObjects.TabItem = this.tiRefObjs;
+ this.tcpRefereceObjects.Enter += new System.EventHandler(this.tabpage_Enter);
+ //
+ // ppBtnRoToSql
+ //
+ this.ppBtnRoToSql.Location = new System.Drawing.Point(337, 146);
+ this.ppBtnRoToSql.Name = "ppBtnRoToSql";
+ this.ppBtnRoToSql.Size = new System.Drawing.Size(163, 46);
+ this.ppBtnRoToSql.TabIndex = 48;
+ this.ppBtnRoToSql.Text = "Migrate Data to Sql";
+ this.ppBtnRoToSql.UseVisualStyleBackColor = true;
+ this.ppBtnRoToSql.Visible = false;
+ this.ppBtnRoToSql.Click += new System.EventHandler(this.ppBtnRoToSql_Click);
+ //
+ // tbRoDb
+ //
+ this.tbRoDb.Enabled = false;
+ this.tbRoDb.Location = new System.Drawing.Point(80, 13);
+ this.tbRoDb.Margin = new System.Windows.Forms.Padding(2);
+ this.tbRoDb.Name = "tbRoDb";
+ this.tbRoDb.Size = new System.Drawing.Size(318, 20);
+ this.tbRoDb.TabIndex = 20;
+ this.tbRoDb.TextChanged += new System.EventHandler(this.tbRoDb_TextChanged);
+ //
+ // ppBtnRoDbBrowse
+ //
+ this.ppBtnRoDbBrowse.Location = new System.Drawing.Point(406, 34);
+ this.ppBtnRoDbBrowse.Margin = new System.Windows.Forms.Padding(2);
+ this.ppBtnRoDbBrowse.Name = "ppBtnRoDbBrowse";
+ this.ppBtnRoDbBrowse.Size = new System.Drawing.Size(51, 20);
+ this.ppBtnRoDbBrowse.TabIndex = 22;
+ this.ppBtnRoDbBrowse.Text = "Browse...";
+ this.ppBtnRoDbBrowse.UseVisualStyleBackColor = true;
+ this.ppBtnRoDbBrowse.Click += new System.EventHandler(this.ppBtnRoDbBrowse_Click);
+ //
+ // btnRoDbProperties
+ //
+ this.btnRoDbProperties.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+ this.btnRoDbProperties.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+ this.btnRoDbProperties.Image = ((System.Drawing.Image)(resources.GetObject("btnRoDbProperties.Image")));
+ this.btnRoDbProperties.Location = new System.Drawing.Point(406, 10);
+ this.btnRoDbProperties.Margin = new System.Windows.Forms.Padding(2);
+ this.btnRoDbProperties.Name = "btnRoDbProperties";
+ this.btnRoDbProperties.Size = new System.Drawing.Size(33, 23);
+ this.btnRoDbProperties.TabIndex = 21;
+ this.btnRoDbProperties.Click += new System.EventHandler(this.btnRoDbProperties_Click);
+ //
+ // cmbRoDb
+ //
+ this.cmbRoDb.FormattingEnabled = true;
+ this.cmbRoDb.Location = new System.Drawing.Point(80, 13);
+ this.cmbRoDb.Margin = new System.Windows.Forms.Padding(2);
+ this.cmbRoDb.Name = "cmbRoDb";
+ this.cmbRoDb.Size = new System.Drawing.Size(318, 21);
+ this.cmbRoDb.TabIndex = 47;
+ this.cmbRoDb.SelectedIndexChanged += new System.EventHandler(this.cmbRoDb_SelectedIndexChanged);
+ //
+ // ppGpbxUpROvals
+ //
+ this.ppGpbxUpROvals.BackColor = System.Drawing.Color.Transparent;
+ this.ppGpbxUpROvals.CanvasColor = System.Drawing.SystemColors.Control;
+ this.ppGpbxUpROvals.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+ this.ppGpbxUpROvals.Controls.Add(this.ppBtnResetRoVals);
+ this.ppGpbxUpROvals.Controls.Add(this.ppBtnUpRoVals);
+ this.ppGpbxUpROvals.DisabledBackColor = System.Drawing.Color.Empty;
+ this.ppGpbxUpROvals.Location = new System.Drawing.Point(34, 69);
+ this.ppGpbxUpROvals.Margin = new System.Windows.Forms.Padding(2);
+ this.ppGpbxUpROvals.Name = "ppGpbxUpROvals";
+ this.ppGpbxUpROvals.Size = new System.Drawing.Size(112, 162);
+ //
+ //
+ //
+ this.ppGpbxUpROvals.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+ this.ppGpbxUpROvals.Style.BackColorGradientAngle = 90;
+ this.ppGpbxUpROvals.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+ this.ppGpbxUpROvals.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+ this.ppGpbxUpROvals.Style.BorderBottomWidth = 1;
+ this.ppGpbxUpROvals.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.ppGpbxUpROvals.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+ this.ppGpbxUpROvals.Style.BorderLeftWidth = 1;
+ this.ppGpbxUpROvals.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+ this.ppGpbxUpROvals.Style.BorderRightWidth = 1;
+ this.ppGpbxUpROvals.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+ this.ppGpbxUpROvals.Style.BorderTopWidth = 1;
+ this.ppGpbxUpROvals.Style.CornerDiameter = 4;
+ this.ppGpbxUpROvals.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+ this.ppGpbxUpROvals.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+ this.ppGpbxUpROvals.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+ this.ppGpbxUpROvals.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+ //
+ //
+ //
+ this.ppGpbxUpROvals.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ppGpbxUpROvals.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ppGpbxUpROvals.TabIndex = 46;
+ this.ppGpbxUpROvals.Text = "RO Values";
+ //
+ // tiRefObjs
+ //
+ this.tiRefObjs.AttachedControl = this.tcpRefereceObjects;
+ this.tiRefObjs.Name = "tiRefObjs";
+ this.tiRefObjs.Text = "Referenced Objects";
+ //
// tabControlPanel1
//
this.tabControlPanel1.Controls.Add(this.ppChbxEnhancedAllowMods);
@@ -2172,14 +2295,14 @@ namespace VEPROMS
this.documentEntryCountDataGridViewTextBoxColumn,
this.libTitleDataGridViewTextBoxColumn});
this.ppGrdLibDocList.DataSource = this.documentInfoListBindingSource;
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.ppGrdLibDocList.DefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.ppGrdLibDocList.DefaultCellStyle = dataGridViewCellStyle4;
this.ppGrdLibDocList.Dock = System.Windows.Forms.DockStyle.Fill;
this.ppGrdLibDocList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
this.ppGrdLibDocList.HighlightSelectedColumnHeaders = false;
@@ -2196,8 +2319,8 @@ namespace VEPROMS
// documentEntryCountDataGridViewTextBoxColumn
//
this.documentEntryCountDataGridViewTextBoxColumn.DataPropertyName = "DocumentEntryCount";
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- this.documentEntryCountDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ this.documentEntryCountDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
this.documentEntryCountDataGridViewTextBoxColumn.HeaderText = "Number of Usages";
this.documentEntryCountDataGridViewTextBoxColumn.Name = "documentEntryCountDataGridViewTextBoxColumn";
this.documentEntryCountDataGridViewTextBoxColumn.ReadOnly = true;
@@ -2664,132 +2787,14 @@ namespace VEPROMS
this.btnGeneral.Text = "General";
this.btnGeneral.Click += new System.EventHandler(this.btnGeneral_Click);
//
+ // ROPrefixBindingSource
+ //
+ this.ROPrefixBindingSource.CurrentChanged += new System.EventHandler(this.ROPrefixBindingSource_CurrentChanged);
+ //
// formatInfoListBindingSource
//
this.formatInfoListBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.FormatInfo);
//
- // gpxMOSLandLocation
- //
- this.gpxMOSLandLocation.BackColor = System.Drawing.Color.Transparent;
- this.gpxMOSLandLocation.CanvasColor = System.Drawing.SystemColors.Control;
- this.gpxMOSLandLocation.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
- this.gpxMOSLandLocation.Controls.Add(this.ppCmbxMOSLandcornerLoc);
- this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandyloc);
- this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandxloc);
- this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandcorner);
- this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandyloc);
- this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandxloc);
- this.gpxMOSLandLocation.DisabledBackColor = System.Drawing.Color.Empty;
- this.gpxMOSLandLocation.Location = new System.Drawing.Point(284, 164);
- this.gpxMOSLandLocation.Margin = new System.Windows.Forms.Padding(2);
- this.gpxMOSLandLocation.Name = "gpxMOSLandLocation";
- this.gpxMOSLandLocation.Size = new System.Drawing.Size(209, 98);
- //
- //
- //
- this.gpxMOSLandLocation.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
- this.gpxMOSLandLocation.Style.BackColorGradientAngle = 90;
- this.gpxMOSLandLocation.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
- this.gpxMOSLandLocation.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
- this.gpxMOSLandLocation.Style.BorderBottomWidth = 1;
- this.gpxMOSLandLocation.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
- this.gpxMOSLandLocation.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
- this.gpxMOSLandLocation.Style.BorderLeftWidth = 1;
- this.gpxMOSLandLocation.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
- this.gpxMOSLandLocation.Style.BorderRightWidth = 1;
- this.gpxMOSLandLocation.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
- this.gpxMOSLandLocation.Style.BorderTopWidth = 1;
- this.gpxMOSLandLocation.Style.CornerDiameter = 4;
- this.gpxMOSLandLocation.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
- this.gpxMOSLandLocation.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
- this.gpxMOSLandLocation.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
- this.gpxMOSLandLocation.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
- //
- //
- //
- this.gpxMOSLandLocation.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.gpxMOSLandLocation.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.gpxMOSLandLocation.TabIndex = 7;
- this.gpxMOSLandLocation.Text = "Landscape Location";
- //
- // ppCmbxMOSLandcornerLoc
- //
- this.ppCmbxMOSLandcornerLoc.DisplayMember = "Text";
- this.ppCmbxMOSLandcornerLoc.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
- this.ppCmbxMOSLandcornerLoc.FormattingEnabled = true;
- this.ppCmbxMOSLandcornerLoc.ItemHeight = 16;
- this.ppCmbxMOSLandcornerLoc.Location = new System.Drawing.Point(59, 53);
- this.ppCmbxMOSLandcornerLoc.Margin = new System.Windows.Forms.Padding(2);
- this.ppCmbxMOSLandcornerLoc.Name = "ppCmbxMOSLandcornerLoc";
- this.ppCmbxMOSLandcornerLoc.Size = new System.Drawing.Size(144, 22);
- this.ppCmbxMOSLandcornerLoc.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.ppCmbxMOSLandcornerLoc.TabIndex = 9;
- this.ppCmbxMOSLandcornerLoc.WatermarkText = "corner location";
- //
- // tbxMOSLandyloc
- //
- //
- //
- //
- this.tbxMOSLandyloc.Border.Class = "TextBoxBorder";
- this.tbxMOSLandyloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.tbxMOSLandyloc.Location = new System.Drawing.Point(62, 30);
- this.tbxMOSLandyloc.Margin = new System.Windows.Forms.Padding(2);
- this.tbxMOSLandyloc.Name = "tbxMOSLandyloc";
- this.tbxMOSLandyloc.PreventEnterBeep = true;
- this.tbxMOSLandyloc.Size = new System.Drawing.Size(75, 20);
- this.tbxMOSLandyloc.TabIndex = 8;
- //
- // tbxMOSLandxloc
- //
- //
- //
- //
- this.tbxMOSLandxloc.Border.Class = "TextBoxBorder";
- this.tbxMOSLandxloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.tbxMOSLandxloc.Location = new System.Drawing.Point(62, 10);
- this.tbxMOSLandxloc.Margin = new System.Windows.Forms.Padding(2);
- this.tbxMOSLandxloc.Name = "tbxMOSLandxloc";
- this.tbxMOSLandxloc.PreventEnterBeep = true;
- this.tbxMOSLandxloc.Size = new System.Drawing.Size(75, 20);
- this.tbxMOSLandxloc.TabIndex = 7;
- //
- // lblMOSLandcorner
- //
- this.lblMOSLandcorner.AutoSize = true;
- this.lblMOSLandcorner.BackColor = System.Drawing.Color.Transparent;
- this.lblMOSLandcorner.Location = new System.Drawing.Point(14, 54);
- this.lblMOSLandcorner.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
- this.lblMOSLandcorner.Name = "lblMOSLandcorner";
- this.lblMOSLandcorner.Size = new System.Drawing.Size(41, 13);
- this.lblMOSLandcorner.TabIndex = 6;
- this.lblMOSLandcorner.Text = "Corner:";
- //
- // lblMOSLandyloc
- //
- this.lblMOSLandyloc.AutoSize = true;
- this.lblMOSLandyloc.BackColor = System.Drawing.Color.Transparent;
- this.lblMOSLandyloc.Location = new System.Drawing.Point(14, 32);
- this.lblMOSLandyloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
- this.lblMOSLandyloc.Name = "lblMOSLandyloc";
- this.lblMOSLandyloc.Size = new System.Drawing.Size(34, 13);
- this.lblMOSLandyloc.TabIndex = 5;
- this.lblMOSLandyloc.Text = "Y (in):";
- //
- // lblMOSLandxloc
- //
- this.lblMOSLandxloc.AutoSize = true;
- this.lblMOSLandxloc.BackColor = System.Drawing.Color.Transparent;
- this.lblMOSLandxloc.Location = new System.Drawing.Point(14, 10);
- this.lblMOSLandxloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
- this.lblMOSLandxloc.Name = "lblMOSLandxloc";
- this.lblMOSLandxloc.Size = new System.Drawing.Size(34, 13);
- this.lblMOSLandxloc.TabIndex = 4;
- this.lblMOSLandxloc.Text = "X (in):";
- //
// frmVersionsProperties
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -2797,7 +2802,7 @@ namespace VEPROMS
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.CancelButton = this.ppBtnCancel;
this.CaptionFont = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.ClientSize = new System.Drawing.Size(806, 365);
+ this.ClientSize = new System.Drawing.Size(802, 361);
this.ControlBox = false;
this.Controls.Add(this.panVerBtns);
this.Controls.Add(this.tcVersions);
@@ -2824,17 +2829,19 @@ namespace VEPROMS
this.ppGpbxUserSpecTxt.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.tcVersions)).EndInit();
this.tcVersions.ResumeLayout(false);
+ this.tabControlPanel2.ResumeLayout(false);
+ this.tabControlPanel2.PerformLayout();
+ this.gpxMOSLandLocation.ResumeLayout(false);
+ this.gpxMOSLandLocation.PerformLayout();
+ this.gpxMOSLocation.ResumeLayout(false);
+ this.gpxMOSLocation.PerformLayout();
+ this.gpxMOSfont.ResumeLayout(false);
+ this.gpxMOSfont.PerformLayout();
this.tcpGeneral.ResumeLayout(false);
this.tcpGeneral.PerformLayout();
this.tcpRefereceObjects.ResumeLayout(false);
this.tcpRefereceObjects.PerformLayout();
this.ppGpbxUpROvals.ResumeLayout(false);
- this.tabControlPanel2.ResumeLayout(false);
- this.tabControlPanel2.PerformLayout();
- this.gpxMOSLocation.ResumeLayout(false);
- this.gpxMOSLocation.PerformLayout();
- this.gpxMOSfont.ResumeLayout(false);
- this.gpxMOSfont.PerformLayout();
this.tabControlPanel1.ResumeLayout(false);
this.tabControlPanel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).EndInit();
@@ -2859,8 +2866,6 @@ namespace VEPROMS
this.panVerBtns.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).EndInit();
- this.gpxMOSLandLocation.ResumeLayout(false);
- this.gpxMOSLandLocation.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs
index 599422b4..68aec555 100644
--- a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs
+++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs
@@ -1928,6 +1928,16 @@ namespace VEPROMS
#endregion
#endregion
+
+ private void tbRoDb_TextChanged(object sender, EventArgs e)
+ {
+
+ }
+
+ private void ROPrefixBindingSource_CurrentChanged(object sender, EventArgs e)
+ {
+
+ }
}
diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.resx b/PROMS/VEPROMS User Interface/frmVersionsProperties.resx
index e37237c8..4025d810 100644
--- a/PROMS/VEPROMS User Interface/frmVersionsProperties.resx
+++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.resx
@@ -123,6 +123,12 @@
415, 17
+
+ 415, 17
+
+
+ 643, 17
+
Allows you to specify the default format to use for all procedures in this set.
@@ -210,9 +216,21 @@ Check "Show Default Settings" to display the "default" duplexing setting (below
817, 17
+
+ 17, 65
+
+
+ 817, 17
+
118, 17
+
+ 118, 17
+
+
+ 17, 17
+
17, 17
diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs
index 656bbd98..2a1ed189 100644
--- a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs
@@ -285,16 +285,24 @@ namespace VEPROMS.CSLA.Library
#region ROTextConvertMethods
// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
// step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
- public static string ROConvertSymbols(string retval)
+ public static string ROConvertSymbols(string retval, ItemInfo MyItemInfo = null)
{
- retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow
- retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow
- retval = retval.Replace("->", @"\u8594?"); // Right Arrow
- retval = retval.Replace("<-", @"\u8592?"); // Left Arrow
- retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal
- retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal
- retval = retval.Replace("+\\u8209?", @"\'b1"); // plus minus
- retval = retval.Replace("+-", @"\'b1"); // plus minus
+ // _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
+ // _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue
+ if (MyItemInfo == null || MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue)
+ {
+ retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow
+ retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow
+ retval = retval.Replace("->", @"\u8594?"); // Right Arrow
+ retval = retval.Replace("<-", @"\u8592?"); // Left Arrow
+ }
+ if (MyItemInfo == null || MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue)
+ {
+ retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal
+ retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal
+ retval = retval.Replace("+\\u8209?", @"\'b1"); // plus minus
+ retval = retval.Replace("+-", @"\'b1"); // plus minus
+ }
return retval;
}
#endregion
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
index c573b818..5adba7a0 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
@@ -695,9 +695,9 @@ namespace VEPROMS.CSLA.Library
newvalue = newvalue.Replace("`", @"\'b0");
// B2023-037: Handle <=, >=, +-, -> and <- symbols. If the format has flags to convert these RO symbols, it
// is done here so that output (print & edit/view) has symbol, not 2 characters.
- if (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
- _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue)
- newvalue = ROFSTLookup.ROConvertSymbols(newvalue);
+ if (!_MyItemInfo.IsTable && (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
+ _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
+ newvalue = ROFSTLookup.ROConvertSymbols(newvalue, _MyItemInfo);
if (gg != newvalue)
text = text.Substring(0, myIndex) + newvalue + text.Substring(myIndex + myLength);
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index 0252740d..821aa997 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -1184,7 +1184,9 @@ namespace VEPROMS.CSLA.Library
if (sectionInfo != null)
{
// B2023-037: loading print text, resolve the RO symbols
- string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues,sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue|| sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue);
+ bool GTLT = sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
+ bool GLTArrows = sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
+ string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, itemInfo.IsTable && GTLT || GLTArrows);
ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo);
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
index 483a321a..82072c38 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
@@ -978,7 +978,8 @@ namespace VEPROMS.CSLA.Library
retstr = unitnum.Replace("#", retstr);
}
// B2022-004: Remove Proc PC/PC token from transition text.
- if (tb._FromItem.ActiveFormat != null && tb._FromItem.ActiveFormat.PlantFormat.FormatData.TransData.ProcLevelPCPC && retstr.ToUpper().StartsWith("");
retstr = retstr.Substring(indx + 1);
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index d7a16080..653c3df8 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -7279,6 +7279,15 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _ProcLevelPCPC, "@ProcLevelPCPC");
}
}
+ // F2024-030 for Vogtle Units 3 & 4, added KeepOnePCPCTag flag to keep one of the PC/PC tokens when editing
+ private LazyLoad _KeepOnePCPCTag;
+ public bool KeepOnePCPCTag
+ {
+ get
+ {
+ return LazyLoad(ref _KeepOnePCPCTag, "@KeepOnePCPCTag");
+ }
+ }
}
#endregion
#region TransType
diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.cs b/PROMS/Volian.Controls.Library/DisplayTransition.cs
index 21ac3f2f..2dd78b0e 100644
--- a/PROMS/Volian.Controls.Library/DisplayTransition.cs
+++ b/PROMS/Volian.Controls.Library/DisplayTransition.cs
@@ -687,6 +687,8 @@ namespace Volian.Controls.Library
cbPageNum.Checked = _ModExistingPageNum = tc != null && tc.Transition_Formatted.ToUpper() == "TRUE";
}
}
+ // B2024-016 if transition format does not have {First Step} then don't show step list
+ HideStepTreeIfNeeded();
}
#endregion
#region Events
@@ -916,11 +918,10 @@ namespace Volian.Controls.Library
}
else
{
- _InitializingTrans = true; // just initializing now, don't set any ranges, etc.
+ _InitializingTrans = true; // just initializing now, don't set any ranges, etc.
tvTranFillIn((secitm.Steps == null || secitm.Steps.Count == 0) ? null : secitm.Steps[0]);
- tvTran.Enabled = true;
- cbIncStepNum.Enabled = true;
- cbIncStepNum.Checked = true;
+ // B2024-016 only show the list of steps if used by the select transition
+ HideStepTreeIfNeeded();
// if doing a 'new' range, no node is selected in tree. Without this, the first node in the
// tree was the selected node which was throwing off the logic for defining the _RangeNode1
// and _RangeNode2
@@ -935,6 +936,18 @@ namespace Volian.Controls.Library
SaveCancelEnabling();
}
}
+ // B2024-016 Hide the step tree when the transition definition does not include a step number {First Step}
+ private void HideStepTreeIfNeeded()
+ {
+ string trnFmt = _CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[_TranFmtIndx].TransFormat;
+ bool showStepList = trnFmt.Contains("{First Step}");
+ if (!showStepList)
+ tvTran.Nodes.Clear(); // clear the tree view of steps if not needed for selected transition
+ tvTran.Enabled = showStepList; // show the tree view of steps?
+ cbIncStepNum.Enabled = showStepList; // display the Include Step checkbox?
+ cbIncStepNum.Checked = showStepList; // uncheck the Include Step?
+ }
+
// B2018-002 - Invalid Transitions - Declare Default Section variables
private bool NeedsDefault;
private bool HasDefault;