diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs index 4410f386..3f9a0577 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs @@ -225,7 +225,7 @@ namespace VEPROMS // this.ppBtnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.ppBtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.ppBtnCancel.Location = new System.Drawing.Point(845, 428); + this.ppBtnCancel.Location = new System.Drawing.Point(811, 432); this.ppBtnCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnCancel.Name = "ppBtnCancel"; this.ppBtnCancel.Size = new System.Drawing.Size(75, 26); @@ -237,7 +237,7 @@ namespace VEPROMS // ppBtnOK // this.ppBtnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ppBtnOK.Location = new System.Drawing.Point(748, 428); + this.ppBtnOK.Location = new System.Drawing.Point(722, 432); this.ppBtnOK.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnOK.Name = "ppBtnOK"; this.ppBtnOK.Size = new System.Drawing.Size(75, 26); @@ -970,7 +970,7 @@ namespace VEPROMS // // this.ppCbShwDefSettings.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ppCbShwDefSettings.Location = new System.Drawing.Point(23, 651); + this.ppCbShwDefSettings.Location = new System.Drawing.Point(23, 694); this.ppCbShwDefSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCbShwDefSettings.Name = "ppCbShwDefSettings"; this.ppCbShwDefSettings.Size = new System.Drawing.Size(205, 25); @@ -1117,7 +1117,7 @@ namespace VEPROMS this.ppLblDefSettingsInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.ppLblDefSettingsInfo.AutoSize = true; this.ppLblDefSettingsInfo.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppLblDefSettingsInfo.Location = new System.Drawing.Point(13, 628); + this.ppLblDefSettingsInfo.Location = new System.Drawing.Point(13, 671); this.ppLblDefSettingsInfo.Name = "ppLblDefSettingsInfo"; this.ppLblDefSettingsInfo.Size = new System.Drawing.Size(205, 17); this.ppLblDefSettingsInfo.TabIndex = 25; @@ -1132,19 +1132,19 @@ namespace VEPROMS this.tcVersions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.tcVersions.BackColor = System.Drawing.Color.Transparent; this.tcVersions.CanReorderTabs = true; - this.tcVersions.Controls.Add(this.tabControlPanel1); this.tcVersions.Controls.Add(this.tcpGeneral); + this.tcVersions.Controls.Add(this.tabControlPanel1); this.tcVersions.Controls.Add(this.tcpApplicability); this.tcVersions.Controls.Add(this.tcpFormatSettings); this.tcVersions.Controls.Add(this.tcpOutputSettings); this.tcVersions.Controls.Add(this.tabControlPanel5); this.tcVersions.Controls.Add(this.tcpRefereceObjects); - this.tcVersions.Location = new System.Drawing.Point(237, 2); + this.tcVersions.Location = new System.Drawing.Point(208, 2); this.tcVersions.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcVersions.Name = "tcVersions"; this.tcVersions.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold); this.tcVersions.SelectedTabIndex = 0; - this.tcVersions.Size = new System.Drawing.Size(685, 414); + this.tcVersions.Size = new System.Drawing.Size(700, 414); this.tcVersions.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Dock; this.tcVersions.TabIndex = 28; this.tcVersions.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -1179,7 +1179,7 @@ namespace VEPROMS this.tcpGeneral.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpGeneral.Name = "tcpGeneral"; this.tcpGeneral.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tcpGeneral.Size = new System.Drawing.Size(685, 390); + this.tcpGeneral.Size = new System.Drawing.Size(700, 390); this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1218,7 +1218,7 @@ namespace VEPROMS this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabControlPanel1.Name = "tabControlPanel1"; this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel1.Size = new System.Drawing.Size(685, 390); + this.tabControlPanel1.Size = new System.Drawing.Size(700, 390); this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1410,7 +1410,7 @@ namespace VEPROMS this.tcpApplicability.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpApplicability.Name = "tcpApplicability"; this.tcpApplicability.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tcpApplicability.Size = new System.Drawing.Size(685, 390); + this.tcpApplicability.Size = new System.Drawing.Size(700, 390); this.tcpApplicability.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpApplicability.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpApplicability.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1716,7 +1716,7 @@ namespace VEPROMS this.tcpFormatSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpFormatSettings.Name = "tcpFormatSettings"; this.tcpFormatSettings.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tcpFormatSettings.Size = new System.Drawing.Size(685, 390); + this.tcpFormatSettings.Size = new System.Drawing.Size(700, 390); this.tcpFormatSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpFormatSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpFormatSettings.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1783,7 +1783,7 @@ namespace VEPROMS this.tcpOutputSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpOutputSettings.Name = "tcpOutputSettings"; this.tcpOutputSettings.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tcpOutputSettings.Size = new System.Drawing.Size(685, 390); + this.tcpOutputSettings.Size = new System.Drawing.Size(700, 390); this.tcpOutputSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpOutputSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpOutputSettings.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1922,7 +1922,7 @@ namespace VEPROMS this.tabControlPanel5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabControlPanel5.Name = "tabControlPanel5"; this.tabControlPanel5.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tabControlPanel5.Size = new System.Drawing.Size(685, 390); + this.tabControlPanel5.Size = new System.Drawing.Size(700, 390); this.tabControlPanel5.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel5.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel5.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1961,7 +1961,7 @@ namespace VEPROMS this.ppGrdLibDocList.RowTemplate.Height = 24; this.ppGrdLibDocList.SelectAllSignVisible = false; this.ppGrdLibDocList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.ppGrdLibDocList.Size = new System.Drawing.Size(679, 386); + this.ppGrdLibDocList.Size = new System.Drawing.Size(694, 386); this.ppGrdLibDocList.TabIndex = 1; // // documentEntryCountDataGridViewTextBoxColumn @@ -2006,7 +2006,7 @@ namespace VEPROMS this.tcpRefereceObjects.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpRefereceObjects.Name = "tcpRefereceObjects"; this.tcpRefereceObjects.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tcpRefereceObjects.Size = new System.Drawing.Size(685, 390); + this.tcpRefereceObjects.Size = new System.Drawing.Size(700, 390); this.tcpRefereceObjects.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpRefereceObjects.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpRefereceObjects.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -2227,7 +2227,7 @@ namespace VEPROMS this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.CancelButton = this.ppBtnCancel; this.CaptionFont = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ClientSize = new System.Drawing.Size(925, 444); + this.ClientSize = new System.Drawing.Size(889, 467); this.ControlBox = false; this.Controls.Add(this.panVerBtns); this.Controls.Add(this.tcVersions); diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs index f2ad810b..b8d5ab74 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs @@ -1134,7 +1134,8 @@ namespace VEPROMS.CSLA.Library } } #endregion - #region Enhanced_Unlink + #region Enhanced + #region Enhanced_UnlinkItems [Serializable()] private class EnhancedUnlinkCriteria { @@ -1192,6 +1193,8 @@ namespace VEPROMS.CSLA.Library throw new DbCslaException("Error on ContentInfoList.DoEnhancedUnlink", ex); } } + #endregion Enhanced_UnlinkItems + #region Enhanced_UnlinkDocVersionAndItems ////// [Serializable()] private class EnhancedDocVersionUnlinkCriteria @@ -1250,8 +1253,159 @@ namespace VEPROMS.CSLA.Library throw new DbCslaException("Error on ContentInfoList.DoEnhancedDocVersionUnlink", ex); } } - - - #endregion Enhanced_Unlink + #endregion Enhanced_UnlinkDocVersionAndItems + #region Enhanced_Convert16To32 + ////// + [Serializable()] + private class GetEnhanced16To32ContentsCriteria + { + public GetEnhanced16To32ContentsCriteria(int? srcProcID, int? enhancedProcID, int enhType) + { + _SrcProcID = srcProcID; + _EnhancedProcID = enhancedProcID; + _EnhType = enhType; + } + private int? _SrcProcID; + public int? SrcProcID + { + get { return _SrcProcID; } + set { _SrcProcID = value; } + } + private int? _EnhancedProcID; + public int? EnhancedProcID + { + get { return _EnhancedProcID; } + set { _EnhancedProcID = value; } + } + private int? _EnhType; + public int? EnhType + { + get { return _EnhType; } + set { _EnhType = value; } + } + } + private void DataPortal_Fetch(GetEnhanced16To32ContentsCriteria criteria) + { + try + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "vesp_Get16BitEnhancedContents"; + cm.Parameters.AddWithValue("@SourceID", criteria.SrcProcID); + cm.Parameters.AddWithValue("@EnhanceID", criteria.EnhancedProcID); + cm.Parameters.AddWithValue("@EnhType", criteria.EnhType); + cm.CommandTimeout = Database.DefaultTimeout; + using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader())) + { + IsReadOnly = false; + while (dr.Read()) + { + ContentInfo contentInfo = new ContentInfo(dr); + this.Add(contentInfo); + } + IsReadOnly = true; + } + } + } + } + catch (Exception ex) + { + Database.LogException("GetEnhanced16To32ContentsCriteria.DataPortal_Fetch", ex); + } + } + public static ContentInfoList Get16BitEnhancedContents(int srcProcID, int enhProcID, int enhType) + { + // query returns a list of items that were found to have compatible 16bit data to set link to enhanced + // from the input source. Caller can check if there are non-procedure items, then procedures can be + // linked using 16bit data in the config field + try + { + ContentInfoList tmp = DataPortal.Fetch(new GetEnhanced16To32ContentsCriteria(srcProcID, enhProcID, enhType)); + return tmp; + } + catch (Exception ex) + { + throw new DbCslaException("Error on ContentInfoList.Get16BitEnhancedContents", ex); + } + } + ////// + [Serializable()] + private class ConvertEnhanced16To32ContentsCriteria + { + public ConvertEnhanced16To32ContentsCriteria(int? srcProcID, int? enhancedProcID, int enhType) + { + _SrcProcID = srcProcID; + _EnhancedProcID = enhancedProcID; + _EnhType = enhType; + } + private int? _SrcProcID; + public int? SrcProcID + { + get { return _SrcProcID; } + set { _SrcProcID = value; } + } + private int? _EnhancedProcID; + public int? EnhancedProcID + { + get { return _EnhancedProcID; } + set { _EnhancedProcID = value; } + } + private int? _EnhType; + public int? EnhType + { + get { return _EnhType; } + set { _EnhType = value; } + } + } + private void DataPortal_Fetch(ConvertEnhanced16To32ContentsCriteria criteria) + { + try + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "vesp_Convert16to32EnhancedContents"; + cm.Parameters.AddWithValue("@SourceID", criteria.SrcProcID); + cm.Parameters.AddWithValue("@EnhanceID", criteria.EnhancedProcID); + cm.Parameters.AddWithValue("@EnhType", criteria.EnhType); + cm.CommandTimeout = Database.DefaultTimeout; + using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader())) + { + IsReadOnly = false; + while (dr.Read()) + { + ContentInfo contentInfo = new ContentInfo(dr); + this.Add(contentInfo); + } + IsReadOnly = true; + } + } + } + } + catch (Exception ex) + { + Database.LogException("ConvertEnhanced16To32ContentsCriteria.DataPortal_Fetch", ex); + } + } + public static ContentInfoList Convert16To32EnhancedContents(int srcProcID, int enhProcID, int enhType) + { + // query links the 2 procedures (source and enhanced) setting the Enhanced type to 'enhType' + try + { + ContentInfoList tmp = DataPortal.Fetch(new ConvertEnhanced16To32ContentsCriteria(srcProcID, enhProcID, enhType)); + return tmp; + } + catch (Exception ex) + { + throw new DbCslaException("Error on ContentInfoList.Convert16To32EnhancedContents", ex); + } + } + #endregion Enhanced_Convert16To32 + #endregion Enhanced } }