Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f1e04396de | |||
| d0cae8c2fc | |||
| 90c215d4c1 | |||
| 1b1dc78548 | |||
| a112163f85 | |||
| 2a9f2e188d | |||
| 652e0cb06f | |||
| 123b1b08c2 | |||
| b321bc354b | |||
| 03d7397242 | |||
| fe7c5893bb | |||
| 2b57c552d1 |
@@ -1478,11 +1478,15 @@ namespace VEPROMS
|
|||||||
{
|
{
|
||||||
ProcedureConfig pc = procedureInfo.MyConfig as ProcedureConfig;
|
ProcedureConfig pc = procedureInfo.MyConfig as ProcedureConfig;
|
||||||
if (pc == null) return;
|
if (pc == null) return;
|
||||||
pc.SelectedSlave = selectedSlave;
|
|
||||||
|
//C2026-015 set overall change bar date
|
||||||
|
pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss");
|
||||||
|
|
||||||
|
pc.SelectedSlave = selectedSlave;
|
||||||
pc.Print_Rev = revNumber;
|
pc.Print_Rev = revNumber;
|
||||||
//AppRevDate Change
|
//AppRevDate Change
|
||||||
pc.Print_RevDate = revDate.ToString("MM/dd/yyyy");
|
pc.Print_RevDate = revDate.ToString("MM/dd/yyyy");
|
||||||
pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss");
|
pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss"); //this is needed to set the changebar date for an indeividual unit also
|
||||||
using (Item itm = Item.Get(procedureInfo.ItemID))
|
using (Item itm = Item.Get(procedureInfo.ItemID))
|
||||||
{
|
{
|
||||||
itm.MyContent.Config = pc.ToString();
|
itm.MyContent.Config = pc.ToString();
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ using System.IO;
|
|||||||
using System.Configuration;
|
using System.Configuration;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using VEPROMS.CSLA.Library;
|
using VEPROMS.CSLA.Library;
|
||||||
|
//using Csla;
|
||||||
using DevComponents;
|
using DevComponents;
|
||||||
using DevComponents.DotNetBar;
|
using DevComponents.DotNetBar;
|
||||||
using DevComponents.DotNetBar.Rendering;
|
using DevComponents.DotNetBar.Rendering;
|
||||||
|
|||||||
@@ -6215,8 +6215,13 @@ namespace VEPROMS.CSLA.Library
|
|||||||
if (!SectionHasCheckOffs()) return null;
|
if (!SectionHasCheckOffs()) return null;
|
||||||
int stpCoIndx = CheckOffIndex(); // this step has a checkoff defined
|
int stpCoIndx = CheckOffIndex(); // this step has a checkoff defined
|
||||||
if (stpCoIndx == -1) return null;
|
if (stpCoIndx == -1) return null;
|
||||||
|
//B2026-040 - Signoff/Checkoffs not printing unless set to Section Default
|
||||||
|
if (stpCoIndx > 1)
|
||||||
|
{
|
||||||
|
return ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList[stpCoIndx]; // DO override of CheckOffList[]
|
||||||
|
}
|
||||||
|
|
||||||
int sectCoIndx = SectionDefaultCheckOffIndex(); // no checkoff on step, see if there is a section default.
|
int sectCoIndx = SectionDefaultCheckOffIndex(); // no checkoff on step, see if there is a section default.
|
||||||
if (sectCoIndx == -1) return null;
|
if (sectCoIndx == -1) return null;
|
||||||
if ((ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffOnHLSOnly && IsHigh)
|
if ((ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffOnHLSOnly && IsHigh)
|
||||||
|| (!ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffOnHLSOnly && IsLowestLevelStep && stpCheckOff)) // && !RNOsHighHasCheckOff()))
|
|| (!ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffOnHLSOnly && IsLowestLevelStep && stpCheckOff)) // && !RNOsHighHasCheckOff()))
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ namespace Volian.Controls.Library
|
|||||||
this.btnApplicabilitychg.Size = new System.Drawing.Size(80, 22);
|
this.btnApplicabilitychg.Size = new System.Drawing.Size(80, 22);
|
||||||
this.btnApplicabilitychg.Margin = new System.Windows.Forms.Padding(2);
|
this.btnApplicabilitychg.Margin = new System.Windows.Forms.Padding(2);
|
||||||
this.btnApplicabilitychg.RightToLeft = System.Windows.Forms.RightToLeft.No;
|
this.btnApplicabilitychg.RightToLeft = System.Windows.Forms.RightToLeft.No;
|
||||||
this.superTooltip1.SetSuperTooltip(this.btnApplicabilitychg, new DevComponents.DotNetBar.SuperTooltipInfo("Change applicability settings - All At Level", "", "When clicked, all sub-steps at that level of the current step will be set to the selected applicability. Note that this button is disabled when on a RNO step type but enabled for sub-step under it.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
|
this.superTooltip1.SetSuperTooltip(this.btnApplicabilitychg, new DevComponents.DotNetBar.SuperTooltipInfo("Change applicability settings - All At Level", "", "When clicked, all steps at that level of the current step will be set to the selected applicability. Note that this button is disabled when on a RNO step type but enabled for sub-step under it.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
|
||||||
this.btnApplicabilitychg.TabIndex = 0;
|
this.btnApplicabilitychg.TabIndex = 0;
|
||||||
this.btnApplicabilitychg.Text = "Set All at Level";
|
this.btnApplicabilitychg.Text = "Set All at Level";
|
||||||
this.btnApplicabilitychg.ColorTable = DevComponents.DotNetBar.eButtonColor.BlueOrb;
|
this.btnApplicabilitychg.ColorTable = DevComponents.DotNetBar.eButtonColor.BlueOrb;
|
||||||
@@ -175,3 +175,4 @@ namespace Volian.Controls.Library
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ namespace Volian.Controls.Library
|
|||||||
names.Add(dcfg.Unit_Name);
|
names.Add(dcfg.Unit_Name);
|
||||||
}
|
}
|
||||||
dcfg.SelectedSlave = 0;
|
dcfg.SelectedSlave = 0;
|
||||||
// string[] names = dcfg.Unit_Name.Split(',');
|
// string[] names = dcfg.Unit_Name.Split(',');
|
||||||
int apple = -1;
|
int apple = -1;
|
||||||
if(_MyDisplayTabItem.MyStepTabPanel != null)
|
if(_MyDisplayTabItem.MyStepTabPanel != null)
|
||||||
apple = _MyDisplayTabItem.MyStepTabPanel.MyStepPanel.ApplDisplayMode;
|
apple = _MyDisplayTabItem.MyStepTabPanel.MyStepPanel.ApplDisplayMode;
|
||||||
@@ -69,14 +69,6 @@ namespace Volian.Controls.Library
|
|||||||
{
|
{
|
||||||
MyItemInfo = _MyDisplayTabItem.MyItemInfo;
|
MyItemInfo = _MyDisplayTabItem.MyItemInfo;
|
||||||
}
|
}
|
||||||
if (MyItemInfo.IsRNOPart == true)
|
|
||||||
{
|
|
||||||
btnApplicabilitychg.Enabled = false;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
btnApplicabilitychg.Enabled = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -402,7 +394,7 @@ namespace Volian.Controls.Library
|
|||||||
if (_MyItemInfo != null)
|
if (_MyItemInfo != null)
|
||||||
{
|
{
|
||||||
if (this.Visible == false) return;
|
if (this.Visible == false) return;
|
||||||
if (_MyItemInfo.IsRNOPart == true) // Check if step is an RNO disable "Set All To Level" button.
|
if (_MyItemInfo.IsRNOPart == true) // Check if step is an RNO disable "Set All To Level" button.
|
||||||
{
|
{
|
||||||
btnApplicabilitychg.Enabled = false;
|
btnApplicabilitychg.Enabled = false;
|
||||||
}
|
}
|
||||||
@@ -516,3 +508,4 @@ namespace Volian.Controls.Library
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user