Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a58ef4ecdd | ||
|
|
81e9ceb784 | ||
|
|
1d51080765 | ||
|
|
df2934a654 |
No files matched your search
@@ -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"))
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user