Added Express format flag; adjust tabs/indents for section, subsection, step and substeps; flag warnings as separate from notes & make boxes different between Notes/Cautions/Warnings
Proms Express: Adjust PrintLevel (of steps) for tabs Proms Express: Added Express flag Proms Express: Put out message when user adds substep that is greater than a level of 4 Proms Express: If a section doesn’t have text & in Proms Express, don’t put out ‘No Section Content’ message
This commit is contained in:
parent
94a1c4289b
commit
9e0b85c5ac
Binary file not shown.
@ -3331,8 +3331,8 @@ namespace VEPROMS.CSLA.Library
|
|||||||
if (sd.StepSectionLayoutData.ShowSectionTitles
|
if (sd.StepSectionLayoutData.ShowSectionTitles
|
||||||
&& !MyDocStyle.CancelSectTitle
|
&& !MyDocStyle.CancelSectTitle
|
||||||
&& !(MyDocStyle.SpecialStepsFoldout && MyDocStyle.UseColSByLevel))
|
&& !(MyDocStyle.SpecialStepsFoldout && MyDocStyle.UseColSByLevel))
|
||||||
localPrintLevel = PrintLevel + CurrentSectionLevel();
|
localPrintLevel = PrintLevel + ((ActiveFormat.PlantFormat.FormatData.Express && IsSequential) ? 0 : CurrentSectionLevel());
|
||||||
doMeta = true;
|
if (!ActiveFormat.PlantFormat.FormatData.Express) doMeta = true;
|
||||||
}
|
}
|
||||||
SeqTabFmtList seqtabs = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.SeqTabFmtList;
|
SeqTabFmtList seqtabs = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.SeqTabFmtList;
|
||||||
// Start with basic cases of alpha/numeric/seq:
|
// Start with basic cases of alpha/numeric/seq:
|
||||||
|
@ -179,6 +179,14 @@ namespace VEPROMS.CSLA.Library
|
|||||||
return LazyLoad(ref _Name, "@Name");
|
return LazyLoad(ref _Name, "@Name");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private LazyLoad<bool> _Express;
|
||||||
|
public bool Express
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return LazyLoad(ref _Express, "@Express");
|
||||||
|
}
|
||||||
|
}
|
||||||
private LazyLoad<bool> _SpecificInfo;
|
private LazyLoad<bool> _SpecificInfo;
|
||||||
public bool SpecificInfo
|
public bool SpecificInfo
|
||||||
{
|
{
|
||||||
@ -4000,6 +4008,14 @@ namespace VEPROMS.CSLA.Library
|
|||||||
return LazyLoad(ref _ReadOnly, "@ReadOnly");
|
return LazyLoad(ref _ReadOnly, "@ReadOnly");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//private LazyLoad<bool> _SeparateWarning; // KBR: To be used for Proms Express to separate out warnings from notes/cautions on ribbon, etc
|
||||||
|
//public bool SeparateWarning
|
||||||
|
//{
|
||||||
|
// get
|
||||||
|
// {
|
||||||
|
// return LazyLoad(ref _SeparateWarning, "@SeparateWarning");
|
||||||
|
// }
|
||||||
|
//}
|
||||||
private LazyLoad<bool> _Inactive;
|
private LazyLoad<bool> _Inactive;
|
||||||
public bool Inactive
|
public bool Inactive
|
||||||
{
|
{
|
||||||
|
@ -1227,7 +1227,8 @@ namespace Volian.Controls.Library
|
|||||||
// if (rno is enabled, set the tag:
|
// if (rno is enabled, set the tag:
|
||||||
if (btnInsRNO.Enabled)
|
if (btnInsRNO.Enabled)
|
||||||
btnInsRNO.Tag = string.Format("{0} {1}", (int)E_FromTypes.RNOs, MyEditItem.MyItemInfo.ActiveFormat.PlantFormat.FormatData.GetIndexFromType("RNOType"));
|
btnInsRNO.Tag = string.Format("{0} {1}", (int)E_FromTypes.RNOs, MyEditItem.MyItemInfo.ActiveFormat.PlantFormat.FormatData.GetIndexFromType("RNOType"));
|
||||||
|
// Proms Express/Message when substep level > 4 may have reset tooltip, so reset:
|
||||||
|
if (btnInsSubstep.Enabled) this.superTooltipRibbon.SetSuperTooltip(this.btnInsSubstep, new DevComponents.DotNetBar.SuperTooltipInfo("Insert Substep [Ctrl] [Shift] [S]", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
|
||||||
// add subitems depending on whether parent type is enabled:
|
// add subitems depending on whether parent type is enabled:
|
||||||
if (btnInsHLS.Enabled) GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.HLS, sd, btnInsHLS, 0, btnCMInsHLS, docontextmenus);
|
if (btnInsHLS.Enabled) GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.HLS, sd, btnInsHLS, 0, btnCMInsHLS, docontextmenus);
|
||||||
if (btnInsCaut.Enabled) GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Caution, sd, btnInsCaut, (int)E_FromType.Caution, btnCMInsCaution, docontextmenus);
|
if (btnInsCaut.Enabled) GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Caution, sd, btnInsCaut, (int)E_FromType.Caution, btnCMInsCaution, docontextmenus);
|
||||||
@ -1386,6 +1387,13 @@ namespace Volian.Controls.Library
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
// If in Proms Express, let user know if they are going to create a new substep deeper than 4 levels. This uses the
|
||||||
|
// tool tip to display the message.
|
||||||
|
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.Express && btn.Name == "btnInsSubstep" && (MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0))
|
||||||
|
{
|
||||||
|
if (MyItemInfo.GetStepLevel() >= 4)
|
||||||
|
this.superTooltipRibbon.SetSuperTooltip(this.btnInsSubstep, new DevComponents.DotNetBar.SuperTooltipInfo("Per PPA WG Standard If the task exceeds four step levels, consider rewriting the task.", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Red));
|
||||||
|
}
|
||||||
rbnStepParts.Refresh();
|
rbnStepParts.Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2239,6 +2247,9 @@ namespace Volian.Controls.Library
|
|||||||
moveDown = cnt;
|
moveDown = cnt;
|
||||||
cnt++;
|
cnt++;
|
||||||
}
|
}
|
||||||
|
// If in Proms Express, let user know if they are going to create a new substep deeper than 4 levels:
|
||||||
|
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.Express && MyItemInfo.GetStepLevel() >= 4)
|
||||||
|
MessageBox.Show("Per PPA WG Standard If the task exceeds four step levels, consider rewriting the task.", "Warning...", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||||
break;
|
break;
|
||||||
case "InsCaution":
|
case "InsCaution":
|
||||||
displayMenu = ((actable & E_AccStep.AddingCaution) > 0) && btnCMInsCaution.Enabled;
|
displayMenu = ((actable & E_AccStep.AddingCaution) > 0) && btnCMInsCaution.Enabled;
|
||||||
|
@ -1454,7 +1454,7 @@ namespace Volian.Print.Library
|
|||||||
//pt.Description = "After vlnParagrph";
|
//pt.Description = "After vlnParagrph";
|
||||||
float localYPageStart = 0;
|
float localYPageStart = 0;
|
||||||
float yPageStart = yTopMargin;
|
float yPageStart = yTopMargin;
|
||||||
if (myItemInfo.HasChildren || myItemInfo.MyDocVersion.DocVersionConfig.SelectedSlave > 0)
|
if (myItemInfo.HasChildren || myItemInfo.MyDocVersion.DocVersionConfig.SelectedSlave > 0 || (myItemInfo.ActiveFormat.PlantFormat.FormatData.Express && myItemInfo.MyDocStyle.OptionalSectionContent))
|
||||||
{
|
{
|
||||||
localYPageStart = myParagraph.ToPdf(cb, yPageStart, ref yTopMargin, ref yBottomMargin);
|
localYPageStart = myParagraph.ToPdf(cb, yPageStart, ref yTopMargin, ref yBottomMargin);
|
||||||
if (myParagraph.MyPlaceKeeper != null)
|
if (myParagraph.MyPlaceKeeper != null)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user