diff --git a/app/DD_PM_WINDREAM/ClassIDBData.vb b/app/DD_PM_WINDREAM/ClassIDBData.vb index 7908aef..334a77e 100644 --- a/app/DD_PM_WINDREAM/ClassIDBData.vb +++ b/app/DD_PM_WINDREAM/ClassIDBData.vb @@ -206,7 +206,7 @@ For Each oNewValueRow As DataRow In oDTMyNewValues.Rows Dim oSuccess As Boolean = False - Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValueRow.Item(1).ToString}','{USER_LANGUAGE}',{CURRENT_DOC_ID},@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" + Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValueRow.Item(1).ToString}','{USER_LANGUAGE}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" oSuccess = ClassDatabase.Execute_non_Query_ConStr(oFNSQL, CONNECTION_STRING_IDB) If oSuccess = False Then Return False @@ -214,7 +214,7 @@ Next Return True Else - Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValue}','{USER_LANGUAGE}',{CURRENT_DOC_ID},@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" + Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValue}','{USER_LANGUAGE}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" Return ClassDatabase.Execute_non_Query_ConStr(oFNSQL, CONNECTION_STRING_IDB) End If diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index 46086df..5458cfc 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -86,6 +86,7 @@ + False @@ -121,6 +122,7 @@ False + @@ -873,6 +875,7 @@ + diff --git a/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb b/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb index 68f410a..604b836 100644 --- a/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb +++ b/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb @@ -460,6 +460,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property ExcelWorksheetView_11748() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("ExcelWorksheetView_11748", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/app/DD_PM_WINDREAM/My Project/Resources.resx b/app/DD_PM_WINDREAM/My Project/Resources.resx index b71b856..aa645a5 100644 --- a/app/DD_PM_WINDREAM/My Project/Resources.resx +++ b/app/DD_PM_WINDREAM/My Project/Resources.resx @@ -121,15 +121,9 @@ ..\Resources\refresh_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\asterisk_yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\hide_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -217,9 +211,6 @@ ..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Image_File.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -232,6 +223,9 @@ ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\show_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\dxf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -250,6 +244,9 @@ ..\Resources\Hammer_Builder_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -268,6 +265,9 @@ ..\Resources\resultset_last.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bullet_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -280,6 +280,9 @@ ..\Resources\ampel-gruen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\email_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\A_1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -292,15 +295,15 @@ ..\Resources\puzzle2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ampel-gelb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\dtp.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\delete_12x12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bullet_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Nextrequest_10302.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -346,18 +349,21 @@ ..\Resources\flag_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\bullet_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\resultset_previous.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\email_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Image_File.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Files_7954.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\conversation_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\flag_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -373,9 +379,6 @@ ..\Resources\doc_text_image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -385,14 +388,14 @@ ..\Resources\Link_5762.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ampel-gelb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\WorkItem_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\show_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\resultset_first.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -406,14 +409,14 @@ ..\Resources\zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\bullet_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Checkbox.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\key1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -421,7 +424,7 @@ ..\Resources\user_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\conversation_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ExcelWorksheetView_11748.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/Resources/ExcelWorksheetView_11748.png b/app/DD_PM_WINDREAM/Resources/ExcelWorksheetView_11748.png new file mode 100644 index 0000000..0c8c175 Binary files /dev/null and b/app/DD_PM_WINDREAM/Resources/ExcelWorksheetView_11748.png differ diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index ac9fe28..6f39c1d 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -44,11 +44,13 @@ Partial Class frmMain Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.AktionenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateiAlsLinkVersendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ExportierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GridView_Docs = New DevExpress.XtraGrid.Views.Grid.GridView() Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator(Me.components) Me.bindsourcegrid = New System.Windows.Forms.BindingSource(Me.components) Me.ToolStripLabelViewTape = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() + Me.tslblObjectCount = New System.Windows.Forms.ToolStripLabel() Me.NavBarControl1 = New DevExpress.XtraNavBar.NavBarControl() Me.NavBarGroupProfiles = New DevExpress.XtraNavBar.NavBarGroup() Me.cmsNavPane = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -172,7 +174,7 @@ Partial Class frmMain Me.PrintPreviewBarCheckItem17 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem() Me.PrintPreviewBarCheckItem18 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem() Me.PrintPreviewBarCheckItem19 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem() - Me.tslblObjectCount = New System.Windows.Forms.ToolStripLabel() + Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components) CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() @@ -255,7 +257,7 @@ Partial Class frmMain 'ContextMenuGrid ' Me.ContextMenuGrid.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.ContextMenuGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CMGroupStart, Me.CMFileStart, Me.CMFileMetadata, Me.ToolStripSeparator4, Me.tsmiMarkedFilesFinish, Me.ToolStripSeparator2, Me.LöscheAlleFilterToolStripMenuItem, Me.TabellenlayoutZurücksetzenToolStripMenuItem, Me.LayoutSpeichernToolStripMenuItem, Me.ToolStripSeparator3, Me.AktionenToolStripMenuItem}) + Me.ContextMenuGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CMGroupStart, Me.CMFileStart, Me.CMFileMetadata, Me.ToolStripSeparator4, Me.tsmiMarkedFilesFinish, Me.ToolStripSeparator2, Me.LöscheAlleFilterToolStripMenuItem, Me.TabellenlayoutZurücksetzenToolStripMenuItem, Me.LayoutSpeichernToolStripMenuItem, Me.ToolStripSeparator3, Me.AktionenToolStripMenuItem, Me.ExportierenToolStripMenuItem}) Me.ContextMenuGrid.Name = "ContextMenuStrip1" resources.ApplyResources(Me.ContextMenuGrid, "ContextMenuGrid") ' @@ -324,6 +326,12 @@ Partial Class frmMain Me.DateiAlsLinkVersendenToolStripMenuItem.Name = "DateiAlsLinkVersendenToolStripMenuItem" resources.ApplyResources(Me.DateiAlsLinkVersendenToolStripMenuItem, "DateiAlsLinkVersendenToolStripMenuItem") ' + 'ExportierenToolStripMenuItem + ' + Me.ExportierenToolStripMenuItem.Image = Global.DD_ProcessManager.My.Resources.Resources.ExcelWorksheetView_11748 + Me.ExportierenToolStripMenuItem.Name = "ExportierenToolStripMenuItem" + resources.ApplyResources(Me.ExportierenToolStripMenuItem, "ExportierenToolStripMenuItem") + ' 'GridView_Docs ' Me.GridView_Docs.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue @@ -368,6 +376,11 @@ Partial Class frmMain Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2" resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2") ' + 'tslblObjectCount + ' + Me.tslblObjectCount.Name = "tslblObjectCount" + resources.ApplyResources(Me.tslblObjectCount, "tslblObjectCount") + ' 'NavBarControl1 ' Me.NavBarControl1.ActiveGroup = Me.NavBarGroupProfiles @@ -1338,10 +1351,9 @@ Partial Class frmMain Me.PrintPreviewBarCheckItem19.Id = 58 Me.PrintPreviewBarCheckItem19.Name = "PrintPreviewBarCheckItem19" ' - 'tslblObjectCount + 'XtraSaveFileDialog1 ' - Me.tslblObjectCount.Name = "tslblObjectCount" - resources.ApplyResources(Me.tslblObjectCount, "tslblObjectCount") + Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1" ' 'frmMain ' @@ -1537,4 +1549,6 @@ Partial Class frmMain Friend WithEvents bsi_GhostMode As DevExpress.XtraBars.BarStaticItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents tslblObjectCount As ToolStripLabel + Friend WithEvents ExportierenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents XtraSaveFileDialog1 As DevExpress.XtraEditors.XtraSaveFileDialog End Class diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 2241795..58673c6 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAbQBBgG0AQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAcQBBgHEAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -179,7 +179,7 @@ 597, 17 - 1347, 56 + 392, 95 @@ -266,20 +266,20 @@ 266, 6 - - 200, 22 - - - Datei als Link versenden - 269, 26 - Aktionen + Aktionen Datei + + + 269, 26 + + + Exportieren - 270, 230 + 270, 256 ContextMenuGrid @@ -316,10 +316,10 @@ 0 - 138, 95 + 662, 95 - 292, 95 + 816, 95 Segoe UI, 9pt, style=Bold @@ -416,7 +416,7 @@ - 17, 95 + 541, 95 219, 26 @@ -604,11 +604,17 @@ 3 + + 200, 22 + + + Datei als Link versenden + 908, 17 - 640, 95 + 17, 134 234, 22 @@ -816,31 +822,31 @@ 1023, 17 - 1146, 17 - - 17, 56 + + 213, 56 + - 207, 56 + 403, 56 - 470, 56 + 666, 56 - 727, 56 + 923, 56 - 972, 56 + 17, 95 - 1212, 56 + 257, 95 - 426, 95 + 950, 95 - 541, 95 + 1065, 95 Aktualisieren @@ -1321,18 +1327,6 @@ 0, 0 - - Allgemein - - - Funktionen - - - Verwaltung - - - Grundeinstellungen - Start @@ -1369,26 +1363,38 @@ 5 + + Allgemein + + + Funktionen + + + Verwaltung + + + Grundeinstellungen + RibbonPage2 - 822, 95 + 199, 134 - 974, 95 + 351, 134 - 1067, 95 + 444, 134 PDF Files (*.pdf*)|*.pdf - 1204, 95 + 581, 134 - 17, 134 + 701, 134 Top @@ -1766,6 +1772,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ExportierenToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + GridView_Docs @@ -1790,6 +1802,12 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tslblObjectCount + + + System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + NavBarGroupProfiles @@ -2474,11 +2492,11 @@ DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem, DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - tslblObjectCount + + XtraSaveFileDialog1 - - System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + DevExpress.XtraEditors.XtraSaveFileDialog, DevExpress.XtraDialogs.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a frmMain @@ -2692,6 +2710,9 @@ &Ansicht + + &Hintergrund + &Seiten Layout @@ -2704,9 +2725,6 @@ Bars - - &Hintergrund - PDF Dokument @@ -2821,4 +2839,7 @@ Graphisches Dokument + + 919, 134 + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 57f312d..c0fe190 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -14,6 +14,7 @@ Imports System.ComponentModel Imports System.IO Imports System.Drawing.Imaging Imports Microsoft.Office.Interop +Imports DevExpress.XtraPrinting Public Class frmMain Private UserLoggedin As Integer = 0 @@ -931,6 +932,7 @@ Public Class frmMain Else tsmiMarkedFilesFinish.Visible = True ToolStripSeparator4.Visible = True + GridView_Docs.OptionsSelection.MultiSelect = True GridView_Docs.OptionsSelection.MultiSelectMode = GridMultiSelectMode.CheckBoxRowSelect End If @@ -2206,4 +2208,17 @@ Public Class frmMain End Try End Sub + + Private Sub ExportierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExportierenToolStripMenuItem.Click + XtraSaveFileDialog1.FileName = "OverviewProcessManager.xlsx" + XtraSaveFileDialog1.DefaultExt = ".xlsx" + + If XtraSaveFileDialog1.ShowDialog() = Windows.Forms.DialogResult.OK Then + Dim oOptions As New XlsxExportOptions() With { + .ExportMode = XlsxExportMode.SingleFile + } + GridView_Docs.ExportToXlsx(XtraSaveFileDialog1.FileName, oOptions) + End If + + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 6083cbb..9b8f8da 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -1583,7 +1583,7 @@ Public Class frmValidator LOGGER.Warn("Careful: the oControl2Set contains no CONTROL_GUID") Exit Sub End If - 'Dim oDependingLookup As LookupControl2 = pnldesigner.Controls.Find(oDEPENDING_CtrlName, False).FirstOrDefault() + For Each oControl As Control In pnldesigner.Controls If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid = oControl2Set Then oFound = True @@ -1798,7 +1798,7 @@ Public Class frmValidator Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oRowDependingControl.Item("CONNECTION_ID"), $"LookupControl_DependingControls - oControlID: {oControlID}") Try Dim oFound As Boolean = False - 'Dim oDependingLookup As LookupControl2 = pnldesigner.Controls.Find(oDEPENDING_CtrlName, False).FirstOrDefault() + For Each oControl As Control In pnldesigner.Controls If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid = oDEPENDING_GUID Then oFound = True @@ -2166,7 +2166,7 @@ Public Class frmValidator Dim oENABLERESULT As Boolean = ClassDatabase.Execute_Scalar_ConID(oSqlCommand, oRowEnablingControl.Item("CONNECTION_ID"), $"Controls2beEnabled - oENABLE_CTRLID: {oENABLE_GUID}") Try Dim oFound As Boolean = False - 'Dim oDependingLookup As LookupControl2 = pnldesigner.Controls.Find(oDEPENDING_CtrlName, False).FirstOrDefault() + For Each oControl As Control In pnldesigner.Controls If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid = oENABLE_GUID Then oFound = True @@ -2444,21 +2444,15 @@ Public Class frmValidator LOGGER.Debug($"Checking file 0 [{oResult}] exists?...") WMDocPathWindows = String.Empty If File.Exists(oResult) = False Then - If USER_USERNAME = "SchreiberM" Then - oResult = "\\windream\objects\Geschäftsprozesse\TEST.pdf" - 'ElseIf USER_USERNAME = "Administrator" Then - ' 'oResult = "C:\Users\Administrator.DD-GAN\Desktop\test.pdf" - ' oResult = "\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\AANG-3302-swbn.pdf" - Else - LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...") - oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)" + LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...") + oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)" oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, "GetDocPathWindows2") LOGGER.Debug($"Checking file 1[{oResult}] exists?...") If File.Exists(oResult) = False Then LOGGER.Warn($"GetDocPathWindows: File [{oResult}] not existing!") Return False End If - End If + End If WMDocPathWindows = oResult OLD_Document_Path = WMDocPathWindows @@ -3920,7 +3914,7 @@ Public Class frmValidator ' die Vorkommen im SQL-String auslesen Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(WORK_HISTORY_ENTRY) '#### - ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen + ' alle Vorkommen innerhalb der Namenkonvention durchlaufen For Each element As System.Text.RegularExpressions.Match In elemente Try LOGGER.Debug("element in RegeX WORK_HISTORY_ENTRY: " & element.Value) @@ -3980,7 +3974,7 @@ Public Class frmValidator Next End If - If Not IsNothing(value_from_control) And value_from_control <> String.Empty Then + If Not IsNothing(value_from_control) Then WORK_HISTORY_ENTRY = WORK_HISTORY_ENTRY.ToString.Replace(element.Value, value_from_control) End If Catch ex As Exception @@ -4715,7 +4709,7 @@ Public Class frmValidator Dim _Value Dim oObjectCheck = GetVariableValuefromSource(oIndexName, oIDBTyp) - If IsNothing(oObjectCheck) Then + If IsNothing(oObjectCheck) Or IsDBNull(oObjectCheck) Then oBoolValue = False Else If oObjectCheck.ToString = "System.Object[]" Then