Compare commits

..
15 Commits
Author SHA1 Message Date
mschill 9ec3fbf5c1 Merge branch 'B2026-092' of https://git.volian.com/Volian/SourceCode into B2026-092 2026-11-17 07:33:40 -05:00
mschill feb632a2e2 vesp_RofstDataSearch was in PROMS fixes twice 2026-11-17 07:33:32 -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
mschill e1630bd358 Merge branch 'Development' into B2026-092 2026-11-16 14:54:59 -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
jjenko 382b8d7434 B2026-093 Fixed a null reference error that happened when opening an alarm point page for the first time 2026-11-05 15:27:37 -05:00
jjenko 44bddbc95d Merge pull request 'F2026-027 In the Comanche Peak ERG and ABN format, removed the End of Section messages from the Abnormal section styles and move the bottom continue message up so that it does not run into the section number below it.' (#835) from F2026-027_ComPeak into Development
format only change.
Good for testing
2026-11-05 14:48:33 -05:00
jjenko eb246b1dbe F2026-027 In the Comanche Peak ERG and ABN format, removed the End of Section messages from the Abnormal section styles and move the bottom continue message up so that it does not run into the section number below it. 2026-11-05 14:50:20 -05:00
jjenko 93c6d32110 Merge pull request 'B2026-082 Fix Load Global Search' (#834) from B2026-082 into Development
good for testing
2026-11-03 08:36:22 -05:00
5 changed files with 53 additions and 92 deletions

No files matched your search

Binary file not shown.
+5 -86
View File
@@ -18846,87 +18846,6 @@ GO
ELSE PRINT 'Procedure Creation: [vesp_RofstHeaderFinalizeLoad] Error on Creation'
GO
/****** Object: StoredProcedure [dbo].[vesp_RofstDataSearch] Script Date: 06/23/2022 ******/
If Exists(SELECT * FROM sys.objects Where name = 'vesp_RofstDataSearch' AND type in (N'P'))
DROP PROCEDURE [dbo].[vesp_RofstDataSearch]
GO
SET ANSI_NULLS ON
GO
SET QUOTED_IDENTIFIER ON
GO
/*****************************************************************************
Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
Copyright 2020 - Volian Enterprises, Inc. All rights reserved.
*****************************************************************************/
/*
==========================================================================================================
Author: Jake Ropar
Create Date: 06/23/2022
Description: RO Default Value Search
@SearchTypeID => (1) Starts With (2) Ends With (3) Contains (4) Exact Match
==========================================================================================================
*/
Create Procedure [dbo].[vesp_RofstDataSearch]
(
@RofstID int,
@Value VarChar(Max) = null,
@SearchTypeID Int = 1, -- Starts With
@MaxNumOfRecords Int = null
)
With Execute as Owner
As
Begin
-- Remove any leading/trailing white spaces
Set @Value = dbo.vefn_Clean( @Value, 0, null );
-- Escape any % signs in the search value
Set @Value = Replace( @Value, '%', '[%]' );
-- Format search value
If (Len(@Value) = 0) Set @Value = null;
-- Create Temp Results Table
Create Table #SearchResults
(roid VarChar(50) Not Null, [value] VarChar(Max), RowNum Int Not Null Primary Key);
-- Select roids/values based on search criteria
Insert Into #SearchResults (roid, [value], RowNum)
Select rdv.roid,
rdv.[value],
Row_Number() Over (Order By rdv.[value] Asc, rdv.roid Asc) as 'RowNum'
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 = 4 And rdv.[value] = @Value)) -- Exact Match
Order By rdv.[value] Asc, rdv.roid Asc
Option (Recompile);
-- Return the specified number of results
Select sr.roid, sr.[value]
From #SearchResults sr
Where (@MaxNumOfRecords is null Or sr.RowNum <= @MaxNumOfRecords)
Order By sr.RowNum Asc;
Return;
End
Go
IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_RofstDataSearch] Succeeded'
ELSE PRINT 'Procedure Creation: [vesp_RofstDataSearch] Error on Creation'
GO
/****** Object: StoredProcedure [dbo].[vesp_RofstDataGetValueDifferences] Script Date: 06/23/2022 ******/
If Exists(SELECT * FROM sys.objects Where name = 'vesp_RofstDataGetValueDifferences' AND type in (N'P'))
DROP PROCEDURE [dbo].[vesp_RofstDataGetValueDifferences]
@@ -20438,9 +20357,9 @@ GO
Where rdv.RofstID = @RofstID
And (@OnlyRoid16 = 0 Or Len(rdv.roid) = 16)
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 +25143,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"))
{
+16 -2
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;
@@ -3663,6 +3676,8 @@ namespace Volian.Controls.Library
TabLeft = 20;
if (!itemInfo.IsStep) // C2025-036 reduce un-needed processing - this will prevent duplicat calls that generate step tabs when loading a procedure
SetupHeader(itemInfo);
//B2026-093 move the setting of MyStepPanel to fix null reference error when the Alarm Point Table is first setup for the editor view
MyStepPanel = myStepPanel;
SetupAlarmTableView(itemInfo); // C2021-018 display alarm point table information in the step editor (if the format flag is set)
this.Paint -= new PaintEventHandler(EditItem_Paint);
this.Paint += new PaintEventHandler(EditItem_Paint);
@@ -3707,7 +3722,6 @@ namespace Volian.Controls.Library
if (myStepPanel.MyFont != null) ContentFont = TabFont = myStepPanel.MyFont;
}
if (expand) ShowExpanded();
MyStepPanel = myStepPanel;
if (itemInfo != null && !myStepPanel._LookupEditItems.ContainsKey(itemInfo.ItemID)) myStepPanel._LookupEditItems.Add(itemInfo.ItemID, this);
_MyChildRelation = myChildRelation;
if (myParentEditItem != null) RNOLevel = myParentEditItem.RNOLevel;