From 582e701492d1da247044a356b69eef3042bdcc43 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Fri, 10 Jan 2020 11:02:33 +0100 Subject: [PATCH] ControlLayout --- app/DD_PM_WINDREAM/ClassIDBData.vb | 1 - app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj | 2 + .../My Project/Resources.Designer.vb | 10 + app/DD_PM_WINDREAM/My Project/Resources.resx | 99 +- app/DD_PM_WINDREAM/My Project/licenses.licx | 11 +- app/DD_PM_WINDREAM/Resources/TextBox.png | Bin 0 -> 207 bytes app/DD_PM_WINDREAM/clsPatterns.vb | 18 +- app/DD_PM_WINDREAM/frmAdmin2.Designer.vb | 544 +++-- app/DD_PM_WINDREAM/frmAdmin2.resx | 860 +++----- app/DD_PM_WINDREAM/frmAdmin2.vb | 57 +- .../frmAdministration.Designer.vb | 1 + app/DD_PM_WINDREAM/frmAdministration.resx | 1911 ++++++----------- .../frmDesignerLayout.Designer.vb | 189 +- app/DD_PM_WINDREAM/frmDesignerLayout.resx | 22 + app/DD_PM_WINDREAM/frmDesignerLayout.vb | 23 + app/DD_PM_WINDREAM/frmValidator.vb | 141 +- 16 files changed, 1828 insertions(+), 2061 deletions(-) create mode 100644 app/DD_PM_WINDREAM/Resources/TextBox.png diff --git a/app/DD_PM_WINDREAM/ClassIDBData.vb b/app/DD_PM_WINDREAM/ClassIDBData.vb index 88408f1..447258f 100644 --- a/app/DD_PM_WINDREAM/ClassIDBData.vb +++ b/app/DD_PM_WINDREAM/ClassIDBData.vb @@ -166,7 +166,6 @@ End If End If - 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" diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index 590ad0d..6da43de 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -130,6 +130,7 @@ False + ..\..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll @@ -806,6 +807,7 @@ + diff --git a/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb b/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb index 82f194c..098fc22 100644 --- a/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb +++ b/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb @@ -890,6 +890,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property TextBox() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("TextBox", 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 95e9067..7bd89eb 100644 --- a/app/DD_PM_WINDREAM/My Project/Resources.resx +++ b/app/DD_PM_WINDREAM/My Project/Resources.resx @@ -121,20 +121,26 @@ ..\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\key.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\ComboBox_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 + + + ..\Resources\GoToDeclaration_5576.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\GoToDeclaration_5576.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -142,8 +148,8 @@ ..\Resources\save.bmp;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\ampel-rot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\doc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -169,12 +175,12 @@ ..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ampel-rot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ampel-gruen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\application_form_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -187,9 +193,6 @@ ..\Resources\txt.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 - ..\Resources\checkbox_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -199,12 +202,12 @@ ..\Resources\database_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\show_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\database_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\zoom_in.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -235,9 +238,6 @@ ..\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 @@ -265,8 +265,8 @@ ..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ampel-gruen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\shape_square_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 @@ -280,6 +280,9 @@ ..\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 @@ -289,15 +292,9 @@ ..\Resources\Nextrequest_10302.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\resultset_last.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\shape_square_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\bullet_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -310,8 +307,8 @@ ..\Resources\hide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\zoom_in.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Open_6296.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -319,20 +316,20 @@ ..\Resources\lbl.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ID_FILE_PAGE_SETUP.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ComboBox_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\show_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\flag_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ID_FILE_PAGE_SETUP.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\flag_orange.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\bullet_red.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 @@ -346,8 +343,11 @@ ..\Resources\flag_green.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\Monitor_Screen_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\flag_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\OpenFileDialog_692.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -355,17 +355,20 @@ ..\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 - - ..\Resources\ampel-gelb.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\WorkItem_16xMD.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\show_16x16.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 @@ -385,8 +388,8 @@ ..\Resources\Checkbox.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\magifier_zoom_out.png;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 @@ -394,7 +397,7 @@ ..\Resources\user_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Monitor_Screen_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\TextBox.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/My Project/licenses.licx b/app/DD_PM_WINDREAM/My Project/licenses.licx index 8ed718f..373f20f 100644 --- a/app/DD_PM_WINDREAM/My Project/licenses.licx +++ b/app/DD_PM_WINDREAM/My Project/licenses.licx @@ -1,7 +1,10 @@ -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD_PM_WINDREAM/Resources/TextBox.png b/app/DD_PM_WINDREAM/Resources/TextBox.png new file mode 100644 index 0000000000000000000000000000000000000000..e38d5a05bba87c835cc62257e21b314e4e08d383 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!4yvy#}Etu4z6ih7_w=lZS?3^US%aFKo!ppsdYd}tC@O1TaS?83{1OQ0&L3aQE literal 0 HcmV?d00001 diff --git a/app/DD_PM_WINDREAM/clsPatterns.vb b/app/DD_PM_WINDREAM/clsPatterns.vb index dca15b4..46edfc2 100644 --- a/app/DD_PM_WINDREAM/clsPatterns.vb +++ b/app/DD_PM_WINDREAM/clsPatterns.vb @@ -54,13 +54,13 @@ Public Class clsPatterns Public Shared Function ReplaceAllValues(input As String, panel As Panel, document As WMObject, prename As Object, surname As Object, shortname As Object, language As Object, email As Object, userId As Object, profileId As Object) As String Try Dim result = input - LOGGER.Debug($"ReplaceString BEFORE replacing: [{result}]") + LOGGER.Debug($"inputString BEFORE replacing: [{result}]") result = ReplaceInternalValues(result) result = ReplaceControlValues(result, panel) If Not IsNothing(document) Then result = ReplaceWindreamIndicies(result, document) result = ReplaceIDBAttributes(result) result = ReplaceUserValues(result, prename, surname, shortname, language, email, userId, profileId) - LOGGER.Debug($"ReplaceString AFTER replacing: [{result}]") + LOGGER.Debug($"inputString AFTER replacing: [{result}]") Return result Catch ex As Exception LOGGER.Error(ex) @@ -91,7 +91,7 @@ Public Class clsPatterns While ContainsPatternAndValue(result, PATTERN_INT, INT_VALUE_DATE) result = ReplacePattern(result, PATTERN_INT, Now.ToShortDateString) End While - + LOGGER.Debug("sql after ReplaceInternalValues: " & input) Return result Catch ex As Exception LOGGER.Error(ex) @@ -132,7 +132,7 @@ Public Class clsPatterns While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_PROFILE_ID) result = ReplacePattern(result, PATTERN_USER, profileId) End While - + LOGGER.Debug("sql after ReplaceUserValues: " & input) Return result Catch ex As Exception LOGGER.Error(ex) @@ -160,7 +160,7 @@ Public Class clsPatterns oTryCounter += 1 End While - + LOGGER.Debug("sql after ReplaceControlValues: " & input) Return result Catch ex As Exception LOGGER.Error(ex) @@ -186,7 +186,7 @@ Public Class clsPatterns End If oTryCounter += 100 End While - + LOGGER.Debug("sql after ReplaceWindreamIndicies: " & input) Return result Catch ex As Exception LOGGER.Error(ex) @@ -218,11 +218,13 @@ Public Class clsPatterns End If If oIDBValue IsNot Nothing Then - result = ReplacePattern(result, PATTERN_IDBA, oIDBValue) + Dim oReplaceValue = "{" + $"#{PATTERN_IDBA}#{indexName}" + "}" + result = result.Replace(oReplaceValue, oIDBValue) + 'result = ReplacePattern(result, oReplaceValue, oIDBValue) End If oTryCounter += 100 End While - + LOGGER.Debug("sql after ReplaceIDBAttributes: " & input) Return result Catch ex As Exception LOGGER.Error(ex) diff --git a/app/DD_PM_WINDREAM/frmAdmin2.Designer.vb b/app/DD_PM_WINDREAM/frmAdmin2.Designer.vb index 001ec16..d8281c7 100644 --- a/app/DD_PM_WINDREAM/frmAdmin2.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdmin2.Designer.vb @@ -23,18 +23,8 @@ Partial Class frmAdmin2 Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim GUIDLabel As System.Windows.Forms.Label - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAdmin2)) - Dim TITLELabel As System.Windows.Forms.Label - Dim EMAIL_SUBJECTLabel As System.Windows.Forms.Label - Dim EMAIL_BODY1Label As System.Windows.Forms.Label - Dim EMAIL_BODY2Label As System.Windows.Forms.Label - Dim EMAIL_BODY3Label As System.Windows.Forms.Label - Dim ADDED_WHOLabel As System.Windows.Forms.Label - Dim ADDED_WHENLabel As System.Windows.Forms.Label - Dim CHANGED_WHOLabel As System.Windows.Forms.Label - Dim CHANGED_WHENLabel As System.Windows.Forms.Label Dim GUIDLabel1 As System.Windows.Forms.Label + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAdmin2)) Dim TITLELabel1 As System.Windows.Forms.Label Dim LANGUAGELabel As System.Windows.Forms.Label Dim CAPT_TYPELabel As System.Windows.Forms.Label @@ -60,6 +50,7 @@ Partial Class frmAdmin2 Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -67,23 +58,34 @@ Partial Class frmAdmin2 Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() - Me.Button1 = New System.Windows.Forms.Button() - Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.DataLayoutControl1 = New DevExpress.XtraDataLayout.DataLayoutControl() + Me.GUIDTextEdit = New DevExpress.XtraEditors.TextEdit() Me.TBDD_EMAIL_TEMPLATEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet() + Me.TITLETextEdit = New DevExpress.XtraEditors.TextEdit() + Me.EMAIL_BODY3TextEdit = New DevExpress.XtraEditors.TextEdit() + Me.ADDED_WHOTextEdit = New DevExpress.XtraEditors.TextEdit() + Me.ADDED_WHENDateEdit = New DevExpress.XtraEditors.DateEdit() + Me.CHANGED_WHOTextEdit = New DevExpress.XtraEditors.TextEdit() + Me.CHANGED_WHENDateEdit = New DevExpress.XtraEditors.DateEdit() + Me.EMAIL_BODY1TextEdit = New DevExpress.XtraEditors.MemoEdit() + Me.EMAIL_BODY2TextEdit = New DevExpress.XtraEditors.MemoEdit() + Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.ItemForGUID = New DevExpress.XtraLayout.LayoutControlItem() + Me.ItemForTITLE = New DevExpress.XtraLayout.LayoutControlItem() + Me.ItemForEMAIL_SUBJECT = New DevExpress.XtraLayout.LayoutControlItem() + Me.ItemForEMAIL_BODY1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.ItemForEMAIL_BODY2 = New DevExpress.XtraLayout.LayoutControlItem() + Me.ItemForEMAIL_BODY3 = New DevExpress.XtraLayout.LayoutControlItem() + Me.ItemForADDED_WHO = New DevExpress.XtraLayout.LayoutControlItem() + Me.ItemForADDED_WHEN = New DevExpress.XtraLayout.LayoutControlItem() + Me.ItemForCHANGED_WHO = New DevExpress.XtraLayout.LayoutControlItem() + Me.ItemForCHANGED_WHEN = New DevExpress.XtraLayout.LayoutControlItem() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn() Me.colTITLE = New DevExpress.XtraGrid.Columns.GridColumn() - Me.GUIDTextBox = New System.Windows.Forms.TextBox() - Me.TITLETextBox = New System.Windows.Forms.TextBox() - Me.EMAIL_SUBJECTTextBox = New System.Windows.Forms.TextBox() - Me.EMAIL_BODY1TextBox = New System.Windows.Forms.TextBox() - Me.EMAIL_BODY2TextBox = New System.Windows.Forms.TextBox() - Me.EMAIL_BODY3TextBox = New System.Windows.Forms.TextBox() - Me.ADDED_WHOTextBox = New System.Windows.Forms.TextBox() - Me.ADDED_WHENTextBox = New System.Windows.Forms.TextBox() - Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox() - Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox() Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() Me.INTERNALCheckBox = New System.Windows.Forms.CheckBox() Me.TBDD_GUI_LANGUAGE_PHRASEBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -112,16 +114,7 @@ Partial Class frmAdmin2 Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.TBDD_GUI_LANGUAGE_PHRASETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_GUI_LANGUAGE_PHRASETableAdapter() Me.LayoutConverter1 = New DevExpress.XtraLayout.Converter.LayoutConverter(Me.components) - GUIDLabel = New System.Windows.Forms.Label() - TITLELabel = New System.Windows.Forms.Label() - EMAIL_SUBJECTLabel = New System.Windows.Forms.Label() - EMAIL_BODY1Label = New System.Windows.Forms.Label() - EMAIL_BODY2Label = New System.Windows.Forms.Label() - EMAIL_BODY3Label = New System.Windows.Forms.Label() - ADDED_WHOLabel = New System.Windows.Forms.Label() - ADDED_WHENLabel = New System.Windows.Forms.Label() - CHANGED_WHOLabel = New System.Windows.Forms.Label() - CHANGED_WHENLabel = New System.Windows.Forms.Label() + Me.EMAIL_SUBJECTTextEdit = New DevExpress.XtraEditors.TextEdit() GUIDLabel1 = New System.Windows.Forms.Label() TITLELabel1 = New System.Windows.Forms.Label() LANGUAGELabel = New System.Windows.Forms.Label() @@ -141,66 +134,42 @@ Partial Class frmAdmin2 CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.XtraTabPage1.SuspendLayout() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DataLayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.DataLayoutControl1.SuspendLayout() + CType(Me.GUIDTextEdit.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_EMAIL_TEMPLATEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TITLETextEdit.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EMAIL_BODY3TextEdit.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ADDED_WHOTextEdit.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ADDED_WHENDateEdit.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ADDED_WHENDateEdit.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CHANGED_WHOTextEdit.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CHANGED_WHENDateEdit.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CHANGED_WHENDateEdit.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EMAIL_BODY1TextEdit.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EMAIL_BODY2TextEdit.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ItemForGUID, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ItemForTITLE, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ItemForEMAIL_SUBJECT, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ItemForEMAIL_BODY1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ItemForEMAIL_BODY2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ItemForEMAIL_BODY3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ItemForADDED_WHO, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ItemForADDED_WHEN, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ItemForCHANGED_WHO, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ItemForCHANGED_WHEN, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPage2.SuspendLayout() CType(Me.TBDD_GUI_LANGUAGE_PHRASEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EMAIL_SUBJECTTextEdit.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'GUIDLabel - ' - resources.ApplyResources(GUIDLabel, "GUIDLabel") - GUIDLabel.Name = "GUIDLabel" - ' - 'TITLELabel - ' - resources.ApplyResources(TITLELabel, "TITLELabel") - TITLELabel.Name = "TITLELabel" - ' - 'EMAIL_SUBJECTLabel - ' - resources.ApplyResources(EMAIL_SUBJECTLabel, "EMAIL_SUBJECTLabel") - EMAIL_SUBJECTLabel.Name = "EMAIL_SUBJECTLabel" - ' - 'EMAIL_BODY1Label - ' - resources.ApplyResources(EMAIL_BODY1Label, "EMAIL_BODY1Label") - EMAIL_BODY1Label.Name = "EMAIL_BODY1Label" - ' - 'EMAIL_BODY2Label - ' - resources.ApplyResources(EMAIL_BODY2Label, "EMAIL_BODY2Label") - EMAIL_BODY2Label.Name = "EMAIL_BODY2Label" - ' - 'EMAIL_BODY3Label - ' - resources.ApplyResources(EMAIL_BODY3Label, "EMAIL_BODY3Label") - EMAIL_BODY3Label.Name = "EMAIL_BODY3Label" - ' - 'ADDED_WHOLabel - ' - resources.ApplyResources(ADDED_WHOLabel, "ADDED_WHOLabel") - ADDED_WHOLabel.Name = "ADDED_WHOLabel" - ' - 'ADDED_WHENLabel - ' - resources.ApplyResources(ADDED_WHENLabel, "ADDED_WHENLabel") - ADDED_WHENLabel.Name = "ADDED_WHENLabel" - ' - 'CHANGED_WHOLabel - ' - resources.ApplyResources(CHANGED_WHOLabel, "CHANGED_WHOLabel") - CHANGED_WHOLabel.Name = "CHANGED_WHOLabel" - ' - 'CHANGED_WHENLabel - ' - resources.ApplyResources(CHANGED_WHENLabel, "CHANGED_WHENLabel") - CHANGED_WHENLabel.Name = "CHANGED_WHENLabel" - ' 'GUIDLabel1 ' resources.ApplyResources(GUIDLabel1, "GUIDLabel1") @@ -279,9 +248,9 @@ Partial Class frmAdmin2 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BbitemplateAdd, Me.BbitemplateSave, Me.BbitemplateDelete, Me.BarButtonItem1, Me.labelStatus, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BbitemplateAdd, Me.BbitemplateSave, Me.BbitemplateDelete, Me.BarButtonItem1, Me.labelStatus, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 11 + Me.RibbonControl1.MaxItemId = 12 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 @@ -372,6 +341,14 @@ Partial Class frmAdmin2 Me.BarButtonItem6.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem6.ImageOptions.LargeImage"), System.Drawing.Image) Me.BarButtonItem6.Name = "BarButtonItem6" ' + 'BarButtonItem7 + ' + resources.ApplyResources(Me.BarButtonItem7, "BarButtonItem7") + Me.BarButtonItem7.Id = 11 + Me.BarButtonItem7.ImageOptions.Image = CType(resources.GetObject("BarButtonItem7.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItem7.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem7.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonItem7.Name = "BarButtonItem7" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) @@ -382,6 +359,7 @@ Partial Class frmAdmin2 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BbitemplateAdd) Me.RibbonPageGroup1.ItemLinks.Add(Me.BbitemplateSave) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem7) Me.RibbonPageGroup1.ItemLinks.Add(Me.BbitemplateDelete) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" @@ -419,44 +397,40 @@ Partial Class frmAdmin2 'XtraTabPage1 ' resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1") - Me.XtraTabPage1.Controls.Add(Me.Button1) + Me.XtraTabPage1.Controls.Add(Me.DataLayoutControl1) Me.XtraTabPage1.Controls.Add(Me.GridControl1) - Me.XtraTabPage1.Controls.Add(GUIDLabel) - Me.XtraTabPage1.Controls.Add(Me.GUIDTextBox) - Me.XtraTabPage1.Controls.Add(TITLELabel) - Me.XtraTabPage1.Controls.Add(Me.TITLETextBox) - Me.XtraTabPage1.Controls.Add(EMAIL_SUBJECTLabel) - Me.XtraTabPage1.Controls.Add(Me.EMAIL_SUBJECTTextBox) - Me.XtraTabPage1.Controls.Add(EMAIL_BODY1Label) - Me.XtraTabPage1.Controls.Add(Me.EMAIL_BODY1TextBox) - Me.XtraTabPage1.Controls.Add(EMAIL_BODY2Label) - Me.XtraTabPage1.Controls.Add(Me.EMAIL_BODY2TextBox) - Me.XtraTabPage1.Controls.Add(EMAIL_BODY3Label) - Me.XtraTabPage1.Controls.Add(Me.EMAIL_BODY3TextBox) - Me.XtraTabPage1.Controls.Add(ADDED_WHOLabel) - Me.XtraTabPage1.Controls.Add(Me.ADDED_WHOTextBox) - Me.XtraTabPage1.Controls.Add(ADDED_WHENLabel) - Me.XtraTabPage1.Controls.Add(Me.ADDED_WHENTextBox) - Me.XtraTabPage1.Controls.Add(CHANGED_WHOLabel) - Me.XtraTabPage1.Controls.Add(Me.CHANGED_WHOTextBox) - Me.XtraTabPage1.Controls.Add(CHANGED_WHENLabel) - Me.XtraTabPage1.Controls.Add(Me.CHANGED_WHENTextBox) Me.XtraTabPage1.Name = "XtraTabPage1" ' - 'Button1 - ' - resources.ApplyResources(Me.Button1, "Button1") - Me.Button1.Name = "Button1" - Me.Button1.UseVisualStyleBackColor = True - ' - 'GridControl1 - ' - Me.GridControl1.DataSource = Me.TBDD_EMAIL_TEMPLATEBindingSource - resources.ApplyResources(Me.GridControl1, "GridControl1") - Me.GridControl1.MainView = Me.GridView1 - Me.GridControl1.MenuManager = Me.RibbonControl1 - Me.GridControl1.Name = "GridControl1" - Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + 'DataLayoutControl1 + ' + resources.ApplyResources(Me.DataLayoutControl1, "DataLayoutControl1") + Me.DataLayoutControl1.Controls.Add(Me.GUIDTextEdit) + Me.DataLayoutControl1.Controls.Add(Me.TITLETextEdit) + Me.DataLayoutControl1.Controls.Add(Me.EMAIL_BODY3TextEdit) + Me.DataLayoutControl1.Controls.Add(Me.ADDED_WHOTextEdit) + Me.DataLayoutControl1.Controls.Add(Me.ADDED_WHENDateEdit) + Me.DataLayoutControl1.Controls.Add(Me.CHANGED_WHOTextEdit) + Me.DataLayoutControl1.Controls.Add(Me.CHANGED_WHENDateEdit) + Me.DataLayoutControl1.Controls.Add(Me.EMAIL_BODY1TextEdit) + Me.DataLayoutControl1.Controls.Add(Me.EMAIL_BODY2TextEdit) + Me.DataLayoutControl1.Controls.Add(Me.EMAIL_SUBJECTTextEdit) + Me.DataLayoutControl1.DataSource = Me.TBDD_EMAIL_TEMPLATEBindingSource + Me.DataLayoutControl1.Name = "DataLayoutControl1" + Me.DataLayoutControl1.Root = Me.Root + ' + 'GUIDTextEdit + ' + Me.GUIDTextEdit.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_EMAIL_TEMPLATEBindingSource, "GUID", True)) + resources.ApplyResources(Me.GUIDTextEdit, "GUIDTextEdit") + Me.GUIDTextEdit.MenuManager = Me.RibbonControl1 + Me.GUIDTextEdit.Name = "GUIDTextEdit" + Me.GUIDTextEdit.Properties.Appearance.Options.UseTextOptions = True + Me.GUIDTextEdit.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far + Me.GUIDTextEdit.Properties.Mask.EditMask = resources.GetString("GUIDTextEdit.Properties.Mask.EditMask") + Me.GUIDTextEdit.Properties.Mask.MaskType = CType(resources.GetObject("GUIDTextEdit.Properties.Mask.MaskType"), DevExpress.XtraEditors.Mask.MaskType) + Me.GUIDTextEdit.Properties.Mask.UseMaskAsDisplayFormat = CType(resources.GetObject("GUIDTextEdit.Properties.Mask.UseMaskAsDisplayFormat"), Boolean) + Me.GUIDTextEdit.Properties.ReadOnly = True + Me.GUIDTextEdit.StyleController = Me.DataLayoutControl1 ' 'TBDD_EMAIL_TEMPLATEBindingSource ' @@ -468,6 +442,196 @@ Partial Class frmAdmin2 Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet" Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' + 'TITLETextEdit + ' + Me.TITLETextEdit.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_EMAIL_TEMPLATEBindingSource, "TITLE", True)) + resources.ApplyResources(Me.TITLETextEdit, "TITLETextEdit") + Me.TITLETextEdit.MenuManager = Me.RibbonControl1 + Me.TITLETextEdit.Name = "TITLETextEdit" + Me.TITLETextEdit.StyleController = Me.DataLayoutControl1 + ' + 'EMAIL_BODY3TextEdit + ' + Me.EMAIL_BODY3TextEdit.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_EMAIL_TEMPLATEBindingSource, "EMAIL_BODY3", True)) + resources.ApplyResources(Me.EMAIL_BODY3TextEdit, "EMAIL_BODY3TextEdit") + Me.EMAIL_BODY3TextEdit.MenuManager = Me.RibbonControl1 + Me.EMAIL_BODY3TextEdit.Name = "EMAIL_BODY3TextEdit" + Me.EMAIL_BODY3TextEdit.StyleController = Me.DataLayoutControl1 + ' + 'ADDED_WHOTextEdit + ' + Me.ADDED_WHOTextEdit.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_EMAIL_TEMPLATEBindingSource, "ADDED_WHO", True)) + resources.ApplyResources(Me.ADDED_WHOTextEdit, "ADDED_WHOTextEdit") + Me.ADDED_WHOTextEdit.MenuManager = Me.RibbonControl1 + Me.ADDED_WHOTextEdit.Name = "ADDED_WHOTextEdit" + Me.ADDED_WHOTextEdit.Properties.ReadOnly = True + Me.ADDED_WHOTextEdit.StyleController = Me.DataLayoutControl1 + ' + 'ADDED_WHENDateEdit + ' + Me.ADDED_WHENDateEdit.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_EMAIL_TEMPLATEBindingSource, "ADDED_WHEN", True)) + resources.ApplyResources(Me.ADDED_WHENDateEdit, "ADDED_WHENDateEdit") + Me.ADDED_WHENDateEdit.MenuManager = Me.RibbonControl1 + Me.ADDED_WHENDateEdit.Name = "ADDED_WHENDateEdit" + Me.ADDED_WHENDateEdit.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("ADDED_WHENDateEdit.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.ADDED_WHENDateEdit.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("ADDED_WHENDateEdit.Properties.CalendarTimeProperties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.ADDED_WHENDateEdit.Properties.Mask.EditMask = resources.GetString("ADDED_WHENDateEdit.Properties.Mask.EditMask") + Me.ADDED_WHENDateEdit.Properties.ReadOnly = True + Me.ADDED_WHENDateEdit.StyleController = Me.DataLayoutControl1 + ' + 'CHANGED_WHOTextEdit + ' + Me.CHANGED_WHOTextEdit.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_EMAIL_TEMPLATEBindingSource, "CHANGED_WHO", True)) + resources.ApplyResources(Me.CHANGED_WHOTextEdit, "CHANGED_WHOTextEdit") + Me.CHANGED_WHOTextEdit.MenuManager = Me.RibbonControl1 + Me.CHANGED_WHOTextEdit.Name = "CHANGED_WHOTextEdit" + Me.CHANGED_WHOTextEdit.Properties.ReadOnly = True + Me.CHANGED_WHOTextEdit.StyleController = Me.DataLayoutControl1 + ' + 'CHANGED_WHENDateEdit + ' + Me.CHANGED_WHENDateEdit.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_EMAIL_TEMPLATEBindingSource, "CHANGED_WHEN", True)) + resources.ApplyResources(Me.CHANGED_WHENDateEdit, "CHANGED_WHENDateEdit") + Me.CHANGED_WHENDateEdit.MenuManager = Me.RibbonControl1 + Me.CHANGED_WHENDateEdit.Name = "CHANGED_WHENDateEdit" + Me.CHANGED_WHENDateEdit.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("CHANGED_WHENDateEdit.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.CHANGED_WHENDateEdit.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("CHANGED_WHENDateEdit.Properties.CalendarTimeProperties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.CHANGED_WHENDateEdit.Properties.ReadOnly = True + Me.CHANGED_WHENDateEdit.StyleController = Me.DataLayoutControl1 + ' + 'EMAIL_BODY1TextEdit + ' + Me.EMAIL_BODY1TextEdit.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_EMAIL_TEMPLATEBindingSource, "EMAIL_BODY1", True)) + resources.ApplyResources(Me.EMAIL_BODY1TextEdit, "EMAIL_BODY1TextEdit") + Me.EMAIL_BODY1TextEdit.MenuManager = Me.RibbonControl1 + Me.EMAIL_BODY1TextEdit.Name = "EMAIL_BODY1TextEdit" + Me.EMAIL_BODY1TextEdit.StyleController = Me.DataLayoutControl1 + ' + 'EMAIL_BODY2TextEdit + ' + Me.EMAIL_BODY2TextEdit.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_EMAIL_TEMPLATEBindingSource, "EMAIL_BODY2", True)) + resources.ApplyResources(Me.EMAIL_BODY2TextEdit, "EMAIL_BODY2TextEdit") + Me.EMAIL_BODY2TextEdit.MenuManager = Me.RibbonControl1 + Me.EMAIL_BODY2TextEdit.Name = "EMAIL_BODY2TextEdit" + Me.EMAIL_BODY2TextEdit.StyleController = Me.DataLayoutControl1 + ' + 'Root + ' + Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.Root.GroupBordersVisible = False + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1}) + Me.Root.Name = "Root" + Me.Root.Size = New System.Drawing.Size(684, 505) + Me.Root.TextVisible = False + ' + 'LayoutControlGroup1 + ' + Me.LayoutControlGroup1.AllowDrawBackground = False + Me.LayoutControlGroup1.GroupBordersVisible = False + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.ItemForGUID, Me.ItemForTITLE, Me.ItemForEMAIL_SUBJECT, Me.ItemForEMAIL_BODY1, Me.ItemForEMAIL_BODY2, Me.ItemForEMAIL_BODY3, Me.ItemForADDED_WHO, Me.ItemForCHANGED_WHO, Me.ItemForADDED_WHEN, Me.ItemForCHANGED_WHEN}) + Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlGroup1.Name = "autoGeneratedGroup0" + Me.LayoutControlGroup1.Size = New System.Drawing.Size(664, 485) + ' + 'ItemForGUID + ' + Me.ItemForGUID.Control = Me.GUIDTextEdit + Me.ItemForGUID.Location = New System.Drawing.Point(0, 0) + Me.ItemForGUID.Name = "ItemForGUID" + Me.ItemForGUID.Size = New System.Drawing.Size(664, 24) + resources.ApplyResources(Me.ItemForGUID, "ItemForGUID") + Me.ItemForGUID.TextSize = New System.Drawing.Size(74, 13) + ' + 'ItemForTITLE + ' + Me.ItemForTITLE.Control = Me.TITLETextEdit + Me.ItemForTITLE.Location = New System.Drawing.Point(0, 24) + Me.ItemForTITLE.Name = "ItemForTITLE" + Me.ItemForTITLE.Size = New System.Drawing.Size(664, 24) + resources.ApplyResources(Me.ItemForTITLE, "ItemForTITLE") + Me.ItemForTITLE.TextSize = New System.Drawing.Size(74, 13) + ' + 'ItemForEMAIL_SUBJECT + ' + Me.ItemForEMAIL_SUBJECT.Control = Me.EMAIL_SUBJECTTextEdit + Me.ItemForEMAIL_SUBJECT.Location = New System.Drawing.Point(0, 48) + Me.ItemForEMAIL_SUBJECT.Name = "ItemForEMAIL_SUBJECT" + Me.ItemForEMAIL_SUBJECT.Size = New System.Drawing.Size(664, 24) + resources.ApplyResources(Me.ItemForEMAIL_SUBJECT, "ItemForEMAIL_SUBJECT") + Me.ItemForEMAIL_SUBJECT.TextSize = New System.Drawing.Size(74, 13) + ' + 'ItemForEMAIL_BODY1 + ' + Me.ItemForEMAIL_BODY1.Control = Me.EMAIL_BODY1TextEdit + Me.ItemForEMAIL_BODY1.Location = New System.Drawing.Point(0, 72) + Me.ItemForEMAIL_BODY1.Name = "ItemForEMAIL_BODY1" + Me.ItemForEMAIL_BODY1.Size = New System.Drawing.Size(664, 147) + resources.ApplyResources(Me.ItemForEMAIL_BODY1, "ItemForEMAIL_BODY1") + Me.ItemForEMAIL_BODY1.TextSize = New System.Drawing.Size(74, 13) + ' + 'ItemForEMAIL_BODY2 + ' + Me.ItemForEMAIL_BODY2.Control = Me.EMAIL_BODY2TextEdit + Me.ItemForEMAIL_BODY2.Location = New System.Drawing.Point(0, 219) + Me.ItemForEMAIL_BODY2.Name = "ItemForEMAIL_BODY2" + Me.ItemForEMAIL_BODY2.Size = New System.Drawing.Size(664, 194) + resources.ApplyResources(Me.ItemForEMAIL_BODY2, "ItemForEMAIL_BODY2") + Me.ItemForEMAIL_BODY2.TextSize = New System.Drawing.Size(74, 13) + ' + 'ItemForEMAIL_BODY3 + ' + Me.ItemForEMAIL_BODY3.Control = Me.EMAIL_BODY3TextEdit + Me.ItemForEMAIL_BODY3.Location = New System.Drawing.Point(0, 413) + Me.ItemForEMAIL_BODY3.Name = "ItemForEMAIL_BODY3" + Me.ItemForEMAIL_BODY3.Size = New System.Drawing.Size(664, 24) + resources.ApplyResources(Me.ItemForEMAIL_BODY3, "ItemForEMAIL_BODY3") + Me.ItemForEMAIL_BODY3.TextSize = New System.Drawing.Size(74, 13) + ' + 'ItemForADDED_WHO + ' + Me.ItemForADDED_WHO.Control = Me.ADDED_WHOTextEdit + Me.ItemForADDED_WHO.Location = New System.Drawing.Point(0, 437) + Me.ItemForADDED_WHO.Name = "ItemForADDED_WHO" + Me.ItemForADDED_WHO.Size = New System.Drawing.Size(332, 24) + resources.ApplyResources(Me.ItemForADDED_WHO, "ItemForADDED_WHO") + Me.ItemForADDED_WHO.TextSize = New System.Drawing.Size(74, 13) + ' + 'ItemForADDED_WHEN + ' + Me.ItemForADDED_WHEN.Control = Me.ADDED_WHENDateEdit + Me.ItemForADDED_WHEN.Location = New System.Drawing.Point(332, 437) + Me.ItemForADDED_WHEN.Name = "ItemForADDED_WHEN" + Me.ItemForADDED_WHEN.Size = New System.Drawing.Size(332, 24) + resources.ApplyResources(Me.ItemForADDED_WHEN, "ItemForADDED_WHEN") + Me.ItemForADDED_WHEN.TextSize = New System.Drawing.Size(74, 13) + ' + 'ItemForCHANGED_WHO + ' + Me.ItemForCHANGED_WHO.Control = Me.CHANGED_WHOTextEdit + Me.ItemForCHANGED_WHO.Location = New System.Drawing.Point(0, 461) + Me.ItemForCHANGED_WHO.Name = "ItemForCHANGED_WHO" + Me.ItemForCHANGED_WHO.Size = New System.Drawing.Size(332, 24) + resources.ApplyResources(Me.ItemForCHANGED_WHO, "ItemForCHANGED_WHO") + Me.ItemForCHANGED_WHO.TextSize = New System.Drawing.Size(74, 13) + ' + 'ItemForCHANGED_WHEN + ' + Me.ItemForCHANGED_WHEN.Control = Me.CHANGED_WHENDateEdit + Me.ItemForCHANGED_WHEN.Location = New System.Drawing.Point(332, 461) + Me.ItemForCHANGED_WHEN.Name = "ItemForCHANGED_WHEN" + Me.ItemForCHANGED_WHEN.Size = New System.Drawing.Size(332, 24) + resources.ApplyResources(Me.ItemForCHANGED_WHEN, "ItemForCHANGED_WHEN") + Me.ItemForCHANGED_WHEN.TextSize = New System.Drawing.Size(74, 13) + ' + 'GridControl1 + ' + Me.GridControl1.DataSource = Me.TBDD_EMAIL_TEMPLATEBindingSource + resources.ApplyResources(Me.GridControl1, "GridControl1") + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.MenuManager = Me.RibbonControl1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' 'GridView1 ' Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.PeachPuff @@ -494,72 +658,6 @@ Partial Class frmAdmin2 Me.colTITLE.FieldName = "TITLE" Me.colTITLE.Name = "colTITLE" ' - 'GUIDTextBox - ' - Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_TEMPLATEBindingSource, "GUID", True)) - resources.ApplyResources(Me.GUIDTextBox, "GUIDTextBox") - Me.GUIDTextBox.Name = "GUIDTextBox" - Me.GUIDTextBox.ReadOnly = True - ' - 'TITLETextBox - ' - Me.TITLETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_TEMPLATEBindingSource, "TITLE", True)) - resources.ApplyResources(Me.TITLETextBox, "TITLETextBox") - Me.TITLETextBox.Name = "TITLETextBox" - Me.TITLETextBox.ReadOnly = True - ' - 'EMAIL_SUBJECTTextBox - ' - Me.EMAIL_SUBJECTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_TEMPLATEBindingSource, "EMAIL_SUBJECT", True)) - resources.ApplyResources(Me.EMAIL_SUBJECTTextBox, "EMAIL_SUBJECTTextBox") - Me.EMAIL_SUBJECTTextBox.Name = "EMAIL_SUBJECTTextBox" - ' - 'EMAIL_BODY1TextBox - ' - resources.ApplyResources(Me.EMAIL_BODY1TextBox, "EMAIL_BODY1TextBox") - Me.EMAIL_BODY1TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_TEMPLATEBindingSource, "EMAIL_BODY1", True)) - Me.EMAIL_BODY1TextBox.Name = "EMAIL_BODY1TextBox" - ' - 'EMAIL_BODY2TextBox - ' - resources.ApplyResources(Me.EMAIL_BODY2TextBox, "EMAIL_BODY2TextBox") - Me.EMAIL_BODY2TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_TEMPLATEBindingSource, "EMAIL_BODY2", True)) - Me.EMAIL_BODY2TextBox.Name = "EMAIL_BODY2TextBox" - ' - 'EMAIL_BODY3TextBox - ' - resources.ApplyResources(Me.EMAIL_BODY3TextBox, "EMAIL_BODY3TextBox") - Me.EMAIL_BODY3TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_TEMPLATEBindingSource, "EMAIL_BODY3", True)) - Me.EMAIL_BODY3TextBox.Name = "EMAIL_BODY3TextBox" - ' - 'ADDED_WHOTextBox - ' - Me.ADDED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_TEMPLATEBindingSource, "ADDED_WHO", True)) - resources.ApplyResources(Me.ADDED_WHOTextBox, "ADDED_WHOTextBox") - Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox" - Me.ADDED_WHOTextBox.ReadOnly = True - ' - 'ADDED_WHENTextBox - ' - Me.ADDED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_TEMPLATEBindingSource, "ADDED_WHEN", True)) - resources.ApplyResources(Me.ADDED_WHENTextBox, "ADDED_WHENTextBox") - Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox" - Me.ADDED_WHENTextBox.ReadOnly = True - ' - 'CHANGED_WHOTextBox - ' - Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_TEMPLATEBindingSource, "CHANGED_WHO", True)) - resources.ApplyResources(Me.CHANGED_WHOTextBox, "CHANGED_WHOTextBox") - Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" - Me.CHANGED_WHOTextBox.ReadOnly = True - ' - 'CHANGED_WHENTextBox - ' - Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_TEMPLATEBindingSource, "CHANGED_WHEN", True)) - resources.ApplyResources(Me.CHANGED_WHENTextBox, "CHANGED_WHENTextBox") - Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" - Me.CHANGED_WHENTextBox.ReadOnly = True - ' 'XtraTabPage2 ' resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2") @@ -784,6 +882,14 @@ Partial Class frmAdmin2 ' Me.TBDD_GUI_LANGUAGE_PHRASETableAdapter.ClearBeforeFill = True ' + 'EMAIL_SUBJECTTextEdit + ' + Me.EMAIL_SUBJECTTextEdit.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_EMAIL_TEMPLATEBindingSource, "EMAIL_SUBJECT", True)) + resources.ApplyResources(Me.EMAIL_SUBJECTTextEdit, "EMAIL_SUBJECTTextEdit") + Me.EMAIL_SUBJECTTextEdit.MenuManager = Me.RibbonControl1 + Me.EMAIL_SUBJECTTextEdit.Name = "EMAIL_SUBJECTTextEdit" + Me.EMAIL_SUBJECTTextEdit.StyleController = Me.DataLayoutControl1 + ' 'frmAdmin2 ' resources.ApplyResources(Me, "$this") @@ -799,16 +905,41 @@ Partial Class frmAdmin2 CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl1.ResumeLayout(False) Me.XtraTabPage1.ResumeLayout(False) - Me.XtraTabPage1.PerformLayout() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DataLayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.DataLayoutControl1.ResumeLayout(False) + CType(Me.GUIDTextEdit.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_EMAIL_TEMPLATEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TITLETextEdit.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EMAIL_BODY3TextEdit.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ADDED_WHOTextEdit.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ADDED_WHENDateEdit.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ADDED_WHENDateEdit.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CHANGED_WHOTextEdit.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CHANGED_WHENDateEdit.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CHANGED_WHENDateEdit.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EMAIL_BODY1TextEdit.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EMAIL_BODY2TextEdit.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ItemForGUID, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ItemForTITLE, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ItemForEMAIL_SUBJECT, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ItemForEMAIL_BODY1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ItemForEMAIL_BODY2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ItemForEMAIL_BODY3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ItemForADDED_WHO, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ItemForADDED_WHEN, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ItemForCHANGED_WHO, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ItemForCHANGED_WHEN, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPage2.ResumeLayout(False) Me.XtraTabPage2.PerformLayout() CType(Me.TBDD_GUI_LANGUAGE_PHRASEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EMAIL_SUBJECTTextEdit.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -834,19 +965,8 @@ Partial Class frmAdmin2 Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents colGUID As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colTITLE As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents GUIDTextBox As TextBox - Friend WithEvents TITLETextBox As TextBox - Friend WithEvents EMAIL_SUBJECTTextBox As TextBox - Friend WithEvents EMAIL_BODY1TextBox As TextBox - Friend WithEvents EMAIL_BODY2TextBox As TextBox - Friend WithEvents EMAIL_BODY3TextBox As TextBox - Friend WithEvents ADDED_WHOTextBox As TextBox - Friend WithEvents ADDED_WHENTextBox As TextBox - Friend WithEvents CHANGED_WHOTextBox As TextBox - Friend WithEvents CHANGED_WHENTextBox As TextBox Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents labelStatus As DevExpress.XtraBars.BarStaticItem - Friend WithEvents Button1 As Button Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem @@ -877,4 +997,28 @@ Partial Class frmAdmin2 Friend WithEvents GridColumn5 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents INTERNALCheckBox As CheckBox Friend WithEvents LayoutConverter1 As DevExpress.XtraLayout.Converter.LayoutConverter + Friend WithEvents DataLayoutControl1 As DevExpress.XtraDataLayout.DataLayoutControl + Friend WithEvents GUIDTextEdit As DevExpress.XtraEditors.TextEdit + Friend WithEvents TITLETextEdit As DevExpress.XtraEditors.TextEdit + Friend WithEvents EMAIL_BODY3TextEdit As DevExpress.XtraEditors.TextEdit + Friend WithEvents ADDED_WHOTextEdit As DevExpress.XtraEditors.TextEdit + Friend WithEvents ADDED_WHENDateEdit As DevExpress.XtraEditors.DateEdit + Friend WithEvents CHANGED_WHOTextEdit As DevExpress.XtraEditors.TextEdit + Friend WithEvents CHANGED_WHENDateEdit As DevExpress.XtraEditors.DateEdit + Friend WithEvents EMAIL_BODY1TextEdit As DevExpress.XtraEditors.MemoEdit + Friend WithEvents EMAIL_BODY2TextEdit As DevExpress.XtraEditors.MemoEdit + Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents ItemForGUID As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents ItemForTITLE As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents ItemForEMAIL_SUBJECT As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents ItemForEMAIL_BODY1 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents ItemForEMAIL_BODY2 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents ItemForEMAIL_BODY3 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents ItemForADDED_WHO As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents ItemForADDED_WHEN As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents ItemForCHANGED_WHO As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents ItemForCHANGED_WHEN As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents BarButtonItem7 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents EMAIL_SUBJECTTextEdit As DevExpress.XtraEditors.TextEdit End Class diff --git a/app/DD_PM_WINDREAM/frmAdmin2.resx b/app/DD_PM_WINDREAM/frmAdmin2.resx index d733754..10f20e3 100644 --- a/app/DD_PM_WINDREAM/frmAdmin2.resx +++ b/app/DD_PM_WINDREAM/frmAdmin2.resx @@ -117,314 +117,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - False - - - - True - - - - 359, 15 - - - 22, 13 - - - 0 - - - ID: - - - GUIDLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 2 - - - False - - - True - - - 359, 42 - - - 31, 13 - - - 2 - - - Titel: - - - TITLELabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 4 - - - False - - - True - - - 359, 69 - - - 45, 13 - - - 4 - - - Betreff: - - - EMAIL_SUBJECTLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 6 - - - False - - - True - - - 359, 93 - - - 41, 13 - - - 6 - - - Body1: - - - EMAIL_BODY1Label - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 8 - - - False - - - True - - - 359, 224 - - - 41, 13 - - - 8 - - - Body2: - - - EMAIL_BODY2Label - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 10 - - - False - - - True - - - 359, 350 - - - 41, 13 - - - 10 - - - Body3: - - - EMAIL_BODY3Label - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 12 - - - False - - - True - - - 359, 426 - - - 65, 13 - - - 12 - - - Erstellt wer: - - - ADDED_WHOLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 14 - - - False - - - True - - - 604, 426 - - - 73, 13 - - - 14 - - - Erstellt wann: - - - ADDED_WHENLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 16 - - - False - - - True - - - 359, 456 - - - 77, 13 - - - 16 - - - Geändert wer: - - - CHANGED_WHOLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 18 - - - False - - - True - - - 604, 456 - - - 85, 13 - - - 18 - - - Geändert wann: - - - CHANGED_WHENLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 20 - False + True + 586, 15 @@ -1133,6 +833,32 @@ xH19sFD7OfC5qvuM1DsLoA2L4/Av+CbpIfVJvIGMWmU4T15T65r0kHqXbyB8zdCuVjl5BVZAgiUSgMMF h3NoFRgiMpykPok3QHzlPDmHr0NkOEm9ywCkh+DwDYgMFlLvOgAxRAl+HU5Sn0QA4j+d+F6E1DsL0ID/ AM4CNOXvBnAp3l8YN9Nk3EyTcTNNxs30+N4PvvKeTNimaekAAAAASUVORK5CYII= + + + + Vorschau Email + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAATdEVYdFRpdGxlAFByZXZpZXc7UHJpbnSYkaHzAAAA + rklEQVQ4T2P4//8/RRjOaGlp+Y8H/4PSxsiaQRjFAHwAJN/X13cX3RCSDACCX+iGkGQAMgYC0gxABgQN + 2Hjiwf+yeSf+B7XtAtMgPjLAawBIccGsY/83nXj4/9O3X2AaxEc2BK8BIBtBmpABiA8ShwG8BoCcDbIZ + GYD4IHEYoI0LQCKXHrz979u0g7wwgGmGYZCNJMUCsmaQYfgAXhfANIMU4cMgPSAMN4A8/J8BANeiMofG + 7sTDAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAATdEVYdFRpdGxlAFByZXZpZXc7UHJpbnSYkaHzAAAB + g0lEQVRYR9WUsUoDQRCG83yBoO9g5WvotdeksDsbH8HGIIgiCNYK0cBVARGbNDZGZdzvyMJmZzjM7bmH + P/ws+8/czr+zk4xEZFCaYk6aYk6aYk6aomdRFLIjl45jR75VtGqYoqf7yC2/B/llWX5WVTV22/isrb2n + KXp2MVDXtWkimwFgmchqAMQmshsAGxNrTAxiAHgTLqYGEyohZBcDLXxxKaqGEkLyYV/YnKVqKCGkZeBu + /irT80c5PLmV/WLWrOzR25BsYPX+IaeXT7J3PJPJ0YUiOnHyLCQb4HAKHUxv5OxqIfPlStZf383KHp04 + eRaSDNBebkiR6wdmSQOdOHnWcyQZ4I25HTdtA3HyyI+RZIBB42Da3Qbi5JEfI8kA087BvHkbiJNHfoz/ + 3YHBZ2DwX8H981tzM0gRbkq7//x/wHGrOOSG4T7Ue/8njIuzp728MYPGtLOyt9oeYmcDruAkLp6CLgZU + cQ5JIefGVIKnK+w7MLHifdEUc9IUc9IU81FGP7lCqzQ2PA77AAAAAElFTkSuQmCC @@ -1193,29 +919,8 @@ True - - 907, 37 - - - 75, 23 - - - 21 - - - Vorschau - - - Button1 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 0 + + Top, Bottom, Left, Right 179, 17 @@ -1223,290 +928,349 @@ 17, 17 - - Left + + 89, 12 - - 0, 0 + + N0 - - ID + + + Numeric - + True - - 0 + + 583, 20 - - 51 + + 4 - - Titel + + GUIDTextEdit - - True + + DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 1 + + DataLayoutControl1 - - 128 + + 4 - - 353, 508 + + 89, 36 - - 20 + + 583, 20 - - GridControl1 + + 5 - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + TITLETextEdit - - XtraTabPage1 + + DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 1 + + DataLayoutControl1 - - 461, 12 + + 5 - - 100, 21 + + 89, 425 - - 1 + + 583, 20 - - GUIDTextBox + + 9 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + EMAIL_BODY3TextEdit - - XtraTabPage1 + + DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 3 + + DataLayoutControl1 - - 461, 39 + + 6 - - 428, 21 + + 89, 449 - - 3 + + 251, 20 - - TITLETextBox + + 10 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ADDED_WHOTextEdit - - XtraTabPage1 + + DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 5 + + DataLayoutControl1 - - 461, 66 + + 7 - - 428, 21 + + - - 5 + + 421, 449 - - EMAIL_SUBJECTTextBox + + + Combo - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Combo - - XtraTabPage1 + + G - - 7 + + 251, 20 - - Top, Left, Right + + 11 - - 461, 93 + + ADDED_WHENDateEdit - - True + + DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - Both + + DataLayoutControl1 - - 583, 125 + + 8 - - 7 + + 89, 473 - - EMAIL_BODY1TextBox + + 251, 20 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 12 - - XtraTabPage1 + + CHANGED_WHOTextEdit + + + DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + + DataLayoutControl1 + + 9 - - Top, Left, Right + + - - 461, 224 + + 421, 473 - - True + + Combo - - Both + + Combo - - 583, 120 + + 251, 20 - - 9 + + 13 - - EMAIL_BODY2TextBox + + CHANGED_WHENDateEdit - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - XtraTabPage1 + + DataLayoutControl1 - - 11 + + 10 - - Top, Left, Right + + 89, 84 - - 461, 350 + + 583, 143 - - True + + 7 + + + EMAIL_BODY1TextEdit - - Both + + DevExpress.XtraEditors.MemoEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 583, 67 + + DataLayoutControl1 - + 11 - - EMAIL_BODY3TextBox + + 89, 231 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 583, 190 - - XtraTabPage1 + + 8 - - 13 + + EMAIL_BODY2TextEdit + + + DevExpress.XtraEditors.MemoEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DataLayoutControl1 - - 461, 423 + + 12 + + + 89, 60 + + + 583, 20 + + + 6 + + + EMAIL_SUBJECTTextEdit - - 124, 21 + + DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + + DataLayoutControl1 + + 13 - - ADDED_WHOTextBox + + 359, 3 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ID - - XtraTabPage1 + + Titel - - 15 + + Betreff - - 694, 423 + + Body1 - - 128, 21 + + Body2 - - 15 + + Body3 - - ADDED_WHENTextBox + + Erstellt wer - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Geändert wer - - XtraTabPage1 + + Erstellt wann - - 17 + + Geändert wann - - 461, 453 + + 684, 505 - - 124, 21 + + 22 - - 17 + + DataLayoutControl1 - - CHANGED_WHOTextBox + + DataLayoutControl1 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + XtraTabPage1 - - 19 + + 0 + + + Left - - 694, 453 + + 0, 0 - - 128, 21 + + ID - - 19 + + True - - CHANGED_WHENTextBox + + 0 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 51 + + + Titel - + + True + + + 1 + + + 128 + + + 353, 508 + + + 20 + + + GridControl1 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + XtraTabPage1 - - 21 + + 1 1057, 508 @@ -2107,6 +1871,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem7 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -2143,6 +1913,78 @@ DD_PM_WINDREAM.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + Root + + + DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControlGroup1 + + + DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ItemForGUID + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ItemForTITLE + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ItemForEMAIL_SUBJECT + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ItemForEMAIL_BODY1 + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ItemForEMAIL_BODY2 + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ItemForEMAIL_BODY3 + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ItemForADDED_WHO + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ItemForADDED_WHEN + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ItemForCHANGED_WHO + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ItemForCHANGED_WHEN + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + GridView1 diff --git a/app/DD_PM_WINDREAM/frmAdmin2.vb b/app/DD_PM_WINDREAM/frmAdmin2.vb index 75e5ed8..cb3c96d 100644 --- a/app/DD_PM_WINDREAM/frmAdmin2.vb +++ b/app/DD_PM_WINDREAM/frmAdmin2.vb @@ -1,16 +1,14 @@  +Imports System.IO Imports DevExpress.XtraTab Public Class frmAdmin2 Private Sub frmAdmin2_Load(sender As Object, e As EventArgs) Handles MyBase.Load - 'TODO: Diese Codezeile lädt Daten in die Tabelle "DD_DMSLiteDataSet.TBDD_GUI_LANGUAGE_PHRASE". Sie können sie bei Bedarf verschieben oder entfernen. - - 'TODO: Diese Codezeile lädt Daten in die Tabelle "DD_DMSLiteDataSet.TBDD_EMAIL_TEMPLATE". Sie können sie bei Bedarf verschieben oder entfernen. Load_Email_template() - Load_Gui_Phrases + Load_Gui_Phrases() End Sub Sub Status_Changed(text As String) labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Always @@ -19,7 +17,7 @@ Public Class frmAdmin2 Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BbitemplateAdd.ItemClick TBDD_EMAIL_TEMPLATEBindingSource.AddNew() - TITLETextBox.ReadOnly = False + TITLETextEdit.ReadOnly = False End Sub @@ -54,11 +52,11 @@ Public Class frmAdmin2 Try Me.TBDD_EMAIL_TEMPLATEBindingSource.EndEdit() If Not IsNothing(DD_DMSLiteDataSet.TBDD_EMAIL_TEMPLATE.GetChanges) Then - Me.CHANGED_WHOTextBox.Text = USER_USERNAME + Me.CHANGED_WHOTextEdit.Text = USER_USERNAME Me.TBDD_EMAIL_TEMPLATEBindingSource.EndEdit() Me.TBDD_EMAIL_TEMPLATETableAdapter.Update(DD_DMSLiteDataSet.TBDD_EMAIL_TEMPLATE) Status_Changed("Vorlage gespeichert") - TITLETextBox.ReadOnly = True + TITLETextEdit.ReadOnly = True Else Status_Changed("Keine Änderung") End If @@ -72,7 +70,7 @@ Public Class frmAdmin2 Dim result As MsgBoxResult = MsgBox("Wollen Sie die Vorlage wirklich löschen?", MsgBoxStyle.YesNo, "Bestätigung erforderlich:") 'wenn Speichern ja If result = MsgBoxResult.Yes Then - Dim oSQL = $"Delete from TBDD_EMAIL_TEMPLATE where guid = {GUIDTextBox.Text}" + Dim oSQL = $"Delete from TBDD_EMAIL_TEMPLATE where guid = {GUIDTextEdit.Text}" If ClassDatabase.Execute_non_Query(oSQL) = True Then Load_Email_template() Status_Changed("Vorlage gelöscht!") @@ -92,18 +90,7 @@ Public Class frmAdmin2 End Select End Sub - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click - Dim oText = EMAIL_BODY1TextBox.Text - If EMAIL_BODY2TextBox.Text <> "" Then - oText = oText & "

" & EMAIL_BODY2TextBox.Text - End If - If EMAIL_BODY3TextBox.Text <> "" Then - oText = oText & "

" & EMAIL_BODY3TextBox.Text - End If - Dim ofrm As New frmPreviewHtml - ofrm.DisplayText = oText - ofrm.ShowDialog() - End Sub + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick GuiPhrase_Save() @@ -149,4 +136,34 @@ Public Class frmAdmin2 OBJ_NAMETextBox.ReadOnly = False End If End Sub + + Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick + Dim oText = EMAIL_BODY1TextEdit.Text + If EMAIL_BODY2TextEdit.Text <> "" Then + oText = oText & "

" & EMAIL_BODY2TextEdit.Text + End If + If EMAIL_BODY3TextEdit.Text <> "" Then + oText = oText & "

" & EMAIL_BODY3TextEdit.Text + End If + Dim ofrm As New frmPreviewHtml + ofrm.DisplayText = oText + ofrm.ShowDialog() + End Sub + + Private Sub frmAdmin2_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing + Try + Dim Filename As String = String.Format("DevExLayoutAdmin2_Email.xml") + Dim xml As String = System.IO.Path.Combine(Application.UserAppDataPath(), Filename) + If File.Exists(xml) Then + DataLayoutControl1.SaveLayoutToXml(xml) + + End If + + Catch ex As Exception + LOGGER.Error(ex) + LOGGER.Info("Error while restoring layout 1: " & ex.Message) + End Try + + + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb index 87dc9d7..e4f478b 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb @@ -760,6 +760,7 @@ Partial Class frmAdministration Me.TableAdapterManager.Connection = Nothing Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBDD_EMAIL_TEMPLATETableAdapter = Nothing + Me.TableAdapterManager.TBDD_GUI_LANGUAGE_PHRASETableAdapter = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index c7fc528..7725ca3 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -264,6 +264,24 @@ 0 + + Left + + + 0, 0 + + + 194, 25 + + + 0 + + + Zugeordnete Benutzer: + + + MiddleLeft + Label20 @@ -414,6 +432,24 @@ 0 + + Left + + + 0, 0 + + + 194, 25 + + + 0 + + + Verfügbare Benutzer: + + + MiddleLeft + Label19 @@ -483,69 +519,6 @@ 0 - - 206, 17 - - - Left - - - 0, 0 - - - 194, 25 - - - 0 - - - Zugeordnete Benutzer: - - - MiddleLeft - - - Label20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 0 - - - Left - - - 0, 0 - - - 194, 25 - - - 0 - - - Verfügbare Benutzer: - - - MiddleLeft - - - Label19 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel2 - - - 0 - Fill @@ -609,6 +582,27 @@ 0 + + Left + + + NoControl + + + 0, 0 + + + 194, 25 + + + 0 + + + Zugeordnete Gruppen: + + + MiddleLeft + Label22 @@ -711,6 +705,27 @@ 0 + + Left + + + NoControl + + + 0, 0 + + + 194, 25 + + + 0 + + + Verfügbare Gruppen: + + + MiddleLeft + Label23 @@ -780,72 +795,6 @@ 0 - - Left - - - NoControl - - - 0, 0 - - - 194, 25 - - - 0 - - - Zugeordnete Gruppen: - - - MiddleLeft - - - Label22 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel3 - - - 0 - - - Left - - - NoControl - - - 0, 0 - - - 194, 25 - - - 0 - - - Verfügbare Gruppen: - - - MiddleLeft - - - Label23 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel4 - - - 0 - False @@ -1921,9 +1870,18 @@ 4 - - 174, 56 - + + Segoe UI, 9pt + + + 9, 21 + + + 862, 23 + + + 0 + MOVE2FOLDERTextBox @@ -1936,6 +1894,21 @@ 0 + + Segoe UI, 9.75pt, style=Bold + + + 877, 19 + + + 29, 23 + + + 72 + + + ... + btnmovetoFolderDialog @@ -1975,68 +1948,17 @@ 3 - - Segoe UI, 9pt - - - 9, 21 + + Tahoma, 9.75pt - - 862, 23 + + 693, 12 - - 0 + + 55, 23 - - MOVE2FOLDERTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox3 - - - 0 - - - Segoe UI, 9.75pt, style=Bold - - - 877, 19 - - - 29, 23 - - - 72 - - - ... - - - btnmovetoFolderDialog - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox3 - - - 1 - - - Tahoma, 9.75pt - - - 693, 12 - - - 55, 23 - - - 5 + + 5 PRIORITYNumericUpDown @@ -2566,740 +2488,164 @@ True - - TabControl2 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Top, Bottom, Left, Right - - TabPage6 + + 17, 251 + + + 677, 212 + + + Fill - - 0 + + 0, 0 - - 4, 25 + + Windream Index - - 3, 3, 3, 3 + + True - - 970, 473 + + 0 - - 1 + + Fester Wert - - Aktionen nach erfolgreicher Indexierung: + + True - - TabPage6 + + 2 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + SQL Befehl - - tabctrl_Profilkonfig + + True - + 1 - - 288, 98 - - - 978, 502 + + Doppelte Werte vermeiden - - 79 + + Neue Werte erlauben - - tabctrl_Profilkonfig + + Hinzugefügt Wer - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - TabPage1 + + 3 - - 0 + + Hinzugefügt Wann - - Left + + True - - 3, 3 + + 4 - - Profil-Name + + Geändert Wer - + True - - 0 + + 5 - - 129 + + Geändert Wann - - 276, 600 + + True - - 84 + + 6 - - GridControl1 + + 627, 302 - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 93 - - TabPage1 + + gridFinalIndex - - 7 + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - Tahoma, 9.75pt + + Panel5 - - 973, 68 + + 0 - - 238, 24 + + Right - - 78 + + False - - Neueste Dokumente zuerst anzeigen + + 627, 0 - - SORT_BY_LATESTCheckBox + + 323, 302 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 91 - - TabPage1 + + PropertyGrid1 - - 9 + + System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4, 25 + + Panel5 - - 3, 3, 3, 3 + + 1 - - 1272, 606 + + 3, 166 - - 0 + + 950, 302 - - Profil-Verwaltung + + 94 - - TabPage1 + + Panel5 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabControl1 + + TabPage11 - + 0 - - SplitContainerProfilzuordnung + + 1045, 173 + + + True - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 0 - - - 4, 25 - - - 3, 3, 3, 3 - - - 1272, 606 - - - 1 - - - Profilzuordnung - - - TabPage2 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 1 - - - btnSQLProfilehome - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 0 - - - btnUserManager - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 1 - - - Button2 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 2 - - - VEKTOR_DELIMITERTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 4 - - - btnConnections - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 5 - - - btnopen_SQLAdmin - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 6 - - - EMAIL_ACTIVECheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 7 - - - grpbxEmail - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 8 - - - btnlicensemanager_open - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 9 - - - INTERVALL_CKECK_NO_OF_FILESNumericUpDown - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 11 - - - Label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 12 - - - GEAENDERTWERTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 14 - - - GEAENDERTWANNTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 16 - - - btnSaveKonfig - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 17 - - - 4, 25 - - - 3, 3, 3, 3 - - - 1272, 606 - - - 2 - - - Grundeinstellungen - - - TabPage3 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 2 - - - Fill - - - 0, 0 - - - 1280, 635 - - - 3 - - - TabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlMain - - - 0 - - - TabPage11 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl2 - - - 0 - - - TabPage12 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl2 - - - 1 - - - Fill - - - 3, 3 - - - 964, 467 - - - 92 - - - TabControl2 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage6 - - - 0 - - - 1045, 173 - - - Panel5 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage11 - - - 0 - - - BindingNavigator1 - - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage11 - - - 1 - - - Label13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage11 - - - 2 - - - Label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage11 - - - 4 - - - Label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage11 - - - 5 - - - Tahoma, 9pt - - - 4, 25 - - - 3, 3, 3, 3 - - - 956, 438 - - - 0 - - - Move und finale Indexe - - - TabPage11 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl2 - - - 0 - - - Top, Bottom, Left, Right - - - gridFinalIndex - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel5 - - - 0 - - - PropertyGrid1 - - - System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel5 - - - 1 - - - 3, 166 - - - 950, 299 - - - 94 - - - Panel5 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage11 - - - 0 - - - 17, 251 - - - 677, 212 - - - Fill - - - 0, 0 - - - Windream Index - - - True - - - 0 - - - Fester Wert - - - True - - - 2 - - - SQL Befehl - - - True - - - 1 - - - Doppelte Werte vermeiden - - - Neue Werte erlauben - - - Hinzugefügt Wer - - - True - - - 3 - - - Hinzugefügt Wann - - - True - - - 4 - - - Geändert Wer - - - True - - - 5 - - - Geändert Wann - - - True - - - 6 - - - 627, 299 - - - 93 - - - gridFinalIndex - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel5 - - - 0 - - - 677, 212 - - - Right - - - False - - - 627, 0 - - - 323, 299 - - - 91 - - - PropertyGrid1 - - - System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel5 - - - 1 - - - 1045, 173 - - - True - - - 116, 24 + + 116, 24 Neu hinzufügen @@ -3563,101 +2909,56 @@ 583, 17 - - 75 - - - Diese Indexe werden nach erfolgreicher Indexierung automatisch bei dem indexierten Dokument gesetzt. - - - Label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage11 - - - 5 - - - True - - - ANNOTATE_WORK_HISTORY_ENTRYCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage12 - - - 0 - - - ANNOTATE_ALL_WORK_HISTORY_ENTRIESCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage12 - - - 1 - - - SQL_VIEWTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage12 + + 75 - - 3 + + Diese Indexe werden nach erfolgreicher Indexierung automatisch bei dem indexierten Dokument gesetzt. - - WORK_HISTORY_ENTRYTextBox + + Label6 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage12 + + TabPage11 - + 5 - + + Tahoma, 9pt + + 4, 25 - + 3, 3, 3, 3 - - 956, 441 + + 956, 438 - - 1 + + 0 - - Nachbearbeitungsfunktionen 2 + + Move und finale Indexe - - TabPage12 + + TabPage11 - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TabControl2 - - 1 + + 0 + + + True 291, 336 @@ -3755,6 +3056,195 @@ 5 + + 4, 25 + + + 3, 3, 3, 3 + + + 956, 441 + + + 1 + + + Nachbearbeitungsfunktionen 2 + + + TabPage12 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl2 + + + 1 + + + Fill + + + 3, 3 + + + 964, 467 + + + 92 + + + TabControl2 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 0 + + + 4, 25 + + + 3, 3, 3, 3 + + + 970, 473 + + + 1 + + + Aktionen nach erfolgreicher Indexierung: + + + TabPage6 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabctrl_Profilkonfig + + + 1 + + + 288, 98 + + + 978, 502 + + + 79 + + + tabctrl_Profilkonfig + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 0 + + + Left + + + 3, 3 + + + Profil-Name + + + True + + + 0 + + + 129 + + + 276, 600 + + + 84 + + + GridControl1 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TabPage1 + + + 7 + + + Tahoma, 9.75pt + + + 973, 68 + + + 238, 24 + + + 78 + + + Neueste Dokumente zuerst anzeigen + + + SORT_BY_LATESTCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 9 + + + 4, 25 + + + 3, 3, 3, 3 + + + 1272, 606 + + + 0 + + + Profil-Verwaltung + + + TabPage1 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 0 + Fill @@ -3842,15 +3332,30 @@ SplitContainerProfilzuordnung.Panel1 - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainerProfilzuordnung + + + 0 + + + 4, 25 + + + 3, 3, 3, 3 - - SplitContainerProfilzuordnung + + 907, 571 - + 0 + + Benutzer + TabPage7 @@ -3863,6 +3368,21 @@ 0 + + 4, 25 + + + 3, 3, 3, 3 + + + 907, 571 + + + 1 + + + Gruppen + TabPage8 @@ -3932,58 +3452,31 @@ 0 - - 4, 25 - - - 3, 3, 3, 3 - - - 907, 571 - - - 0 - - - Benutzer - - - TabPage7 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl3 - - - 0 - - + 4, 25 - + 3, 3, 3, 3 - - 907, 571 + + 1272, 606 - + 1 - - Gruppen + + Profilzuordnung - - TabPage8 + + TabPage2 - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabControl3 + + TabControl1 - + 1 @@ -4082,287 +3575,113 @@ 2 - - 234, 95 - - - 182, 61 - - - 45, 23 - - - 14 - - - VEKTOR_DELIMITERTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 4 - - - 234, 95 - - - MiddleLeft - - - 649, 64 - - - 172, 30 - - - 13 - - - Connections Verwaltung - - - MiddleRight - - - btnConnections - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 5 - - - MiddleLeft - - - 649, 104 - - - 172, 30 - - - 12 - - - SQL-Admin - - - MiddleRight - - - btnopen_SQLAdmin - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 6 - - - 463, 32 - - - 162, 24 - - - 11 - - - Email Meldungen Aktiv - - - EMAIL_ACTIVECheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 7 - - - GroupBox5 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxEmail - - - 0 - - - EMAIL_REMINDER_FOOTERTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxEmail - - - 2 - - - EMAIL_REMINDER_HEADERTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxEmail - - - 4 - - - EMAIL_PWTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxEmail - - - 6 - - - EMAIL_USERTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxEmail - - - 8 - - - EMAIL_SMTPTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 234, 95 + + + 182, 61 - - grpbxEmail + + 45, 23 - - 10 + + 14 - - EMAIL_FROMTextBox + + VEKTOR_DELIMITERTextBox - + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpbxEmail - - - 12 + + TabPage3 - - False + + 4 - - 21, 90 + + MiddleLeft - - 622, 324 + + 649, 64 - - 1 + + 172, 30 - - E-Mail Konfiguration + + 13 - - grpbxEmail + + Connections Verwaltung - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + MiddleRight - - TabPage3 + + btnConnections - - 8 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - txtemailEmpfaenger + + TabPage3 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 5 - - GroupBox5 + + MiddleLeft - - 0 + + 649, 104 - - Label8 + + 172, 30 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 12 - - GroupBox5 + + SQL-Admin - - 1 + + MiddleRight - - btnTest_Email + + btnopen_SQLAdmin - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - GroupBox5 + + TabPage3 - - 2 + + 6 - - 307, 23 + + 463, 32 - - 303, 87 + + 162, 24 - - 21 + + 11 - - Email testen + + Email Meldungen Aktiv - - GroupBox5 + + EMAIL_ACTIVECheckBox - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpbxEmail + + TabPage3 - - 0 + + 7 112, 19 @@ -4445,6 +3764,30 @@ 2 + + 307, 23 + + + 303, 87 + + + 21 + + + Email testen + + + GroupBox5 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 0 + 10, 258 @@ -4577,6 +3920,33 @@ 12 + + False + + + 21, 90 + + + 622, 324 + + + 1 + + + E-Mail Konfiguration + + + grpbxEmail + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 8 + MiddleLeft @@ -4727,6 +4097,57 @@ 17 + + 4, 25 + + + 3, 3, 3, 3 + + + 1272, 606 + + + 2 + + + Grundeinstellungen + + + TabPage3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 2 + + + Fill + + + 0, 0 + + + 1280, 635 + + + 3 + + + TabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlMain + + + 0 + 775, 134 @@ -4736,6 +4157,12 @@ 754, 95 + + 20, 20 + + + False + 0, 635 @@ -4760,12 +4187,6 @@ 1 - - 20, 20 - - - False - 17, 95 diff --git a/app/DD_PM_WINDREAM/frmDesignerLayout.Designer.vb b/app/DD_PM_WINDREAM/frmDesignerLayout.Designer.vb index b25308d..abe11dc 100644 --- a/app/DD_PM_WINDREAM/frmDesignerLayout.Designer.vb +++ b/app/DD_PM_WINDREAM/frmDesignerLayout.Designer.vb @@ -22,30 +22,59 @@ Partial Class frmDesignerLayout 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDesignerLayout)) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarListItem1 = New DevExpress.XtraBars.BarListItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.DataLayoutControl1 = New DevExpress.XtraDataLayout.DataLayoutControl() + Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() + Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() + Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() + Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() + Me.PropertyGridControl1 = New DevExpress.XtraVerticalGrid.PropertyGridControl() + Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() + Me.ToolboxControlMain = New DevExpress.XtraToolbox.ToolboxControl() + Me.ToolboxGroupMain = New DevExpress.XtraToolbox.ToolboxGroup() + Me.ToolboxItemTextbox = New DevExpress.XtraToolbox.ToolboxItem() + Me.ToolboxItemMemoedit = New DevExpress.XtraToolbox.ToolboxItem() + Me.ToolboxItemDatepicker = New DevExpress.XtraToolbox.ToolboxItem() + Me.ToolboxItemCheckbox = New DevExpress.XtraToolbox.ToolboxItem() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.DataLayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.SuspendLayout() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabControl1.SuspendLayout() + Me.XtraTabPage1.SuspendLayout() + CType(Me.PropertyGridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabPage2.SuspendLayout() Me.SuspendLayout() ' 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarListItem1, Me.BarButtonItem1}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 1 + Me.RibbonControl1.MaxItemId = 3 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.Size = New System.Drawing.Size(1196, 158) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' + 'BarListItem1 + ' + Me.BarListItem1.Caption = "Layout auswählen" + Me.BarListItem1.Id = 1 + Me.BarListItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarListItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarListItem1.Name = "BarListItem1" + Me.BarListItem1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) @@ -54,11 +83,13 @@ Partial Class frmDesignerLayout ' 'RibbonPageGroup1 ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarListItem1) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "RibbonPageGroup1" ' 'RibbonPageGroup2 ' + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "RibbonPageGroup2" ' @@ -74,30 +105,136 @@ Partial Class frmDesignerLayout Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2" ' - 'DataLayoutControl1 + 'SplitContainerControl1 + ' + Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 158) + Me.SplitContainerControl1.Name = "SplitContainerControl1" + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LayoutControl1) + Me.SplitContainerControl1.Panel1.Text = "Panel1" + Me.SplitContainerControl1.Panel2.Controls.Add(Me.XtraTabControl1) + Me.SplitContainerControl1.Panel2.Text = "Panel2" + Me.SplitContainerControl1.Size = New System.Drawing.Size(1196, 440) + Me.SplitContainerControl1.SplitterPosition = 818 + Me.SplitContainerControl1.TabIndex = 8 + ' + 'LayoutControl1 ' - Me.DataLayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.DataLayoutControl1.Location = New System.Drawing.Point(0, 158) - Me.DataLayoutControl1.Name = "DataLayoutControl1" - Me.DataLayoutControl1.Root = Me.Root - Me.DataLayoutControl1.Size = New System.Drawing.Size(1196, 440) - Me.DataLayoutControl1.TabIndex = 2 - Me.DataLayoutControl1.Text = "DataLayoutControl1" + Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControl1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControl1.Name = "LayoutControl1" + Me.LayoutControl1.Root = Me.Root + Me.LayoutControl1.Size = New System.Drawing.Size(818, 440) + Me.LayoutControl1.TabIndex = 0 + Me.LayoutControl1.Text = "LayoutControl1" ' 'Root ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.GroupBordersVisible = False Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(1196, 440) + Me.Root.Size = New System.Drawing.Size(818, 440) Me.Root.TextVisible = False ' + 'XtraTabControl1 + ' + Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) + Me.XtraTabControl1.Name = "XtraTabControl1" + Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 + Me.XtraTabControl1.Size = New System.Drawing.Size(368, 440) + Me.XtraTabControl1.TabIndex = 0 + Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) + ' + 'XtraTabPage1 + ' + Me.XtraTabPage1.Controls.Add(Me.PropertyGridControl1) + Me.XtraTabPage1.Name = "XtraTabPage1" + Me.XtraTabPage1.Size = New System.Drawing.Size(366, 415) + Me.XtraTabPage1.Text = "XtraTabPage1" + ' + 'PropertyGridControl1 + ' + Me.PropertyGridControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.PropertyGridControl1.Location = New System.Drawing.Point(0, 0) + Me.PropertyGridControl1.MenuManager = Me.RibbonControl1 + Me.PropertyGridControl1.Name = "PropertyGridControl1" + Me.PropertyGridControl1.Size = New System.Drawing.Size(366, 415) + Me.PropertyGridControl1.TabIndex = 0 + ' + 'XtraTabPage2 + ' + Me.XtraTabPage2.Controls.Add(Me.ToolboxControlMain) + Me.XtraTabPage2.Name = "XtraTabPage2" + Me.XtraTabPage2.Size = New System.Drawing.Size(366, 415) + Me.XtraTabPage2.Text = "XtraTabPage2" + ' + 'ToolboxControlMain + ' + Me.ToolboxControlMain.Caption = "Form Controls" + Me.ToolboxControlMain.Dock = System.Windows.Forms.DockStyle.Fill + Me.ToolboxControlMain.Groups.Add(Me.ToolboxGroupMain) + Me.ToolboxControlMain.Location = New System.Drawing.Point(0, 0) + Me.ToolboxControlMain.Name = "ToolboxControlMain" + Me.ToolboxControlMain.OptionsMinimizing.AllowMinimizing = False + Me.ToolboxControlMain.OptionsView.ShowMenuButton = False + Me.ToolboxControlMain.OptionsView.ShowSearchPanel = False + Me.ToolboxControlMain.OptionsView.ShowToolboxCaption = True + Me.ToolboxControlMain.SelectedGroup = Me.ToolboxGroupMain + Me.ToolboxControlMain.SelectedGroupIndex = 0 + Me.ToolboxControlMain.Size = New System.Drawing.Size(366, 415) + Me.ToolboxControlMain.TabIndex = 5 + Me.ToolboxControlMain.Text = "Form Controls" + ' + 'ToolboxGroupMain + ' + Me.ToolboxGroupMain.Caption = "Basis Controls" + Me.ToolboxGroupMain.Items.Add(Me.ToolboxItemTextbox) + Me.ToolboxGroupMain.Items.Add(Me.ToolboxItemMemoedit) + Me.ToolboxGroupMain.Items.Add(Me.ToolboxItemDatepicker) + Me.ToolboxGroupMain.Items.Add(Me.ToolboxItemCheckbox) + Me.ToolboxGroupMain.Name = "ToolboxGroupMain" + ' + 'ToolboxItemTextbox + ' + Me.ToolboxItemTextbox.Caption = "Textbox" + Me.ToolboxItemTextbox.ImageOptions.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.TextBox + Me.ToolboxItemTextbox.Name = "ToolboxItemTextbox" + Me.ToolboxItemTextbox.Tag = "Textbox" + ' + 'ToolboxItemMemoedit + ' + Me.ToolboxItemMemoedit.Caption = "Multiline Textbox" + Me.ToolboxItemMemoedit.ImageOptions.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.TextBox + Me.ToolboxItemMemoedit.Name = "ToolboxItemMemoedit" + Me.ToolboxItemMemoedit.Tag = "Memoedit" + ' + 'ToolboxItemDatepicker + ' + Me.ToolboxItemDatepicker.Caption = "Datepicker" + Me.ToolboxItemDatepicker.ImageOptions.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.DateOrTimePicker_675 + Me.ToolboxItemDatepicker.Name = "ToolboxItemDatepicker" + Me.ToolboxItemDatepicker.Tag = "Datepicker" + ' + 'ToolboxItemCheckbox + ' + Me.ToolboxItemCheckbox.Caption = "Checkbox" + Me.ToolboxItemCheckbox.ImageOptions.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.checkbox_16xLG + Me.ToolboxItemCheckbox.Name = "ToolboxItemCheckbox" + Me.ToolboxItemCheckbox.Tag = "Checkbox" + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "BarButtonItem1" + Me.BarButtonItem1.Id = 2 + Me.BarButtonItem1.Name = "BarButtonItem1" + ' 'frmDesignerLayout ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1196, 622) - Me.Controls.Add(Me.DataLayoutControl1) + Me.Controls.Add(Me.SplitContainerControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.Name = "frmDesignerLayout" @@ -105,8 +242,15 @@ Partial Class frmDesignerLayout Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "frmDesignerLayout" CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DataLayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.ResumeLayout(False) + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabControl1.ResumeLayout(False) + Me.XtraTabPage1.ResumeLayout(False) + CType(Me.PropertyGridControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabPage2.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -118,6 +262,19 @@ Partial Class frmDesignerLayout Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents DataLayoutControl1 As DevExpress.XtraDataLayout.DataLayoutControl + Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl + Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl + Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage + Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage + Friend WithEvents ToolboxControlMain As DevExpress.XtraToolbox.ToolboxControl + Friend WithEvents ToolboxGroupMain As DevExpress.XtraToolbox.ToolboxGroup + Friend WithEvents ToolboxItemTextbox As DevExpress.XtraToolbox.ToolboxItem + Friend WithEvents ToolboxItemMemoedit As DevExpress.XtraToolbox.ToolboxItem + Friend WithEvents ToolboxItemDatepicker As DevExpress.XtraToolbox.ToolboxItem + Friend WithEvents ToolboxItemCheckbox As DevExpress.XtraToolbox.ToolboxItem + Friend WithEvents BarListItem1 As DevExpress.XtraBars.BarListItem + Friend WithEvents PropertyGridControl1 As DevExpress.XtraVerticalGrid.PropertyGridControl + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/app/DD_PM_WINDREAM/frmDesignerLayout.resx b/app/DD_PM_WINDREAM/frmDesignerLayout.resx index 1af7de1..a5fb450 100644 --- a/app/DD_PM_WINDREAM/frmDesignerLayout.resx +++ b/app/DD_PM_WINDREAM/frmDesignerLayout.resx @@ -117,4 +117,26 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAADQDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iUmVwZWF0X0FsbF9JdGVtX0xhYmVsc19QaXZvdF9UYWJsZSIgc3R5bGU9 + ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3Mi + PgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLnN0MHtvcGFjaXR5 + OjAuNzU7fQo8L3N0eWxlPg0KICA8cGF0aCBkPSJNMjcsMkg1QzQuNCwyLDQsMi40LDQsM3YyNmMwLDAu + NiwwLjQsMSwxLDFoMjJjMC42LDAsMS0wLjQsMS0xVjNDMjgsMi40LDI3LjYsMiwyNywyeiBNMjYsMjhI + NlY0aDIwVjI4eiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8ZyBjbGFzcz0ic3QwIj4NCiAgICA8cGF0aCBk + PSJNMTgsMTBoLTRWOGg0VjEweiBNMjQsOGgtNHYyaDRWOHogTTI0LDEyaC00djJoNFYxMnogTTE4LDEy + aC00djJoNFYxMnogTTE4LDE2aC00djJoNFYxNnogTTI0LDE2aC00djJoNFYxNiAgIHogTTI0LDIwaC00 + djJoNFYyMHogTTE4LDIwaC00djJoNFYyMHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPC9nPg0KICA8cGF0 + aCBkPSJNMTIsMTBIOFY4aDRWMTB6IE0xMiwxMkg4djJoNFYxMnogTTEyLDE2SDh2Mmg0VjE2eiBNMTIs + MjBIOHYyaDRWMjB6IiBjbGFzcz0iQmx1ZSIgLz4NCjwvc3ZnPgs= + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmDesignerLayout.vb b/app/DD_PM_WINDREAM/frmDesignerLayout.vb index 8e5608b..77677b0 100644 --- a/app/DD_PM_WINDREAM/frmDesignerLayout.vb +++ b/app/DD_PM_WINDREAM/frmDesignerLayout.vb @@ -1,3 +1,26 @@ Public Class frmDesignerLayout + Dim DT_Foms As DataTable + Private Sub frmDesignerLayout_Load(sender As Object, e As EventArgs) Handles Me.Load + Try + Dim oSQL = "Select * from TBIDB_LAYOUT_CONFIG" + DT_Foms = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB) + If Not IsNothing(DT_Foms) Then + For Each oRow As DataRow In DT_Foms.Rows + BarListItem1.Strings.Add(oRow.Item("TITLE")) + Next + End If + Catch ex As Exception + MsgBox("Unexpected Error in FormLoad:" & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + + Private Sub BarListItem1_ListItemClick(sender As Object, e As DevExpress.XtraBars.ListItemClickEventArgs) Handles BarListItem1.ListItemClick + Dim barlistItem = e.Item + ' Dim oSelectedText = e.Item.str + End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + LayoutControl1.sa + 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 b451074..261cd5c 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -414,10 +414,10 @@ Public Class frmValidator For Each row As DataRow In dt.Rows Dim name As String = row.Item("NAME") Dim oGUID As String = row.Item("GUID") - If clsPatterns.HasComplexPatterns(row.Item("SQL_UEBERPRUEFUNG")) Then - LOGGER.Debug($"SQL has complex patterns - GUID: {oGUID}") - Continue For - End If + 'If clsPatterns.HasComplexPatterns(row.Item("SQL_UEBERPRUEFUNG")) Then + ' LOGGER.Debug($"SQL [{row.Item("SQL_UEBERPRUEFUNG")}] has complex patterns - GUID: {oGUID}") + ' Continue For + 'End If If IsDBNull(row.Item("CONNECTION_ID")) Then LOGGER.Info($"No CONNECTION_ID for SQL-Data - oGUID: {oGUID}") Continue For @@ -427,16 +427,137 @@ Public Class frmValidator Dim sqlStatement As String = row.Item("SQL_UEBERPRUEFUNG") Dim connectionId As Integer = row.Item("CONNECTION_ID") + 'If clsPatterns.HasComplexPatterns(sqlStatement) Then + ' Continue For + 'End If + If IsNothing(sqlStatement) Then + Continue For + End If + 'oSql = clsPatterns.ReplaceUserValues(sqlStatement, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + 'oSql = clsPatterns.ReplaceInternalValues(oSql) + sqlStatement = clsPatterns.ReplaceAllValues(sqlStatement, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + If IsNothing(sqlStatement) Then + Continue For + End If If clsPatterns.HasComplexPatterns(sqlStatement) Then + LOGGER.Warn($"Unexpected error LoadSQLData2 - sql Statement still has complex patterns! [{oSql}]") Continue For End If - - oSql = clsPatterns.ReplaceUserValues(sqlStatement, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) - oSql = clsPatterns.ReplaceInternalValues(oSql) - LOGGER.Debug(">>> sql after ReplaceInternalValues: " & oSql) 'sql = ClassPatterns.ReplaceInternalValues(sqlStatement) dt = ClassDatabase.Return_Datatable_ConId(oSql, connectionId) + If IsNothing(dt) Then + LOGGER.Warn($"SQL-Query [{oSql}] for control {control.Name} is invalid.") + Exit Sub + End If + Dim oValue + + If TypeOf control Is TextBox Then + Try + Dim firstRow As DataRow = dt.Rows(0) + + Dim value = firstRow.Item(0) + + control.Text = value + oValue = value + Catch ex As Exception + LOGGER.Error(ex) + clsLogger.Add("Error in LoadSimpleData for TextBox: " & ex.Message) + End Try + ElseIf TypeOf control Is ComboBox Then + Try + Dim oMyComboBox As ComboBox = control + Dim oselectedIndex = oMyComboBox.SelectedIndex + LOGGER.Debug($"oMyComboBox {oMyComboBox.Name} - Saving selected index {oselectedIndex}") + Dim list As New List(Of String) + + For Each _row As DataRow In dt.Rows + list.Add(_row.Item(0)) + Next + + oMyComboBox.DataSource = list + oMyComboBox.SelectedIndex = oselectedIndex + + Catch ex As Exception + LOGGER.Error(ex) + clsLogger.Add("Error in LoadSimpleData for Combobox: " & ex.Message) + End Try + ElseIf TypeOf control Is LookupControl2 Then + Try + Dim lookup As LookupControl2 = control + + lookup.DataSource = dt + Catch ex As Exception + LOGGER.Error(ex) + clsLogger.Add("Error in LoadSimpleData for LookupControl2: " & ex.Message) + End Try + ElseIf TypeOf control Is GridControl Then + Try + Dim dataGridView As GridControl = control + Dim oDataSource As DataTable = dataGridView.DataSource + + If oDataSource Is Nothing OrElse oDataSource.Rows.Count = 0 Then + 'dataGridView.DataSource = dt + + Dim oDatatable As DataTable = dt.Clone() + + For Each oColumn As DataColumn In oDatatable.Columns + If oDataSource.Columns(oColumn.ColumnName) Is Nothing Then + 'oDataSource.Columns.Add(oColumn) + oDataSource.Columns.Add(oColumn.ColumnName, oColumn.DataType) + End If + Next + + For Each oRow As DataRow In dt.Rows + oDataSource.ImportRow(oRow) + Next + + dataGridView.DataSource = oDataSource + End If + Catch ex As Exception + LOGGER.Error(ex) + clsLogger.Add("Error in LoadSimpleData for DataGridView: " & ex.Message) + End Try + End If + Next + Catch ex As Exception + LOGGER.Error(ex) + MsgBox("Error in LoadSQLData: " & ex.Message, MsgBoxStyle.Critical) + clsLogger.Add("Error in LoadSQLData: " & ex.Message) + End Try + End Sub + Sub LoadSQLData2(control As Control, controlId As Integer) + Try + If TypeOf control Is Label Then Exit Sub + + Dim oSql As String = $"SELECT GUID,NAME, CONNECTION_ID, SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE GUID = {controlId} AND PROFIL_ID = {CURRENT_ProfilGUID} AND LEN(ISNULL(SQL_UEBERPRUEFUNG,'')) > 0 AND CTRL_TYPE <> 'BUTTON'" + ' And SQL_UEBERPRUEFUNG Not Like '%#WMI#%' AND SQL_UEBERPRUEFUNG NOT LIKE '%#CTRL#%' + Dim dt As DataTable = ClassDatabase.Return_Datatable(oSql) + + + If IsNothing(dt) Then Exit Sub + If dt.Rows.Count = 0 Then Exit Sub + + For Each row As DataRow In dt.Rows + Dim oControlName As String = row.Item("NAME") + Dim oControlID As String = row.Item("GUID") + If IsDBNull(row.Item("CONNECTION_ID")) Then + LOGGER.Info($"No CONNECTION_ID for SQL-Data - oGUID: {oControlID}") + Continue For + End If + If IsDBNull(row.Item("SQL_UEBERPRUEFUNG")) Then Continue For + + Dim oSqlStatement As String = row.Item("SQL_UEBERPRUEFUNG") + Dim oConnectionId As Integer = row.Item("CONNECTION_ID") + oSql = clsPatterns.ReplaceAllValues(oSqlStatement, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + + If clsPatterns.HasComplexPatterns(oSqlStatement) Then + LOGGER.Warn($"Unexpected error LoadSQLData2 - sql Statement still has complex patterns! [{oSql}]") + Continue For + End If + 'sql = ClassPatterns.ReplaceInternalValues(sqlStatement) + dt = ClassDatabase.Return_Datatable_ConId(oSql, oConnectionId) + If IsNothing(dt) Then MsgBox($"SQL-Query for control {control.Name} is invalid.") Exit Sub @@ -513,8 +634,8 @@ Public Class frmValidator Next Catch ex As Exception LOGGER.Error(ex) - MsgBox("Error in LoadSimpleData: " & ex.Message, MsgBoxStyle.Critical) - clsLogger.Add("Error in LoadSimpleData: " & ex.Message) + MsgBox("Error in LoadSQLData2: " & ex.Message, MsgBoxStyle.Critical) + clsLogger.Add("Error in LoadSQLData2: " & ex.Message) End Try End Sub Private Function PreventNulletc(myObject As Object)