diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 012625c2..07010212 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -79,13 +79,13 @@ namespace VEPROMS this.tv = new Volian.Controls.Library.vlnTreeView(); this.infoPanel = new DevComponents.DotNetBar.ExpandablePanel(); this.infoTabs = new DevComponents.DotNetBar.TabControl(); + this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); + this.displayHistory = new Volian.Controls.Library.DisplayHistory(); + this.infotabHistory = new DevComponents.DotNetBar.TabItem(this.components); this.infotabControlPanelTags = new DevComponents.DotNetBar.TabControlPanel(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.displayTags = new Volian.Controls.Library.DisplayTags(); this.infotabTags = new DevComponents.DotNetBar.TabItem(this.components); - this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); - this.displayHistory = new Volian.Controls.Library.DisplayHistory(); - this.infotabHistory = new DevComponents.DotNetBar.TabItem(this.components); this.infotabControlPanelTransitions = new DevComponents.DotNetBar.TabControlPanel(); this.displayTransition = new Volian.Controls.Library.DisplayTransition(); this.infotabTransition = new DevComponents.DotNetBar.TabItem(this.components); @@ -104,18 +104,21 @@ namespace VEPROMS this.annotationSearch = new DevComponents.DotNetBar.TabControlPanel(); this.displaySearch1 = new Volian.Controls.Library.DisplaySearch(); this.toolstabResults = new DevComponents.DotNetBar.TabItem(this.components); + this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); + this.displayReports = new Volian.Controls.Library.DisplayReports(); + this.toosTabReports = new DevComponents.DotNetBar.TabItem(this.components); + this.tabControlPanelLD = new DevComponents.DotNetBar.TabControlPanel(); + this.displayLibDocs = new Volian.Controls.Library.DisplayLibDocs(); + this.tabItemLibDocs = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.displayBookMarks = new Volian.Controls.Library.DisplayBookMarks(); this.toolsTabBookMarks = new DevComponents.DotNetBar.TabItem(this.components); - this.tabControlPanelLD = new DevComponents.DotNetBar.TabControlPanel(); - this.displayLibDocs = new Volian.Controls.Library.DisplayLibDocs(); - this.tabItemLibDocs = new DevComponents.DotNetBar.TabItem(this.components); this.expandableSplitter4 = new DevComponents.DotNetBar.ExpandableSplitter(); + this.fbd = new System.Windows.Forms.FolderBrowserDialog(); this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.itemAnnotationsBindingSource = new System.Windows.Forms.BindingSource(this.components); this.tc = new Volian.Controls.Library.DisplayTabControl(); - this.fbd = new System.Windows.Forms.FolderBrowserDialog(); ((System.ComponentModel.ISupportInitialize)(this.bottomBar)).BeginInit(); this.bottomBar.SuspendLayout(); this.epAnnotations.SuspendLayout(); @@ -123,18 +126,19 @@ namespace VEPROMS this.infoPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.infoTabs)).BeginInit(); this.infoTabs.SuspendLayout(); + this.tabControlPanel1.SuspendLayout(); this.infotabControlPanelTags.SuspendLayout(); this.panelEx1.SuspendLayout(); - this.tabControlPanel1.SuspendLayout(); this.infotabControlPanelTransitions.SuspendLayout(); this.infotabControlPanelRO.SuspendLayout(); this.toolsPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.toolsTabs)).BeginInit(); this.toolsTabs.SuspendLayout(); this.annotationSearch.SuspendLayout(); + this.tabControlPanel3.SuspendLayout(); + this.tabControlPanelLD.SuspendLayout(); this.tabControlPanel2.SuspendLayout(); this.panelEx3.SuspendLayout(); - this.tabControlPanelLD.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).BeginInit(); this.SuspendLayout(); // @@ -259,6 +263,10 @@ namespace VEPROMS this.itemContainer1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer2, this.itemContainer5}); + // + // + // + //this.itemContainer1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // itemContainer2 // @@ -272,6 +280,10 @@ namespace VEPROMS this.itemContainer2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer3, this.icRecentDocs}); + // + // + // + //this.itemContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // itemContainer3 // @@ -289,6 +301,10 @@ namespace VEPROMS this.btnPrint, this.btnPrepare, this.btnAdmin}); + // + // + // + //this.itemContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // btnNew // @@ -358,6 +374,10 @@ namespace VEPROMS this.icRecentDocs.Name = "icRecentDocs"; this.icRecentDocs.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem8}); + // + // + // + //this.icRecentDocs.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // labelItem8 // @@ -382,6 +402,10 @@ namespace VEPROMS this.itemContainer5.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnOptions, this.btnExit}); + // + // + // + //this.itemContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // btnOptions // @@ -459,9 +483,9 @@ namespace VEPROMS this.lblItemID, this.lblResolution, this.btnEditItem}); - this.bottomBar.Location = new System.Drawing.Point(5, 605); + this.bottomBar.Location = new System.Drawing.Point(5, 552); this.bottomBar.Name = "bottomBar"; - this.bottomBar.Size = new System.Drawing.Size(1185, 25); + this.bottomBar.Size = new System.Drawing.Size(1185, 29); this.bottomBar.Stretch = true; this.bottomBar.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.bottomBar.TabIndex = 1; @@ -474,7 +498,7 @@ namespace VEPROMS this.cmbFont.FormattingEnabled = true; this.cmbFont.Location = new System.Drawing.Point(1013, 0); this.cmbFont.Name = "cmbFont"; - this.cmbFont.Size = new System.Drawing.Size(172, 23); + this.cmbFont.Size = new System.Drawing.Size(172, 28); this.cmbFont.TabIndex = 0; this.cmbFont.SelectedIndexChanged += new System.EventHandler(this.cmbFont_SelectedIndexChanged); // @@ -567,7 +591,7 @@ namespace VEPROMS this.epAnnotations.Expanded = false; this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(4, 544, 1187, 202); this.epAnnotations.ExpandOnTitleClick = true; - this.epAnnotations.Location = new System.Drawing.Point(5, 579); + this.epAnnotations.Location = new System.Drawing.Point(5, 526); this.epAnnotations.Name = "epAnnotations"; this.epAnnotations.Size = new System.Drawing.Size(1185, 26); this.epAnnotations.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -600,7 +624,7 @@ namespace VEPROMS this.ctrlAnnotationDetails.CurrentAnnotation = null; this.ctrlAnnotationDetails.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlAnnotationDetails.Location = new System.Drawing.Point(0, 26); - this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2); this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails"; this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1185, 0); this.ctrlAnnotationDetails.TabIndex = 15; @@ -614,7 +638,6 @@ namespace VEPROMS this.btnAnnoDetailsPushPin.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.btnAnnoDetailsPushPin.ColorTable = DevComponents.DotNetBar.eButtonColor.Flat; this.btnAnnoDetailsPushPin.FocusCuesEnabled = false; - this.btnAnnoDetailsPushPin.FocusOnLeftMouseButtonDown = true; this.btnAnnoDetailsPushPin.Image = ((System.Drawing.Image)(resources.GetObject("btnAnnoDetailsPushPin.Image"))); this.btnAnnoDetailsPushPin.Location = new System.Drawing.Point(1130, 1); this.btnAnnoDetailsPushPin.Name = "btnAnnoDetailsPushPin"; @@ -638,7 +661,7 @@ namespace VEPROMS this.epProcedures.ExpandOnTitleClick = true; this.epProcedures.Location = new System.Drawing.Point(5, 57); this.epProcedures.Name = "epProcedures"; - this.epProcedures.Size = new System.Drawing.Size(30, 522); + this.epProcedures.Size = new System.Drawing.Size(30, 469); this.epProcedures.Style.Alignment = System.Drawing.StringAlignment.Center; this.epProcedures.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.epProcedures.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -667,7 +690,7 @@ namespace VEPROMS this.tv.HideSelection = false; this.tv.Location = new System.Drawing.Point(0, 26); this.tv.Name = "tv"; - this.tv.Size = new System.Drawing.Size(30, 508); + this.tv.Size = new System.Drawing.Size(30, 443); this.tv.TabIndex = 1; this.tv.MouseUp += new System.Windows.Forms.MouseEventHandler(this.tv_MouseUp); this.tv.SectionShouldClose += new Volian.Controls.Library.vlnTreeViewSectionInfoEvent(this.tv_SectionShouldClose); @@ -682,11 +705,11 @@ namespace VEPROMS this.infoPanel.Controls.Add(this.infoTabs); this.infoPanel.Dock = System.Windows.Forms.DockStyle.Right; this.infoPanel.Expanded = false; - this.infoPanel.ExpandedBounds = new System.Drawing.Rectangle(927, 57, 230, 522); + this.infoPanel.ExpandedBounds = new System.Drawing.Rectangle(927, 57, 230, 471); this.infoPanel.ExpandOnTitleClick = true; this.infoPanel.Location = new System.Drawing.Point(1127, 57); this.infoPanel.Name = "infoPanel"; - this.infoPanel.Size = new System.Drawing.Size(30, 522); + this.infoPanel.Size = new System.Drawing.Size(30, 469); this.infoPanel.Style.Alignment = System.Drawing.StringAlignment.Center; this.infoPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.infoPanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -712,8 +735,8 @@ namespace VEPROMS // this.infoTabs.BackColor = System.Drawing.Color.Transparent; this.infoTabs.CanReorderTabs = true; - this.infoTabs.Controls.Add(this.tabControlPanel1); this.infoTabs.Controls.Add(this.infotabControlPanelTags); + this.infoTabs.Controls.Add(this.tabControlPanel1); this.infoTabs.Controls.Add(this.infotabControlPanelTransitions); this.infoTabs.Controls.Add(this.infotabControlPanelRO); this.infoTabs.Dock = System.Windows.Forms.DockStyle.Fill; @@ -721,7 +744,7 @@ namespace VEPROMS this.infoTabs.Name = "infoTabs"; this.infoTabs.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold); this.infoTabs.SelectedTabIndex = 0; - this.infoTabs.Size = new System.Drawing.Size(30, 496); + this.infoTabs.Size = new System.Drawing.Size(30, 443); this.infoTabs.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Right; this.infoTabs.TabIndex = 1; this.infoTabs.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -733,6 +756,42 @@ namespace VEPROMS this.infoTabs.ThemeAware = true; this.infoTabs.Visible = false; // + // tabControlPanel1 + // + this.tabControlPanel1.Controls.Add(this.displayHistory); + this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanel1.Location = new System.Drawing.Point(0, 0); + this.tabControlPanel1.Name = "tabControlPanel1"; + this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel1.Size = new System.Drawing.Size(3, 443); + this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control; + this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tabControlPanel1.Style.GradientAngle = 180; + this.tabControlPanel1.TabIndex = 6; + this.tabControlPanel1.TabItem = this.infotabHistory; + this.tabControlPanel1.ThemeAware = true; + // + // displayHistory + // + this.displayHistory.Dock = System.Windows.Forms.DockStyle.Fill; + this.displayHistory.Location = new System.Drawing.Point(1, 1); + this.displayHistory.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.displayHistory.MyEditItem = null; + this.displayHistory.MyItemInfo = null; + this.displayHistory.MyProcedureInfo = null; + this.displayHistory.Name = "displayHistory"; + this.displayHistory.Size = new System.Drawing.Size(1, 509); + this.displayHistory.TabIndex = 0; + // + // infotabHistory + // + this.infotabHistory.AttachedControl = this.tabControlPanel1; + this.infotabHistory.Name = "infotabHistory"; + this.infotabHistory.Text = "History"; + this.infotabHistory.Visible = false; + // // infotabControlPanelTags // this.infotabControlPanelTags.Controls.Add(this.panelEx1); @@ -740,7 +799,7 @@ namespace VEPROMS this.infotabControlPanelTags.Location = new System.Drawing.Point(0, 0); this.infotabControlPanelTags.Name = "infotabControlPanelTags"; this.infotabControlPanelTags.Padding = new System.Windows.Forms.Padding(1); - this.infotabControlPanelTags.Size = new System.Drawing.Size(203, 496); + this.infotabControlPanelTags.Size = new System.Drawing.Size(3, 443); this.infotabControlPanelTags.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.infotabControlPanelTags.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.infotabControlPanelTags.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) @@ -758,7 +817,7 @@ namespace VEPROMS this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(1, 1); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(201, 494); + this.panelEx1.Size = new System.Drawing.Size(1, 441); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.Transparent; this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.SlateGray; @@ -774,7 +833,7 @@ namespace VEPROMS this.displayTags.Dock = System.Windows.Forms.DockStyle.Top; this.displayTags.IsVisible = false; this.displayTags.Location = new System.Drawing.Point(0, 0); - this.displayTags.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.displayTags.Margin = new System.Windows.Forms.Padding(2); this.displayTags.MinimumSize = new System.Drawing.Size(100, 630); this.displayTags.MyEditItem = null; this.displayTags.Name = "displayTags"; @@ -790,42 +849,6 @@ namespace VEPROMS this.infotabTags.Visible = false; this.infotabTags.Click += new System.EventHandler(this.infotabTags_Click); // - // tabControlPanel1 - // - this.tabControlPanel1.Controls.Add(this.displayHistory); - this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel1.Location = new System.Drawing.Point(0, 0); - this.tabControlPanel1.Name = "tabControlPanel1"; - this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel1.Size = new System.Drawing.Size(3, 496); - this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control; - this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel1.Style.GradientAngle = 180; - this.tabControlPanel1.TabIndex = 6; - this.tabControlPanel1.TabItem = this.infotabHistory; - this.tabControlPanel1.ThemeAware = true; - // - // displayHistory - // - this.displayHistory.Dock = System.Windows.Forms.DockStyle.Fill; - this.displayHistory.Location = new System.Drawing.Point(1, 1); - this.displayHistory.Margin = new System.Windows.Forms.Padding(4); - this.displayHistory.MyEditItem = null; - this.displayHistory.MyItemInfo = null; - this.displayHistory.MyProcedureInfo = null; - this.displayHistory.Name = "displayHistory"; - this.displayHistory.Size = new System.Drawing.Size(1, 509); - this.displayHistory.TabIndex = 0; - // - // infotabHistory - // - this.infotabHistory.AttachedControl = this.tabControlPanel1; - this.infotabHistory.Name = "infotabHistory"; - this.infotabHistory.Text = "History"; - this.infotabHistory.Visible = false; - // // infotabControlPanelTransitions // this.infotabControlPanelTransitions.Controls.Add(this.displayTransition); @@ -833,7 +856,7 @@ namespace VEPROMS this.infotabControlPanelTransitions.Location = new System.Drawing.Point(0, 0); this.infotabControlPanelTransitions.Name = "infotabControlPanelTransitions"; this.infotabControlPanelTransitions.Padding = new System.Windows.Forms.Padding(1); - this.infotabControlPanelTransitions.Size = new System.Drawing.Size(3, 496); + this.infotabControlPanelTransitions.Size = new System.Drawing.Size(3, 443); this.infotabControlPanelTransitions.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.infotabControlPanelTransitions.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.infotabControlPanelTransitions.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) @@ -855,7 +878,7 @@ namespace VEPROMS this.displayTransition.MyRTB = null; this.displayTransition.Name = "displayTransition"; this.displayTransition.RangeColor = System.Drawing.Color.LightGray; - this.displayTransition.Size = new System.Drawing.Size(1, 494); + this.displayTransition.Size = new System.Drawing.Size(1, 441); this.displayTransition.TabIndex = 0; // // infotabTransition @@ -873,7 +896,7 @@ namespace VEPROMS this.infotabControlPanelRO.Location = new System.Drawing.Point(0, 0); this.infotabControlPanelRO.Name = "infotabControlPanelRO"; this.infotabControlPanelRO.Padding = new System.Windows.Forms.Padding(1); - this.infotabControlPanelRO.Size = new System.Drawing.Size(3, 496); + this.infotabControlPanelRO.Size = new System.Drawing.Size(3, 443); this.infotabControlPanelRO.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.infotabControlPanelRO.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.infotabControlPanelRO.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) @@ -895,7 +918,7 @@ namespace VEPROMS this.displayRO.Name = "displayRO"; this.displayRO.ProgressBar = null; this.displayRO.ROTypeFilter = VEPROMS.CSLA.Library.E_ROValueType.All; - this.displayRO.Size = new System.Drawing.Size(1, 494); + this.displayRO.Size = new System.Drawing.Size(1, 441); this.displayRO.TabControl = null; this.displayRO.TabIndex = 0; // @@ -950,7 +973,7 @@ namespace VEPROMS this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter1.Location = new System.Drawing.Point(35, 57); this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(3, 522); + this.expandableSplitter1.Size = new System.Drawing.Size(3, 469); this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter1.TabIndex = 5; this.expandableSplitter1.TabStop = false; @@ -982,7 +1005,7 @@ namespace VEPROMS this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter2.Location = new System.Drawing.Point(38, 576); + this.expandableSplitter2.Location = new System.Drawing.Point(38, 523); this.expandableSplitter2.Name = "expandableSplitter2"; this.expandableSplitter2.Size = new System.Drawing.Size(1089, 3); this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; @@ -1018,7 +1041,7 @@ namespace VEPROMS this.expandableSplitter3.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter3.Location = new System.Drawing.Point(1124, 57); this.expandableSplitter3.Name = "expandableSplitter3"; - this.expandableSplitter3.Size = new System.Drawing.Size(3, 519); + this.expandableSplitter3.Size = new System.Drawing.Size(3, 466); this.expandableSplitter3.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter3.TabIndex = 7; this.expandableSplitter3.TabStop = false; @@ -1040,11 +1063,11 @@ namespace VEPROMS this.toolsPanel.Controls.Add(this.toolsTabs); this.toolsPanel.Dock = System.Windows.Forms.DockStyle.Right; this.toolsPanel.Expanded = false; - this.toolsPanel.ExpandedBounds = new System.Drawing.Rectangle(847, 57, 343, 522); + this.toolsPanel.ExpandedBounds = new System.Drawing.Rectangle(847, 57, 343, 471); this.toolsPanel.ExpandOnTitleClick = true; this.toolsPanel.Location = new System.Drawing.Point(1160, 57); this.toolsPanel.Name = "toolsPanel"; - this.toolsPanel.Size = new System.Drawing.Size(30, 522); + this.toolsPanel.Size = new System.Drawing.Size(30, 469); this.toolsPanel.Style.Alignment = System.Drawing.StringAlignment.Center; this.toolsPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.toolsPanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1070,20 +1093,22 @@ namespace VEPROMS this.toolsTabs.BackColor = System.Drawing.Color.Transparent; this.toolsTabs.CanReorderTabs = true; this.toolsTabs.Controls.Add(this.annotationSearch); - this.toolsTabs.Controls.Add(this.tabControlPanel2); + this.toolsTabs.Controls.Add(this.tabControlPanel3); this.toolsTabs.Controls.Add(this.tabControlPanelLD); + this.toolsTabs.Controls.Add(this.tabControlPanel2); this.toolsTabs.Dock = System.Windows.Forms.DockStyle.Fill; this.toolsTabs.Location = new System.Drawing.Point(0, 26); this.toolsTabs.Name = "toolsTabs"; this.toolsTabs.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold); this.toolsTabs.SelectedTabIndex = 0; - this.toolsTabs.Size = new System.Drawing.Size(30, 496); + this.toolsTabs.Size = new System.Drawing.Size(30, 443); this.toolsTabs.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Right; this.toolsTabs.TabIndex = 1; this.toolsTabs.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; this.toolsTabs.Tabs.Add(this.toolstabResults); this.toolsTabs.Tabs.Add(this.toolsTabBookMarks); this.toolsTabs.Tabs.Add(this.tabItemLibDocs); + this.toolsTabs.Tabs.Add(this.toosTabReports); this.toolsTabs.Text = "tabControl1"; this.toolsTabs.ThemeAware = true; // @@ -1094,7 +1119,7 @@ namespace VEPROMS this.annotationSearch.Location = new System.Drawing.Point(0, 0); this.annotationSearch.Name = "annotationSearch"; this.annotationSearch.Padding = new System.Windows.Forms.Padding(1); - this.annotationSearch.Size = new System.Drawing.Size(3, 496); + this.annotationSearch.Size = new System.Drawing.Size(3, 443); this.annotationSearch.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.annotationSearch.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.annotationSearch.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) @@ -1118,7 +1143,7 @@ namespace VEPROMS this.displaySearch1.RightToLeft = System.Windows.Forms.RightToLeft.Yes; this.displaySearch1.SearchResults = null; this.displaySearch1.SearchString = null; - this.displaySearch1.Size = new System.Drawing.Size(1, 494); + this.displaySearch1.Size = new System.Drawing.Size(1, 441); this.displaySearch1.TabIndex = 0; this.displaySearch1.TypesSelected = null; // @@ -1129,57 +1154,42 @@ namespace VEPROMS this.toolstabResults.Text = "Search"; this.toolstabResults.Click += new System.EventHandler(this.infotabResults_Click); // - // tabControlPanel2 + // tabControlPanel3 // - this.tabControlPanel2.Controls.Add(this.panelEx3); - this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel2.Location = new System.Drawing.Point(0, 0); - this.tabControlPanel2.Name = "tabControlPanel2"; - this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel2.Size = new System.Drawing.Size(3, 496); - this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.SystemColors.Control; - this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) + this.tabControlPanel3.Controls.Add(this.displayReports); + this.tabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanel3.Location = new System.Drawing.Point(0, 0); + this.tabControlPanel3.Name = "tabControlPanel3"; + this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel3.Size = new System.Drawing.Size(3, 443); + this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.SystemColors.Control; + this.tabControlPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel2.Style.GradientAngle = 180; - this.tabControlPanel2.TabIndex = 2; - this.tabControlPanel2.TabItem = this.toolsTabBookMarks; - this.tabControlPanel2.ThemeAware = true; + this.tabControlPanel3.Style.GradientAngle = 180; + this.tabControlPanel3.TabIndex = 5; + this.tabControlPanel3.TabItem = this.toosTabReports; + this.tabControlPanel3.ThemeAware = true; // - // panelEx3 + // displayReports // - this.panelEx3.AutoScroll = true; - this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; - this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.panelEx3.Controls.Add(this.displayBookMarks); - this.panelEx3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panelEx3.Location = new System.Drawing.Point(1, 1); - this.panelEx3.Name = "panelEx3"; - this.panelEx3.Size = new System.Drawing.Size(1, 494); - this.panelEx3.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx3.Style.BackColor1.Color = System.Drawing.Color.Transparent; - this.panelEx3.Style.BackColor2.Color = System.Drawing.Color.SlateGray; - this.panelEx3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx3.Style.BorderColor.Color = System.Drawing.Color.Gray; - this.panelEx3.Style.ForeColor.Color = System.Drawing.Color.Transparent; - this.panelEx3.TabIndex = 3; + this.displayReports.Dock = System.Windows.Forms.DockStyle.Fill; + this.displayReports.Location = new System.Drawing.Point(1, 1); + this.displayReports.Margin = new System.Windows.Forms.Padding(2); + this.displayReports.Mydocversion = null; + this.displayReports.MyROFSTLookup = null; + this.displayReports.Name = "displayReports"; + this.displayReports.ReportResult = null; + this.displayReports.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.displayReports.Size = new System.Drawing.Size(1, 441); + this.displayReports.TabIndex = 0; // - // displayBookMarks + // toosTabReports // - this.displayBookMarks.Dock = System.Windows.Forms.DockStyle.Fill; - this.displayBookMarks.Location = new System.Drawing.Point(0, 0); - this.displayBookMarks.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.displayBookMarks.MyDisplayTabControl = null; - this.displayBookMarks.MyEditItem = null; - this.displayBookMarks.Name = "displayBookMarks"; - this.displayBookMarks.Size = new System.Drawing.Size(1, 494); - this.displayBookMarks.TabIndex = 0; - // - // toolsTabBookMarks - // - this.toolsTabBookMarks.AttachedControl = this.tabControlPanel2; - this.toolsTabBookMarks.Name = "toolsTabBookMarks"; - this.toolsTabBookMarks.Text = "Bookmarks"; + this.toosTabReports.AttachedControl = this.tabControlPanel3; + this.toosTabReports.Name = "toosTabReports"; + this.toosTabReports.Text = "Reports"; + this.toosTabReports.Click += new System.EventHandler(this.toosTabReports_Click); // // tabControlPanelLD // @@ -1188,7 +1198,7 @@ namespace VEPROMS this.tabControlPanelLD.Location = new System.Drawing.Point(0, 0); this.tabControlPanelLD.Name = "tabControlPanelLD"; this.tabControlPanelLD.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanelLD.Size = new System.Drawing.Size(3, 496); + this.tabControlPanelLD.Size = new System.Drawing.Size(3, 443); this.tabControlPanelLD.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.tabControlPanelLD.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.tabControlPanelLD.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) @@ -1207,7 +1217,7 @@ namespace VEPROMS this.displayLibDocs.Location = new System.Drawing.Point(1, 1); this.displayLibDocs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.displayLibDocs.Name = "displayLibDocs"; - this.displayLibDocs.Size = new System.Drawing.Size(1, 494); + this.displayLibDocs.Size = new System.Drawing.Size(1, 441); this.displayLibDocs.TabIndex = 0; // // tabItemLibDocs @@ -1217,6 +1227,58 @@ namespace VEPROMS this.tabItemLibDocs.Text = "Library Documents"; this.tabItemLibDocs.Click += new System.EventHandler(this.tabItemLibDocs_Click); // + // tabControlPanel2 + // + this.tabControlPanel2.Controls.Add(this.panelEx3); + this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.tabControlPanel2.Name = "tabControlPanel2"; + this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel2.Size = new System.Drawing.Size(3, 443); + this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.SystemColors.Control; + this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tabControlPanel2.Style.GradientAngle = 180; + this.tabControlPanel2.TabIndex = 2; + this.tabControlPanel2.TabItem = this.toolsTabBookMarks; + this.tabControlPanel2.ThemeAware = true; + // + // panelEx3 + // + this.panelEx3.AutoScroll = true; + this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.panelEx3.Controls.Add(this.displayBookMarks); + this.panelEx3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panelEx3.Location = new System.Drawing.Point(1, 1); + this.panelEx3.Name = "panelEx3"; + this.panelEx3.Size = new System.Drawing.Size(1, 441); + this.panelEx3.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx3.Style.BackColor1.Color = System.Drawing.Color.Transparent; + this.panelEx3.Style.BackColor2.Color = System.Drawing.Color.SlateGray; + this.panelEx3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx3.Style.BorderColor.Color = System.Drawing.Color.Gray; + this.panelEx3.Style.ForeColor.Color = System.Drawing.Color.Transparent; + this.panelEx3.TabIndex = 3; + // + // displayBookMarks + // + this.displayBookMarks.Dock = System.Windows.Forms.DockStyle.Fill; + this.displayBookMarks.Location = new System.Drawing.Point(0, 0); + this.displayBookMarks.Margin = new System.Windows.Forms.Padding(2); + this.displayBookMarks.MyDisplayTabControl = null; + this.displayBookMarks.MyEditItem = null; + this.displayBookMarks.Name = "displayBookMarks"; + this.displayBookMarks.Size = new System.Drawing.Size(1, 441); + this.displayBookMarks.TabIndex = 0; + // + // toolsTabBookMarks + // + this.toolsTabBookMarks.AttachedControl = this.tabControlPanel2; + this.toolsTabBookMarks.Name = "toolsTabBookMarks"; + this.toolsTabBookMarks.Text = "Bookmarks"; + // // expandableSplitter4 // this.expandableSplitter4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); @@ -1247,7 +1309,7 @@ namespace VEPROMS this.expandableSplitter4.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter4.Location = new System.Drawing.Point(1157, 57); this.expandableSplitter4.Name = "expandableSplitter4"; - this.expandableSplitter4.Size = new System.Drawing.Size(3, 522); + this.expandableSplitter4.Size = new System.Drawing.Size(3, 469); this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter4.TabIndex = 3; this.expandableSplitter4.TabStop = false; @@ -1268,12 +1330,12 @@ namespace VEPROMS this.tc.Dock = System.Windows.Forms.DockStyle.Fill; this.tc.ForeColor = System.Drawing.SystemColors.ControlText; this.tc.Location = new System.Drawing.Point(38, 57); - this.tc.Margin = new System.Windows.Forms.Padding(4); + this.tc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tc.MyCopyStep = null; this.tc.Name = "tc"; this.tc.RibbonExpanded = true; this.tc.SelectedDisplayTabItem = null; - this.tc.Size = new System.Drawing.Size(1086, 519); + this.tc.Size = new System.Drawing.Size(1086, 466); this.tc.TabIndex = 8; this.tc.PanelTabDisplay += new Volian.Controls.Library.StepPanelTabDisplayEvent(this.tc_PanelTabDisplay); this.tc.WordSectionClose += new Volian.Controls.Library.StepPanelWordSectionCloseEvent(this.tc_WordSectionClose); @@ -1286,10 +1348,10 @@ namespace VEPROMS // // frmVEPROMS // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; - this.ClientSize = new System.Drawing.Size(1195, 632); + this.ClientSize = new System.Drawing.Size(1195, 583); this.Controls.Add(this.tc); this.Controls.Add(this.expandableSplitter3); this.Controls.Add(this.expandableSplitter2); @@ -1315,9 +1377,9 @@ namespace VEPROMS this.infoPanel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.infoTabs)).EndInit(); this.infoTabs.ResumeLayout(false); + this.tabControlPanel1.ResumeLayout(false); this.infotabControlPanelTags.ResumeLayout(false); this.panelEx1.ResumeLayout(false); - this.tabControlPanel1.ResumeLayout(false); this.infotabControlPanelTransitions.ResumeLayout(false); this.infotabControlPanelTransitions.PerformLayout(); this.infotabControlPanelRO.ResumeLayout(false); @@ -1325,9 +1387,10 @@ namespace VEPROMS ((System.ComponentModel.ISupportInitialize)(this.toolsTabs)).EndInit(); this.toolsTabs.ResumeLayout(false); this.annotationSearch.ResumeLayout(false); + this.tabControlPanel3.ResumeLayout(false); + this.tabControlPanelLD.ResumeLayout(false); this.tabControlPanel2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); - this.tabControlPanelLD.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).EndInit(); this.ResumeLayout(false); @@ -1446,6 +1509,9 @@ namespace VEPROMS private DevComponents.DotNetBar.ButtonItem btnUpdateFormats; private System.Windows.Forms.FolderBrowserDialog fbd; private DevComponents.DotNetBar.ButtonItem btnSendErrorLog; + private DevComponents.DotNetBar.TabControlPanel tabControlPanel3; + private DevComponents.DotNetBar.TabItem toosTabReports; + private Volian.Controls.Library.DisplayReports displayReports; } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index fae5cdac..ed524849 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -85,6 +85,7 @@ namespace VEPROMS _SelectedROFst = null; } InitiateSearch(false); + InitiateDisplayReports(false); } } // TODO: Should the following be an info @@ -222,6 +223,7 @@ namespace VEPROMS displayHistory.ChronologyPrintRequest += new DisplayHistoryReportEvent(displayHistory_ChronologyPrintRequest); displayHistory.SummaryPrintRequest += new DisplayHistoryReportEvent(displayHistory_SummaryPrintRequest); displayHistory.AnnotationRestored += new AnnotationRestoredHandler(displayHistory_AnnotationRestored); + displayReports.PrintRequest += new DisplayReportsEvent(displayReports_PrintRequest); this.Activated += new EventHandler(frmVEPROMS_Activated); VlnSettings.StepTypeToolType = Settings.Default.StepTypeToolTip; displayLibDocs.PrintRequest += new DisplayLibDocEvent(displayLibDocs_PrintRequest); @@ -267,6 +269,7 @@ namespace VEPROMS break; } } + static string _ErrorLogFileName; public static string ErrorLogFileName @@ -436,6 +439,21 @@ namespace VEPROMS myReport.Build(); } + void displayReports_PrintRequest(object sender, DisplayReportsEventArgs args) + { + if (args.TypesSelected == "RO Usage") + { + Volian.Print.Library.PDFReport myReport = new Volian.Print.Library.PDFReport(args.ReportTitle, args.MyItemInfoList, Volian.Base.Library.VlnSettings.TemporaryFolder + @"\ROUsageReport.pdf", args.SortUsageByProcedure); + myReport.Build(); + } + else if (args.TypesSelected == "RO Report") + { + Volian.Print.Library.PDFReport myReport = new Volian.Print.Library.PDFReport(args.ReportTitle, args.RODataFile, Volian.Base.Library.VlnSettings.TemporaryFolder + @"\ROCompleteReport.pdf", args.CompleteROReport); + myReport.Build(); + } + } + + bool tv_InsertItemInfo(object sender, vlnTreeItemInfoInsertEventArgs args) { // Don't select the newly created Step. This will be handled by tmrTreeView @@ -1736,6 +1754,24 @@ namespace VEPROMS } } + private void toosTabReports_Click(object sender, EventArgs e) + { + toolsPanel.Expanded = true; + InitiateDisplayReports(true); + } + + private void InitiateDisplayReports(bool reportFocus) + { + if (toolsPanel.Expanded) + { + if (SelectedDVI != null) + displayReports.Mydocversion = SelectedDVI; + displayReports.advTreeProcSetsFillIn(reportFocus); + displayReports.advTreeROFillIn(reportFocus); + displayReports.SelectReferencedObjectTab(); // to enable RO selection + } + } + private void ribbonControl1_ExpandedChanged(object sender, EventArgs e) { Console.WriteLine("Size {0}", ribbonControl1.Expanded); @@ -1797,7 +1833,10 @@ namespace VEPROMS _panelExpandedChanging = false; expandableSplitter4.Enabled = toolsPanel.Expanded; if (toolsPanel.Expanded) + { InitiateSearch(true); + InitiateDisplayReports(true); + } } private void epAnnotations_ExpandedChanged(object sender, ExpandedChangeEventArgs e) @@ -1928,6 +1967,5 @@ namespace VEPROMS MessageBox.Show("PROMS Error Log successfully sent to Volian support"); } } - } } diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs index 2e0ce5a6..1bd16887 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs @@ -263,6 +263,28 @@ namespace VEPROMS.CSLA.Library if (ROID.StartsWith("FFFF")) return "?"; // string.Format("Invalid Unit RO '{0}'", ROID); return "?"; // string.Format("Invalid RO '{0}'", ROID); } + // Get the the RO's Accessory Page ID + public string GetRoACID(string ROID16) + { + string ROID = ROID16.Substring(0,12); + if (dicRos == null) ParseIntoDictionary(_ROFst!=null?_ROFst.ROLookup:_ROFstInfo.ROLookup); + // Use the ROID to get the value from the dictionary + if (dicRos.ContainsKey(ROID.ToUpper())) + { + rochild rochld = (rochild)dicRos[ROID.ToUpper()]; + if (rochld.value != null && rochld.value != string.Empty) + return rochld.appid; + if (rochld.children != null) + { + foreach (rochild child in rochld.children) + if (child.roid.ToUpper() == ROID16 || (child.roid.EndsWith("0041") && ROID16.EndsWith("0000"))) + return child.appid; + // if there isn't a specific match for multi-return values, default to the first child. + return rochld.children[0].appid; + } + } + return ""; // no accessory page ID found + } public rochild GetRoChild12(string ROID16) { string ROID = ROID16.Substring(0, 12); @@ -304,6 +326,27 @@ namespace VEPROMS.CSLA.Library } while (roc.ID > 0); return sb.ToString(); } + // Return the RO Title in a list of strings + // The last item in the list is the actual RO title, the items preceding it are the + // titles of the groups and sub-groups containing the RO + public List GetROTitleAndGroupPath(string ROID) + { + List titlePath = new List(); + rochild roc = GetRoChild12(ROID); + //string tmp = roc.title.Replace(roc.appid, "").Replace(roc.value, "").Trim(); + string tmp = roc.title.Replace(roc.appid, string.Format("<{0}>",roc.appid)).Trim(); + titlePath.Add(tmp); + do + { + string parent = ROID.Substring(0, 4) + string.Format("{0:X8}", roc.ParentID); + roc = GetRoChild12(parent); + if (roc.ID > 0) + titlePath.Add(roc.title); + } while (roc.ID > 0); + titlePath.Reverse(); + return titlePath; + } + // The following Method is not correct. It needs to have a RO database id as well as an id. Without that, // the first RO with a specific id will be found regardless of the RO Database id. //public rochild GetRoChildFromID(int id)