Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 mschill
|
1d51080765 | ||
 jjenko
|
df2934a654 | ||
|
jjenko
|
71a4aa313d | ||
|
mschill
|
f860ba367d | ||
|
jjenko
|
382b8d7434 | ||
|
jjenko
|
44bddbc95d | ||
|
jjenko
|
eb246b1dbe | ||
|
jjenko
|
93c6d32110 | ||
|
mschill
|
1a81c17ccd | ||
|
jjenko
|
9078e99741 |
No files matched your search
Binary file not shown.
@@ -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();
|
||||
|
||||
@@ -3192,7 +3192,7 @@ namespace Volian.Controls.Library
|
||||
{
|
||||
int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
|
||||
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);
|
||||
}
|
||||
lbSrchResults.DataSource = SearchResults;
|
||||
@@ -3214,7 +3214,7 @@ namespace Volian.Controls.Library
|
||||
int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
|
||||
ItemInfo ii = ItemInfo.Get(itemID);
|
||||
// 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.SearchAnnotationID = ii.ItemAnnotations[0].AnnotationID;
|
||||
@@ -3245,7 +3245,7 @@ namespace Volian.Controls.Library
|
||||
{
|
||||
int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
|
||||
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);
|
||||
}
|
||||
lbSrchResultsIncTrans.DataSource = SearchResults;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user