Merge branch 'Development' into C2026-015

PROMS/VEPROMS User Interface/dlgApproveProcedure.cs

@@ -1479,9 +1479,6 @@ namespace VEPROMS
 			ProcedureConfig pc = procedureInfo.MyConfig as ProcedureConfig;
 			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.Print_Rev = revNumber;
 			//AppRevDate Change
@@ -1493,8 +1490,22 @@ namespace VEPROMS
 				//itm.DTS = dts;
 				itm.UserID = Volian.Base.Library.VlnSettings.UserID;
 				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

PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs

@@ -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
 				// that with the Content datetime, otherwise we proceed as before.
 				DateTime? viewableStartingDateTime = (MyProcedure.MyConfig as ProcedureConfig).Print_ViewableStartingChangeBarDate;
-				if (viewableStartingDateTime != null && viewableStartingDateTime > MyProcedure.ChangeBarDate)
+				if (viewableStartingDateTime != null && viewableStartingDateTime > MyProcedure.ChangeBarDate && (MyProcedure.MyConfig as ProcedureConfig).SelectedSlave == 0)
 					return (MyContent.DTS > viewableStartingDateTime);
 				return (MyContent.DTS > MyProcedure.ChangeBarDate);
 			}

PROMS/Volian.Controls.Library/DisplayApplicability.Designer.cs

@@ -1,4 +1,3 @@
-using System.Drawing;
 using System.Security.Cryptography;
 using VEPROMS.CSLA.Library;
 
@@ -35,8 +34,7 @@ namespace Volian.Controls.Library
 		{
 			this.gpMode = new DevComponents.DotNetBar.Controls.GroupPanel();
 			this.gpItem = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.gpSubItem = new DevComponents.DotNetBar.Controls.GroupPanel();
-			//this.btnApplicabilitychg2 = new DevComponents.DotNetBar.ButtonItem();
+			this.btnApplicabilitychg2 = new DevComponents.DotNetBar.ButtonItem();
 			this.btnApplicabilitychg = new DevComponents.DotNetBar.ButtonX();
 			this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
 			this.gpItem.SuspendLayout();
@@ -44,11 +42,11 @@ namespace Volian.Controls.Library
 			// 
 			// btnApplicabilitychg
 			// 
-			this.btnApplicabilitychg.Location = new System.Drawing.Point(90, 8);
+			this.btnApplicabilitychg.Location = new System.Drawing.Point(60, 8);
 			this.btnApplicabilitychg.Margin = new System.Windows.Forms.Padding(4);
 			this.btnApplicabilitychg.BackColor = System.Drawing.SystemColors.Control;
 			this.btnApplicabilitychg.Name = "btnApplicabilitychg";
-			this.btnApplicabilitychg.Size = new System.Drawing.Size(87, 22);
+			this.btnApplicabilitychg.Size = new System.Drawing.Size(80, 22);
 			this.btnApplicabilitychg.Margin = new System.Windows.Forms.Padding(2);
 			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));
@@ -114,8 +112,7 @@ namespace Volian.Controls.Library
 			this.gpItem.Location = new System.Drawing.Point(0, 49);
 			this.gpItem.Margin = new System.Windows.Forms.Padding(4);
 			this.gpItem.Name = "gpItem";
-			//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.Padding = new System.Windows.Forms.Padding(13, 12, 13, 37);
 			this.gpItem.Size = new System.Drawing.Size(432, 85);
 			// 
 			// 
@@ -147,31 +144,6 @@ namespace Volian.Controls.Library
 			this.gpItem.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.gpItem.TabIndex = 1;
 			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
 			// 
@@ -197,8 +169,7 @@ namespace Volian.Controls.Library
 
 		private DevComponents.DotNetBar.Controls.GroupPanel gpMode;
 		private DevComponents.DotNetBar.Controls.GroupPanel gpItem;
-		private DevComponents.DotNetBar.Controls.GroupPanel gpSubItem;
-		//private DevComponents.DotNetBar.ButtonItem btnApplicabilitychg2;
+		private DevComponents.DotNetBar.ButtonItem btnApplicabilitychg2;
 		private DevComponents.DotNetBar.ButtonX btnApplicabilitychg;
 		private DevComponents.DotNetBar.SuperTooltip superTooltip1;
 

PROMS/Volian.Controls.Library/DisplayApplicability.cs

@@ -31,7 +31,6 @@ namespace Volian.Controls.Library
 				_MyDisplayTabItem = value;
 				gpMode.Controls.Clear();
 				gpItem.Controls.Clear();
-				gpSubItem.Controls.Clear();
 				MyCheckBoxes.Clear();
 				if (_MyDisplayTabItem != null)
 				{
@@ -60,8 +59,6 @@ namespace Volian.Controls.Library
 					foreach (string name in names)
 						AddItemMode(name.Trim(), (++i).ToString());
 					AddItemMode("None", "0");
-					gpItem.Controls.Add(gpSubItem);						
-					gpSubItem.BringToFront();
 					gpItem.Controls.Add(btnApplicabilitychg);
 					btnApplicabilitychg.BringToFront();
 					if (_MyDisplayTabItem.MyStepTabPanel != null)
@@ -134,17 +131,11 @@ namespace Volian.Controls.Library
 		private void AddItemMode(string name, string value)
 		{
 			CheckBox cb = new CheckBox();
-			//cb.BackColor = Color.Beige;
 			cb.BackColor = Color.Transparent;
-			cb.Height = 24;
-			cb.Width = 75;
-			cb.AutoSize = true;
 			cb.Text = name;
 			cb.Tag = value;
 			cb.Dock = DockStyle.Top;
-			//cb.Dock = DockStyle.Left;
-			//gpItem.Controls.Add(cb);
-			gpSubItem.Controls.Add(cb);
+			gpItem.Controls.Add(cb);
 			cb.BringToFront();
 			cb.CheckedChanged += new EventHandler(cb_CheckedChanged);
 			MyCheckBoxes.Add(value == null ? -1 : int.Parse(value), cb);
@@ -410,7 +401,7 @@ namespace Volian.Controls.Library
 					else
 					{
 						btnApplicabilitychg.Enabled = true;
-					}				
+					}
 					IItemConfig cfg = _MyItemInfo.MyConfig as IItemConfig;
 					List<int> apples = cfg.MasterSlave_Applicability.GetFlags();
 					UnwireCheckboxes(true);