Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6f5c41abb8 | |||
| 6379321785 | |||
| e4c6e4393e | |||
| 3e6bb81e39 | |||
| 81643e2aef | |||
| 8a186f9f0c | |||
| 14aa39976a | |||
| c077e0ddc2 | |||
| d198a7b63a |
Binary file not shown.
@@ -1337,11 +1337,13 @@ namespace VEPROMS
|
|||||||
pi.ClearChangeBarOverrides();
|
pi.ClearChangeBarOverrides();
|
||||||
|
|
||||||
//B2019-140 Change bars do not get refreshed when approval is run.
|
//B2019-140 Change bars do not get refreshed when approval is run.
|
||||||
ProcedureInfo newproc = ItemInfo.ResetProcedure(pi.ItemID);
|
ProcedureInfo newproc;
|
||||||
|
|
||||||
//// Refresh the StepPanel for the current Procedure
|
//// Refresh the StepPanel for the current Procedure
|
||||||
//// so change bars update
|
//// so change bars update
|
||||||
//// on any open StepPanel
|
//// on any open StepPanel
|
||||||
|
|
||||||
|
//B2026-019 Attempt to prevent an Access Error by utilizing a different Refresh if a Procedure is Open
|
||||||
DisplayTabItem dti = MyFrmVEPROMS.GetTabContainingProcedure(pi.ItemID);
|
DisplayTabItem dti = MyFrmVEPROMS.GetTabContainingProcedure(pi.ItemID);
|
||||||
if (dti != null)
|
if (dti != null)
|
||||||
{
|
{
|
||||||
@@ -1349,9 +1351,20 @@ namespace VEPROMS
|
|||||||
dti.MyStepTabPanel.MyStepPanel.Focus();
|
dti.MyStepTabPanel.MyStepPanel.Focus();
|
||||||
|
|
||||||
foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
|
foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
|
||||||
|
{
|
||||||
eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
|
eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dti.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
|
||||||
|
Application.DoEvents();
|
||||||
|
newproc = ProcedureInfo.Get(pi.ItemID);
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
newproc = ItemInfo.ResetProcedure(pi.ItemID);
|
||||||
|
}
|
||||||
|
|
||||||
//since in a separate form, need to update the tree view
|
//since in a separate form, need to update the tree view
|
||||||
//so "Showing Change Bars" Content Menu Item is correct
|
//so "Showing Change Bars" Content Menu Item is correct
|
||||||
MyFrmVEPROMS.RefreshProcedureNode(newproc);
|
MyFrmVEPROMS.RefreshProcedureNode(newproc);
|
||||||
|
|||||||
@@ -628,11 +628,12 @@ namespace VEPROMS
|
|||||||
|
|
||||||
//B2019-140 Change bars do not get refreshed when approval is run.
|
//B2019-140 Change bars do not get refreshed when approval is run.
|
||||||
// Reset a Procedure and sub items in the cache
|
// Reset a Procedure and sub items in the cache
|
||||||
ProcedureInfo newproc = ItemInfo.ResetProcedure(pi.ItemID);
|
|
||||||
|
|
||||||
//// Refresh the StepPanel for the current Procedure
|
//// Refresh the StepPanel for the current Procedure
|
||||||
//// so change bars update
|
//// so change bars update
|
||||||
//// on any open StepPanel
|
//// on any open StepPanel
|
||||||
|
|
||||||
|
//B2026-019 Attempt to prevent an Access Error by utilizing a different Refresh if a Procedure is Open
|
||||||
DisplayTabItem dti = GetTabContainingProcedure(pi.ItemID);
|
DisplayTabItem dti = GetTabContainingProcedure(pi.ItemID);
|
||||||
if (dti != null)
|
if (dti != null)
|
||||||
{
|
{
|
||||||
@@ -640,8 +641,16 @@ namespace VEPROMS
|
|||||||
dti.MyStepTabPanel.MyStepPanel.Focus();
|
dti.MyStepTabPanel.MyStepPanel.Focus();
|
||||||
|
|
||||||
foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
|
foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
|
||||||
|
{
|
||||||
eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
|
eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dti.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_ = ItemInfo.ResetProcedure(pi.ItemID);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3841,6 +3841,14 @@ namespace VEPROMS.CSLA.Library
|
|||||||
|
|
||||||
//B2019-140 Change bars do not get refreshed when approval is run.
|
//B2019-140 Change bars do not get refreshed when approval is run.
|
||||||
// Reset a Procedure and sub items in the cache
|
// Reset a Procedure and sub items in the cache
|
||||||
|
// **********************
|
||||||
|
// Be carefull calling this when the Procedure is Open
|
||||||
|
// When the Procedure is Open - use StepTabRibbon.RefreshProcedure(); instead
|
||||||
|
// When a Procedure is open and you try to refresh it,
|
||||||
|
// events can fire behind the scenes - causing data to try to be accessed while you are trying to refresh it
|
||||||
|
// When This occurs, it will cause a
|
||||||
|
// "ThreadException ... Collection was modified; enumeration operation may not execute.”
|
||||||
|
// **********************
|
||||||
public static ProcedureInfo ResetProcedure(int procID)
|
public static ProcedureInfo ResetProcedure(int procID)
|
||||||
{
|
{
|
||||||
// The following lines reload the procedure info cache
|
// The following lines reload the procedure info cache
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ using System.Collections.Generic;
|
|||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.Data;
|
using System.Data;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
using VEPROMS.CSLA.Library;
|
using VEPROMS.CSLA.Library;
|
||||||
@@ -284,10 +285,17 @@ namespace Volian.Controls.Library
|
|||||||
Volian.Base.Library.BigNum MasterSlave_ApplicabilityTmp;
|
Volian.Base.Library.BigNum MasterSlave_ApplicabilityTmp;
|
||||||
StepConfig sc = MyItemInfo.MyConfig as StepConfig;
|
StepConfig sc = MyItemInfo.MyConfig as StepConfig;
|
||||||
MasterSlave_ApplicabilityTmp = sc.MasterSlave_Applicability;
|
MasterSlave_ApplicabilityTmp = sc.MasterSlave_Applicability;
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
|
|
||||||
ItemInfo startitm = MyItemInfo.FirstSibling;
|
ItemInfo startitm = MyItemInfo.FirstSibling;
|
||||||
while (startitm != null)
|
while (startitm != null)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
// C2026-023: Check for Transitions when setting Applicability to all for a level
|
||||||
|
List<InvalidTransition> invalidTrans = WillTransitionsBeValidCommand.Execute(startitm.ItemID, MasterSlave_ApplicabilityTmp.ToString());
|
||||||
|
if (IsProcWithNoExternalTrans(startitm, invalidTrans))
|
||||||
|
{
|
||||||
StepConfig sc2 = startitm.MyConfig as StepConfig;
|
StepConfig sc2 = startitm.MyConfig as StepConfig;
|
||||||
using (Content cnt = Content.Get(startitm.MyContent.ContentID))
|
using (Content cnt = Content.Get(startitm.MyContent.ContentID))
|
||||||
{
|
{
|
||||||
@@ -295,11 +303,34 @@ namespace Volian.Controls.Library
|
|||||||
cnt.Config = sc2.ToString();
|
cnt.Config = sc2.ToString();
|
||||||
cnt.Save();
|
cnt.Save();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (sb.Length == 0)
|
||||||
|
{
|
||||||
|
sb.AppendLine("The applicability for some Step(s) cannot be changed due to transition links.");
|
||||||
|
sb.AppendLine("Applicability settings for these steps will return to original settings when OK is selected.");
|
||||||
|
sb.AppendLine("Changing the applicability for would invalidate a transition in the following steps:");
|
||||||
|
sb.AppendLine();
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (InvalidTransition inv in invalidTrans.Where(x => !x.TgtStep.StartsWith(x.SrcStep)))
|
||||||
|
{
|
||||||
|
sb.AppendLine(string.Format("{0} : From {1} to {2}.", startitm.MyTab.CleanTextNoSymbols.Trim(), inv.TgtStep, inv.SrcStep));
|
||||||
|
}
|
||||||
|
|
||||||
|
invalidTrans.Clear();
|
||||||
|
}
|
||||||
|
|
||||||
startitm = startitm.GetNext();
|
startitm = startitm.GetNext();
|
||||||
}
|
}
|
||||||
|
|
||||||
_MyDisplayTabItem.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
|
_MyDisplayTabItem.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
|
||||||
|
|
||||||
|
if (sb.Length > 0)
|
||||||
|
FlexibleMessageBox.Show(sb.ToString(), "Transitions Affected By Applicability Change");
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// B2021-149: for procedure, only consider external transitions as invalid
|
// B2021-149: for procedure, only consider external transitions as invalid
|
||||||
|
|||||||
@@ -1668,8 +1668,18 @@ namespace Volian.Controls.Library
|
|||||||
}
|
}
|
||||||
Clipboard.Clear();
|
Clipboard.Clear();
|
||||||
|
|
||||||
|
//Try to update the data object to persist beyond PROMS life
|
||||||
|
//if can't, log it and use old method of scoping clipboard to PROMS life
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Clipboard.SetDataObject(myDO, true); // this saves the cleaned up information to the Windows clipboard
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_MyLog.Warn($"Error Setting Clipboard Object to Persist beyond PROMS. Clipboard will be scoped to PROMS. Error:{ex.Message}");
|
||||||
Clipboard.SetDataObject(myDO); // this saves the cleaned up information to the Windows clipboard
|
Clipboard.SetDataObject(myDO); // this saves the cleaned up information to the Windows clipboard
|
||||||
}
|
}
|
||||||
|
}
|
||||||
iData = Clipboard.GetDataObject();
|
iData = Clipboard.GetDataObject();
|
||||||
bool noEquationData = true;
|
bool noEquationData = true;
|
||||||
// part of bug B2017-117 we were running out of window handles when printing, found this similar use of
|
// part of bug B2017-117 we were running out of window handles when printing, found this similar use of
|
||||||
|
|||||||
Reference in New Issue
Block a user