C2026-021_B2026-048 Expand Functionality of Viewing Mode
This commit is contained in:
@@ -246,6 +246,10 @@ namespace VEPROMS
|
|||||||
|
|
||||||
tc.MyCopyStep = myParent.tc.MyCopyStep; // copy the copystep info to the child window
|
tc.MyCopyStep = myParent.tc.MyCopyStep; // copy the copystep info to the child window
|
||||||
|
|
||||||
|
//B2026 - 048 View Only Mode freezes PROMS if last tab closed
|
||||||
|
tc.EnableDisableStepProperties -= EnableDisableStepProperties;
|
||||||
|
tc.EnableDisableStepProperties += new StepTabRibbonEvent(EnableDisableStepProperties);
|
||||||
|
|
||||||
(tv.Nodes[0] as VETreeNode).InChildWindow = true; // tells us this folder's tree nodes are in the child window
|
(tv.Nodes[0] as VETreeNode).InChildWindow = true; // tells us this folder's tree nodes are in the child window
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -352,6 +356,7 @@ namespace VEPROMS
|
|||||||
|
|
||||||
displayRO.TabControl = tc; // B2019-043 this was being passed in as a parameter for DisplayRO which caused issues with the Visual Studio designer
|
displayRO.TabControl = tc; // B2019-043 this was being passed in as a parameter for DisplayRO which caused issues with the Visual Studio designer
|
||||||
bottomProgBar.ValueChanged += new EventHandler(bottomProgBar_ValueChanged);
|
bottomProgBar.ValueChanged += new EventHandler(bottomProgBar_ValueChanged);
|
||||||
|
tc.EnableDisableStepProperties += new StepTabRibbonEvent(EnableDisableStepProperties);
|
||||||
|
|
||||||
// When creating an XY Plot, a System.Drawing.Graphics is needed and it requires a form. Use the main form.
|
// When creating an XY Plot, a System.Drawing.Graphics is needed and it requires a form. Use the main form.
|
||||||
if (VlnSettings.DebugMode)
|
if (VlnSettings.DebugMode)
|
||||||
@@ -964,7 +969,18 @@ namespace VEPROMS
|
|||||||
{
|
{
|
||||||
pnl.ApplDisplayMode = displayApplicability.ViewMode;
|
pnl.ApplDisplayMode = displayApplicability.ViewMode;
|
||||||
displayHistory.ApplDisplayMode = pnl.ApplDisplayMode;
|
displayHistory.ApplDisplayMode = pnl.ApplDisplayMode;
|
||||||
|
|
||||||
|
//C2026-021 Expand Functionality of Viewing Mode
|
||||||
|
if (pnl.ApplDisplayMode > 0 && pnl.VwMode != E_ViewMode.View)
|
||||||
|
{
|
||||||
|
pnl.VwMode = E_ViewMode.View;
|
||||||
|
EnableDisableStepProperties(sender, new StepTabRibbonEventArgs(tc.SelectedDisplayTabItem.MyItemInfo, 0, pnl.VwMode));
|
||||||
|
MessageBox.Show("Changing to View Only Mode. Applicability Viewing Mode must be Master to return to Edit Mode. View Mode can be toggled off via the Ribbon->View tab.", "Changing to View Mode", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pnl.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void tv_ViewPDF(object sender, vlnTreeViewPdfArgs args)
|
void tv_ViewPDF(object sender, vlnTreeViewPdfArgs args)
|
||||||
@@ -4867,15 +4883,31 @@ namespace VEPROMS
|
|||||||
//In View Only Mode - Step Properties should be disabled
|
//In View Only Mode - Step Properties should be disabled
|
||||||
public void EnableDisableStepProperties(object sender, StepTabRibbonEventArgs args)
|
public void EnableDisableStepProperties(object sender, StepTabRibbonEventArgs args)
|
||||||
{
|
{
|
||||||
if (args.ViewMode == E_ViewMode.View && (infoTabs.Enabled || infoTabs.SelectedTab != infotabTags))
|
//C2026 - 021 Expand Functionality of Viewing Mode
|
||||||
|
//B2026 - 048 View Only Mode freezes PROMS if last tab closed
|
||||||
|
if (args.ViewMode == E_ViewMode.View && (infotabControlPanelTags.Enabled || (infoTabs.SelectedTab != infotabTags && infoTabs.SelectedTab != infotabApplicability)))
|
||||||
|
{
|
||||||
|
if (infoTabs.SelectedTab != infotabApplicability)
|
||||||
{
|
{
|
||||||
infoTabs.Enabled = true;
|
|
||||||
infoTabs.SelectedTab = infotabTags;
|
infoTabs.SelectedTab = infotabTags;
|
||||||
infoTabs.Enabled = false;
|
|
||||||
}
|
}
|
||||||
else if (args.ViewMode != E_ViewMode.View && !infoTabs.Enabled)
|
|
||||||
|
infotabControlPanelTags.Enabled = false;
|
||||||
|
infotabControlPanelRO.Enabled = false;
|
||||||
|
infotabControlPanelTransitions.Enabled = false;
|
||||||
|
tabControlPanel1.Enabled = false;
|
||||||
|
displayApplicability.SetEnableDisableItemSelection(false);
|
||||||
|
tcpFoldoutMaint.Enabled = false;
|
||||||
|
|
||||||
|
}
|
||||||
|
else if (args.ViewMode != E_ViewMode.View && !infotabControlPanelTags.Enabled)
|
||||||
{
|
{
|
||||||
infoTabs.Enabled = true;
|
infotabControlPanelTags.Enabled = true;
|
||||||
|
infotabControlPanelRO.Enabled = true;
|
||||||
|
infotabControlPanelTransitions.Enabled = true;
|
||||||
|
tabControlPanel1.Enabled = true;
|
||||||
|
displayApplicability.SetEnableDisableItemSelection(true);
|
||||||
|
tcpFoldoutMaint.Enabled = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8123,6 +8123,10 @@ namespace VEPROMS.CSLA.Library
|
|||||||
}
|
}
|
||||||
set { _ChangeBarDate = value; }
|
set { _ChangeBarDate = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//C2026-021 Expand Functionality of Viewing Mode
|
||||||
|
public void ResetChangeBar() => _ChangeBarDate = null;
|
||||||
|
|
||||||
public Dictionary<int, ItemInfo> MyLookup = null;
|
public Dictionary<int, ItemInfo> MyLookup = null;
|
||||||
public override void SetupTags()
|
public override void SetupTags()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ namespace Volian.Controls.Library
|
|||||||
foreach (string name in names)
|
foreach (string name in names)
|
||||||
{
|
{
|
||||||
i++;
|
i++;
|
||||||
AddViewMode(name.Trim(), i.ToString(), apple == i);
|
AddViewMode($"{name.Trim()} (View Only)", i.ToString(), apple == i);
|
||||||
}
|
}
|
||||||
|
|
||||||
AddItemMode("All", "-1", ref gpSubItem);
|
AddItemMode("All", "-1", ref gpSubItem);
|
||||||
@@ -130,6 +130,10 @@ namespace Volian.Controls.Library
|
|||||||
set { _MyApplicability = value; }
|
set { _MyApplicability = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//C2026-021 Expand Functionality of Viewing Mode
|
||||||
|
public bool ShowItemSelection = true;
|
||||||
|
public void SetEnableDisableItemSelection(bool value) => gpItem.Enabled = ShowItemSelection = value;
|
||||||
|
|
||||||
//private ProcedureInfo _MyProcedureInfo;
|
//private ProcedureInfo _MyProcedureInfo;
|
||||||
//public ProcedureInfo MyProcedureInfo
|
//public ProcedureInfo MyProcedureInfo
|
||||||
//{
|
//{
|
||||||
@@ -550,7 +554,7 @@ namespace Volian.Controls.Library
|
|||||||
void DisplayApplicability_VisibleChanged(object sender, EventArgs e)
|
void DisplayApplicability_VisibleChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
MyItemInfo = MyItemInfo;
|
MyItemInfo = MyItemInfo;
|
||||||
gpItem.Enabled = UserInfo.CanEdit(MyUserInfo,(MyItemInfo == null) ? null : MyItemInfo.MyDocVersion); //Can Change Applicability
|
gpItem.Enabled = ShowItemSelection && UserInfo.CanEdit(MyUserInfo,(MyItemInfo == null) ? null : MyItemInfo.MyDocVersion); //Can Change Applicability
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -549,6 +549,14 @@ namespace Volian.Controls.Library
|
|||||||
if (((Bar)sender).Items == null) return;
|
if (((Bar)sender).Items == null) return;
|
||||||
if (((Bar)sender).Items.Count == 1)// Remove bar if last item is closed...
|
if (((Bar)sender).Items.Count == 1)// Remove bar if last item is closed...
|
||||||
{
|
{
|
||||||
|
//B2026 - 048 View Only Mode freezes PROMS if last tab closed
|
||||||
|
//if last item is closing, need to re-enable Step Properties
|
||||||
|
//so if closing in view only mode will not freeze when re-opening
|
||||||
|
if (MyEditItem != null && MyEditItem.MyStepPanel.VwMode == E_ViewMode.View)
|
||||||
|
{
|
||||||
|
OnEnableDisableStepProperties(new StepTabRibbonEventArgs(MyEditItem.MyItemInfo, 0, E_ViewMode.Edit));
|
||||||
|
}
|
||||||
|
|
||||||
Bar bar = sender as Bar;
|
Bar bar = sender as Bar;
|
||||||
if (bar != null)
|
if (bar != null)
|
||||||
{
|
{
|
||||||
@@ -568,6 +576,13 @@ namespace Volian.Controls.Library
|
|||||||
ActivateRemainingTab((Bar)sender);
|
ActivateRemainingTab((Bar)sender);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public event StepTabRibbonEvent EnableDisableStepProperties;
|
||||||
|
private void OnEnableDisableStepProperties(StepTabRibbonEventArgs args)
|
||||||
|
{
|
||||||
|
if (EnableDisableStepProperties != null)
|
||||||
|
EnableDisableStepProperties(this, args);
|
||||||
|
}
|
||||||
#endregion
|
#endregion
|
||||||
#region Public Methods
|
#region Public Methods
|
||||||
public void RefreshItem(ItemInfo myItemInfo)
|
public void RefreshItem(ItemInfo myItemInfo)
|
||||||
|
|||||||
@@ -245,6 +245,20 @@ namespace Volian.Controls.Library
|
|||||||
}
|
}
|
||||||
protected void MyContent_Changed(object sender)
|
protected void MyContent_Changed(object sender)
|
||||||
{
|
{
|
||||||
|
//C2026-021 Expand Functionality of Viewing Mode
|
||||||
|
if (MyStepPanel.ApplDisplayMode > 0)
|
||||||
|
{
|
||||||
|
MyItemInfo.MyDocVersion.DocVersionConfig.SelectedSlave = MyStepPanel.ApplDisplayMode;
|
||||||
|
MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = MyStepPanel.ApplDisplayMode;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
MyItemInfo.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
||||||
|
MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
MyItemInfo.MyProcedure.ResetChangeBar();
|
||||||
|
|
||||||
// Update the text to reflect the content change
|
// Update the text to reflect the content change
|
||||||
MyItemInfo.RefreshItemAnnotations();
|
MyItemInfo.RefreshItemAnnotations();
|
||||||
ChangeBar = MyItemInfo.HasChangeBar;
|
ChangeBar = MyItemInfo.HasChangeBar;
|
||||||
@@ -4115,6 +4129,13 @@ namespace Volian.Controls.Library
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
//// TIMING: DisplayItem.TimeIt("CSLARTB Parent");
|
//// TIMING: DisplayItem.TimeIt("CSLARTB Parent");
|
||||||
|
|
||||||
|
//C2026-021 Expand Functionality of Viewing Mode
|
||||||
|
if (MyStepPanel.ApplDisplayMode > 0)
|
||||||
|
MyItemInfo.MyDocVersion.DocVersionConfig.SelectedSlave = MyStepPanel.ApplDisplayMode;
|
||||||
|
else
|
||||||
|
MyItemInfo.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
||||||
|
|
||||||
SetText();
|
SetText();
|
||||||
if (itemInfo.IsSupInfoPart)
|
if (itemInfo.IsSupInfoPart)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -492,7 +492,24 @@ namespace Volian.Controls.Library
|
|||||||
OnAdjustTableWidth(this, new StepRTBTableWidthEventArgs(true));
|
OnAdjustTableWidth(this, new StepRTBTableWidthEventArgs(true));
|
||||||
//Volian.Base.Library.HWndCounter.GetWindowHandlesForCurrentProcess(this.Handle, "RefreshDisplay 2");
|
//Volian.Base.Library.HWndCounter.GetWindowHandlesForCurrentProcess(this.Handle, "RefreshDisplay 2");
|
||||||
_InitializingRTB = true;
|
_InitializingRTB = true;
|
||||||
|
|
||||||
|
//C2026-021 Expand Functionality of Viewing Mode
|
||||||
|
StepPanel pnl = (Parent as RTBItem)?.MyStepPanel;
|
||||||
|
if (pnl?.ApplDisplayMode > 0)
|
||||||
|
{
|
||||||
|
MyItemInfo.MyDocVersion.DocVersionConfig.SelectedSlave = pnl.ApplDisplayMode;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
MyItemInfo.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
||||||
|
}
|
||||||
|
|
||||||
DisplayText vlntxt = new DisplayText(MyItemInfo, E_EditPrintMode.Edit, VwMode, !ActiveMode, FieldToEdit, true,null, null,false);
|
DisplayText vlntxt = new DisplayText(MyItemInfo, E_EditPrintMode.Edit, VwMode, !ActiveMode, FieldToEdit, true,null, null,false);
|
||||||
|
if (pnl?.ApplDisplayMode > 0 && MyItemInfo.MyContent.ContentRoUsageCount > 0)
|
||||||
|
{
|
||||||
|
vlntxt.StartText = RefreshROsWithUnitStartText(vlntxt.StartText, pnl.ApplDisplayMode);
|
||||||
|
}
|
||||||
|
|
||||||
//Volian.Base.Library.HWndCounter.GetWindowHandlesForCurrentProcess(this.Handle, "RefreshDisplay 3");
|
//Volian.Base.Library.HWndCounter.GetWindowHandlesForCurrentProcess(this.Handle, "RefreshDisplay 3");
|
||||||
//if (_origDisplayText != null && vlntxt.StartText == _origDisplayText.StartText)
|
//if (_origDisplayText != null && vlntxt.StartText == _origDisplayText.StartText)
|
||||||
//{
|
//{
|
||||||
@@ -656,6 +673,47 @@ namespace Volian.Controls.Library
|
|||||||
Application.DoEvents();
|
Application.DoEvents();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//C2026-021 Expand Functionality of Viewing Mode
|
||||||
|
//regex for finding Referenced object links
|
||||||
|
private static Regex regRefObj = new Regex(@"\#Link\:ReferencedObject:([0-9]*) ([0-9a-zA-Z]*) ([0-9]*)", RegexOptions.Singleline);
|
||||||
|
|
||||||
|
//Replace the Default RO text with Unit Specific RO text
|
||||||
|
private string RefreshROsWithUnitStartText(string startText, int unitID)
|
||||||
|
{
|
||||||
|
ROFSTLookup lookup = MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyItemInfo.MyDocVersion);
|
||||||
|
|
||||||
|
MatchCollection mc = regRefObj.Matches(startText);
|
||||||
|
|
||||||
|
if (mc.Count == 0)
|
||||||
|
return startText;
|
||||||
|
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
int lastindex = 0;
|
||||||
|
|
||||||
|
foreach (Match match in mc)
|
||||||
|
{
|
||||||
|
//get where ther default text for the RO starts
|
||||||
|
int indx = startText.LastIndexOf(@"\v <START]\v0", match.Index) + 13;
|
||||||
|
|
||||||
|
//get the RO, value will be the unit related value
|
||||||
|
ROFSTLookup.rochild roc = lookup.GetRoChild(ROFSTLookup.FormatRoidKey(match.Groups[2].Value, true));
|
||||||
|
|
||||||
|
// append before tags up through the <START]\v0
|
||||||
|
//note if multiple tags this will also append the end up the previous tags
|
||||||
|
sb.Append(startText.Substring(lastindex, indx - lastindex));
|
||||||
|
|
||||||
|
//append the unit specific RO value (replacing where the default RO value was)
|
||||||
|
sb.Append($@"\cf1 {roc.value}\cf0\v");
|
||||||
|
|
||||||
|
lastindex = match.Index;
|
||||||
|
}
|
||||||
|
|
||||||
|
//append referenced object tag & text after tag
|
||||||
|
sb.Append(startText.Substring(lastindex));
|
||||||
|
|
||||||
|
return sb.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
private bool IsDerived(StepConfig sc)
|
private bool IsDerived(StepConfig sc)
|
||||||
{
|
{
|
||||||
foreach (EnhancedDocument ed in sc.MyEnhancedDocuments)
|
foreach (EnhancedDocument ed in sc.MyEnhancedDocuments)
|
||||||
|
|||||||
@@ -3367,6 +3367,13 @@ namespace Volian.Controls.Library
|
|||||||
MessageBox.Show(this, message, "Procedure Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
MessageBox.Show(this, message, "Procedure Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
//C2026-021 Expand Functionality of Viewing Mode
|
||||||
|
if (MyEditItem.MyStepPanel.VwMode == E_ViewMode.View && MyEditItem.MyStepPanel.ApplDisplayMode > 0)
|
||||||
|
{
|
||||||
|
//Procedure Viewing Mode is set to a specific Unit - so cannot exit vie only mode
|
||||||
|
MessageBox.Show(this, "Procedures with multiple units are only editable when the Viewing Mode is set to Master. To change out of View Only Mode, first open the Step Propeties panel->Applicability tab and change the Viewing Mode to be Master. Then you can disable View Only Mode.", "Procedure Viewing Mode Incompatiple with Edits", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||||
|
return;
|
||||||
|
}
|
||||||
else if (MyEditItem.MyStepPanel.VwMode == E_ViewMode.View)
|
else if (MyEditItem.MyStepPanel.VwMode == E_ViewMode.View)
|
||||||
{
|
{
|
||||||
//swapping into edit mode, so check out procedure and Setup Security
|
//swapping into edit mode, so check out procedure and Setup Security
|
||||||
|
|||||||
Reference in New Issue
Block a user