diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj index 7183693a..31ad04a4 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj +++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj @@ -152,6 +152,12 @@ AboutVEPROMS.cs + + Form + + + dlgAnnotationsSelect.cs + Form @@ -331,6 +337,9 @@ Designer AboutVEPROMS.cs + + dlgAnnotationsSelect.cs + dlgCheckOpenTabs.cs diff --git a/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs b/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs new file mode 100644 index 00000000..bd778dd9 --- /dev/null +++ b/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs @@ -0,0 +1,197 @@ + +namespace VEPROMS +{ + partial class DlgAnnotationsSelect + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.lstUnselected = new System.Windows.Forms.ListBox(); + this.lstSelected = new System.Windows.Forms.ListBox(); + this.btnSelect = new System.Windows.Forms.Button(); + this.btnSelectAll = new System.Windows.Forms.Button(); + this.btnDeselectAll = new System.Windows.Forms.Button(); + this.btnDeselect = new System.Windows.Forms.Button(); + this.btnUpdate = new System.Windows.Forms.Button(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.btnCancel = new System.Windows.Forms.Button(); + this.tableLayoutPanel1.SuspendLayout(); + this.SuspendLayout(); + // + // lstUnselected + // + this.lstUnselected.Dock = System.Windows.Forms.DockStyle.Fill; + this.lstUnselected.FormattingEnabled = true; + this.lstUnselected.IntegralHeight = false; + this.lstUnselected.Location = new System.Drawing.Point(3, 3); + this.lstUnselected.Name = "lstUnselected"; + this.tableLayoutPanel1.SetRowSpan(this.lstUnselected, 4); + this.lstUnselected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; + this.lstUnselected.Size = new System.Drawing.Size(287, 394); + this.lstUnselected.TabIndex = 0; + this.lstUnselected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged); + // + // lstSelected + // + this.lstSelected.Dock = System.Windows.Forms.DockStyle.Fill; + this.lstSelected.FormattingEnabled = true; + this.lstSelected.IntegralHeight = false; + this.lstSelected.Location = new System.Drawing.Point(334, 3); + this.lstSelected.Name = "lstSelected"; + this.tableLayoutPanel1.SetRowSpan(this.lstSelected, 4); + this.lstSelected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; + this.lstSelected.Size = new System.Drawing.Size(288, 394); + this.lstSelected.TabIndex = 1; + this.lstSelected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged); + // + // btnSelect + // + this.btnSelect.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btnSelect.Location = new System.Drawing.Point(298, 38); + this.btnSelect.Name = "btnSelect"; + this.btnSelect.Size = new System.Drawing.Size(28, 23); + this.btnSelect.TabIndex = 2; + this.btnSelect.Text = ">"; + this.btnSelect.UseVisualStyleBackColor = true; + this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click); + // + // btnSelectAll + // + this.btnSelectAll.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btnSelectAll.Location = new System.Drawing.Point(298, 138); + this.btnSelectAll.Name = "btnSelectAll"; + this.btnSelectAll.Size = new System.Drawing.Size(28, 23); + this.btnSelectAll.TabIndex = 3; + this.btnSelectAll.Text = ">>"; + this.btnSelectAll.UseVisualStyleBackColor = true; + this.btnSelectAll.Click += new System.EventHandler(this.btnSelectAll_Click); + // + // btnDeselectAll + // + this.btnDeselectAll.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btnDeselectAll.Location = new System.Drawing.Point(298, 238); + this.btnDeselectAll.Name = "btnDeselectAll"; + this.btnDeselectAll.Size = new System.Drawing.Size(28, 23); + this.btnDeselectAll.TabIndex = 5; + this.btnDeselectAll.Text = "<<"; + this.btnDeselectAll.UseVisualStyleBackColor = true; + this.btnDeselectAll.Click += new System.EventHandler(this.btnDeselectAll_Click); + // + // btnDeselect + // + this.btnDeselect.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btnDeselect.Location = new System.Drawing.Point(298, 338); + this.btnDeselect.Name = "btnDeselect"; + this.btnDeselect.Size = new System.Drawing.Size(28, 23); + this.btnDeselect.TabIndex = 4; + this.btnDeselect.Text = "<"; + this.btnDeselect.UseVisualStyleBackColor = true; + this.btnDeselect.Click += new System.EventHandler(this.btnDeselect_Click); + // + // btnUpdate + // + this.btnUpdate.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btnUpdate.Location = new System.Drawing.Point(536, 422); + this.btnUpdate.Name = "btnUpdate"; + this.btnUpdate.Size = new System.Drawing.Size(100, 35); + this.btnUpdate.TabIndex = 8; + this.btnUpdate.Text = "Update"; + this.btnUpdate.UseVisualStyleBackColor = true; + this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click); + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tableLayoutPanel1.ColumnCount = 3; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 38F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.lstUnselected, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.lstSelected, 2, 0); + this.tableLayoutPanel1.Controls.Add(this.btnDeselect, 1, 3); + this.tableLayoutPanel1.Controls.Add(this.btnDeselectAll, 1, 2); + this.tableLayoutPanel1.Controls.Add(this.btnSelect, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.btnSelectAll, 1, 1); + this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 12); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 4; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(625, 400); + this.tableLayoutPanel1.TabIndex = 6; + // + // btnCancel + // + this.btnCancel.Location = new System.Drawing.Point(411, 422); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(100, 35); + this.btnCancel.TabIndex = 9; + this.btnCancel.Text = "Cancel"; + this.btnCancel.UseVisualStyleBackColor = true; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click_1); + // + // DlgAnnotationsSelect + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(653, 466); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.btnUpdate); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "DlgAnnotationsSelect"; + this.Text = "Select Annotation Types"; + this.Load += new System.EventHandler(this.DlgAnnotationsSelect_Load); + this.tableLayoutPanel1.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + private System.Windows.Forms.ListBox lstUnselected; + private System.Windows.Forms.ListBox lstSelected; + private System.Windows.Forms.Button btnSelect; + private System.Windows.Forms.Button btnSelectAll; + private System.Windows.Forms.Button btnDeselectAll; + private System.Windows.Forms.Button btnDeselect; + private System.Windows.Forms.Button btnUpdate; + + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Button btnCancel; + + //private System.Windows.Forms.ListBox lstUnselected; + //private System.Windows.Forms.ListBox lstSelected; + //private System.Windows.Forms.Button btnSelect; + //private System.Windows.Forms.Button btnSelectAll; + //private System.Windows.Forms.Button btnDeselectAll; + //private System.Windows.Forms.Button btnDeselect; + //private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + } +} \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.cs b/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.cs new file mode 100644 index 00000000..bc2c71c5 --- /dev/null +++ b/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.cs @@ -0,0 +1,193 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using VEPROMS.CSLA.Library; + +namespace VEPROMS +{ + public partial class DlgAnnotationsSelect : Form + { + public DlgAnnotationsSelect() + { + InitializeComponent(); + } + + public DlgAnnotationsSelect(ProcedureInfo pi) + { + InitializeComponent(); + MyItemID = pi.ItemID; + } + + private int _MyItemID; + public int MyItemID + { + get { return _MyItemID; } + set { _MyItemID = value; } + } + + private void btnSelect_Click(object sender, EventArgs e) + { + MoveSelectedItems(lstUnselected, lstSelected); + } + + // Move selected items to lstUnselected. + private void btnDeselect_Click(object sender, EventArgs e) + { + MoveSelectedItems(lstSelected, lstUnselected); + } + + // Move selected items from one ListBox to another. + private void MoveSelectedItems(ListBox lstFrom, ListBox lstTo) + { + while (lstFrom.SelectedItems.Count > 0) + { + lstSelected.DisplayMember = "NameStr"; + lstSelected.ValueMember = "TypeID"; + //lstSelected.Items.Add(lstFrom.SelectedItems[0]); + + //lstFrom.SelectedItems[0]; + AnnotataionItem item = (AnnotataionItem)lstFrom.SelectedItems[0]; + //string item2 = (string)lstFrom.; + lstTo.Items.Add(new AnnotataionItem(item.NameStr, item.TypeID)); + //lstTo.Items.Add(item); + lstFrom.Items.Remove(item); + } + SetButtonsEditable(); + } + + // Move all items to lstSelected. + private void btnSelectAll_Click(object sender, EventArgs e) + { + MoveAllItems(lstUnselected, lstSelected); + } + + // Move all items to lstUnselected. + private void btnDeselectAll_Click(object sender, EventArgs e) + { + MoveAllItems(lstSelected, lstUnselected); + } + + // Move all items from one ListBox to another. + private void MoveAllItems(ListBox lstFrom, ListBox lstTo) + { + lstTo.Items.AddRange(lstFrom.Items); + lstFrom.Items.Clear(); + SetButtonsEditable(); + } + + // Enable and disable buttons. + private void lst_SelectedIndexChanged(object sender, EventArgs e) + { + SetButtonsEditable(); + } + // Move selected items to lstUnselected. + private void btnUpdate_Click(object sender, EventArgs e) + { + int dltFlg = 1; + foreach (AnnotataionItem item in lstSelected.Items) + { + //item.NameStr, item.TypeID + //string Name = (item.Row[lstSelected.DisplayMember].ToString()); + //int TypeID = int.Parse(item.Row[lstSelected.ValueMember].ToString()); + //lstSelected.Items. + // item. + + //sb.Append(item.ToString()); + //sb.Append(" "); + //DataTable lstSelectedTbl = VEPROMS.CSLA.Library.AnnotationstypeSelections.Get(MyItemID, item.ValueMember ); + + VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(MyItemID, item.TypeID, dltFlg, item.NameStr); + dltFlg = 0; + } + + //MoveSelectedItems(lstSelected, lstUnselected); + } + public class AnnotataionItem + { + private string _NameStr; + private int _TypeID; + + public AnnotataionItem(string NameStr, int TypeID) + { + this._NameStr = NameStr; + this._TypeID = TypeID; + } + public string NameStr + { + get + { + return _NameStr; + } + } + public int TypeID + { + get + { + return _TypeID; + } + } + } + + // Enable and disable buttons. + private void SetButtonsEditable() + { + btnSelect.Enabled = (lstUnselected.SelectedItems.Count > 0); + btnSelectAll.Enabled = (lstUnselected.Items.Count > 0); + btnDeselect.Enabled = (lstSelected.SelectedItems.Count > 0); + btnDeselectAll.Enabled = (lstSelected.Items.Count > 0); + } + + //lstUnselected.DisplayMember = "NameStr"; + //lstUnselected.ValueMember = "TypeID"; + + private void DlgAnnotationsSelect_Load(object sender, EventArgs e) + { + lstUnselected.DisplayMember = "NameStr"; + lstUnselected.ValueMember = "TypeID"; + SetButtonsEditable(); + //AnnotationTypeInfoList tmp = AnnotationTypeInfoList.Get(); + DataTable AnnoType = AnnotationstypeSelections.GetAnnoTypes(MyItemID); + foreach (DataRow dr in AnnoType.Rows) + { + //USStates.Add(new USState("Alabama", "AL")); + //AnnotataionItem + lstUnselected.Items.Add(new AnnotataionItem(dr["Name"].ToString(), (int)dr["TypeID"])); + //lstUnselected.Items.Add(new AnnotataionItem(tp.Name, tp.TypeID)); + //lstUnselected.Items.Add(tp.Name); + //lstUnselected.DisplayMember = tp.Name; + //lstUnselected.ValueMember = tp.TypeID.ToString(); + } + + //AnnotationstypeSelections.retrieveAnnotSelectionsList tmp2 = AnnotationstypeSelections.Retrieve(MyItemID); + //foreach (AnnotationType tp2 in tmp2) + //{ + // lstSelected.Items.Add(tp2.Name); + // lstSelected.DisplayMember = tp2.Name; + // lstSelected.ValueMember = tp2.TypeID.ToString(); + //} + lstSelected.DisplayMember = "NameStr"; + lstSelected.ValueMember = "TypeID"; + DataTable lstSelectedTbl = VEPROMS.CSLA.Library.AnnotationstypeSelections.Retrieve(MyItemID); + if (lstSelectedTbl.Rows.Count > 0) + { + foreach (DataRow lstSelectedRow in lstSelectedTbl.Rows) + { + lstSelected.Items.Add(lstSelectedRow["Name"]); + lstSelected.DisplayMember = lstSelectedRow["Name"].ToString(); + lstSelected.ValueMember = lstSelectedRow["TypeID"].ToString(); + } + } + } + + private void btnCancel_Click_1(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.resx b/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 8548a650..92f47854 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -47,13 +47,13 @@ namespace VEPROMS this.btnOpen = new DevComponents.DotNetBar.ButtonItem(); this.btnPrepare = new DevComponents.DotNetBar.ButtonItem(); this.btnAdmin = new DevComponents.DotNetBar.ButtonItem(); - this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem(); this.icRecentDocs = new DevComponents.DotNetBar.ItemContainer(); this.labelItem8 = new DevComponents.DotNetBar.LabelItem(); this.itemContainer5 = new DevComponents.DotNetBar.ItemContainer(); this.btnOptions = new DevComponents.DotNetBar.ButtonItem(); this.btnExit = new DevComponents.DotNetBar.ButtonItem(); this.qatCustomizeItem1 = new DevComponents.DotNetBar.QatCustomizeItem(); + this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem(); this.galleryGroup1 = new DevComponents.DotNetBar.GalleryGroup(); this.galleryGroup2 = new DevComponents.DotNetBar.GalleryGroup(); this.galleryGroup3 = new DevComponents.DotNetBar.GalleryGroup(); @@ -208,13 +208,13 @@ namespace VEPROMS this.btnHelp.KeyTips = "?"; this.btnHelp.Name = "btnHelp"; this.btnHelp.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btnHelpManual, - this.btnShortCuts, - this.btnHelpVWeb, - this.btnSendErrorLog, - this.btnShowErrFld, - this.btnShowPrtFld, - this.btnHelpAbout}); + this.btnHelpManual, + this.btnShortCuts, + this.btnHelpVWeb, + this.btnSendErrorLog, + this.btnShowErrFld, + this.btnShowPrtFld, + this.btnHelpAbout}); this.btnHelp.Text = "Help"; // // btnHelpManual @@ -249,23 +249,19 @@ namespace VEPROMS this.btnSendErrorLog.Click += new System.EventHandler(this.btnSendErrorLog_Click); // // btnShowErrFld - // - //this.btnShowErrFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS; + // this.btnShowErrFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowErrFld.Image"))); this.btnShowErrFld.Name = "btnShowErrFld"; this.btnShowErrFld.Text = "Open Log Folder"; this.btnShowErrFld.Click += new System.EventHandler(this.btnShowErrFld_Click); // // btnShowPrtFld - // - //this.btnShowPrtFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS; + // this.btnShowPrtFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowPrtFld.Image"))); this.btnShowPrtFld.Name = "btnShowPrtFld"; this.btnShowPrtFld.Text = "Open Default Print Folder"; this.btnShowPrtFld.Click += new System.EventHandler(this.btnShowPrtFld_Click); // - // - // // btnHelpAbout // this.btnHelpAbout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -303,6 +299,10 @@ namespace VEPROMS this.itemContainer1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer2, this.itemContainer5}); + // + // + // + this.itemContainer1.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // @@ -320,6 +320,10 @@ namespace VEPROMS this.itemContainer2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer3, this.icRecentDocs}); + // + // + // + this.itemContainer2.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // @@ -340,6 +344,10 @@ namespace VEPROMS this.btnOpen, this.btnPrepare, this.btnAdmin}); + // + // + // + this.itemContainer3.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // @@ -363,7 +371,6 @@ namespace VEPROMS this.btnOpen.SubItemsExpandWidth = 24; this.btnOpen.Text = "&Open..."; this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click); - // // btnPrepare // @@ -382,16 +389,8 @@ namespace VEPROMS this.btnAdmin.CanCustomize = false; this.btnAdmin.Image = global::VEPROMS.Properties.Resources.Admin; this.btnAdmin.Name = "btnAdmin"; - //this.btnAdmin.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { - //this.btnUpdateFormats}); this.btnAdmin.Text = "A&dministration"; // - // btnUpdateFormats - // - this.btnUpdateFormats.Name = "btnUpdateFormats"; - this.btnUpdateFormats.Text = "Update Formats"; - this.btnUpdateFormats.Click += new System.EventHandler(this.btnUpdateFormat_Click); - // // icRecentDocs // // @@ -404,6 +403,10 @@ namespace VEPROMS this.icRecentDocs.Name = "icRecentDocs"; this.icRecentDocs.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem8}); + // + // + // + this.icRecentDocs.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // @@ -432,6 +435,10 @@ namespace VEPROMS this.itemContainer5.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnOptions, this.btnExit}); + // + // + // + this.itemContainer5.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // @@ -461,6 +468,12 @@ namespace VEPROMS // this.qatCustomizeItem1.Name = "qatCustomizeItem1"; // + // btnUpdateFormats + // + this.btnUpdateFormats.Name = "btnUpdateFormats"; + this.btnUpdateFormats.Text = "Update Formats"; + this.btnUpdateFormats.Click += new System.EventHandler(this.btnUpdateFormat_Click); + // // galleryGroup1 // this.galleryGroup1.Name = "galleryGroup1"; @@ -535,7 +548,7 @@ namespace VEPROMS // this.txtSearch.Dock = System.Windows.Forms.DockStyle.Right; this.txtSearch.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F); - this.txtSearch.Location = new System.Drawing.Point(820, 0); + this.txtSearch.Location = new System.Drawing.Point(810, 0); this.txtSearch.Multiline = true; this.txtSearch.Name = "txtSearch"; this.txtSearch.Size = new System.Drawing.Size(100, 25); @@ -544,7 +557,7 @@ namespace VEPROMS // btnPrevious // this.btnPrevious.Dock = System.Windows.Forms.DockStyle.Right; - this.btnPrevious.Location = new System.Drawing.Point(920, 0); + this.btnPrevious.Location = new System.Drawing.Point(910, 0); this.btnPrevious.Name = "btnPrevious"; this.btnPrevious.Size = new System.Drawing.Size(23, 25); this.btnPrevious.TabIndex = 1; @@ -554,7 +567,7 @@ namespace VEPROMS // btnPrint1 // this.btnPrint1.Dock = System.Windows.Forms.DockStyle.Right; - this.btnPrint1.Location = new System.Drawing.Point(943, 0); + this.btnPrint1.Location = new System.Drawing.Point(933, 0); this.btnPrint1.Name = "btnPrint1"; this.btnPrint1.Size = new System.Drawing.Size(23, 25); this.btnPrint1.TabIndex = 2; @@ -566,7 +579,7 @@ namespace VEPROMS this.cbScrunch.Checked = true; this.cbScrunch.CheckState = System.Windows.Forms.CheckState.Checked; this.cbScrunch.Dock = System.Windows.Forms.DockStyle.Right; - this.cbScrunch.Location = new System.Drawing.Point(966, 0); + this.cbScrunch.Location = new System.Drawing.Point(956, 0); this.cbScrunch.Name = "cbScrunch"; this.cbScrunch.Size = new System.Drawing.Size(24, 25); this.cbScrunch.TabIndex = 3; @@ -575,7 +588,7 @@ namespace VEPROMS // btnNext // this.btnNext.Dock = System.Windows.Forms.DockStyle.Right; - this.btnNext.Location = new System.Drawing.Point(990, 0); + this.btnNext.Location = new System.Drawing.Point(980, 0); this.btnNext.Name = "btnNext"; this.btnNext.Size = new System.Drawing.Size(23, 25); this.btnNext.TabIndex = 4; @@ -586,7 +599,7 @@ namespace VEPROMS // this.cmbFont.Dock = System.Windows.Forms.DockStyle.Right; this.cmbFont.FormattingEnabled = true; - this.cmbFont.Location = new System.Drawing.Point(1013, 0); + this.cmbFont.Location = new System.Drawing.Point(1003, 0); this.cmbFont.Name = "cmbFont"; this.cmbFont.Size = new System.Drawing.Size(172, 23); this.cmbFont.TabIndex = 0; @@ -596,9 +609,10 @@ namespace VEPROMS // this.lblDummy.Dock = System.Windows.Forms.DockStyle.Right; this.lblDummy.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F); - this.lblDummy.Location = new System.Drawing.Point(1013, 0); + this.lblDummy.Location = new System.Drawing.Point(1175, 0); this.lblDummy.Name = "lblDummy"; this.lblDummy.Size = new System.Drawing.Size(10, 25); + this.lblDummy.TabIndex = 5; this.lblDummy.Visible = false; // // labelItem10 @@ -707,9 +721,9 @@ 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, 547); + this.epAnnotations.Location = new System.Drawing.Point(5, 324); this.epAnnotations.Name = "epAnnotations"; - this.epAnnotations.Size = new System.Drawing.Size(1185, 26); + this.epAnnotations.Size = new System.Drawing.Size(1185, 249); this.epAnnotations.Style.Alignment = System.Drawing.StringAlignment.Center; this.epAnnotations.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.epAnnotations.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -734,8 +748,9 @@ namespace VEPROMS // ctrlAnnotationDetails // this.ctrlAnnotationDetails.AnnotationDirty = false; - this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft S" + - "ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n"; + this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 " + + "Microsoft Sans Serif;}}\r\n{\\*\\generator Riched20 10.0.26100}\\viewkind4\\uc1 \r\n\\par" + + "d\\f0\\fs20\\par\r\n}\r\n"; this.ctrlAnnotationDetails.Annotations = null; this.ctrlAnnotationDetails.AnnotationText = ""; this.ctrlAnnotationDetails.ClientProcess = null; @@ -744,11 +759,11 @@ namespace VEPROMS this.ctrlAnnotationDetails.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlAnnotationDetails.Enabled = false; 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.MyUserInfo = null; this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails"; this.ctrlAnnotationDetails.ProcItem = null; - this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1185, 0); + this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1185, 223); this.ctrlAnnotationDetails.TabIndex = 15; // // btnAnnoDetailsPushPin @@ -782,7 +797,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(326, 490); + this.epProcedures.Size = new System.Drawing.Size(326, 267); 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; @@ -806,6 +821,7 @@ namespace VEPROMS // tv // this.tv.AllowDrop = true; + this.tv.DelProcReason = null; this.tv.Dock = System.Windows.Forms.DockStyle.Fill; this.tv.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tv.HideSelection = false; @@ -814,7 +830,7 @@ namespace VEPROMS this.tv.MyUserInfo = null; this.tv.Name = "tv"; this.tv.ProgressBar = null; - this.tv.Size = new System.Drawing.Size(326, 464); + this.tv.Size = new System.Drawing.Size(326, 241); this.tv.TabIndex = 1; this.tv.SectionShouldClose += new Volian.Controls.Library.vlnTreeViewSectionInfoEvent(this.tv_SectionShouldClose); this.tv.WordSectionDeleted += new Volian.Controls.Library.WordSectionDeletedEvent(this.tv_WordSectionDeleted); @@ -833,7 +849,7 @@ namespace VEPROMS this.infoPanel.ExpandOnTitleClick = true; this.infoPanel.Location = new System.Drawing.Point(614, 57); this.infoPanel.Name = "infoPanel"; - this.infoPanel.Size = new System.Drawing.Size(230, 490); + this.infoPanel.Size = new System.Drawing.Size(230, 267); 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; @@ -870,7 +886,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(230, 464); + this.infoTabs.Size = new System.Drawing.Size(230, 241); this.infoTabs.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Right; this.infoTabs.TabIndex = 1; this.infoTabs.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -891,7 +907,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, 464); + this.infotabControlPanelTags.Size = new System.Drawing.Size(203, 241); 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) @@ -910,7 +926,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, 462); + this.panelEx1.Size = new System.Drawing.Size(201, 239); 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; @@ -926,13 +942,15 @@ namespace VEPROMS this.displayTags.Dock = System.Windows.Forms.DockStyle.Fill; 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"; this.displayTags.NotVisibleEditItem = null; this.displayTags.Size = new System.Drawing.Size(201, 630); this.displayTags.TabIndex = 0; + this.displayTags.TbFSht = ""; + this.displayTags.TbFSwd = ""; // // infotabTags // @@ -950,7 +968,7 @@ namespace VEPROMS this.tcpApplicability.Location = new System.Drawing.Point(0, 0); this.tcpApplicability.Name = "tcpApplicability"; this.tcpApplicability.Padding = new System.Windows.Forms.Padding(1); - this.tcpApplicability.Size = new System.Drawing.Size(203, 464); + this.tcpApplicability.Size = new System.Drawing.Size(203, 241); this.tcpApplicability.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.tcpApplicability.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.tcpApplicability.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) @@ -969,7 +987,7 @@ namespace VEPROMS this.displayApplicability.MyDisplayTabItem = null; this.displayApplicability.MyItemInfo = null; this.displayApplicability.Name = "displayApplicability"; - this.displayApplicability.Size = new System.Drawing.Size(201, 462); + this.displayApplicability.Size = new System.Drawing.Size(201, 239); this.displayApplicability.TabIndex = 2; // // infotabApplicability @@ -987,7 +1005,7 @@ namespace VEPROMS this.tcpFoldoutMaint.Location = new System.Drawing.Point(0, 0); this.tcpFoldoutMaint.Name = "tcpFoldoutMaint"; this.tcpFoldoutMaint.Padding = new System.Windows.Forms.Padding(1); - this.tcpFoldoutMaint.Size = new System.Drawing.Size(203, 464); + this.tcpFoldoutMaint.Size = new System.Drawing.Size(203, 241); this.tcpFoldoutMaint.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.tcpFoldoutMaint.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.tcpFoldoutMaint.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) @@ -1004,7 +1022,7 @@ namespace VEPROMS this.displayFoldoutMaint.Margin = new System.Windows.Forms.Padding(4); this.displayFoldoutMaint.MyItemInfo = null; this.displayFoldoutMaint.Name = "displayFoldoutMaint"; - this.displayFoldoutMaint.Size = new System.Drawing.Size(201, 462); + this.displayFoldoutMaint.Size = new System.Drawing.Size(201, 239); this.displayFoldoutMaint.TabIndex = 2; // // tabControlPanel1 @@ -1015,7 +1033,7 @@ namespace VEPROMS 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(203, 464); + this.tabControlPanel1.Size = new System.Drawing.Size(203, 241); 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) @@ -1036,7 +1054,7 @@ namespace VEPROMS this.displayHistory.MyProcedureInfo = null; this.displayHistory.MyRevDate = new System.DateTime(((long)(0))); this.displayHistory.Name = "displayHistory"; - this.displayHistory.Size = new System.Drawing.Size(201, 462); + this.displayHistory.Size = new System.Drawing.Size(201, 239); this.displayHistory.TabIndex = 0; // // infotabHistory @@ -1054,7 +1072,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(203, 464); + this.infotabControlPanelTransitions.Size = new System.Drawing.Size(203, 241); 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) @@ -1076,7 +1094,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(201, 462); + this.displayTransition.Size = new System.Drawing.Size(201, 239); this.displayTransition.TabIndex = 0; // // infotabTransition @@ -1095,7 +1113,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(203, 464); + this.infotabControlPanelRO.Size = new System.Drawing.Size(203, 241); 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) @@ -1111,13 +1129,13 @@ namespace VEPROMS this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill; this.displayRO.Location = new System.Drawing.Point(1, 1); this.displayRO.Margin = new System.Windows.Forms.Padding(4); + this.displayRO.MyDvi = null; this.displayRO.MyROFST = null; - //this.displayRO.MyROFSTLookup = null; this.displayRO.MyRTB = null; this.displayRO.Name = "displayRO"; this.displayRO.ProgressBar = null; this.displayRO.ROTypeFilter = VEPROMS.CSLA.Library.E_ROValueType.All; - this.displayRO.Size = new System.Drawing.Size(201, 462); + this.displayRO.Size = new System.Drawing.Size(201, 239); this.displayRO.TabControl = this.tc; this.displayRO.TabIndex = 0; // @@ -1126,6 +1144,7 @@ namespace VEPROMS this.tc.ChgId = null; this.tc.Dock = System.Windows.Forms.DockStyle.Fill; this.tc.ForeColor = System.Drawing.SystemColors.ControlText; + this.tc.LastSelectedDisplayTabItem = null; this.tc.Location = new System.Drawing.Point(334, 57); this.tc.Margin = new System.Windows.Forms.Padding(4); this.tc.MyAnnotationDetails = null; @@ -1137,7 +1156,7 @@ namespace VEPROMS this.tc.SelectedDisplayTabItem = null; this.tc.SeparateWindows = false; this.tc.ShuttingDown = false; - this.tc.Size = new System.Drawing.Size(277, 487); + this.tc.Size = new System.Drawing.Size(277, 264); this.tc.SyncEnhancedDocuments = false; this.tc.TabIndex = 8; this.tc.VersionID = 0; @@ -1209,7 +1228,7 @@ namespace VEPROMS this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter1.Location = new System.Drawing.Point(331, 57); this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(3, 490); + this.expandableSplitter1.Size = new System.Drawing.Size(3, 267); this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter1.TabIndex = 5; this.expandableSplitter1.TabStop = false; @@ -1241,7 +1260,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(334, 544); + this.expandableSplitter2.Location = new System.Drawing.Point(334, 321); this.expandableSplitter2.Name = "expandableSplitter2"; this.expandableSplitter2.Size = new System.Drawing.Size(280, 3); this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; @@ -1277,7 +1296,7 @@ namespace VEPROMS this.expandableSplitter3.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter3.Location = new System.Drawing.Point(611, 57); this.expandableSplitter3.Name = "expandableSplitter3"; - this.expandableSplitter3.Size = new System.Drawing.Size(3, 487); + this.expandableSplitter3.Size = new System.Drawing.Size(3, 264); this.expandableSplitter3.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter3.TabIndex = 7; this.expandableSplitter3.TabStop = false; @@ -1307,7 +1326,7 @@ namespace VEPROMS this.toolsPanel.ExpandOnTitleClick = true; this.toolsPanel.Location = new System.Drawing.Point(847, 57); this.toolsPanel.Name = "toolsPanel"; - this.toolsPanel.Size = new System.Drawing.Size(343, 490); + this.toolsPanel.Size = new System.Drawing.Size(343, 267); 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; @@ -1341,7 +1360,7 @@ namespace VEPROMS 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(343, 464); + this.toolsTabs.Size = new System.Drawing.Size(343, 241); this.toolsTabs.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Right; this.toolsTabs.TabIndex = 1; this.toolsTabs.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -1360,7 +1379,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(316, 464); + this.annotationSearch.Size = new System.Drawing.Size(316, 241); 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) @@ -1373,6 +1392,7 @@ namespace VEPROMS // displaySearch1 // this.displaySearch1.Dock = System.Windows.Forms.DockStyle.Fill; + this.displaySearch1.LastSearchWasAnnotations = false; this.displaySearch1.LoadingList = false; this.displaySearch1.Location = new System.Drawing.Point(1, 1); this.displaySearch1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); @@ -1382,9 +1402,10 @@ namespace VEPROMS this.displaySearch1.ProgressBar = null; this.displaySearch1.ReportTitle = null; this.displaySearch1.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.displaySearch1.SearchIncTransII = null; this.displaySearch1.SearchResults = null; this.displaySearch1.SearchString = null; - this.displaySearch1.Size = new System.Drawing.Size(314, 462); + this.displaySearch1.Size = new System.Drawing.Size(314, 239); this.displaySearch1.TabIndex = 0; this.displaySearch1.TopFolderID = 1; this.displaySearch1.TypesSelected = ""; @@ -1404,7 +1425,7 @@ namespace VEPROMS 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(316, 464); + this.tabControlPanel2.Size = new System.Drawing.Size(316, 241); 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) @@ -1424,7 +1445,7 @@ namespace VEPROMS 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(314, 462); + this.panelEx3.Size = new System.Drawing.Size(314, 239); 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; @@ -1442,7 +1463,7 @@ namespace VEPROMS this.displayBookMarks.MyDisplayTabControl = null; this.displayBookMarks.MyEditItem = null; this.displayBookMarks.Name = "displayBookMarks"; - this.displayBookMarks.Size = new System.Drawing.Size(314, 462); + this.displayBookMarks.Size = new System.Drawing.Size(314, 239); this.displayBookMarks.TabIndex = 0; // // toolsTabBookMarks @@ -1459,7 +1480,7 @@ namespace VEPROMS 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(316, 464); + this.tabControlPanel3.Size = new System.Drawing.Size(316, 241); 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) @@ -1479,7 +1500,7 @@ namespace VEPROMS this.displayReports.Name = "displayReports"; this.displayReports.ReportResult = null; this.displayReports.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.displayReports.Size = new System.Drawing.Size(314, 462); + this.displayReports.Size = new System.Drawing.Size(314, 239); this.displayReports.TabIndex = 0; // // toosTabReports @@ -1497,7 +1518,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(316, 464); + this.tabControlPanelLD.Size = new System.Drawing.Size(316, 241); 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) @@ -1516,7 +1537,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(314, 462); + this.displayLibDocs.Size = new System.Drawing.Size(314, 239); this.displayLibDocs.TabIndex = 0; // // tabItemLibDocs @@ -1556,7 +1577,7 @@ namespace VEPROMS this.expandableSplitter4.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter4.Location = new System.Drawing.Point(844, 57); this.expandableSplitter4.Name = "expandableSplitter4"; - this.expandableSplitter4.Size = new System.Drawing.Size(3, 490); + this.expandableSplitter4.Size = new System.Drawing.Size(3, 267); this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter4.TabIndex = 3; this.expandableSplitter4.TabStop = false; diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 9c78ae63..484d7123 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -542,6 +542,7 @@ namespace VEPROMS tv.RefreshCheckedOutProcedures += new vlnTreeViewEvent(tv_RefreshCheckedOutProcedures); tv.ProcedureCheckedOutTo += new vlnTreeViewEvent(tv_ProcedureCheckedOutTo); tv.ViewPDF += new vlnTreeViewPdfEvent(tv_ViewPDF); + tv.SelectAnnotations += new vlnTreeViewEvent(tv_SelectAnnotations); displayApplicability.ApplicabilityViewModeChanged += new DisplayApplicability.DisplayApplicabilityEvent(displayApplicability_ApplicabilityViewModeChanged); @@ -1300,6 +1301,23 @@ namespace VEPROMS pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0; } + void tv_SelectAnnotations(object sender, vlnTreeEventArgs args) + { + ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo; + if (pi == null) return; + + tc.SaveCurrentEditItem(pi); + + //pi.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex; + + DlgAnnotationsSelect sannoDlg = new DlgAnnotationsSelect(pi); + //sannoDlg.SelectedSlave = args.UnitIndex; + //sannoDlg.MySessionInfo = MySessionInfo; + sannoDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window + + //pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0; + } + void RefreshDisplayHistory(object sender) { displayHistory.RefreshChangeList(); diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.resx b/PROMS/VEPROMS User Interface/frmVEPROMS.resx index 3c84ece0..cc34350f 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.resx +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.resx @@ -172,16 +172,16 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAACxMAAAsTAQCanBgAAAA0SURBVDhPY2CgFHxqEvyPDX9sFOhAV4sVoGsk2RB0TeiY - oCH/l+n9pwSPGjBqAHUMGHAAAO9c/kJD+HpiAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAADRJREFUOE9jYKAUfGoS/I8Nf2wU6EBXixWgayTZEHRN6JigIf+X6f2nBI8aMGoA + dQwYcAAA71z+QkP4emIAAAAASUVORK5CYII= - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAACxMAAAsTAQCanBgAAAA0SURBVDhPY2CgFHxqEvyPDX9sFOhAV4sVoGsk2RB0TeiY - oCH/l+n9pwSPGjBqAHUMGHAAAO9c/kJD+HpiAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAADRJREFUOE9jYKAUfGoS/I8Nf2wU6EBXixWgayTZEHRN6JigIf+X6f2nBI8aMGoA + dQwYcAAA71z+QkP4emIAAAAASUVORK5CYII= @@ -418,7 +418,7 @@ 164, 17 - 64 + 25 diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeInfoList.cs b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeInfoList.cs index a7a13130..ee609336 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeInfoList.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeInfoList.cs @@ -105,6 +105,33 @@ namespace VEPROMS.CSLA.Library throw new DbCslaException("Error on AnnotationTypeInfoList.Get", ex); } } + + //AnnotationTypeInfoList AnnotationTypeInfoList2 = new AnnotationTypeInfoList(); + + public static AnnotationTypeInfoList AnnotationSelectByItem(int itemID) + { + try + { // C2025-027 This method needs to be refreshed everytime. + //if (_AnnotationTypeInfoList != null) + // return _AnnotationTypeInfoList; + AnnotationTypeInfoList tmp = (AnnotationTypeInfoList)DataPortal.Fetch(new AnnotationSelectByItemIDCriteria(itemID)); + if (tmp.Count < 1) + { + tmp = DataPortal.Fetch(); + } + AnnotationTypeInfo.AddList(tmp); + tmp.AddEvents(); + _AnnotationTypeInfoList = tmp; + OnListChanged(); + return tmp; + + } + catch (Exception ex) + { + throw new DbCslaException("Error on AnnotationTypeInfoList.Get", ex); + } + } + /// /// Reset the list of all AnnotationTypeInfo. /// @@ -157,6 +184,50 @@ namespace VEPROMS.CSLA.Library } this.RaiseListChangedEvents = true; } + + [Serializable()] + protected class AnnotationSelectByItemIDCriteria + { + private int _itemID; + public int ItemID + { get { return _itemID; } } + + public AnnotationSelectByItemIDCriteria(int itemID) + { + _itemID = itemID; + } + } + + private void DataPortal_Fetch(AnnotationSelectByItemIDCriteria criteria) + { + this.RaiseListChangedEvents = false; + if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AnnotationTypeInfoList.DataPortal_Fetch", GetHashCode()); + try + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "getAnnotationTypes2"; + cm.Parameters.AddWithValue("@itemID", criteria.ItemID); + cm.CommandTimeout = Database.DefaultTimeout; + using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader())) + { + IsReadOnly = false; + while (dr.Read()) this.Add(new AnnotationTypeInfo(dr)); + IsReadOnly = true; + } + } + } + } + catch (Exception ex) + { + if (_MyLog.IsErrorEnabled) _MyLog.Error("AnnotationTypeInfoList.DataPortal_Fetch", ex); + throw new DbCslaException("AnnotationTypeInfoList.DataPortal_Fetch", ex); + } + this.RaiseListChangedEvents = true; + } #endregion #region ICustomTypeDescriptor impl public String GetClassName() diff --git a/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSelections.cs b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSelections.cs new file mode 100644 index 00000000..dc817901 --- /dev/null +++ b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSelections.cs @@ -0,0 +1,442 @@ +using System; +using System.Collections.Generic; +using System.Collections; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Data; +using System.Data.SqlClient; +using System.Text.RegularExpressions; +using Csla; +using Csla.Data; +using System.Configuration; +using System.IO; +using System.ComponentModel; + + +//namespace VEPROMS.CSLA.Library; + +// C2025-027 this new file is used to support (data retrival) for selecting Annotation types to display on the Annotation screen. + +namespace VEPROMS.CSLA.Library +{ + public class AnnotationstypeSelections + { + public static DataTable Get(int ItemID) + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + try + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "getAnnotationstypeSelections"; + cm.CommandTimeout = Database.DefaultTimeout; + cm.Parameters.AddWithValue("@ItemID", ItemID); + SqlDataAdapter da = new SqlDataAdapter(cm); + SqlDataReader reader = cm.ExecuteReader(); + DataTable dt = new DataTable(); + dt.Load(reader); + // if the user has not created a annotation sub-set list saved to AnnotationTypeSelections table. + if (dt.Rows.Count < 1) + { + //dt.Rows.Add(DataPortal.Fetch()); + //DataPortal.Fetch(); + DataRow row; + foreach (AnnotationTypeInfo annosel in DataPortal.Fetch()) + { + // C2025-027 need to use a datatable instead of AnnotationTypeInfoList so the global search Annotations will not be effected by the Annotation select list selections + row = dt.NewRow(); + row["TypeID"] = annosel.TypeID; + row["ItemID"] = ItemID; + row["Name"] = annosel.Name; + row["Config"] = annosel.Config; + row["DTS"] = annosel.DTS; + row["UserID"] = annosel.UserID; + row["IsEPAnnotationType"] = annosel.IsEPAnnotationType; + + dt.Rows.Add(row); + + //dt.Rows.Add(0,annosel.TypeID, ItemID, annosel.Name, annosel.Config, annosel.DTS, annosel.UserID, 0x0000000000000000, annosel.IsEPAnnotationType); + }; + } + return dt; + + } + catch (Exception ex) + { + //B2025-004 + //if it fails loading previously open tabs, simply treat it as if no tabs were open + //instead of crashing + return new DataTable(); + } + + } + } + } + public static DataTable Retrieve(int ItemID) + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + try + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "getAnnotationstypeSelections"; + cm.CommandTimeout = Database.DefaultTimeout; + cm.Parameters.AddWithValue("@ItemID", ItemID); + SqlDataAdapter da = new SqlDataAdapter(cm); + SqlDataReader reader = cm.ExecuteReader(); + DataTable dt = new DataTable(); + dt.Load(reader); + + return dt; + + } + catch (Exception ex) + { + //B2025-004 + //if it fails loading previously open tabs, simply treat it as if no tabs were open + //instead of crashing + return new DataTable(); + } + + } + } + } + public static DataTable GetAnnoTypes(int ItemID) + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + try + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "getAnnotationSelectListTypes"; + cm.CommandTimeout = Database.DefaultTimeout; + SqlDataAdapter da = new SqlDataAdapter(cm); + cm.Parameters.AddWithValue("@ItemID", ItemID); + SqlDataReader reader = cm.ExecuteReader(); + DataTable dt = new DataTable(); + dt.Load(reader); + + return dt; + + } + catch (Exception ex) + { + //B2025-004 + //if it fails loading previously open tabs, simply treat it as if no tabs were open + //instead of crashing + return new DataTable(); + } + + } + } + } + public static void Update(int ItemID, int TypeID, int dltFlg, string Name = "") + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + try + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "UpdateAnnotationstypeSelections"; + cm.CommandTimeout = Database.DefaultTimeout; + cm.Parameters.AddWithValue("@ItemID", ItemID); + cm.Parameters.AddWithValue("@TypeID", TypeID); + cm.Parameters.AddWithValue("@dltFlg", dltFlg); + cm.Parameters.AddWithValue("@Name", Name); + + cm.ExecuteNonQuery(); + } + catch (Exception ex) + { + + } + } + } + } + + public static AnnotationTypeInfoList AnnotationSelectByItem(int itemID) + { + try + { + //if (_AnnotationTypeInfoList != null) + // return _AnnotationTypeInfoList; + AnnotationTypeInfoList tmp = (AnnotationTypeInfoList)DataPortal.Fetch(new AnnotationSelectByItemIDCriteria(itemID)); + if (tmp.Count < 1) + { + tmp = DataPortal.Fetch(); + } + AnnotationTypeInfo.AddList(tmp); + tmp.AddEvents(); + return tmp; + + } + catch (Exception ex) + { + throw new DbCslaException("Error on AnnotationTypeInfoList.Get", ex); + } + } + private int _TypeID; + [System.ComponentModel.DataObjectField(true, true)] + public int TypeID + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + get + { + return _TypeID; + } + } + private int _ItemID; + [System.ComponentModel.DataObjectField(true, true)] + public int ItemID + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + get + { + return _ItemID; + } + } + private string _Name = string.Empty; + public string Name + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + get + { + return _Name; + } + } + private string _Config = string.Empty; + public string Config + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + get + { + return _Config; + } + } + private DateTime _DTS = new DateTime(); + public DateTime DTS + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + get + { + return _DTS; + } + } + private string _UserID = string.Empty; + public string UserID + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + get + { + return _UserID; + } + } + private int _AnnotationTypeAnnotationCount = 0; + public int AnnotationTypeAnnotationCount + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + get + { + return _AnnotationTypeAnnotationCount; + } + } + //C2025-023 - Electronic Procedures - Modifications to PROMS + // Is Annotation Type an EP Annotation? + private bool _IsEPAnnotationType = false; + public bool IsEPAnnotationType + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + get + { + return _IsEPAnnotationType; + } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + set + { + if (_IsEPAnnotationType != value) + { + _IsEPAnnotationType = value; + //PropertyHasChanged(); + } + } + } + + #region Log4Net + private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + #endregion + private string _ErrorMessage = string.Empty; + public string ErrorMessage + { + get { return _ErrorMessage; } + } + [Serializable()] + protected class retrieveAnnotSelections + { + private int _itemID; + public int itemID { get { return _itemID; } } + + public retrieveAnnotSelections(int itemID) + { + _itemID = itemID; + } + } + [Serializable()] + public class retrieveAnnotSelectionsList + { + private int _TypeID; + public int TypeID + { + get { return _TypeID; } + set { _TypeID = value; } + } + private int _ItemID; + public int ItemID + { + get { return _ItemID; } + set { _ItemID = value; } + } + private string _Name; + public string Name + { + get { return _Name; } + set { _Name = value; } + } + private string _Config; + public string Config + { + get { return _Config; } + set { _Config = value; } + } + private DateTime _DTS; + public DateTime DTS + { + get { return _DTS; } + set { _DTS = value; } + } + private string _UserID; + public string UserID + { + get { return _UserID; } + set { _UserID = value; } + } + private bool _IsEPAnnotationType; + public bool IsEPAnnotationType + { + get { return _IsEPAnnotationType; } + set { _IsEPAnnotationType = value; } + } + private string _ErrorMessage = string.Empty; + public string ErrorMessage + { + get { return _ErrorMessage; } + } + } + + private void DataPortal_Fetch(retrieveAnnotSelections criteria) + { + try + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "getAnnotationstypeSelections"; + cm.CommandTimeout = Database.DefaultTimeout; + cm.Parameters.AddWithValue("@itemID", criteria.itemID); + using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader())) + { + if (!dr.Read()) + { + _ErrorMessage = "No Record Found"; + return; + } + ReadData(dr); + } + } + } + } + catch (Exception ex) + { + if (_MyLog.IsErrorEnabled) _MyLog.Error("retrieveAnnotSelectionsList.DataPortal_Fetch", ex); + throw new DbCslaException("retrieveAnnotSelectionsList.DataPortal_Fetch", ex); + } + //this.RaiseListChangedEvents = true; + } + [Serializable()] + protected class AnnotationSelectByItemIDCriteria + { + private int _itemID; + public int ItemID + { get { return _itemID; } } + + public AnnotationSelectByItemIDCriteria(int itemID) + { + _itemID = itemID; + } + } + private void DataPortal_Fetch(AnnotationSelectByItemIDCriteria criteria) + { + //this.RaiseListChangedEvents = false; + if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AnnotationTypeInfoList.DataPortal_Fetch", GetHashCode()); + try + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "getAnnotationTypes2"; + cm.Parameters.AddWithValue("@itemID", criteria.ItemID); + cm.CommandTimeout = Database.DefaultTimeout; + using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader())) + { + //IsReadOnly = false; + //while (dr.Read()) this.Add(new AnnotationTypeInfo(dr)); + //IsReadOnly = true; + } + } + } + } + catch (Exception ex) + { + if (_MyLog.IsErrorEnabled) _MyLog.Error("AnnotationTypeInfoList.DataPortal_Fetch", ex); + throw new DbCslaException("AnnotationTypeInfoList.DataPortal_Fetch", ex); + } + //this.RaiseListChangedEvents = true; + } + + private void ReadData(SafeDataReader dr) + { + if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] retrieveAnnotSelectionsList.ReadData", GetHashCode()); + try + { + _TypeID = dr.GetInt32("TypeID"); + _ItemID = dr.GetInt32("ItemID"); + _Name = dr.GetString("Name"); + _Config = dr.GetString("Config"); + _DTS = dr.GetDateTime("DTS"); + _UserID = dr.GetString("UserID"); + _AnnotationTypeAnnotationCount = dr.GetInt32("AnnotationCount"); + if (dr.GetSchemaTable().Rows.OfType().Any(row => row["ColumnName"].ToString() == "IsEPAnnotationType")) + _IsEPAnnotationType = (bool)dr.GetValue("IsEPAnnotationType"); + } + catch (Exception ex) + { + if (_MyLog.IsErrorEnabled) _MyLog.Error("retrieveAnnotSelectionsList.ReadData", ex); + _ErrorMessage = ex.Message; + throw new DbCslaException("retrieveAnnotSelectionsList.ReadData", ex); + } + } + + } +} diff --git a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj index 3af1e207..29d08697 100644 --- a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj +++ b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj @@ -387,6 +387,7 @@ + diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.cs b/PROMS/Volian.Controls.Library/AnnotationDetails.cs index 0d047caa..8951b43b 100644 --- a/PROMS/Volian.Controls.Library/AnnotationDetails.cs +++ b/PROMS/Volian.Controls.Library/AnnotationDetails.cs @@ -119,8 +119,14 @@ namespace Volian.Controls.Library if (CurrentItem.MyDocVersion != null) if (CurrentItem.MyDocVersion.DocVersionAssociationCount > 0) _ROPath = CurrentItem.MyDocVersion.DocVersionAssociations[0].MyROFst.MyRODb.FolderPath; - ProcItem = CurrentItem.MyProcedure; - } + + + + ProcItem = CurrentItem.MyProcedure; + // C2025-027 + cbGridAnnoType.DataSource = VEPROMS.CSLA.Library.AnnotationstypeSelections.Get(ProcItem.ItemID); + + } public AnnotationInfo FirstExeAnnotation(ItemInfo ii) { if (ii == null) return null; @@ -365,6 +371,7 @@ namespace Volian.Controls.Library cbGridAnnoType.DisplayMember = "Name"; cbGridAnnoType.ValueMember = "TypeId"; cbGridAnnoType.DataSource = AnnotationTypeInfoList.Get().Clone(); + // If there are no annotatons, then selected index is -1 (not defined), otherwise select the first. // This was done so that it could be saved if there was text entered but user moves to another steprtb without selecting save button // so that annotation gets saved. diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index 1ee963a9..8adf9fb3 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -184,10 +184,10 @@ namespace Volian.Controls.Library this.tabSearchTypes.CanReorderTabs = false; this.tabSearchTypes.CloseButtonOnTabsAlwaysDisplayed = false; this.tabSearchTypes.CloseButtonPosition = DevComponents.DotNetBar.eTabCloseButtonPosition.Right; + this.tabSearchTypes.Controls.Add(this.tabControlPanel3); this.tabSearchTypes.Controls.Add(this.tabControlPanel4); this.tabSearchTypes.Controls.Add(this.tabControlPanel5); this.tabSearchTypes.Controls.Add(this.tabControlPanel2); - this.tabSearchTypes.Controls.Add(this.tabControlPanel3); this.tabSearchTypes.Controls.Add(this.tabControlPanel1); this.tabSearchTypes.Controls.Add(this.contextMenuBar1); this.tabSearchTypes.Dock = System.Windows.Forms.DockStyle.Top; @@ -1406,7 +1406,6 @@ namespace Volian.Controls.Library // this.lbSrchResultsIncTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lbSrchResultsIncTrans.CheckBoxesVisible = true; - this.lbSrchResultsIncTrans.CheckStateMember = null; this.lbSrchResultsIncTrans.ContainerControlProcessDialogKey = true; this.lbSrchResultsIncTrans.Dock = System.Windows.Forms.DockStyle.Fill; this.lbSrchResultsIncTrans.DragDropSupport = true; diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 5fcb43b6..6152a21a 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -22,8 +22,8 @@ namespace Volian.Controls.Library public delegate void vlnTreeViewEvent(object sender, vlnTreeEventArgs args); public delegate void vlnTreeViewTimeEvent(object sender, vlnTreeTimeEventArgs args); public delegate void vlnTreeViewStatusEvent(object sender, vlnTreeStatusEventArgs args); - public delegate ItemInfo vlnTreeViewClipboardStatusEvent(object sender, vlnTreeEventArgs args); - public delegate void vlnTreeViewItemInfoEvent(object sender, vlnTreeItemInfoEventArgs args); + public delegate ItemInfo vlnTreeViewClipboardStatusEvent(object sender, vlnTreeEventArgs args); + public delegate void vlnTreeViewItemInfoEvent(object sender, vlnTreeItemInfoEventArgs args); public delegate bool vlnTreeViewBoolEvent(object sender, vlnTreeEventArgs args); public delegate bool vlnTreeViewItemInfoDeleteEvent(object sender, vlnTreeItemInfoEventArgs args); @@ -567,13 +567,15 @@ namespace Volian.Controls.Library private void OnProcedureCheckedOutTo(object sender, vlnTreeEventArgs args) { if (ProcedureCheckedOutTo != null) ProcedureCheckedOutTo(sender, args); + } + // C2025-027 + public event vlnTreeViewEvent SelectAnnotations; + private void OnSelectAnnotations(object sender, vlnTreeEventArgs args) + { + if (SelectAnnotations != null) SelectAnnotations(sender, args); } - - - - - - public event vlnTreeViewEvent ExportImportProcedureSets; + + public event vlnTreeViewEvent ExportImportProcedureSets; private void OnExportImportProcedureSets(object sender, vlnTreeEventArgs args) { if (ExportImportProcedureSets != null) ExportImportProcedureSets(sender, args); @@ -866,6 +868,7 @@ namespace Volian.Controls.Library MenuItem miqp = new MenuItem("Quick Print"); //MenuItem mips = new MenuItem("Print Section"); MenuItem mia = new MenuItem("Approve"); + MenuItem misa = new MenuItem("Select Annotations"); //C2025-027 int k = 0; foreach (string s in pri.MyDocVersion.UnitNames) { @@ -890,6 +893,9 @@ namespace Volian.Controls.Library MenuItem mtc = mitcas.MenuItems.Add(s, new EventHandler(miMultiUnit_Click)); mtc.Enabled = procAppl; mtc.Tag = k; + MenuItem msa = misa.MenuItems.Add(s, new EventHandler(miMultiUnit_Click)); + msa.Enabled = procAppl; + msa.Tag = k; } cm.MenuItems.Add(micas); cm.MenuItems.Add(mitcas); @@ -898,6 +904,7 @@ namespace Volian.Controls.Library //cm.MenuItems.Add(mips); AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri); cm.MenuItems.Add(mia); + cm.MenuItems.Add(misa); AddApprovedRevisionsMultiUnit(cm.MenuItems, pri); } else @@ -910,6 +917,7 @@ namespace Volian.Controls.Library //MenuItem miqp = new MenuItem("Print"); AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri); cm.MenuItems.Add("Approve", new EventHandler(mi_Click)); + cm.MenuItems.Add("Select Annotations", new EventHandler(mi_Click)); //C2025-027 //_MyLog.WarnFormat("Context Menu 1 before - {0}", GC.GetTotalMemory(true)); AddApprovedRevisions(cm.MenuItems, pri); //_MyLog.WarnFormat("Context Menu 1 after - {0}", GC.GetTotalMemory(true)); @@ -923,6 +931,7 @@ namespace Volian.Controls.Library { MenuItem mip = new MenuItem("Print"); MenuItem miqp = new MenuItem("Quick Print"); + MenuItem misa = new MenuItem("Select Annotations"); //C2025-027 int k = 0; foreach (string s in pri.MyDocVersion.UnitNames) { @@ -931,15 +940,19 @@ namespace Volian.Controls.Library mp.Tag = k; MenuItem mqp = miqp.MenuItems.Add(s, new EventHandler(miMultiUnit_Click)); mqp.Tag = k; + MenuItem msa = misa.MenuItems.Add(s, new EventHandler(miMultiUnit_Click)); + msa.Tag = k; } cm.MenuItems.Add(mip); cm.MenuItems.Add(miqp); + cm.MenuItems.Add(misa); AddApprovedRevisionsMultiUnit(cm.MenuItems, pri); } else { cm.MenuItems.Add("Print", new EventHandler(mi_Click)); cm.MenuItems.Add("Quick Print", new EventHandler(mi_Click)); + cm.MenuItems.Add("Select Annotations", new EventHandler(mi_Click)); //C2025-027 AddApprovedRevisions(cm.MenuItems, pri); } } @@ -1885,6 +1898,9 @@ namespace Volian.Controls.Library case "Create Time Critical Action Summary": OnCreateTimeCriticalActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null,0,mi.Text,(int)mi.Tag)); break; + case "Select Annotations": // C2025-027 + OnSelectAnnotations(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag)); + break; default: if (mip.Text.StartsWith("Showing Change Bars Starting")) OnSelectDateToStartChangeBars(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0)); @@ -2177,6 +2193,9 @@ namespace Volian.Controls.Library FlexibleMessageBox.Show("You have copied a document that is NOT linked to an Enhanced Document.\n\n" + "You cannot paste a Non-Enhanced Procedure into an Enhanced Procedure Set.", "Cannot Paste Here"); break; + case "Select Annotations": // C2025-027 + OnSelectAnnotations(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0)); + break; //case "Check Out Procedure Set": // CheckOutDocVersion(SelectedNode as VETreeNode); // break;