Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e1630bd358 | ||
|
|
bbbb58df34 | ||
|
|
d46f037a9b | ||
|
|
a58ef4ecdd | ||
|
|
81e9ceb784 | ||
|
|
1d51080765 | ||
|
|
df2934a654 | ||
|
|
71a4aa313d | ||
|
|
f860ba367d | ||
|
|
382b8d7434 | ||
|
|
44bddbc95d | ||
|
|
eb246b1dbe | ||
|
|
93c6d32110 | ||
|
|
1a81c17ccd | ||
|
|
9078e99741 |
No files matched your search
Binary file not shown.
@@ -18903,9 +18903,9 @@ GO
|
|||||||
From vwRofstData_RofstDefaultValues rdv
|
From vwRofstData_RofstDefaultValues rdv
|
||||||
Where rdv.RofstID = @RofstID
|
Where rdv.RofstID = @RofstID
|
||||||
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 +25224,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"))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3192,7 +3192,7 @@ namespace Volian.Controls.Library
|
|||||||
{
|
{
|
||||||
int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
|
int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
|
||||||
ItemInfo ii = ItemInfo.Get(itemID);
|
ItemInfo ii = ItemInfo.Get(itemID);
|
||||||
if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
|
if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null && ii.ItemAnnotations.Count > 0) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
|
||||||
SearchResults.AddItemInfo(ii);
|
SearchResults.AddItemInfo(ii);
|
||||||
}
|
}
|
||||||
lbSrchResults.DataSource = SearchResults;
|
lbSrchResults.DataSource = SearchResults;
|
||||||
@@ -3214,7 +3214,7 @@ namespace Volian.Controls.Library
|
|||||||
int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
|
int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
|
||||||
ItemInfo ii = ItemInfo.Get(itemID);
|
ItemInfo ii = ItemInfo.Get(itemID);
|
||||||
// B2020-107: The following was needed to set the Step Path result type for annotations
|
// B2020-107: The following was needed to set the Step Path result type for annotations
|
||||||
if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null)
|
if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null && ii.ItemAnnotations.Count > 0)
|
||||||
{
|
{
|
||||||
ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
|
ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
|
||||||
ii.SearchAnnotationID = ii.ItemAnnotations[0].AnnotationID;
|
ii.SearchAnnotationID = ii.ItemAnnotations[0].AnnotationID;
|
||||||
@@ -3245,7 +3245,7 @@ namespace Volian.Controls.Library
|
|||||||
{
|
{
|
||||||
int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
|
int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
|
||||||
ItemInfo ii = ItemInfo.Get(itemID);
|
ItemInfo ii = ItemInfo.Get(itemID);
|
||||||
if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
|
if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null && ii.ItemAnnotations.Count > 0) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
|
||||||
SearchResults.AddItemInfo(ii);
|
SearchResults.AddItemInfo(ii);
|
||||||
}
|
}
|
||||||
lbSrchResultsIncTrans.DataSource = SearchResults;
|
lbSrchResultsIncTrans.DataSource = SearchResults;
|
||||||
|
|||||||
@@ -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