diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index 07b0528f..75990d28 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -14770,10 +14770,6 @@ IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getFormatNoUCF]' DROP PROCEDURE [getFormatNoUCF]; GO --- Display the status of Proc creation -IF (@@Error = 0) PRINT 'StoredProcedure [getFormatNoUCF] Succeeded' -ELSE PRINT 'StoredProcedure [getFormatNoUCF] Error on Creation' -GO IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vefn_GetItemsMatchingFormatItems]') AND OBJECTPROPERTY(id,N'IsTableFunction') = 1) DROP FUNCTION [vefn_GetItemsMatchingFormatItems]; diff --git a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs index 4e0b24ae..a89d4c62 100644 --- a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs +++ b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs @@ -44,8 +44,12 @@ 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.209")] -[assembly: AssemblyFileVersion("2.2.2509.209")] +[assembly: AssemblyVersion("2.2.2509.216")] +[assembly: AssemblyFileVersion("2.2.2509.216")] + + + + diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 70ecee11..88c6a841 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -36,27 +36,14 @@ namespace VEPROMS.CSLA.Library // User Control of Format allows a PROMS user to make modifications to a very limited set of format settings // Variables in this region are not set in the format files. They are used only in the C# code - // when IgnoreUCF is true, get the original data, i.e. don't apply any UCF changes to it + // when IgnoreUCF is true, get the original data, i.e.don't apply any UCF changes to it private static bool _IgnoreUCF = false; public static bool IgnoreUCF { get { return PlantFormat._IgnoreUCF; } set { PlantFormat._IgnoreUCF = value; } } - // flags that the User Control of Format setting for using additional UCF checkoffs is active - private static bool _DoingUCFCheckOffs = false; - public static bool DoingUCFCheckOffs - { - get { return PlantFormat._DoingUCFCheckOffs; } - set { PlantFormat._DoingUCFCheckOffs = value; } - } - // flags the value that should be used (true/false) for using additional UCF checkoffs (used with DoingUCFCheckOffs) - private static bool _DoingUCFCheckOffsUse = false; - public static bool DoingUCFCheckOffsUse - { - get { return PlantFormat._DoingUCFCheckOffsUse; } - set { PlantFormat._DoingUCFCheckOffsUse = value; } - } + #endregion //User Control of Format (UCF) public static FormatConfig GetFormatConfig(IFormatOrFormatInfo format) { @@ -1861,53 +1848,9 @@ namespace VEPROMS.CSLA.Library { if (_CheckOffList != null) return _CheckOffList; - // Get a list of checkoffs that should be included: - // if !UseCheckOffUCF (Baseall has it as false. User can change setting in UCF to true) - // if !IgnoreUCF, i.e. use UCF changes, return original lists with only active items (Inactive = false) - // if IgnoreUCF, return original lists with all items - // if UseCheckOffUCF is true use the merged lists from current format and baseall.xml and - // do the same processing for IgnoreUCF described above. - - // UseCheckOffUCF is false or there is no FormatConfig (UCF) data: - FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat); - //if (!MyFormat.PlantFormat.FormatData.ProcData.CheckOffUCF || fc==null) - //{ - // _CheckOffList = new CheckOffList(SelectNodes("CheckOffList/CheckOff"), MyFormat); - // // B2019-100: If Ignoring the UCF data, just return the entire list. Also, return entire list if there is no UCF data (fc == null) - // if (PlantFormat.IgnoreUCF || fc == null) return _CheckOffList; - // // If not ignoring UCF settings, only return those that are active - // foreach (FormatConfig.CheckOff co in fc.PlantFormat.FormatData.CheckOffList) - // { - // foreach (CheckOff coo in _CheckOffList) - // { - // if ((int)coo.Index == Convert.ToInt32(co.Index) && !(bool)co.Active) - // { - // _CheckOffList.Remove(coo); - // break; - // } - // } - // } - // return _CheckOffList; - //} - // UseCheckOfffUCF is true: // merge the checkoff list from the current format and the checkoff list from the base format _CheckOffList = new CheckOffList(SelectNodes("CheckOffList/CheckOff"), MyFormat); - CheckOffList retlist2 = new CheckOffList(SelectNodes("../CheckOffDataUCF/CheckOffList/CheckOff"), MyFormat); - if (retlist2 != null && retlist2.Count > 0) foreach (CheckOff co in retlist2) _CheckOffList.Add(co); - if (PlantFormat.IgnoreUCF) return _CheckOffList; - // if applying UCF, then remove those that are inactive: - foreach (FormatConfig.CheckOff co in fc.PlantFormat.FormatData.CheckOffList) - { - foreach (CheckOff coo in _CheckOffList) - { - if ((int)coo.Index == Convert.ToInt32(co.Index) && !(bool)co.Active) - { - _CheckOffList.Remove(coo); - break; - } - } - } return _CheckOffList; } } @@ -1923,77 +1866,13 @@ namespace VEPROMS.CSLA.Library { if (_CheckOffHeaderList != null) return _CheckOffHeaderList; FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat); - //if (!MyFormat.PlantFormat.FormatData.ProcData.CheckOffUCF || fc == null) - //{ - // _CheckOffHeaderList = new CheckOffHeaderList(SelectNodes("CheckOffHeaderList/CheckOffHeader"), MyFormat); - // // Depending on the IgnoreUCF flag, either return this list with UCF Inactive flags set or return the - // // list as is. - // if (PlantFormat.IgnoreUCF || fc == null) return _CheckOffHeaderList; - // // If not ignoring UCF settings, only return those that are active - // foreach (FormatConfig.CheckOffHeader coh in fc.PlantFormat.FormatData.CheckOffHeaderList) - // { - // foreach (CheckOffHeader coo in _CheckOffHeaderList) - // { - // if ((int)coo.Index == Convert.ToInt32(coh.Index) && !(bool)coh.Active) - // { - // _CheckOffHeaderList.Remove(coo); - // break; - // } - // } - // } - // return _CheckOffHeaderList; - //} + // merge the checkoff header lists from the current format and the list from the base _CheckOffHeaderList = new CheckOffHeaderList(SelectNodes("CheckOffHeaderList/CheckOffHeader"), MyFormat); - CheckOffHeaderList retlist2 = new CheckOffHeaderList(SelectNodes("../CheckOffDataUCF/CheckOffHeaderList/CheckOffHeader"), MyFormat); - if (retlist2 != null && retlist2.Count > 0) foreach (CheckOffHeader co in retlist2) _CheckOffHeaderList.Add(co); - if (PlantFormat.IgnoreUCF) return _CheckOffHeaderList; - // if applying UCF, then remove those that are inactive. - foreach (FormatConfig.CheckOffHeader coh in fc.PlantFormat.FormatData.CheckOffHeaderList) - { - foreach (CheckOffHeader cooh in _CheckOffHeaderList) - { - if ((int)cooh.Index == Convert.ToInt32(coh.Index) && !(bool)coh.Active) - { - _CheckOffHeaderList.Remove(cooh); - break; - } - } - } return _CheckOffHeaderList; } } - public void CheckOffHeaderListRefresh(bool CheckOffUCF) - { - if (!CheckOffUCF) - { - _CheckOffHeaderList = new CheckOffHeaderList(SelectNodes("CheckOffHeaderList/CheckOffHeader"), MyFormat); - // Depending on the IgnoreUCF flag, either return this list with UCF Inactive flags set or return the - // list as is. - FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat); - if (PlantFormat.IgnoreUCF || fc == null) return; - // If not ignoring UCF settings, only return those that are active - foreach (FormatConfig.CheckOffHeader coh in fc.PlantFormat.FormatData.CheckOffHeaderList) - { - foreach (CheckOffHeader coo in _CheckOffHeaderList) - { - if ((int)coo.Index == Convert.ToInt32(coh.Index) && !(bool)coh.Active) - { - _CheckOffHeaderList.Remove(coo); - break; - } - } - } - return; - } - // if coming from the UCF dialog, then check for the 'ignoreUCF' this will flag whether to only - // merge the checkoff header lists from the current format and the list from the base - CheckOffHeaderList retlist = new CheckOffHeaderList(SelectNodes("CheckOffHeaderList/CheckOffHeader"), MyFormat); - CheckOffHeaderList retlist2 = new CheckOffHeaderList(SelectNodes("../CheckOffDataUCF/CheckOffHeaderList/CheckOffHeader"), MyFormat); - if (retlist2 != null && retlist2.Count > 0) foreach (CheckOffHeader co in retlist2) retlist.Add(co); - _CheckOffHeaderList = retlist; - } // This is used with the {INITIALS} pagelist token and will put the word "INITIALS" at the specified pagelist // location for the checkoff column header. Used by Calvert Cliffs (BGEOI and BGESTP formats) diff --git a/PROMS/Volian.Controls.Library/DisplayTags.cs b/PROMS/Volian.Controls.Library/DisplayTags.cs index a6674a8a..7621c55c 100644 --- a/PROMS/Volian.Controls.Library/DisplayTags.cs +++ b/PROMS/Volian.Controls.Library/DisplayTags.cs @@ -315,12 +315,6 @@ namespace Volian.Controls.Library if (StepOverRide()) cmbCheckoff.Enabled = false; // Checkoffs already assigned to AER - //// if there are no checkoffs OR - //// if this is a sign-off, the checkoff list is not enabled either (matches 16bit functionality) At some point, we - //// may want to allow them to turn off the checkoff - //if ((fmtdata.ProcData.CheckOffData.CheckOffList == null || fmtdata.ProcData.CheckOffData.CheckOffList.Count == 0) || - // fmtdata.ProcData.CheckOffData.Menu=="Signoff") - // cmbCheckoff.Enabled = false; cbCAS.Enabled = (!CurItemInfo.IsFigure && !CurItemInfo.IsRtfRaw); cbTCAS.Enabled = (!CurItemInfo.IsFigure && !CurItemInfo.IsRtfRaw); //F2022-024 Time Critical Action Summary if (((CurItemInfo.ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedBackgrounds) == E_PurchaseOptions.EnhancedBackgrounds) || @@ -856,21 +850,6 @@ namespace Volian.Controls.Library MyEditItem.SaveContents(); // set selected index in the step's config. int indx = _CheckOffIndex[cmbCheckoff.SelectedIndex]; // C2020-003 get the non-sorted index from the sorted index - // 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. - //if (CurItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffUCF) - //{ - // // 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 mobx. - // foreach (CheckOff co in CurItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList) - // { - // if (cmbCheckoff.SelectedItem == co.MenuItem) - // { - // if ((int)co.Index >= 100) indx = (int)co.Index; - // break; - // } - // } - //} StepConfig sc = CurItemInfo.MyConfig as StepConfig; sc.Step_CheckOffIndex = indx; //using (Content cnt = Content.Get(CurItemInfo.MyContent.ContentID)) diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index deb8468c..fc396d84 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -4459,11 +4459,11 @@ namespace Volian.Print.Library } } // 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); - } + //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.