Compare commits
14
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ec5229101f | ||
|
|
a0e0b1e788 | ||
|
|
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;
|
||||||
|
|
||||||
|
//C2026-015 set overall change bar date
|
||||||
|
pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss");
|
||||||
|
|
||||||
pc.SelectedSlave = selectedSlave;
|
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,6 +6215,11 @@ 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;
|
||||||
|
|||||||
+36
-6
@@ -1,3 +1,4 @@
|
|||||||
|
using System.Drawing;
|
||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using VEPROMS.CSLA.Library;
|
using VEPROMS.CSLA.Library;
|
||||||
|
|
||||||
@@ -34,7 +35,8 @@ namespace Volian.Controls.Library
|
|||||||
{
|
{
|
||||||
this.gpMode = new DevComponents.DotNetBar.Controls.GroupPanel();
|
this.gpMode = new DevComponents.DotNetBar.Controls.GroupPanel();
|
||||||
this.gpItem = new DevComponents.DotNetBar.Controls.GroupPanel();
|
this.gpItem = new DevComponents.DotNetBar.Controls.GroupPanel();
|
||||||
this.btnApplicabilitychg2 = new DevComponents.DotNetBar.ButtonItem();
|
this.gpSubItem = new DevComponents.DotNetBar.Controls.GroupPanel();
|
||||||
|
//this.btnApplicabilitychg2 = new DevComponents.DotNetBar.ButtonItem();
|
||||||
this.btnApplicabilitychg = new DevComponents.DotNetBar.ButtonX();
|
this.btnApplicabilitychg = new DevComponents.DotNetBar.ButtonX();
|
||||||
this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
|
this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
|
||||||
this.gpItem.SuspendLayout();
|
this.gpItem.SuspendLayout();
|
||||||
@@ -42,14 +44,14 @@ namespace Volian.Controls.Library
|
|||||||
//
|
//
|
||||||
// btnApplicabilitychg
|
// btnApplicabilitychg
|
||||||
//
|
//
|
||||||
this.btnApplicabilitychg.Location = new System.Drawing.Point(60, 8);
|
this.btnApplicabilitychg.Location = new System.Drawing.Point(90, 8);
|
||||||
this.btnApplicabilitychg.Margin = new System.Windows.Forms.Padding(4);
|
this.btnApplicabilitychg.Margin = new System.Windows.Forms.Padding(4);
|
||||||
this.btnApplicabilitychg.BackColor = System.Drawing.SystemColors.Control;
|
this.btnApplicabilitychg.BackColor = System.Drawing.SystemColors.Control;
|
||||||
this.btnApplicabilitychg.Name = "btnApplicabilitychg";
|
this.btnApplicabilitychg.Name = "btnApplicabilitychg";
|
||||||
this.btnApplicabilitychg.Size = new System.Drawing.Size(80, 22);
|
this.btnApplicabilitychg.Size = new System.Drawing.Size(87, 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;
|
||||||
@@ -112,7 +114,8 @@ namespace Volian.Controls.Library
|
|||||||
this.gpItem.Location = new System.Drawing.Point(0, 49);
|
this.gpItem.Location = new System.Drawing.Point(0, 49);
|
||||||
this.gpItem.Margin = new System.Windows.Forms.Padding(4);
|
this.gpItem.Margin = new System.Windows.Forms.Padding(4);
|
||||||
this.gpItem.Name = "gpItem";
|
this.gpItem.Name = "gpItem";
|
||||||
this.gpItem.Padding = new System.Windows.Forms.Padding(13, 12, 13, 37);
|
//this.gpItem.Padding = new System.Windows.Forms.Padding(13, 20, 13, 37);
|
||||||
|
this.gpItem.Padding = new System.Windows.Forms.Padding(0, 20, 0, 0);
|
||||||
this.gpItem.Size = new System.Drawing.Size(432, 85);
|
this.gpItem.Size = new System.Drawing.Size(432, 85);
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
@@ -145,6 +148,31 @@ namespace Volian.Controls.Library
|
|||||||
this.gpItem.TabIndex = 1;
|
this.gpItem.TabIndex = 1;
|
||||||
this.gpItem.Text = "Item Mode";
|
this.gpItem.Text = "Item Mode";
|
||||||
//
|
//
|
||||||
|
// gpSubItem
|
||||||
|
//
|
||||||
|
gpSubItem.AutoSize = true;
|
||||||
|
gpSubItem.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
|
||||||
|
gpSubItem.CanvasColor = System.Drawing.SystemColors.Control;
|
||||||
|
gpSubItem.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
|
||||||
|
gpSubItem.DisabledBackColor = System.Drawing.Color.Empty;
|
||||||
|
gpSubItem.Dock = System.Windows.Forms.DockStyle.Top;
|
||||||
|
gpSubItem.Location = new System.Drawing.Point(0, 49);
|
||||||
|
gpSubItem.Margin = new System.Windows.Forms.Padding(4);
|
||||||
|
gpSubItem.Name = "gpSubItem";
|
||||||
|
gpSubItem.Padding = new System.Windows.Forms.Padding(13, 12, 13, 37);
|
||||||
|
gpSubItem.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
|
||||||
|
gpSubItem.Style.BackColorGradientAngle = 90;
|
||||||
|
gpSubItem.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
|
||||||
|
gpSubItem.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
|
||||||
|
gpSubItem.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
|
||||||
|
gpSubItem.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
|
||||||
|
gpSubItem.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
|
gpSubItem.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
|
gpSubItem.TabIndex = 1;
|
||||||
|
gpSubItem.Text = "";
|
||||||
|
gpSubItem.Location = new System.Drawing.Point(0, 49);
|
||||||
|
gpSubItem.Size = new System.Drawing.Size(400, 250);
|
||||||
|
//
|
||||||
// DisplayApplicability
|
// DisplayApplicability
|
||||||
//
|
//
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
|
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
|
||||||
@@ -169,9 +197,11 @@ namespace Volian.Controls.Library
|
|||||||
|
|
||||||
private DevComponents.DotNetBar.Controls.GroupPanel gpMode;
|
private DevComponents.DotNetBar.Controls.GroupPanel gpMode;
|
||||||
private DevComponents.DotNetBar.Controls.GroupPanel gpItem;
|
private DevComponents.DotNetBar.Controls.GroupPanel gpItem;
|
||||||
private DevComponents.DotNetBar.ButtonItem btnApplicabilitychg2;
|
private DevComponents.DotNetBar.Controls.GroupPanel gpSubItem;
|
||||||
|
//private DevComponents.DotNetBar.ButtonItem btnApplicabilitychg2;
|
||||||
private DevComponents.DotNetBar.ButtonX btnApplicabilitychg;
|
private DevComponents.DotNetBar.ButtonX btnApplicabilitychg;
|
||||||
private DevComponents.DotNetBar.SuperTooltip superTooltip1;
|
private DevComponents.DotNetBar.SuperTooltip superTooltip1;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ namespace Volian.Controls.Library
|
|||||||
_MyDisplayTabItem = value;
|
_MyDisplayTabItem = value;
|
||||||
gpMode.Controls.Clear();
|
gpMode.Controls.Clear();
|
||||||
gpItem.Controls.Clear();
|
gpItem.Controls.Clear();
|
||||||
|
gpSubItem.Controls.Clear();
|
||||||
MyCheckBoxes.Clear();
|
MyCheckBoxes.Clear();
|
||||||
if (_MyDisplayTabItem != null)
|
if (_MyDisplayTabItem != null)
|
||||||
{
|
{
|
||||||
@@ -42,7 +43,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;
|
||||||
@@ -59,6 +60,8 @@ namespace Volian.Controls.Library
|
|||||||
foreach (string name in names)
|
foreach (string name in names)
|
||||||
AddItemMode(name.Trim(), (++i).ToString());
|
AddItemMode(name.Trim(), (++i).ToString());
|
||||||
AddItemMode("None", "0");
|
AddItemMode("None", "0");
|
||||||
|
gpItem.Controls.Add(gpSubItem);
|
||||||
|
gpSubItem.BringToFront();
|
||||||
gpItem.Controls.Add(btnApplicabilitychg);
|
gpItem.Controls.Add(btnApplicabilitychg);
|
||||||
btnApplicabilitychg.BringToFront();
|
btnApplicabilitychg.BringToFront();
|
||||||
if (_MyDisplayTabItem.MyStepTabPanel != null)
|
if (_MyDisplayTabItem.MyStepTabPanel != null)
|
||||||
@@ -69,14 +72,6 @@ namespace Volian.Controls.Library
|
|||||||
{
|
{
|
||||||
MyItemInfo = _MyDisplayTabItem.MyItemInfo;
|
MyItemInfo = _MyDisplayTabItem.MyItemInfo;
|
||||||
}
|
}
|
||||||
if (MyItemInfo.IsRNOPart == true)
|
|
||||||
{
|
|
||||||
btnApplicabilitychg.Enabled = false;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
btnApplicabilitychg.Enabled = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -139,11 +134,17 @@ namespace Volian.Controls.Library
|
|||||||
private void AddItemMode(string name, string value)
|
private void AddItemMode(string name, string value)
|
||||||
{
|
{
|
||||||
CheckBox cb = new CheckBox();
|
CheckBox cb = new CheckBox();
|
||||||
|
//cb.BackColor = Color.Beige;
|
||||||
cb.BackColor = Color.Transparent;
|
cb.BackColor = Color.Transparent;
|
||||||
|
cb.Height = 24;
|
||||||
|
cb.Width = 75;
|
||||||
|
cb.AutoSize = true;
|
||||||
cb.Text = name;
|
cb.Text = name;
|
||||||
cb.Tag = value;
|
cb.Tag = value;
|
||||||
cb.Dock = DockStyle.Top;
|
cb.Dock = DockStyle.Top;
|
||||||
gpItem.Controls.Add(cb);
|
//cb.Dock = DockStyle.Left;
|
||||||
|
//gpItem.Controls.Add(cb);
|
||||||
|
gpSubItem.Controls.Add(cb);
|
||||||
cb.BringToFront();
|
cb.BringToFront();
|
||||||
cb.CheckedChanged += new EventHandler(cb_CheckedChanged);
|
cb.CheckedChanged += new EventHandler(cb_CheckedChanged);
|
||||||
MyCheckBoxes.Add(value == null ? -1 : int.Parse(value), cb);
|
MyCheckBoxes.Add(value == null ? -1 : int.Parse(value), cb);
|
||||||
@@ -516,3 +517,4 @@ namespace Volian.Controls.Library
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user