diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index 2d2705fe..e08cd3f3 100644 Binary files a/PROMS/Formats/fmtall/BASEall.xml and b/PROMS/Formats/fmtall/BASEall.xml differ diff --git a/PROMS/Formats/fmtall/PROMSMan1all.xml b/PROMS/Formats/fmtall/PROMSMan1all.xml index c0f6a855..13a6cbb6 100644 Binary files a/PROMS/Formats/fmtall/PROMSMan1all.xml and b/PROMS/Formats/fmtall/PROMSMan1all.xml differ diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index e5b18008..31e5e274 100644 Binary files a/PROMS/Formats/fmtall/VEGP1all.xml and b/PROMS/Formats/fmtall/VEGP1all.xml differ diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index dd2ccec3..dadeaf2b 100644 Binary files a/PROMS/Formats/fmtall/VEGP2all.xml and b/PROMS/Formats/fmtall/VEGP2all.xml differ diff --git a/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.Designer.cs b/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.Designer.cs index b75465e7..9f87e261 100644 --- a/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.Designer.cs +++ b/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.Designer.cs @@ -57,7 +57,7 @@ this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(165, 111); + this.btnCancel.Location = new System.Drawing.Point(179, 111); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(64, 23); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -88,7 +88,7 @@ this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.dateTimeInput1.ButtonDropDown.Visible = true; - this.dateTimeInput1.CustomFormat = "MM/dd/yyyy"; + this.dateTimeInput1.CustomFormat = "MM/dd/yyyy HH:mm:ss"; this.dateTimeInput1.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.DateSelector; this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.dateTimeInput1.IsPopupCalendarOpen = false; @@ -122,7 +122,7 @@ this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true; this.dateTimeInput1.Name = "dateTimeInput1"; - this.dateTimeInput1.Size = new System.Drawing.Size(113, 20); + this.dateTimeInput1.Size = new System.Drawing.Size(146, 20); this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.dateTimeInput1, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar Start Date", "", "Only the changes made after this date will have change bars.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(138, 67))); this.dateTimeInput1.TabIndex = 4; @@ -133,7 +133,7 @@ // this.btnNow.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnNow.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnNow.Location = new System.Drawing.Point(149, 51); + this.btnNow.Location = new System.Drawing.Point(182, 51); this.btnNow.Name = "btnNow"; this.btnNow.Size = new System.Drawing.Size(49, 23); this.btnNow.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -146,7 +146,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(241, 144); + this.ClientSize = new System.Drawing.Size(268, 144); this.Controls.Add(this.btnNow); this.Controls.Add(this.dateTimeInput1); this.Controls.Add(this.label1); diff --git a/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs b/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs index a5ad609f..ba10dfbf 100644 --- a/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs +++ b/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs @@ -32,13 +32,46 @@ namespace VEPROMS { string cbdt = MyProcConfig.Print_ChangeBarDate; string[] tmp = cbdt.Split(' '); - cbdt = tmp[0] + " 00:00:00"; - dateTimeInput1.Value = (cbdt == null || cbdt == "") ? DateTime.Now : DateTime.Parse(cbdt); + + if (tmp[0] == null || tmp[0] == "") // First time date set. + { + cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + DateTime.Now.ToString("HH:mm:ss"); + dateTimeInput1.Value = DateTime.Parse(cbdt); + return; + } + else + { + DateTime tmpdt = DateTime.Parse(cbdt); + if (tmpdt.Date == DateTime.Today) // Date has before been set. + { + TimeSpan start = TimeSpan.Parse("00:00:00"); + + var time = tmpdt.TimeOfDay; + if (start < time) // If time is greater than 12:00:00 AM + { + cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + tmpdt.TimeOfDay.ToString(); + dateTimeInput1.Value = DateTime.Parse(cbdt); + return; + } + else // if time is 12:00:00 AM + { + cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + " 00:00:00"; + dateTimeInput1.Value = DateTime.Parse(cbdt); + return; + } + } + else + { + cbdt = tmpdt.ToString(); + dateTimeInput1.Value = DateTime.Parse(cbdt); + return; + } + } } private void btnOK_Click(object sender, EventArgs e) { - MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy 00:00:00");// ("MM/dd/yyyy HH:mm:ss"); + MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");// ("MM/dd/yyyy HH:mm:ss"); } diff --git a/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.resx b/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.resx index 92c0f12c..6a90c7d0 100644 --- a/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.resx +++ b/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 \ No newline at end of file diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index dd07f3fa..2c4bab67 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -2185,6 +2185,9 @@ namespace Volian.Controls.Library // B2017-043 account for Horizontal Scroll int colT = MyStepPanel.DisplayRectangle.X + MyStepPanel.ToDisplay((int)myStepSectionLayoutData.ColT); if (x < colT) x = colT; + // B2023-025: if x is <= 0, add 20 to it so that left column of table isn't cut-off. 20 was used because lesser numbers + // still cut-off the left column (by trial and error). + if (x <= 0) x = 20; int y = FindTop(myParentEditItem.Bottom); return new Point(x, y); } diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 46282f4d..cddd4d47 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -3185,7 +3185,7 @@ namespace Volian.Controls.Library { // If parent step is open in editor, use the OnInsertItemInfo to insert step & add RTBItems to step editor panel ItemInfo ii = tn.VEObject as ItemInfo; - if (OnInsertItemInfo(this, new vlnTreeItemInfoInsertEventArgs(ii, (newtype == MenuSelections.StepAfter) ? E_InsertType.After : E_InsertType.Before, "New Step"))) + if (OnInsertItemInfo(this, new vlnTreeItemInfoInsertEventArgs(ii, (newtype == MenuSelections.StepAfter) ? E_InsertType.After : E_InsertType.Before, ""))) { tn = (VETreeNode)((newtype == MenuSelections.StepAfter) ? tn.NextNode : tn.PrevNode); }