diff --git a/PROMS/Volian.Controls.Library/DisplayReports.Designer.cs b/PROMS/Volian.Controls.Library/DisplayReports.Designer.cs index 1a5f3147..90ce4f07 100644 --- a/PROMS/Volian.Controls.Library/DisplayReports.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplayReports.Designer.cs @@ -30,6 +30,11 @@ namespace Volian.Controls.Library { this.components = new System.ComponentModel.Container(); this.tctrlReports = new DevComponents.DotNetBar.TabControl(); + this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.cbxTransToProcs = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbxTransFromProcs = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.tabTransitionReports = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); this.panRORpts = new DevComponents.DotNetBar.PanelEx(); this.cbxSummary = new DevComponents.DotNetBar.Controls.CheckBoxX(); @@ -40,11 +45,6 @@ namespace Volian.Controls.Library this.cbiRO = new DevComponents.Editors.ComboItem(); this.cbiProc = new DevComponents.Editors.ComboItem(); this.tabROReports = new DevComponents.DotNetBar.TabItem(this.components); - this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); - this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.cbxTransToProcs = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbxTransFromProcs = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.tabTransitionReports = new DevComponents.DotNetBar.TabItem(this.components); this.advTreeRO = new DevComponents.AdvTree.AdvTree(); this.elementStyle2 = new DevComponents.DotNetBar.ElementStyle(); this.node2 = new DevComponents.AdvTree.Node(); @@ -56,12 +56,13 @@ namespace Volian.Controls.Library this.nodeConnector1 = new DevComponents.AdvTree.NodeConnector(); this.btnPrintReport = new DevComponents.DotNetBar.ButtonX(); this.xpSelROs = new DevComponents.DotNetBar.ExpandablePanel(); + this.cbxIncldMissingROs = new DevComponents.DotNetBar.Controls.CheckBoxX(); ((System.ComponentModel.ISupportInitialize)(this.tctrlReports)).BeginInit(); this.tctrlReports.SuspendLayout(); - this.tabControlPanel2.SuspendLayout(); - this.panRORpts.SuspendLayout(); this.tabControlPanel1.SuspendLayout(); this.panelEx1.SuspendLayout(); + this.tabControlPanel2.SuspendLayout(); + this.panRORpts.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.advTreeRO)).BeginInit(); this.xpSetToReport.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).BeginInit(); @@ -77,13 +78,13 @@ namespace Volian.Controls.Library this.tctrlReports.Controls.Add(this.tabControlPanel1); this.tctrlReports.Dock = System.Windows.Forms.DockStyle.Top; this.tctrlReports.Location = new System.Drawing.Point(0, 0); - this.tctrlReports.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tctrlReports.Margin = new System.Windows.Forms.Padding(2); this.tctrlReports.Name = "tctrlReports"; this.tctrlReports.RightToLeft = System.Windows.Forms.RightToLeft.No; this.tctrlReports.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold); this.tctrlReports.SelectedTabIndex = 0; this.tctrlReports.ShowFocusRectangle = false; - this.tctrlReports.Size = new System.Drawing.Size(348, 112); + this.tctrlReports.Size = new System.Drawing.Size(261, 120); this.tctrlReports.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Document; this.tctrlReports.TabIndex = 0; this.tctrlReports.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -92,158 +93,14 @@ namespace Volian.Controls.Library this.tctrlReports.Text = "tabControl1"; this.tctrlReports.ThemeAware = true; // - // tabControlPanel2 - // - this.tabControlPanel2.Controls.Add(this.panRORpts); - this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel2.Location = new System.Drawing.Point(0, 25); - this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(4); - this.tabControlPanel2.Name = "tabControlPanel2"; - this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel2.Size = new System.Drawing.Size(348, 87); - this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); - this.tabControlPanel2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); - this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); - this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel2.Style.GradientAngle = 90; - this.tabControlPanel2.TabIndex = 2; - this.tabControlPanel2.TabItem = this.tabROReports; - // - // panRORpts - // - this.panRORpts.CanvasColor = System.Drawing.SystemColors.Control; - this.panRORpts.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.panRORpts.Controls.Add(this.cbxSummary); - this.panRORpts.Controls.Add(this.cbxROUsage); - this.panRORpts.Controls.Add(this.cbxComplete); - this.panRORpts.Controls.Add(this.labelX1); - this.panRORpts.Controls.Add(this.cmbxROUsageSort); - this.panRORpts.Dock = System.Windows.Forms.DockStyle.Top; - this.panRORpts.Location = new System.Drawing.Point(1, 1); - this.panRORpts.Margin = new System.Windows.Forms.Padding(4); - this.panRORpts.Name = "panRORpts"; - this.panRORpts.Size = new System.Drawing.Size(346, 84); - this.panRORpts.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panRORpts.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.panRORpts.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.panRORpts.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panRORpts.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.panRORpts.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panRORpts.Style.GradientAngle = 90; - this.panRORpts.TabIndex = 10; - this.panRORpts.ThemeAware = true; - // - // cbxSummary - // - this.cbxSummary.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbxSummary.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxSummary.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbxSummary.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxSummary.Location = new System.Drawing.Point(190, 4); - this.cbxSummary.Margin = new System.Windows.Forms.Padding(4); - this.cbxSummary.Name = "cbxSummary"; - this.cbxSummary.Size = new System.Drawing.Size(99, 28); - this.cbxSummary.TabIndex = 1; - this.cbxSummary.Text = "Summary"; - this.cbxSummary.CheckedChanged += new System.EventHandler(this.cbxSummary_CheckedChanged); - // - // cbxROUsage - // - this.cbxROUsage.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbxROUsage.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxROUsage.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbxROUsage.Checked = true; - this.cbxROUsage.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbxROUsage.CheckValue = "Y"; - this.cbxROUsage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxROUsage.Location = new System.Drawing.Point(9, 4); - this.cbxROUsage.Margin = new System.Windows.Forms.Padding(4); - this.cbxROUsage.Name = "cbxROUsage"; - this.cbxROUsage.Size = new System.Drawing.Size(80, 28); - this.cbxROUsage.TabIndex = 2; - this.cbxROUsage.Text = "Usage"; - this.cbxROUsage.CheckedChanged += new System.EventHandler(this.cbxROUsage_CheckedChanged); - // - // cbxComplete - // - this.cbxComplete.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbxComplete.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxComplete.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbxComplete.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxComplete.Location = new System.Drawing.Point(88, 4); - this.cbxComplete.Margin = new System.Windows.Forms.Padding(4); - this.cbxComplete.Name = "cbxComplete"; - this.cbxComplete.Size = new System.Drawing.Size(105, 28); - this.cbxComplete.TabIndex = 0; - this.cbxComplete.Text = "Complete"; - this.cbxComplete.CheckedChanged += new System.EventHandler(this.cbxComplete_CheckedChanged); - // - // labelX1 - // - // - // - // - this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX1.Location = new System.Drawing.Point(9, 39); - this.labelX1.Margin = new System.Windows.Forms.Padding(4); - this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(59, 28); - this.labelX1.TabIndex = 8; - this.labelX1.Text = "Sort By:"; - // - // cmbxROUsageSort - // - this.cmbxROUsageSort.DisplayMember = "Text"; - this.cmbxROUsageSort.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.cmbxROUsageSort.FormattingEnabled = true; - this.cmbxROUsageSort.ItemHeight = 14; - this.cmbxROUsageSort.Items.AddRange(new object[] { - this.cbiRO, - this.cbiProc}); - this.cmbxROUsageSort.Location = new System.Drawing.Point(76, 43); - this.cmbxROUsageSort.Margin = new System.Windows.Forms.Padding(4); - this.cmbxROUsageSort.Name = "cmbxROUsageSort"; - this.cmbxROUsageSort.Size = new System.Drawing.Size(201, 20); - this.cmbxROUsageSort.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.cmbxROUsageSort.TabIndex = 9; - this.cmbxROUsageSort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - // - // cbiRO - // - this.cbiRO.Text = "Referenced Object"; - // - // cbiProc - // - this.cbiProc.Text = "Procedure"; - // - // tabROReports - // - this.tabROReports.AttachedControl = this.tabControlPanel2; - this.tabROReports.Name = "tabROReports"; - this.tabROReports.Text = "Referenced Objects"; - this.tabROReports.Click += new System.EventHandler(this.tabROReports_Click); - // // tabControlPanel1 // this.tabControlPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Windows7; this.tabControlPanel1.Controls.Add(this.panelEx1); - this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel1.Location = new System.Drawing.Point(0, 25); - this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(4); + this.tabControlPanel1.Location = new System.Drawing.Point(0, 22); this.tabControlPanel1.Name = "tabControlPanel1"; this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel1.Size = new System.Drawing.Size(369, 87); + this.tabControlPanel1.Size = new System.Drawing.Size(261, 82); this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -262,9 +119,8 @@ namespace Volian.Controls.Library this.panelEx1.Controls.Add(this.cbxTransFromProcs); this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(1, 1); - this.panelEx1.Margin = new System.Windows.Forms.Padding(4); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(367, 84); + this.panelEx1.Size = new System.Drawing.Size(259, 81); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -287,10 +143,9 @@ namespace Volian.Controls.Library this.cbxTransToProcs.CheckState = System.Windows.Forms.CheckState.Checked; this.cbxTransToProcs.CheckValue = "Y"; this.cbxTransToProcs.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxTransToProcs.Location = new System.Drawing.Point(4, 4); - this.cbxTransToProcs.Margin = new System.Windows.Forms.Padding(4); + this.cbxTransToProcs.Location = new System.Drawing.Point(3, 3); this.cbxTransToProcs.Name = "cbxTransToProcs"; - this.cbxTransToProcs.Size = new System.Drawing.Size(343, 28); + this.cbxTransToProcs.Size = new System.Drawing.Size(257, 23); this.cbxTransToProcs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.cbxTransToProcs.TabIndex = 0; this.cbxTransToProcs.Text = "Transitions To Selected Procedure(s)"; @@ -305,10 +160,9 @@ namespace Volian.Controls.Library this.cbxTransFromProcs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbxTransFromProcs.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.cbxTransFromProcs.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxTransFromProcs.Location = new System.Drawing.Point(3, 39); - this.cbxTransFromProcs.Margin = new System.Windows.Forms.Padding(4); + this.cbxTransFromProcs.Location = new System.Drawing.Point(2, 32); this.cbxTransFromProcs.Name = "cbxTransFromProcs"; - this.cbxTransFromProcs.Size = new System.Drawing.Size(343, 28); + this.cbxTransFromProcs.Size = new System.Drawing.Size(257, 23); this.cbxTransFromProcs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.cbxTransFromProcs.TabIndex = 1; this.cbxTransFromProcs.Text = "Transitions From Selected Procedure(s)"; @@ -321,6 +175,142 @@ namespace Volian.Controls.Library this.tabTransitionReports.Text = "Transitions"; this.tabTransitionReports.Click += new System.EventHandler(this.tabTransitionReports_Click); // + // tabControlPanel2 + // + this.tabControlPanel2.Controls.Add(this.panRORpts); + this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanel2.Location = new System.Drawing.Point(0, 22); + this.tabControlPanel2.Name = "tabControlPanel2"; + this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel2.Size = new System.Drawing.Size(261, 98); + this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); + this.tabControlPanel2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); + this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanel2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tabControlPanel2.Style.GradientAngle = 90; + this.tabControlPanel2.TabIndex = 2; + this.tabControlPanel2.TabItem = this.tabROReports; + // + // panRORpts + // + this.panRORpts.CanvasColor = System.Drawing.SystemColors.Control; + this.panRORpts.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.panRORpts.Controls.Add(this.cbxIncldMissingROs); + this.panRORpts.Controls.Add(this.cbxSummary); + this.panRORpts.Controls.Add(this.cbxROUsage); + this.panRORpts.Controls.Add(this.cbxComplete); + this.panRORpts.Controls.Add(this.labelX1); + this.panRORpts.Controls.Add(this.cmbxROUsageSort); + this.panRORpts.Dock = System.Windows.Forms.DockStyle.Top; + this.panRORpts.Location = new System.Drawing.Point(1, 1); + this.panRORpts.Name = "panRORpts"; + this.panRORpts.Size = new System.Drawing.Size(259, 97); + this.panRORpts.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panRORpts.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panRORpts.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panRORpts.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panRORpts.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panRORpts.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panRORpts.Style.GradientAngle = 90; + this.panRORpts.TabIndex = 10; + this.panRORpts.ThemeAware = true; + // + // cbxSummary + // + this.cbxSummary.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbxSummary.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxSummary.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbxSummary.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxSummary.Location = new System.Drawing.Point(142, 3); + this.cbxSummary.Name = "cbxSummary"; + this.cbxSummary.Size = new System.Drawing.Size(74, 23); + this.cbxSummary.TabIndex = 1; + this.cbxSummary.Text = "Summary"; + this.cbxSummary.CheckedChanged += new System.EventHandler(this.cbxSummary_CheckedChanged); + // + // cbxROUsage + // + this.cbxROUsage.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbxROUsage.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxROUsage.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbxROUsage.Checked = true; + this.cbxROUsage.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbxROUsage.CheckValue = "Y"; + this.cbxROUsage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxROUsage.Location = new System.Drawing.Point(7, 3); + this.cbxROUsage.Name = "cbxROUsage"; + this.cbxROUsage.Size = new System.Drawing.Size(60, 23); + this.cbxROUsage.TabIndex = 2; + this.cbxROUsage.Text = "Usage"; + this.cbxROUsage.CheckedChanged += new System.EventHandler(this.cbxROUsage_CheckedChanged); + // + // cbxComplete + // + this.cbxComplete.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbxComplete.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxComplete.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbxComplete.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxComplete.Location = new System.Drawing.Point(66, 3); + this.cbxComplete.Name = "cbxComplete"; + this.cbxComplete.Size = new System.Drawing.Size(79, 23); + this.cbxComplete.TabIndex = 0; + this.cbxComplete.Text = "Complete"; + this.cbxComplete.CheckedChanged += new System.EventHandler(this.cbxComplete_CheckedChanged); + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(7, 32); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(44, 23); + this.labelX1.TabIndex = 8; + this.labelX1.Text = "Sort By:"; + // + // cmbxROUsageSort + // + this.cmbxROUsageSort.DisplayMember = "Text"; + this.cmbxROUsageSort.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cmbxROUsageSort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbxROUsageSort.FormattingEnabled = true; + this.cmbxROUsageSort.ItemHeight = 14; + this.cmbxROUsageSort.Items.AddRange(new object[] { + this.cbiRO, + this.cbiProc}); + this.cmbxROUsageSort.Location = new System.Drawing.Point(57, 35); + this.cmbxROUsageSort.Name = "cmbxROUsageSort"; + this.cmbxROUsageSort.Size = new System.Drawing.Size(152, 20); + this.cmbxROUsageSort.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cmbxROUsageSort.TabIndex = 9; + // + // cbiRO + // + this.cbiRO.Text = "Referenced Object"; + // + // cbiProc + // + this.cbiProc.Text = "Procedure"; + // + // tabROReports + // + this.tabROReports.AttachedControl = this.tabControlPanel2; + this.tabROReports.Name = "tabROReports"; + this.tabROReports.Text = "Referenced Objects"; + this.tabROReports.Click += new System.EventHandler(this.tabROReports_Click); + // // advTreeRO // this.advTreeRO.AccessibleRole = System.Windows.Forms.AccessibleRole.Outline; @@ -336,8 +326,7 @@ namespace Volian.Controls.Library this.advTreeRO.DragDropEnabled = false; this.advTreeRO.DragDropNodeCopyEnabled = false; this.advTreeRO.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; - this.advTreeRO.Location = new System.Drawing.Point(0, 32); - this.advTreeRO.Margin = new System.Windows.Forms.Padding(4); + this.advTreeRO.Location = new System.Drawing.Point(0, 26); this.advTreeRO.MultiSelect = true; this.advTreeRO.MultiSelectRule = DevComponents.AdvTree.eMultiSelectRule.AnyNode; this.advTreeRO.Name = "advTreeRO"; @@ -348,7 +337,7 @@ namespace Volian.Controls.Library this.advTreeRO.NodeStyleSelected = this.elementStyle2; this.advTreeRO.PathSeparator = ";"; this.advTreeRO.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.advTreeRO.Size = new System.Drawing.Size(348, 395); + this.advTreeRO.Size = new System.Drawing.Size(261, 303); this.advTreeRO.Styles.Add(this.elementStyle2); this.advTreeRO.TabIndex = 11; this.advTreeRO.Text = "advTree1"; @@ -377,10 +366,10 @@ namespace Volian.Controls.Library this.xpSetToReport.Controls.Add(this.advTreeProcSets); this.xpSetToReport.Dock = System.Windows.Forms.DockStyle.Top; this.xpSetToReport.ExpandOnTitleClick = true; - this.xpSetToReport.Location = new System.Drawing.Point(0, 539); - this.xpSetToReport.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.xpSetToReport.Location = new System.Drawing.Point(0, 449); + this.xpSetToReport.Margin = new System.Windows.Forms.Padding(2); this.xpSetToReport.Name = "xpSetToReport"; - this.xpSetToReport.Size = new System.Drawing.Size(348, 210); + this.xpSetToReport.Size = new System.Drawing.Size(261, 171); this.xpSetToReport.Style.Alignment = System.Drawing.StringAlignment.Center; this.xpSetToReport.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.xpSetToReport.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -389,6 +378,7 @@ namespace Volian.Controls.Library this.xpSetToReport.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; this.xpSetToReport.Style.GradientAngle = 90; this.xpSetToReport.TabIndex = 8; + this.xpSetToReport.TitleHeight = 21; this.xpSetToReport.TitleStyle.Alignment = System.Drawing.StringAlignment.Center; this.xpSetToReport.TitleStyle.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.xpSetToReport.TitleStyle.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -412,8 +402,8 @@ namespace Volian.Controls.Library this.advTreeProcSets.Dock = System.Windows.Forms.DockStyle.Fill; this.advTreeProcSets.DragDropEnabled = false; this.advTreeProcSets.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; - this.advTreeProcSets.Location = new System.Drawing.Point(0, 26); - this.advTreeProcSets.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.advTreeProcSets.Location = new System.Drawing.Point(0, 21); + this.advTreeProcSets.Margin = new System.Windows.Forms.Padding(2); this.advTreeProcSets.MultiSelect = true; this.advTreeProcSets.MultiSelectRule = DevComponents.AdvTree.eMultiSelectRule.AnyNode; this.advTreeProcSets.Name = "advTreeProcSets"; @@ -424,7 +414,7 @@ namespace Volian.Controls.Library this.advTreeProcSets.NodeStyleSelected = this.elementStyle1; this.advTreeProcSets.PathSeparator = ";"; this.advTreeProcSets.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.advTreeProcSets.Size = new System.Drawing.Size(348, 184); + this.advTreeProcSets.Size = new System.Drawing.Size(261, 150); this.advTreeProcSets.Styles.Add(this.elementStyle1); this.advTreeProcSets.TabIndex = 0; this.advTreeProcSets.Text = "advTree1"; @@ -452,10 +442,9 @@ namespace Volian.Controls.Library this.btnPrintReport.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnPrintReport.Dock = System.Windows.Forms.DockStyle.Top; this.btnPrintReport.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnPrintReport.Location = new System.Drawing.Point(0, 749); - this.btnPrintReport.Margin = new System.Windows.Forms.Padding(4); + this.btnPrintReport.Location = new System.Drawing.Point(0, 620); this.btnPrintReport.Name = "btnPrintReport"; - this.btnPrintReport.Size = new System.Drawing.Size(348, 43); + this.btnPrintReport.Size = new System.Drawing.Size(261, 35); this.btnPrintReport.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnPrintReport.TabIndex = 9; this.btnPrintReport.Text = "Create Report"; @@ -467,10 +456,9 @@ namespace Volian.Controls.Library this.xpSelROs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.xpSelROs.Controls.Add(this.advTreeRO); this.xpSelROs.Dock = System.Windows.Forms.DockStyle.Top; - this.xpSelROs.Location = new System.Drawing.Point(0, 112); - this.xpSelROs.Margin = new System.Windows.Forms.Padding(4); + this.xpSelROs.Location = new System.Drawing.Point(0, 120); this.xpSelROs.Name = "xpSelROs"; - this.xpSelROs.Size = new System.Drawing.Size(348, 427); + this.xpSelROs.Size = new System.Drawing.Size(261, 329); this.xpSelROs.Style.Alignment = System.Drawing.StringAlignment.Center; this.xpSelROs.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.xpSelROs.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -479,7 +467,6 @@ namespace Volian.Controls.Library this.xpSelROs.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; this.xpSelROs.Style.GradientAngle = 90; this.xpSelROs.TabIndex = 10; - this.xpSelROs.TitleHeight = 32; this.xpSelROs.TitleStyle.Alignment = System.Drawing.StringAlignment.Center; this.xpSelROs.TitleStyle.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.xpSelROs.TitleStyle.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -489,25 +476,37 @@ namespace Volian.Controls.Library this.xpSelROs.TitleStyle.GradientAngle = 90; this.xpSelROs.TitleText = "Select Referenced Objects"; // + // cbxIncldMissingROs + // + // + // + // + this.cbxIncldMissingROs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxIncldMissingROs.Location = new System.Drawing.Point(7, 61); + this.cbxIncldMissingROs.Name = "cbxIncldMissingROs"; + this.cbxIncldMissingROs.Size = new System.Drawing.Size(138, 23); + this.cbxIncldMissingROs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbxIncldMissingROs.TabIndex = 10; + this.cbxIncldMissingROs.Text = "Include Missing ROs"; + // // DisplayReports // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.btnPrintReport); this.Controls.Add(this.xpSetToReport); this.Controls.Add(this.xpSelROs); this.Controls.Add(this.tctrlReports); - this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Margin = new System.Windows.Forms.Padding(2); this.Name = "DisplayReports"; this.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.Size = new System.Drawing.Size(348, 832); - this.Load += new System.EventHandler(this.DisplayReports_Load); + this.Size = new System.Drawing.Size(261, 676); ((System.ComponentModel.ISupportInitialize)(this.tctrlReports)).EndInit(); this.tctrlReports.ResumeLayout(false); - this.tabControlPanel2.ResumeLayout(false); - this.panRORpts.ResumeLayout(false); this.tabControlPanel1.ResumeLayout(false); this.panelEx1.ResumeLayout(false); + this.tabControlPanel2.ResumeLayout(false); + this.panRORpts.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.advTreeRO)).EndInit(); this.xpSetToReport.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).EndInit(); @@ -545,5 +544,6 @@ namespace Volian.Controls.Library private DevComponents.DotNetBar.ElementStyle elementStyle2; private DevComponents.DotNetBar.ExpandablePanel xpSelROs; private DevComponents.DotNetBar.PanelEx panelEx1; + private DevComponents.DotNetBar.Controls.CheckBoxX cbxIncldMissingROs; } } diff --git a/PROMS/Volian.Controls.Library/DisplayReports.cs b/PROMS/Volian.Controls.Library/DisplayReports.cs index 86789880..50106a8b 100644 --- a/PROMS/Volian.Controls.Library/DisplayReports.cs +++ b/PROMS/Volian.Controls.Library/DisplayReports.cs @@ -194,6 +194,8 @@ namespace Volian.Controls.Library tabTransitionReports.Visible = false; cbxComplete.Enabled = false; cbxSummary.Enabled = true; + cbxIncldMissingROs.Checked = true; + cbxIncldMissingROs.Enabled = cbxROUsage.Checked; } public void SelectReferencedObjectTab() @@ -256,6 +258,7 @@ namespace Volian.Controls.Library xpSetToReport.Enabled = cbxROUsage.Checked; xpSetToReport.Expanded = cbxROUsage.Checked; cmbxROUsageSort.Enabled = cbxROUsage.Checked; + cbxIncldMissingROs.Enabled = cbxROUsage.Checked; xpSelROs.Enabled = true; xpSelROs.Expanded = true; EnableOrDisablePrintButton(); @@ -266,6 +269,7 @@ namespace Volian.Controls.Library xpSetToReport.Enabled = cbxROUsage.Checked; xpSetToReport.Expanded = cbxROUsage.Checked; cmbxROUsageSort.Enabled = cbxROUsage.Checked; + cbxIncldMissingROs.Enabled = cbxROUsage.Checked; // reset the RO tree and clear anything that was selected advTreeROFillIn(true); lstCheckedROs.Clear(); @@ -730,6 +734,7 @@ namespace Volian.Controls.Library #endregion + private void DisplayReports_Load(object sender, EventArgs e) { tabTransitionReports.PerformClick(); @@ -860,10 +865,10 @@ namespace Volian.Controls.Library { Csla.SortedBindingList sortedResults = new Csla.SortedBindingList(SearchResults); sortedResults.ApplySort("FoundROID", ListSortDirection.Ascending); - OnPrintRequest(new DisplayReportsEventArgs("Referenced Objects Usage By RO", "RO Usage", sortedResults, usageSortedByProcedure)); + OnPrintRequest(new DisplayReportsEventArgs("Referenced Objects Usage By RO", "RO Usage", sortedResults, usageSortedByProcedure,cbxIncldMissingROs.Checked)); } else - OnPrintRequest(new DisplayReportsEventArgs("Referenced Objects Usage By Procedure", "RO Usage", SearchResults, usageSortedByProcedure)); + OnPrintRequest(new DisplayReportsEventArgs("Referenced Objects Usage By Procedure", "RO Usage", SearchResults, usageSortedByProcedure,cbxIncldMissingROs.Checked)); } else if (cbxTransFromProcs.Checked) { @@ -926,12 +931,22 @@ namespace Volian.Controls.Library get { return _ROListForReport; } set { _ROListForReport = value; } } - public DisplayReportsEventArgs(string reportTitle, string typesSelected, ICollection myItemInfoList,/*ROFSTLookup rolkup,*/ bool sortByProcedure) + private bool _IncludeMissingROs = true; + + public bool IncludeMissingROs { + get { return _IncludeMissingROs; } + set { _IncludeMissingROs = value; } + } + public DisplayReportsEventArgs(string reportTitle, string typesSelected, ICollection myItemInfoList, bool sortByProcedure, bool includeMissingROs) + { + // RO Usage Report _ReportTitle = reportTitle; _TypesSelected = typesSelected; _MyItemInfoList = myItemInfoList; _SortUsageByProcedure = sortByProcedure; + _IncludeMissingROs = includeMissingROs; + } public DisplayReportsEventArgs(string reportTitle, string typesSelected, string roDataFile, bool completeROReport) { @@ -942,6 +957,7 @@ namespace Volian.Controls.Library } public DisplayReportsEventArgs(string reportTitle, string typesSelected, ROFSTLookup rofstLookUp, List roListForReport) { + // RO Summary Report _ReportTitle = reportTitle; _TypesSelected = typesSelected; _rofstLookup = rofstLookUp;