Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Development #634

Merged
djankowski merged 29 commits from Development into master 2025-10-09 12:50:14 -04:00
Conversation 0 Commits 29 Files Changed 46 +10 -7
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0b015233a9 - Show all commits

14
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@@ -1807,14 +1807,15 @@ namespace VEPROMS
// Deactivate previous procedure tab state by user // Deactivate previous procedure tab state by user
VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID); VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
// Save current procedure tab state // Save current procedure tab state
foreach (KeyValuePair<string, DisplayTabItem> pgTab in tc._MyDisplayTabItems)
//B2024-082 Remember Tabs Not opening in correct order
foreach (DisplayTabItem dti in tc.MyBar.Items)
{ {
cnt++; cnt++;
DisplayTabID = pgTab.Key; DisplayTabID = dti.MyKey;
TabItemID = Int32.Parse(DisplayTabID.Substring(DisplayTabID.IndexOf("Item - ") + 7)); TabItemID = dti.MyItemInfo.ItemID;
DisplayTabName = pgTab.Value.ToString(); DisplayTabName = dti.ToString();
//tc.SelectedDisplayTabItem.MyStepTabPanel.ToString() Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt);
VEPROMS.CSLA.Library.Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt);
} }
} }
@@ -2513,6 +2514,7 @@ namespace VEPROMS
{ {
SelectedStepTabPanel.Select(); SelectedStepTabPanel.Select();
dlgFindReplace.MyEditItem = tc.MyEditItem; dlgFindReplace.MyEditItem = tc.MyEditItem;
SpellChecker.MyEditItem = tc.MyEditItem; //B2025-043 Remember Tabs is not setting the EditItem for the active window causing a PROMS crash when Spell Check
} }
} }
} }

3
PROMS/Volian.Controls.Library/DisplayTabControl.cs
View File

@@ -603,7 +603,8 @@ namespace Volian.Controls.Library
{ {
ItemInfo myItemInfo = myItemInfo2; ItemInfo myItemInfo = myItemInfo2;
if (myItemInfo.MyDocVersion == null) // bug fix: B2016-108 disconnected data will not have a MyDocVersion //B2025-046 Remember Tabs failing when swapping versions of PROMS
if (myItemInfo?.MyDocVersion == null) // bug fix: B2016-108 disconnected data will not have a MyDocVersion
{ {
FlexibleMessageBox.Show(this, "Possible disconnected item", "Item Not Found"); FlexibleMessageBox.Show(this, "Possible disconnected item", "Item Not Found");
return null; return null;