Compare commits

..
Author SHA1 Message Date
mschill e1630bd358 Merge branch 'Development' into B2026-092 2026-11-16 14:54:59 -05:00
mschill bbbb58df34 B2026-092 PROMS cannot find unlinked RO when Hard Spaces used with multiple return values 2026-11-16 14:55:21 -05:00
jjenko d46f037a9b Merge pull request 'B2026-094 When you paste a Caution, Note, or high-level step that has background information tied to it into a substep or an RNO step, PROMS should NOT paste the background information' (#839) from B2026-094 into Development
good for testing
2026-11-16 08:54:17 -05:00
mschill a58ef4ecdd B2026-094 When you paste a Caution, Note, or high-level step that has background information tied to it into a substep or an RNO step, PROMS should NOT paste the background information 2026-11-13 11:22:16 -05:00
jjenko 81e9ceb784 Merge pull request 'B2026-088 Refresh Issue with Refreshing Step Numbers After an inserted Step' (#838) from B2026-088 into Development
good for testing phase
2026-11-11 15:21:05 -05:00
mschill 1d51080765 B2026-088 Refresh Issue with Refreshing Step Numbers After an inserted Step 2026-11-11 15:11:59 -05:00
jjenko df2934a654 Merge pull request 'F2026-029 Comanche Peak ERG and ABN format, The End Of Section was added back to the Abnormal Procedure Steps Two Column section style.' (#837) from F2026-029_ComanchePeak_ABN_Format into Development
Format only change.  Good for testing
2026-11-09 11:11:31 -05:00
jjenko 71a4aa313d F2026-029 Comanche Peak ERG and ABN format, The End Of Section was added back to the Abnormal Procedure Steps Two Column section style. 2026-11-09 11:12:16 -05:00
mschill f860ba367d Merge pull request 'B2026-093 Fixed a null reference error that happened when opening an alarm point page for the first time' (#836) from B2026-093_Vogtle_Alarms into Development
Looks good. Ready for QA.
2026-11-05 15:29:28 -05:00
5 changed files with 51 additions and 10 deletions

No files matched your search

Binary file not shown.
+5 -5
View File
@@ -18903,9 +18903,9 @@ GO
From vwRofstData_RofstDefaultValues rdv
Where rdv.RofstID = @RofstID
And ((@Value is null)
Or (@SearchTypeID = 1 And rdv.[value] like @Value + '%') -- Starts With
Or (@SearchTypeID = 2 And rdv.[value] like '%' + @Value) -- Ends With
Or (@SearchTypeID = 3 And rdv.[value] like '%' + @Value + '%') -- Contains
Or (@SearchTypeID = 1 And REPLACE(rdv.[value], '@HSP(', '') like @Value + '%') -- Starts With
Or (@SearchTypeID = 2 And REPLACE(rdv.[value], '@HSP(', '') like '%' + @Value) -- Ends With
Or (@SearchTypeID = 3 And REPLACE(rdv.[value], '@HSP(', '') like '%' + @Value + '%') -- Contains
Or (@SearchTypeID = 4 And rdv.[value] = @Value)) -- Exact Match
Order By rdv.[value] Asc, rdv.roid Asc
Option (Recompile);
@@ -25224,8 +25224,8 @@ BEGIN TRY -- Try Block
DECLARE @RevDate varchar(255)
DECLARE @RevDescription varchar(255)
set @RevDate = '10/7/2026 9:30 AM'
set @RevDescription = 'Added Reports for Duplicate Acc Page IDs in ROs'
set @RevDate = '11/16/2026 9:30 AM'
set @RevDescription = 'Added Support for Hard Space in RO Search'
Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription
PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription
+1 -1
View File
@@ -1499,7 +1499,7 @@ namespace VEPROMS
}
}
}
else if (tc.MyEditItem != null && displayRO.MyROFST != null && tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].ROFstID != displayRO.MyROFST.ROFstID)
else if (displayRO.MyROFST != null && tc?.MyEditItem?.MyItemInfo?.MyDocVersion?.DocVersionAssociations != null && tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations.Count > 0 && tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].ROFstID != displayRO.MyROFST.ROFstID)
{
SelectedROFst = tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
}
@@ -2153,7 +2153,28 @@ namespace VEPROMS.CSLA.Library
return GetNext();
}
}
private static void ResetOrdinal(int itemID)
//B2026-088 Refresh Issue with Refreshing Step Numbers After an inserted Step
public void ResetOrdinalandPrevious(ItemInfo prevItm)
{
MyPrevious = prevItm;
_Ordinal = null;
_TagsSetup = false;
ConvertListToDictionary();
if (_CacheByPrimaryKey.ContainsKey(ItemID.ToString()))
{
ItemInfo[] items = _CacheByPrimaryKey[ItemID.ToString()].ToArray();
foreach (ItemInfo item in items)
{
item.MyPrevious = prevItm;
item._Ordinal = null;
item._TagsSetup = false;
}
}
OnOrdinalChange(ItemID); // After _Ordinal reset trigger event
}
private static void ResetOrdinal(int itemID)
{
ConvertListToDictionary();
string key = itemID.ToString();
@@ -2448,7 +2469,7 @@ namespace VEPROMS.CSLA.Library
DialogResult rslt = DialogResult.No;
SectionConfig secCfg = itemInfo.ActiveSection.MyConfig as SectionConfig;
if (copyItemInfo.HasEnhancedLinkedStep && secCfg.MyEnhancedDocuments.Count > 0)
if (copyItemInfo.HasEnhancedLinkedStep && secCfg.MyEnhancedDocuments.Count > 0 && IsValidTypeToCopybackground(itemInfo, copyItemInfo))
rslt = FlexibleMessageBox.Show("The step you are copying contains linked background documents." +
"\r\n\r\nDo you also wish to make a copy of the background documents?",
"Paste background documents", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
@@ -2597,8 +2618,15 @@ namespace VEPROMS.CSLA.Library
}
}
}
// B2026-094
// When you paste a Caution, Note, or high level step that has background information tied to it
// into a substep or an RNO step
// PROMS should NOT paste the background information
public static bool IsValidTypeToCopybackground(ItemInfo itemInfo, ItemInfo copyItemInfo) => (!copyItemInfo.IsCaution && !copyItemInfo.IsNote && !copyItemInfo.IsHigh) || (!itemInfo.IsInRNO && !itemInfo.IsSubStep);
#endregion
private static bool HandleSqlExceptionOnCopy(Exception ex)
private static bool HandleSqlExceptionOnCopy(Exception ex)
{
if (ex.Message.Contains("This step has been deleted"))
{
+14 -1
View File
@@ -1259,7 +1259,20 @@ namespace Volian.Controls.Library
default: // Need debug
break;
}
if (updateStatus)
//B2026-088 Refresh Issue with Refreshing Step Numbers After an inserted Step
EditItem tmp = this;
while (tmp.MyNextEditItem != null)
{
ItemInfo prevIInfo = tmp.MyItemInfo;
tmp = tmp.MyNextEditItem;
tmp.MyItemInfo.ResetOrdinalandPrevious(prevIInfo);
tmp.RefreshOrdinal();
}
Application.DoEvents();
if (updateStatus)
MyStepPanel.SelectedEditItem = newEditItem;//Update Screen
}
protected static int _WatchThis = 1;