Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ec5229101f | |||
| a0e0b1e788 |
@@ -1479,6 +1479,9 @@ 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
|
||||||
@@ -1490,22 +1493,8 @@ namespace VEPROMS
|
|||||||
//itm.DTS = dts;
|
//itm.DTS = dts;
|
||||||
itm.UserID = Volian.Base.Library.VlnSettings.UserID;
|
itm.UserID = Volian.Base.Library.VlnSettings.UserID;
|
||||||
itm.Save();
|
itm.Save();
|
||||||
|
|
||||||
//C2026-015 set overall change bar date
|
|
||||||
if (selectedSlave > 0)
|
|
||||||
{
|
|
||||||
pc.SelectedSlave = 0;
|
|
||||||
pc.Print_Rev = revNumber;
|
|
||||||
pc.Print_RevDate = revDate.ToString("MM/dd/yyyy");
|
|
||||||
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 itm2 = Item.Get(procedureInfo.ItemID))
|
|
||||||
{
|
|
||||||
itm2.MyContent.Config = pc.ToString();
|
|
||||||
itm2.UserID = Volian.Base.Library.VlnSettings.UserID;
|
|
||||||
itm2.Save();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public class RevType
|
public class RevType
|
||||||
|
|||||||
@@ -68,26 +68,8 @@ namespace VEPROMS
|
|||||||
MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");// ("MM/dd/yyyy HH:mm:ss");
|
MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");// ("MM/dd/yyyy HH:mm:ss");
|
||||||
|
|
||||||
//CSM - C2026-010 - Add Audit Record for Change Bar Audit History
|
//CSM - C2026-010 - Add Audit Record for Change Bar Audit History
|
||||||
ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Set ChangeBars set to ({dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss")}) by ({VlnSettings.UserID}) on ({DateTime.Now})", DateTime.Now, VlnSettings.UserID, 0);
|
ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Set ChangeBars set to ({ dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss")}) by ({ VlnSettings.UserID}) on ({DateTime.Now})", DateTime.Now, VlnSettings.UserID, 0);
|
||||||
|
|
||||||
//CSM C2026-014 if multi-unit, set for each unit
|
|
||||||
System.Data.DataTable dt = RevisionData.GetRevisionDataByUnit(MyProcInfo.ItemID);
|
|
||||||
if (RevisionData.HasUnits(dt))
|
|
||||||
{
|
|
||||||
//Change the ChangeBarDate for each unit
|
|
||||||
foreach (DataRow r in dt.Rows)
|
|
||||||
{
|
|
||||||
if (!r.IsNull("UnitID"))
|
|
||||||
{
|
|
||||||
MyProcConfig.SelectedSlave = Convert.ToInt32(r["UnitID"]);
|
|
||||||
MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");
|
|
||||||
|
|
||||||
//CSM - C2026-010 - Add Audit Record for Change Bar Audit History
|
|
||||||
ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Set ChangeBars set to ({dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss")}) by ({VlnSettings.UserID}) on ({DateTime.Now}) for (Unit {r["UnitName"]})", DateTime.Now, VlnSettings.UserID, MyProcConfig.SelectedSlave);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
MyProcConfig.SelectedSlave = 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -126,10 +108,7 @@ namespace VEPROMS
|
|||||||
sb.Append($" The Procedure Viewer Change Bar Date will be set to ({maxDTS}).");
|
sb.Append($" The Procedure Viewer Change Bar Date will be set to ({maxDTS}).");
|
||||||
foreach (DataRow r in dt.Rows)
|
foreach (DataRow r in dt.Rows)
|
||||||
{
|
{
|
||||||
if (!r.IsNull("UnitID"))
|
sb.Append($"\r\n The Change Bar Date for Unit ({r["UnitName"]}) will be set to ({Convert.ToDateTime(r["DTS"]):MM/dd/yyyy HH:mm:ss}).");
|
||||||
{
|
|
||||||
sb.Append($"\r\n The Change Bar Date for Unit ({r["UnitName"]}) will be set to ({Convert.ToDateTime(r["DTS"]):MM/dd/yyyy HH:mm:ss}).");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sb.Append("\r\n Any Change Bars for Units not listed above will use the Overall/Procedure Viewer Change Bar Date (as these Units have no approvals).");
|
sb.Append("\r\n Any Change Bars for Units not listed above will use the Overall/Procedure Viewer Change Bar Date (as these Units have no approvals).");
|
||||||
@@ -142,14 +121,12 @@ namespace VEPROMS
|
|||||||
//Change the ChangeBarDate for each unit
|
//Change the ChangeBarDate for each unit
|
||||||
foreach (DataRow r in dt.Rows)
|
foreach (DataRow r in dt.Rows)
|
||||||
{
|
{
|
||||||
if (!r.IsNull("UnitID"))
|
MyProcConfig.SelectedSlave = Convert.ToInt32(r["UnitID"]);
|
||||||
{
|
MyProcConfig.Print_ChangeBarDate = Convert.ToDateTime(r["DTS"]).ToString("MM / dd / yyyy HH: mm: ss");
|
||||||
MyProcConfig.SelectedSlave = Convert.ToInt32(r["UnitID"]);
|
|
||||||
MyProcConfig.Print_ChangeBarDate = Convert.ToDateTime(r["DTS"]).ToString("MM / dd / yyyy HH: mm: ss");
|
//CSM - C2026-010 - Add Audit Record for Change Bar Audit History
|
||||||
|
ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Reset ChangeBars performed by ({VlnSettings.UserID}) on ({DateTime.Now}). ChangeBars reset to show since last approval ({Convert.ToDateTime(r["DTS"]):MM/dd/yyyy HH:mm:ss}) for (Unit {r["UnitName"]})", DateTime.Now, VlnSettings.UserID, MyProcConfig.SelectedSlave);
|
||||||
|
|
||||||
//CSM - C2026-010 - Add Audit Record for Change Bar Audit History
|
|
||||||
ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Reset ChangeBars performed by ({VlnSettings.UserID}) on ({DateTime.Now}). ChangeBars reset to show since last approval ({Convert.ToDateTime(r["DTS"]):MM/dd/yyyy HH:mm:ss}) for (Unit {r["UnitName"]})", DateTime.Now, VlnSettings.UserID, MyProcConfig.SelectedSlave);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
MyProcConfig.SelectedSlave = 0;
|
MyProcConfig.SelectedSlave = 0;
|
||||||
DialogResult = DialogResult.OK;
|
DialogResult = DialogResult.OK;
|
||||||
|
|||||||
@@ -4054,7 +4054,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
// date). Print_ViewableAfterChangeBarDate was created to get only that user specified date, if it exists. If it does exist, we compare
|
// date). Print_ViewableAfterChangeBarDate was created to get only that user specified date, if it exists. If it does exist, we compare
|
||||||
// that with the Content datetime, otherwise we proceed as before.
|
// that with the Content datetime, otherwise we proceed as before.
|
||||||
DateTime? viewableStartingDateTime = (MyProcedure.MyConfig as ProcedureConfig).Print_ViewableStartingChangeBarDate;
|
DateTime? viewableStartingDateTime = (MyProcedure.MyConfig as ProcedureConfig).Print_ViewableStartingChangeBarDate;
|
||||||
if (viewableStartingDateTime != null && viewableStartingDateTime > MyProcedure.ChangeBarDate && (MyProcedure.MyConfig as ProcedureConfig).SelectedSlave == 0)
|
if (viewableStartingDateTime != null && viewableStartingDateTime > MyProcedure.ChangeBarDate)
|
||||||
return (MyContent.DTS > viewableStartingDateTime);
|
return (MyContent.DTS > viewableStartingDateTime);
|
||||||
return (MyContent.DTS > MyProcedure.ChangeBarDate);
|
return (MyContent.DTS > MyProcedure.ChangeBarDate);
|
||||||
}
|
}
|
||||||
|
|||||||
+34
-5
@@ -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,11 +44,11 @@ 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 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));
|
||||||
@@ -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);
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
@@ -144,6 +147,31 @@ namespace Volian.Controls.Library
|
|||||||
this.gpItem.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
this.gpItem.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
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
|
||||||
//
|
//
|
||||||
@@ -169,7 +197,8 @@ 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)
|
||||||
{
|
{
|
||||||
@@ -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)
|
||||||
@@ -131,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);
|
||||||
@@ -401,7 +410,7 @@ namespace Volian.Controls.Library
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
btnApplicabilitychg.Enabled = true;
|
btnApplicabilitychg.Enabled = true;
|
||||||
}
|
}
|
||||||
IItemConfig cfg = _MyItemInfo.MyConfig as IItemConfig;
|
IItemConfig cfg = _MyItemInfo.MyConfig as IItemConfig;
|
||||||
List<int> apples = cfg.MasterSlave_Applicability.GetFlags();
|
List<int> apples = cfg.MasterSlave_Applicability.GetFlags();
|
||||||
UnwireCheckboxes(true);
|
UnwireCheckboxes(true);
|
||||||
|
|||||||
Reference in New Issue
Block a user