diff --git a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs
index 572d6830..5a5e0a0c 100644
--- a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs
+++ b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs
@@ -44,8 +44,10 @@ 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.2.2509.222")]
-[assembly: AssemblyFileVersion("2.2.2509.222")]
+[assembly: AssemblyVersion("2.2.2509.311")]
+[assembly: AssemblyFileVersion("2.2.2509.311")]
+
+
diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj_bak_2 b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj_bak_2
deleted file mode 100644
index ee9fe31a..00000000
--- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj_bak_2
+++ /dev/null
@@ -1,655 +0,0 @@
-
-
-
- Debug
- AnyCPU
- 8.0.50727
- 2.0
- {8D1C47B4-F302-4C5A-87CC-24FDC5529872}
- WinExe
- Properties
- VEPROMS
- VEPROMS
- veproms.ico
-
-
-
-
-
-
-
-
- v4.8.1
-
-
-
-
- 2.0
- false
- publish\
- true
- Disk
- false
- Foreground
- 7
- Days
- false
- false
- true
- 0
- 1.0.0.%2a
- false
- true
-
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- x86
- false
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
- false
-
-
- true
- bin\Demo\
- DEBUG;TRACE
- full
- x86
- prompt
- false
-
-
- true
- bin\Debug\
- DEBUG;TRACE
- full
- x86
- prompt
- false
-
-
- bin\debug\
- TRACE
- true
- pdbonly
- x86
- prompt
- false
-
-
- true
- bin\Demo\
- TRACE;DEMO
- full
- x86
- prompt
- false
-
-
-
-
-
-
-
- False
- ..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll
-
-
- False
- ..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.6Build\DevComponents.DotNetBar2.dll
-
-
- False
- ..\..\..\..\3rdPartyLibraries\Ionic\Ionic.Zip.dll
-
-
- ..\..\..\..\3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Interpreter.dll
-
-
- ..\..\..\..\3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Parser.dll
-
-
- False
- ..\..\..\..\3rdPartyLibraries\Log4Net\log4net.dll
-
-
-
-
- True
-
-
-
-
-
-
-
-
-
-
-
- False
- ..\VEPROMS.CSLA.Library\bin\Debug\VEPROMS.CSLA.Library.dll
-
-
-
-
- Form
-
-
- AboutVEPROMS.cs
-
-
-
- Form
-
-
- dlgAnnotationsSelect.cs
-
-
- True
- True
- dlgAnnotationsSelect.resx
-
-
- Form
-
-
- dlgApproveProcedure.cs
-
-
- Form
-
-
- dlgCheckedOutProcedure.cs
-
-
- Form
-
-
- Form
-
-
- dlgMSWordMessage.cs
-
-
- Form
-
-
- dlgCheckOpenTabs.cs
-
-
- Form
-
-
- DlgCloseTabsOrExit.cs
-
-
- Form
-
-
- dlgExportImport.cs
-
-
- Form
-
-
- dlgImpHowToHandleROs.cs
-
-
- Form
-
-
- dlgManageSecurity.cs
-
-
- Form
-
-
- dlgPhoneList.cs
-
-
- Form
-
-
- dlgPickROFolder.cs
-
-
- Form
-
-
- DlgPrintProcedure.cs
-
-
- Form
-
-
- dlgSetChangeBarStartDate.cs
-
-
- Form
-
-
- dlgTransitionReport.cs
-
-
- Form
-
-
- dlgUCFDetail.cs
-
-
- Form
-
-
- frmAnnotationsCleanup.cs
-
-
- Form
-
-
- frmBatchRefresh.cs
-
-
- Form
-
-
- frmBatchRefreshCheckedOut.cs
-
-
- Form
-
-
- frmManageUser.cs
-
-
- Form
-
-
- frmPDFStatusForm.cs
-
-
- Form
-
-
- frmPSI.cs
-
-
- Form
-
-
- frmRODbProperties.cs
-
-
- Form
-
-
- frmSI.cs
-
-
- Form
-
-
- frmVEPROMS.cs
-
-
- Form
-
-
- frmFolderProperties.cs
-
-
- Form
-
-
- frmProcedureProperties.cs
-
-
- Form
-
-
- frmPropGrid.cs
-
-
- Form
-
-
- frmSectionProperties.cs
-
-
- Form
-
-
- frmSysOptions.cs
-
-
- Form
-
-
- frmVersionsProperties.cs
-
-
-
- Designer
- AboutVEPROMS.cs
-
-
- dlgAnnotationsSelect.cs
- ResXFileCodeGenerator
-
-
- dlgMSWordMessage.cs
-
-
- dlgCheckOpenTabs.cs
-
-
- DlgCloseTabsOrExit.cs
-
-
- dlgImpHowToHandleROs.cs
-
-
- DlgPrintProcedure.cs
- Designer
-
-
- dlgSetChangeBarStartDate.cs
-
-
- dlgUCFDetail.cs
-
-
- frmAnnotationsCleanup.cs
-
-
- frmPDFStatusForm.cs
- Designer
-
-
- Designer
- frmPSI.cs
-
-
- Designer
- frmRODbProperties.cs
-
-
- frmSI.cs
-
-
- Designer
- frmVEPROMS.cs
-
-
- frmFolderProperties.cs
- Designer
-
-
- frmProcedureProperties.cs
- Designer
-
-
- Designer
- frmPropGrid.cs
-
-
- frmSectionProperties.cs
- Designer
-
-
- Designer
- frmSysOptions.cs
-
-
- frmVersionsProperties.cs
- Designer
-
-
-
- ResXFileCodeGenerator
- Designer
- Resources.Designer.cs
-
-
- ShortcutLists.cs
- Designer
-
-
- VlnWeb.cs
- Designer
-
-
- PreserveNewest
- Designer
-
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
-
-
- True
- True
- Resources.resx
-
-
- True
- Settings.settings
- True
-
-
-
- Form
-
-
- ShortcutLists.cs
-
-
- Form
-
-
- VlnWeb.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- Always
-
-
- Always
-
-
- Always
-
-
- Always
-
-
- Always
-
-
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
-
-
- dlgApproveProcedure.cs
- Designer
- PreserveNewest
-
-
- dlgCheckedOutProcedure.cs
- Designer
-
-
- dlgExportImport.cs
- Designer
-
-
- dlgManageSecurity.cs
- Designer
-
-
- Designer
- dlgPhoneList.cs
-
-
- dlgPickROFolder.cs
- Designer
-
-
- dlgTransitionReport.cs
- Designer
-
-
- frmBatchRefresh.cs
- Designer
-
-
- frmBatchRefreshCheckedOut.cs
- Designer
-
-
- frmManageUser.cs
- Designer
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
-
-
-
-
-
-
- PreserveNewest
-
-
-
-
- {00020430-0000-0000-C000-000000000046}
- 2
- 0
- 0
- primary
- False
-
-
-
-
- {b22ce5ad-288c-44cd-8a22-b3bcf77b7161}
- FlexableMessageBox
-
-
- {70F23722-19A3-4AC1-A900-55831C945786}
- LBWordLibrary
-
-
- {AEEE9FD1-6892-45E2-A67E-418C06D46FF9}
- Volian.Base.Library
-
-
- {8556527C-6615-487F-8AF7-22EBC3EF0268}
- Volian.Controls.Library
-
-
- {94830C07-6A3A-450E-9674-C9B4293A7726}
- Volian.Print.Library
-
-
- {62314B9C-DA84-4037-8B68-AA18C1F641F5}
- Volian.Utils.Library
-
-
-
-
- False
- .NET Framework 3.5 SP1 Client Profile
- false
-
-
- False
- .NET Framework 3.5 SP1
- true
-
-
-
-
-
- cmd /c "$(ProjectDir)FixRev.bat"
-
-
\ No newline at end of file
diff --git a/PROMS/VEPROMS User Interface/dlgExportImport.cs b/PROMS/VEPROMS User Interface/dlgExportImport.cs
index 532a7fe7..38367c48 100644
--- a/PROMS/VEPROMS User Interface/dlgExportImport.cs
+++ b/PROMS/VEPROMS User Interface/dlgExportImport.cs
@@ -723,25 +723,7 @@ namespace VEPROMS
//if (isImported && UCFImportCase == E_UCFImportOptions.LoadForSetOnly) UpdateFormatForUCFInSet();
return true;// Import Suceeded
}
- //private void UpdateFormatForUCFInSet()
- //{
- // // this gets called if the UCFImportCase == LoadForSetOnly, i.e. only items in this PROCEDURE Set whose formats point to a
- // // UCF format should point to the updated (copied) UCF format.
- // if (renamedUCFFormatId == null) return;
- // foreach (int key in renamedUCFFormatId.Keys)
- // {
- // using (ContentInfoList cil = ContentInfoList.FixFormatIDAfterImport(MyDocVersion.VersionID.ToString(), renamedUCFFormatId[key], key))
- // {
- // foreach (ContentInfo ci in cil)
- // {
- // using (Content c = ci.Get())
- // {
- // ContentInfo.Refresh(c);
- // }
- // }
- // }
- // }
- //}
+
// Added Error Handling to assure that Change Manager is turned-on regardless of success or failure of the import
// B2019-046: improved error handling (added return value & error message)
private bool TryToLoadImportDataDocument()
@@ -1021,8 +1003,6 @@ namespace VEPROMS
c.Save();
}
}
- //private E_UCFImportOptions UCFImportDefaultFromSettings;
- //private E_UCFImportOptions UCFImportCase = E_UCFImportOptions.LoadOnlyImported;
Dictionary existingCopyFCName = new Dictionary();
// note that this is used when importing a folder or a procedure (procedure was added for UCF changes)
private bool LoadFormats(XmlDocument xd, string xmlpath)
@@ -1123,102 +1103,12 @@ namespace VEPROMS
// various cases listed above:
if (existingFormat.ContainsKey(name))
{
- //// if case 0 and this ucf already exists, ignore it:
- //if (UCFImportCase == E_UCFImportOptions.Ignore) continue;
- //// if case 1, 2, 4 and the name exists, make a 'copy' of the newly imported format:
- //// need to add this format - name must be unique so add 'COPY(x) of 'original name'' where x is unique number:
- //if (UCFImportCase == E_UCFImportOptions.LoadNotUsed || UCFImportCase == E_UCFImportOptions.LoadOnlyImported || UCFImportCase == E_UCFImportOptions.LoadForSetOnly)
- //{
- // int count = (fil.Where(fi => fi.Name.EndsWith(name))).Count();
- // if (count > 0)
- // {
- // string origname = name;
- // name = string.Format("Copy {0} of {1}", count.ToString(), name);
- // if (UCFImportCase == E_UCFImportOptions.LoadOnlyImported || UCFImportCase == E_UCFImportOptions.LoadForSetOnly)
- // {
- // if (renamedUCFFormatName == null) renamedUCFFormatName = new Dictionary();
- // renamedUCFFormatName.Add(origname, name);
- // }
- // }
- //}
- // if case 3, take the existing config data and create in a record whose name is Old(x) of 'original name' (the record
- // creation gets done below). Then modify the existing record to have the config data. The result is that any
- // sections that used this UCF throughout the database will have the new config data.
- //if (UCFImportCase == E_UCFImportOptions.LoadUseAll)
- //{
- // string savname = name;
- // int count = (fil.Where(fi => fi.Name.EndsWith(name))).Count();
- // if (count > 0)
- // {
- // name = string.Format("Old {0} of {1}", count.ToString(), name);
- // }
- // // update the 'old' record by getting the original config data.
- // string savdesc = null;
- // DateTime savdts = DateTime.Now;
- // string savuid = null;
- // int savpar = 0;
- // string savconfig = null;
- // using (Format origRecord = Format.Get(existingFormat[savname]))
- // {
- // savdesc = origRecord.Description;
- // savdts = origRecord.DTS;
- // savuid = origRecord.UserID;
- // savpar = origRecord.ParentID;
- // savconfig = origRecord.Config;
- // origRecord.Name = savname;
- // origRecord.Description = description;
- // origRecord.DTS = dts;
- // origRecord.UserID = userid;
- // origRecord.MyParent = pformat;
- // origRecord.Config = config;
- // origRecord.Save();
- // description = savdesc;
- // dts = savdts;
- // userid = savuid;
- // pformat = Format.Get(savpar);
- // config = savconfig;
-
- // }
- //}
}
- //if (UCFImportCase == 0) // ignore it
- //{
- importedFormat.Add(formatid, name);
- //}
- //else
- //{
- // Format rec = Format.MakeFormat(pformat, name, description, null, null, dts, userid);
- // rec.Config = config;
- // rec.Save();
- // if (UCFImportCase == E_UCFImportOptions.LoadNotUsed || UCFImportCase == E_UCFImportOptions.LoadUseAll) // don't reset format id (case 1 don't use it, case 3 copies new data into original record
- // importedFormat.Add(formatid, name);
- // else if (UCFImportCase == E_UCFImportOptions.LoadOnlyImported || UCFImportCase == E_UCFImportOptions.LoadForSetOnly) // case 2 uses it for any items imported, case 4 uses it for any sections within current set
- // {
- // existingFormat.Add(name, rec.FormatID); // change to original name?
- // importedFormat.Add(rec.FormatID, name);
- // // get format id for the original named format
- // if (UCFImportCase == E_UCFImportOptions.LoadForSetOnly && renamedUCFFormatName != null)
- // {
- // int origformatid = -1;
- // foreach (var kvp in renamedUCFFormatName)
- // {
- // if (kvp.Value == name)
- // {
- // origformatid = existingFormat[kvp.Key];
- // break;
- // }
- // }
- // if (origformatid != -1)
- // {
- // if (renamedUCFFormatId == null) renamedUCFFormatId = new Dictionary();
- // renamedUCFFormatId.Add(rec.FormatID, origformatid);
- // }
- // }
- // }
- //}
+ importedFormat.Add(formatid, name);
+
}
FormatInfoList.Reset();
return true;
diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.cs
index 59d2b38d..1357c074 100644
--- a/PROMS/VEPROMS User Interface/frmFolderProperties.cs
+++ b/PROMS/VEPROMS User Interface/frmFolderProperties.cs
@@ -337,24 +337,7 @@ namespace VEPROMS
btnAnnoTypeUndo.PerformClick();
//if (btnAnnoTypeSave.Enabled) return;
folderConfigBindingSource.EndEdit();
- // if there is a change to the format, clean up any overridden formats that point to the selected item before saving the format change:
- //if (_FolderConfig.MyFolder.FormatID != _cmbxformatOriginal)
- //{
- // // clean up & then refresh the configs
- // using (ContentInfoList cil = ContentInfoList.ClearOverrideFormatsByFolder(_FolderConfig.MyFolder.FolderID, _cmbxformatOriginal, _FolderConfig.MyFolder.FormatID))
- // {
- // foreach (ContentInfo ci in cil)
- // {
- // using (Content c = ci.Get())
- // {
- // // first refresh configs because the ContentInfo.Refresh causes events to occur that refresh screen
- // // and if configs aren't done first, the screen refresh, if based on config data, will not be correct.
- // foreach (ItemInfo ii in ci.ContentItems) ii.RefreshConfig();
- // ContentInfo.Refresh(c);
- // }
- // }
- // }
- //}
+
// Save Default settings for User
//
// Save whether we should display the default values on this property page
diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs
index 9cd396eb..077d4430 100644
--- a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs
+++ b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs
@@ -1211,7 +1211,6 @@ namespace VEPROMS
this.cbUCFLForSetOnly.Size = new System.Drawing.Size(105, 19);
this.cbUCFLForSetOnly.TabIndex = 5;
this.cbUCFLForSetOnly.Text = "Load For Set Only";
- //this.cbUCFLForSetOnly.CheckedChanged += new System.EventHandler(this.cbUCFLForSetOnly_CheckedChanged);
//
// cbUCFLUseAll
//
@@ -1227,7 +1226,6 @@ namespace VEPROMS
this.cbUCFLUseAll.Size = new System.Drawing.Size(105, 19);
this.cbUCFLUseAll.TabIndex = 4;
this.cbUCFLUseAll.Text = "Load Use All";
- //this.cbUCFLUseAll.CheckedChanged += new System.EventHandler(this.cbUCFLUseAll_CheckedChanged);
//
// cbUCFLOnlyImport
//
@@ -1243,7 +1241,6 @@ namespace VEPROMS
this.cbUCFLOnlyImport.Size = new System.Drawing.Size(105, 19);
this.cbUCFLOnlyImport.TabIndex = 3;
this.cbUCFLOnlyImport.Text = "Load Only Imported";
- //this.cbUCFLOnlyImport.CheckedChanged += new System.EventHandler(this.cbUCFLOnlyImport_CheckedChanged);
//
// cbUCFLNotUsed
//
@@ -1259,7 +1256,6 @@ namespace VEPROMS
this.cbUCFLNotUsed.Size = new System.Drawing.Size(88, 19);
this.cbUCFLNotUsed.TabIndex = 2;
this.cbUCFLNotUsed.Text = "Load Not Used";
- //this.cbUCFLNotUsed.CheckedChanged += new System.EventHandler(this.cbUCFLNotUsed_CheckedChanged);
//
// cbUCFIgnore
//
@@ -1275,7 +1271,6 @@ namespace VEPROMS
this.cbUCFIgnore.Size = new System.Drawing.Size(67, 19);
this.cbUCFIgnore.TabIndex = 1;
this.cbUCFIgnore.Text = "Ignore";
- //this.cbUCFIgnore.CheckedChanged += new System.EventHandler(this.cbUCFIgnore_CheckedChanged);
//
// btnReset
//
diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.cs b/PROMS/VEPROMS User Interface/frmSysOptions.cs
index 2d286940..10c695f5 100644
--- a/PROMS/VEPROMS User Interface/frmSysOptions.cs
+++ b/PROMS/VEPROMS User Interface/frmSysOptions.cs
@@ -75,24 +75,6 @@ namespace VEPROMS
cbEnhancedDocumentSync.Checked = Settings.Default.SyncEnhancedDocuments;
cbSeparateWindows.Checked = Settings.Default.SeparateWindows;
txbxVisioPath.Text = Settings.Default.VisioPath;
- //switch (Settings.Default.UCFImportOpt) // see dlgExportImport for descripton of these options.
- //{
- // case 0:
- // cbUCFIgnore.Checked = true;
- // break;
- // case 1:
- // cbUCFLNotUsed.Checked = true;
- // break;
- // case 2:
- // cbUCFLOnlyImport.Checked = true;
- // break;
- // case 3:
- // cbUCFLUseAll.Checked = true;
- // break;
- // case 4:
- // cbUCFLForSetOnly.Checked = true;
- // break;
- //}
//CSM - C2024-031 - Getting User Settings
//and set checkboxes based on what they are set to
@@ -118,6 +100,7 @@ namespace VEPROMS
Settings.Default.PastePlainText = cbPastePlainText.Checked;
}
}
+
private void cbPasteNoReturns_CheckedChanged(object sender, EventArgs e)
{
if (!_initializing)
@@ -193,7 +176,6 @@ namespace VEPROMS
private bool ss_SyncEnhancedDocuments;
private bool ss_SeparateWindows;
private string ss_VisioPath;
- //private int ss_UCFImportOpt;
private void SaveStartingSettings()
{
@@ -210,7 +192,6 @@ namespace VEPROMS
ss_SyncEnhancedDocuments = Settings.Default.SyncEnhancedDocuments;
ss_SeparateWindows = Settings.Default.SeparateWindows;
ss_VisioPath = Settings.Default.VisioPath;
- //ss_UCFImportOpt = Settings.Default.UCFImportOpt;
}
private void RestoreStartingSettings() // used with the cancel button
@@ -227,7 +208,6 @@ namespace VEPROMS
Settings.Default.SyncEnhancedDocuments = ss_SyncEnhancedDocuments;
Settings.Default.SeparateWindows = ss_SeparateWindows;
Settings.Default.VisioPath = ss_VisioPath;
- //Settings.Default.UCFImportOpt = ss_UCFImportOpt;
}
@@ -315,45 +295,7 @@ namespace VEPROMS
Settings.Default.VisioPath = txbxVisioPath.Text;
}
- //private void cbUCFIgnore_CheckedChanged(object sender, EventArgs e)
- //{
- // if (!_initializing)
- // {
- // Settings.Default.UCFImportOpt = 0;
- // }
- //}
- //private void cbUCFLNotUsed_CheckedChanged(object sender, EventArgs e)
- //{
- // if (!_initializing)
- // {
- // Settings.Default.UCFImportOpt = 1;
- // }
- //}
-
- //private void cbUCFLOnlyImport_CheckedChanged(object sender, EventArgs e)
- //{
- // if (!_initializing)
- // {
- // Settings.Default.UCFImportOpt = 2;
- // }
- //}
-
- //private void cbUCFLUseAll_CheckedChanged(object sender, EventArgs e)
- //{
- // if (!_initializing)
- // {
- // Settings.Default.UCFImportOpt = 3;
- // }
- //}
-
- //private void cbUCFLForSetOnly_CheckedChanged(object sender, EventArgs e)
- //{
- // if (!_initializing)
- // {
- // Settings.Default.UCFImportOpt = 4;
- // }
- //}
private void cbOTRemember_CheckedChanged(object sender, EventArgs e)
{
cbOTAutoOpen.Enabled = cbOTAutoOpen.Visible = cbShwRplWrdsColor.Checked;
diff --git a/PROMS/VEPROMS.CSLA.Library/Config/FormatConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/FormatConfig.cs
index ac06ce64..787ef016 100644
--- a/PROMS/VEPROMS.CSLA.Library/Config/FormatConfig.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Config/FormatConfig.cs
@@ -272,41 +272,7 @@ namespace VEPROMS.CSLA.Library
}
#endregion ReplaceStrData
#region ReplaceStr
- //[Flags]
- //public enum E_ReplaceFlags : uint
- //{
- // High = 0x0001, // Do ReplaceWords in HIGH LEVEL STEPS
- // RNO = 0x0002, // Do ReplaceWords in RNOS
- // Caution = 0x0004, // Do ReplaceWords in CAUTIONS
- // Note = 0x0008, // Do ReplaceWords in NOTES
- // Table = 0x0010, // Do ReplaceWords in TABLES
- // Substep = 0x0020, // Do ReplaceWords in SUBSTEPS
- // Attach = 0x0040, // Do ReplaceWords in ATTACHMENTS
- // Bkgd = 0x0080, // Do ReplaceWords in BACKGROUNDS
- // DiffUnit = 0x0100, // Do ReplaceWords ONLY for different UNIT #
- // TOC = 0x0200, // Do in auto table-of-contents
- // StatTree = 0x0400,
- // HLSSetpnt = 0x0800, // Do ReplaceWords in HighLevelStep SETPoiNTs
- // Trans = 0x1000, // Do ReplaceWords in TRANSITIONS
- // Setpoint = 0x2000, // Do ReplaceWords in SETPOINTS
- // // Case Sensitivity Flags - default is off (Case Sensitive Replace)
- // CaseInsens = 0x0000C000, // Do ReplaceWords for all words thatmatch, regardless of case,
- // // and replace with the ReplaceWith string as is
- // // B2019-022: do not support CaseInsensFirst & CaseInsensAll - there is no supporting replace word code:
- // //CaseInsensFirst = 0x4000, // Do ReplaceWords for all words thatexactly match the ReplaceWord,
- // // except the case of the first character may be different
- // //CaseInsensAll = 0x8000, // Do ReplaceWords for all words that match the ReplaceWord, regardless of case
-
- // Partials = 0x10000, // Do replace even on partial matches
- // Plackeep = 0x20000, // Do replace in PlaceKeepers
- // InSecTitle = 0x40000,
- // BeforeTrans = 0x80000, // Only do replace if the string occurs immediately before a transition.
- // BeforeList = 0x100000, // C2021-045 Only if the text ends with a colon ":"
- // PageList = 0x200000, // F2021-053 Do replace words for PageList items that are ROs
- // FirstWord = 0x400000, // C2021-056 Do only if is the first word in the text
- // NotInRO = 0x800000 // B2022-015 BNPPalr: Determine whether RO text should have Replace Words applied
- //}
[Serializable]
[TypeConverter(typeof(ExpandableObjectConverter))]
public class ReplaceStr
@@ -319,7 +285,7 @@ namespace VEPROMS.CSLA.Library
get { return _State; }
set { _State = value; }
}
- //private E_ReplaceFlags _Flag;
+
//[Editor(typeof(FlagEnumUIEditor), typeof(System.Drawing.Design.UITypeEditor))]
//[XmlAttribute("Flag")]
//[DisplayName("Flags (Use In)")] // Note that [Description] is not used in collection items (that use collection editor)
@@ -341,7 +307,6 @@ namespace VEPROMS.CSLA.Library
}
}
private string _ReplaceWith;
- //[Editor(typeof(RtfEditor), typeof(System.Drawing.Design.UITypeEditor))]
[XmlAttribute("ReplaceWith")]
[DisplayName("With")]
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
index e7f3fe24..723857b9 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
@@ -2178,7 +2178,6 @@ namespace VEPROMS.CSLA.Library
// F2021-053: BNPP Alarm - need ability to have super/sub scripts in the text of Alarm Tables (ROs).
// if doing replace words for Page List items, the current item is not a step, use _DoReplWordInPageList flags this
if (_MyItemInfo.MyContent.Type < 20000 && !_DoReplWordInPageList) return Text; // for now only replace in steps.
- //FormatConfig.ReplaceStrData rsl = _MyFormat.PlantFormat.FormatConfig.UCFandReplaceStrData;
ReplaceStrList rsl = _MyFormat.PlantFormat.FormatData.SectData.ReplaceStrList;
if (rsl.Count == 1 && (rsl[0].ReplaceWord == null || rsl[0].ReplaceWord == "")) return Text;
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index 5d00c57b..cc68f7d5 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -6111,23 +6111,7 @@ namespace VEPROMS.CSLA.Library
if (!SectionHasCheckOffs()) return null;
int stpCoIndx = CheckOffIndex(); // this step has a checkoff defined
if (stpCoIndx == -1) return null;
- //if (stpCoIndx > 1)
- //{
- // if (ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffUCF && stpCoIndx >= 100)
- // {
- // // get index, if greater than 100, store that - otherwise store index down list.
- // // if this format does not have ucf signoffs, indx is just the selected index from the combo box.
- // foreach (CheckOff co in ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList)
- // {
- // if (stpCoIndx == co.Index)
- // {
- // stpCoIndx = (int)co.Index;
- // break;
- // }
- // }
- // }
- // return ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList[stpCoIndx]; // DO override of CheckOffList[] to get ucf
- //}
+
int sectCoIndx = SectionDefaultCheckOffIndex(); // no checkoff on step, see if there is a section default.
if (sectCoIndx == -1) return null;
if ((ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffOnHLSOnly && IsHigh)
diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index fc396d84..afacd8a5 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -4458,12 +4458,6 @@ namespace Volian.Print.Library
xloc_co = XOffset + (relX > 0 ? Width : 0) + relX;
}
}
- // if there is ucf value for adjusting the alignment for checkoffs, use it:
- //FormatConfig fc = PlantFormat.GetFormatConfig(formatInfo);
- //if (fc != null && fc.PlantFormat.FormatData.CheckOffXOffAdj != null)
- //{
- // if (co.Index > 99) xloc_co += ((float)fc.PlantFormat.FormatData.CheckOffXOffAdj * 72);
- //}
// CheckOffXtraLines was introduced for the additional lines needed for the longer signoffs
// for VCBA (&WST1), for F2016-061.