Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9ec3fbf5c1 | ||
|
|
feb632a2e2 | ||
|
|
bbbb58df34 | ||
|
|
e1630bd358 | ||
|
|
d46f037a9b | ||
|
|
a58ef4ecdd | ||
|
|
81e9ceb784 | ||
|
|
1d51080765 | ||
|
|
df2934a654 | ||
|
|
71a4aa313d | ||
|
|
f860ba367d | ||
|
|
382b8d7434 | ||
|
|
44bddbc95d |
No files matched your search
Binary file not shown.
@@ -18846,87 +18846,6 @@ GO
|
|||||||
ELSE PRINT 'Procedure Creation: [vesp_RofstHeaderFinalizeLoad] Error on Creation'
|
ELSE PRINT 'Procedure Creation: [vesp_RofstHeaderFinalizeLoad] Error on Creation'
|
||||||
GO
|
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 ******/
|
/****** 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'))
|
If Exists(SELECT * FROM sys.objects Where name = 'vesp_RofstDataGetValueDifferences' AND type in (N'P'))
|
||||||
DROP PROCEDURE [dbo].[vesp_RofstDataGetValueDifferences]
|
DROP PROCEDURE [dbo].[vesp_RofstDataGetValueDifferences]
|
||||||
@@ -20438,9 +20357,9 @@ GO
|
|||||||
Where rdv.RofstID = @RofstID
|
Where rdv.RofstID = @RofstID
|
||||||
And (@OnlyRoid16 = 0 Or Len(rdv.roid) = 16)
|
And (@OnlyRoid16 = 0 Or Len(rdv.roid) = 16)
|
||||||
And ((@Value is null)
|
And ((@Value is null)
|
||||||
Or (@SearchTypeID = 1 And rdv.[value] like @Value + '%') -- Starts With
|
Or (@SearchTypeID = 1 And REPLACE(rdv.[value], '@HSP(', '') like @Value + '%') -- Starts With
|
||||||
Or (@SearchTypeID = 2 And rdv.[value] like '%' + @Value) -- Ends With
|
Or (@SearchTypeID = 2 And REPLACE(rdv.[value], '@HSP(', '') like '%' + @Value) -- Ends With
|
||||||
Or (@SearchTypeID = 3 And rdv.[value] like '%' + @Value + '%') -- Contains
|
Or (@SearchTypeID = 3 And REPLACE(rdv.[value], '@HSP(', '') like '%' + @Value + '%') -- Contains
|
||||||
Or (@SearchTypeID = 4 And rdv.[value] = @Value)) -- Exact Match
|
Or (@SearchTypeID = 4 And rdv.[value] = @Value)) -- Exact Match
|
||||||
Order By rdv.[value] Asc, rdv.roid Asc
|
Order By rdv.[value] Asc, rdv.roid Asc
|
||||||
Option (Recompile);
|
Option (Recompile);
|
||||||
@@ -25224,8 +25143,8 @@ BEGIN TRY -- Try Block
|
|||||||
DECLARE @RevDate varchar(255)
|
DECLARE @RevDate varchar(255)
|
||||||
DECLARE @RevDescription varchar(255)
|
DECLARE @RevDescription varchar(255)
|
||||||
|
|
||||||
set @RevDate = '10/7/2026 9:30 AM'
|
set @RevDate = '11/16/2026 9:30 AM'
|
||||||
set @RevDescription = 'Added Reports for Duplicate Acc Page IDs in ROs'
|
set @RevDescription = 'Added Support for Hard Space in RO Search'
|
||||||
|
|
||||||
Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription
|
Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription
|
||||||
PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription
|
PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription
|
||||||
|
|||||||
@@ -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;
|
SelectedROFst = tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2153,7 +2153,28 @@ namespace VEPROMS.CSLA.Library
|
|||||||
return GetNext();
|
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();
|
ConvertListToDictionary();
|
||||||
string key = itemID.ToString();
|
string key = itemID.ToString();
|
||||||
@@ -2448,7 +2469,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
DialogResult rslt = DialogResult.No;
|
DialogResult rslt = DialogResult.No;
|
||||||
|
|
||||||
SectionConfig secCfg = itemInfo.ActiveSection.MyConfig as SectionConfig;
|
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." +
|
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?",
|
"\r\n\r\nDo you also wish to make a copy of the background documents?",
|
||||||
"Paste background documents", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
|
"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
|
#endregion
|
||||||
private static bool HandleSqlExceptionOnCopy(Exception ex)
|
private static bool HandleSqlExceptionOnCopy(Exception ex)
|
||||||
{
|
{
|
||||||
if (ex.Message.Contains("This step has been deleted"))
|
if (ex.Message.Contains("This step has been deleted"))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1259,7 +1259,20 @@ namespace Volian.Controls.Library
|
|||||||
default: // Need debug
|
default: // Need debug
|
||||||
break;
|
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
|
MyStepPanel.SelectedEditItem = newEditItem;//Update Screen
|
||||||
}
|
}
|
||||||
protected static int _WatchThis = 1;
|
protected static int _WatchThis = 1;
|
||||||
@@ -3663,6 +3676,8 @@ namespace Volian.Controls.Library
|
|||||||
TabLeft = 20;
|
TabLeft = 20;
|
||||||
if (!itemInfo.IsStep) // C2025-036 reduce un-needed processing - this will prevent duplicat calls that generate step tabs when loading a procedure
|
if (!itemInfo.IsStep) // C2025-036 reduce un-needed processing - this will prevent duplicat calls that generate step tabs when loading a procedure
|
||||||
SetupHeader(itemInfo);
|
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)
|
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);
|
||||||
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 (myStepPanel.MyFont != null) ContentFont = TabFont = myStepPanel.MyFont;
|
||||||
}
|
}
|
||||||
if (expand) ShowExpanded();
|
if (expand) ShowExpanded();
|
||||||
MyStepPanel = myStepPanel;
|
|
||||||
if (itemInfo != null && !myStepPanel._LookupEditItems.ContainsKey(itemInfo.ItemID)) myStepPanel._LookupEditItems.Add(itemInfo.ItemID, this);
|
if (itemInfo != null && !myStepPanel._LookupEditItems.ContainsKey(itemInfo.ItemID)) myStepPanel._LookupEditItems.Add(itemInfo.ItemID, this);
|
||||||
_MyChildRelation = myChildRelation;
|
_MyChildRelation = myChildRelation;
|
||||||
if (myParentEditItem != null) RNOLevel = myParentEditItem.RNOLevel;
|
if (myParentEditItem != null) RNOLevel = myParentEditItem.RNOLevel;
|
||||||
|
|||||||
Reference in new issue
Block a user