V 2.4.9.4 WISAG Buttons, Reject-Attribute als Ausnahme in CheckUpdateIndexe, FilterActive Hinweis, Logging anpassen
This commit is contained in:
Digital Data - Marlon Schreiber
@@ -36,10 +36,8 @@ Public Class ClassFormat
|
||||
''' <param name="pType"></param>
|
||||
''' <returns></returns>
|
||||
Public Shared Function GetConvertedValue(pValue As Object, pType As String) As Object
|
||||
Dim oConvertedValue = pValue
|
||||
Dim oCultureInfo As CultureInfo
|
||||
|
||||
|
||||
Dim oConvertedValue
|
||||
LOGGER.Debug($"GetConvertedValue: {pType}")
|
||||
|
||||
Select Case pType
|
||||
Case ClassControlCreator.CONTROL_TYPE_DOUBLE
|
||||
@@ -48,14 +46,29 @@ Public Class ClassFormat
|
||||
End If
|
||||
|
||||
Case ClassControlCreator.CONTROL_TYPE_CURRENCY
|
||||
If Double.TryParse(pValue, NumberStyles.Currency, CultureInfo.InvariantCulture, oConvertedValue) Then
|
||||
Return oConvertedValue
|
||||
End If
|
||||
Try
|
||||
LOGGER.Debug($"GetConvertedValue: Converting {pValue.ToString} to Currency ")
|
||||
If Double.TryParse(pValue, NumberStyles.Currency, CultureInfo.InvariantCulture, oConvertedValue) Then
|
||||
Return oConvertedValue
|
||||
End If
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
End Try
|
||||
|
||||
|
||||
Case ClassControlCreator.CONTROL_TYPE_INTEGER
|
||||
If Integer.TryParse(pValue, NumberStyles.Integer, CultureInfo.InvariantCulture, oConvertedValue) Then
|
||||
Return oConvertedValue
|
||||
End If
|
||||
Case Else
|
||||
LOGGER.Debug($"GetConvertedValue - Case ELSE - pType is {pType}")
|
||||
Try
|
||||
oConvertedValue = pValue.ToString
|
||||
Catch ex As Exception
|
||||
LOGGER.Warn($"Error in GetConvertedValue: pType is {pType} - converting value to String")
|
||||
oConvertedValue = ""
|
||||
End Try
|
||||
|
||||
End Select
|
||||
|
||||
Return oConvertedValue
|
||||
|
||||
@@ -233,6 +233,7 @@
|
||||
Dim oSuccess As Boolean = False
|
||||
|
||||
Dim oPRSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValueRow.Item(1).ToString}','{USER_LANGUAGE}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT"
|
||||
LOGGER.Debug(oPRSQL)
|
||||
oSuccess = DatabaseFallback.ExecuteNonQueryIDB(oPRSQL)
|
||||
If oSuccess = False Then
|
||||
Return False
|
||||
@@ -241,6 +242,7 @@
|
||||
Return True
|
||||
Else
|
||||
Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValue}','{USER_LANGUAGE}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT"
|
||||
LOGGER.Debug(oFNSQL)
|
||||
Return DatabaseFallback.ExecuteNonQueryIDB(oFNSQL)
|
||||
End If
|
||||
|
||||
|
||||
@@ -109,6 +109,19 @@ Public Class ClassInit
|
||||
DEBUG = True
|
||||
LOGCONFIG.Debug = True
|
||||
End If
|
||||
|
||||
USER_CONFIG_DIRECTORY = CONFIG.UserConfigPath.Replace("UserConfig.xml", "")
|
||||
If USER_LANGUAGE <> String.Empty Then
|
||||
USER_CONFIG_DIRECTORY = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, USER_LANGUAGE)
|
||||
End If
|
||||
Try
|
||||
If Not System.IO.Directory.Exists(USER_CONFIG_DIRECTORY) Then
|
||||
System.IO.Directory.CreateDirectory(USER_CONFIG_DIRECTORY)
|
||||
End If
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
End Try
|
||||
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
End Try
|
||||
|
||||
@@ -71,6 +71,7 @@ Module ModuleRuntimeVariables
|
||||
Public Property USER_RIGHT3 As Boolean = False
|
||||
Public Property USER_RIGHT4 As Boolean = False
|
||||
Public Property USER_CONFIG_DEBUG As Boolean = False
|
||||
Public Property USER_CONFIG_DIRECTORY As String = ""
|
||||
|
||||
Public Property USER_GHOST_MODE_ACTIVE As Boolean = False
|
||||
Public Property USER_GHOST_MODE_USRNAME As String = ""
|
||||
|
||||
@@ -9,12 +9,12 @@ Imports System.Runtime.InteropServices
|
||||
|
||||
' Die Werte der Assemblyattribute überprüfen
|
||||
|
||||
<Assembly: AssemblyTitle("TaskFlow")>
|
||||
<Assembly: AssemblyTitle("taskFlow")>
|
||||
<Assembly: AssemblyDescription("")>
|
||||
<Assembly: AssemblyCompany("Digital Data")>
|
||||
<Assembly: AssemblyProduct("TaskFlow")>
|
||||
<Assembly: AssemblyProduct("taskFlow")>
|
||||
<Assembly: AssemblyCopyright("Copyright © Digital Data 2024")>
|
||||
<Assembly: AssemblyTrademark("2.4.6.9")>
|
||||
<Assembly: AssemblyTrademark("2.4.9.4")>
|
||||
|
||||
<Assembly: ComVisible(False)>
|
||||
|
||||
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.4.9.0")>
|
||||
<Assembly: AssemblyVersion("2.4.9.4")>
|
||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||
<Assembly: NeutralResourcesLanguage("")>
|
||||
|
||||
@@ -23,12 +23,12 @@ Public Class frmAdmin2
|
||||
oSave = True
|
||||
Try
|
||||
Dim oFilename As String = String.Format("DevExLayoutAdmin2_Email.xml")
|
||||
Dim oXml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), oFilename)
|
||||
Dim oXml As String = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, oFilename)
|
||||
If File.Exists(oXml) Then
|
||||
DataLayoutControl1.RestoreLayoutFromXml(oXml)
|
||||
End If
|
||||
oFilename = String.Format("DevExLayoutAdmin2_GUIPhrases.xml")
|
||||
oXml = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), oFilename)
|
||||
oXml = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, oFilename)
|
||||
If File.Exists(oXml) Then
|
||||
DataLayoutControl2.RestoreLayoutFromXml(oXml)
|
||||
End If
|
||||
@@ -264,12 +264,12 @@ Public Class frmAdmin2
|
||||
End If
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExLayoutAdmin2_Email.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
'If File.Exists(xml) Then
|
||||
DataLayoutControl1.SaveLayoutToXml(xml)
|
||||
'End If
|
||||
Filename = String.Format("DevExLayoutAdmin2_GUIPhrases.xml")
|
||||
xml = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
xml = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
DataLayoutControl2.SaveLayoutToXml(xml)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@@ -284,7 +284,7 @@ Public Class frmAdmin2
|
||||
Private Sub BarButtonItem8_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem8.ItemClick
|
||||
Try
|
||||
Dim oFilename = String.Format("DevExLayoutAdmin2_GUIPhrases.xml")
|
||||
Dim oXml = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), oFilename)
|
||||
Dim oXml = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, oFilename)
|
||||
File.Delete(oXml)
|
||||
MsgBox("Form will now close to reload all controls!", MsgBoxStyle.Information)
|
||||
Me.Close()
|
||||
@@ -299,7 +299,7 @@ Public Class frmAdmin2
|
||||
Private Sub BarButtonItem9_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem9.ItemClick
|
||||
Try
|
||||
Dim oFilename = String.Format("DevExLayoutAdmin2_Email.xml")
|
||||
Dim oXml = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), oFilename)
|
||||
Dim oXml = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, oFilename)
|
||||
File.Delete(oXml)
|
||||
MsgBox("Form will now close to reload all controls!", MsgBoxStyle.Information)
|
||||
Me.Close()
|
||||
|
||||
@@ -177,7 +177,7 @@ Public Class frmKonfig
|
||||
End Sub
|
||||
|
||||
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
|
||||
Process.Start(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""))
|
||||
Process.Start(USER_CONFIG_DIRECTORY)
|
||||
End Sub
|
||||
|
||||
Private Sub btnopenlog_Click(sender As Object, e As EventArgs) Handles btnopenlog.Click
|
||||
@@ -214,7 +214,7 @@ Public Class frmKonfig
|
||||
End Sub
|
||||
|
||||
Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
|
||||
Dim di As New IO.DirectoryInfo(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""))
|
||||
Dim di As New IO.DirectoryInfo(USER_CONFIG_DIRECTORY)
|
||||
Dim diar1 As IO.FileInfo() = di.GetFiles()
|
||||
Dim dra As IO.FileInfo
|
||||
|
||||
|
||||
13
app/TaskFlow/frmMain.Designer.vb
generated
13
app/TaskFlow/frmMain.Designer.vb
generated
@@ -74,7 +74,6 @@ Partial Class frmMain
|
||||
Me.barItemGridFontSize = New DevExpress.XtraBars.BarEditItem()
|
||||
Me.cmbGridFontSize = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox()
|
||||
Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.bsiRowCount = New DevExpress.XtraBars.BarStaticItem()
|
||||
Me.BbtnitmAHWF1 = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.BbtnitmAHWF2 = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.BbtnitmAHWF3 = New DevExpress.XtraBars.BarButtonItem()
|
||||
@@ -289,7 +288,7 @@ Partial Class frmMain
|
||||
'RibbonControl1
|
||||
'
|
||||
Me.RibbonControl1.ExpandCollapseItem.Id = 0
|
||||
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItemResetLayout, Me.BarButtonItem4, Me.BarButtonItemExportExcel, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch, Me.barItemGridFontSize, Me.BarButtonItem8, Me.bsiRowCount, Me.BbtnitmAHWF1, Me.BbtnitmAHWF2, Me.BbtnitmAHWF3, Me.BbtnitmAHWF4, Me.bbtnitmLanguage, Me.BarButtonItem10, Me.BBtnItmNotfications, Me.BSIVERSION1})
|
||||
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItemResetLayout, Me.BarButtonItem4, Me.BarButtonItemExportExcel, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch, Me.barItemGridFontSize, Me.BarButtonItem8, Me.BbtnitmAHWF1, Me.BbtnitmAHWF2, Me.BbtnitmAHWF3, Me.BbtnitmAHWF4, Me.bbtnitmLanguage, Me.BarButtonItem10, Me.BBtnItmNotfications, Me.BSIVERSION1})
|
||||
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
|
||||
Me.RibbonControl1.MaxItemId = 55
|
||||
Me.RibbonControl1.Name = "RibbonControl1"
|
||||
@@ -636,14 +635,6 @@ Partial Class frmMain
|
||||
Me.BarButtonItem8.Id = 42
|
||||
Me.BarButtonItem8.Name = "BarButtonItem8"
|
||||
'
|
||||
'bsiRowCount
|
||||
'
|
||||
Me.bsiRowCount.Id = 43
|
||||
Me.bsiRowCount.ImageOptions.Image = CType(resources.GetObject("bsiRowCount.ImageOptions.Image"), System.Drawing.Image)
|
||||
Me.bsiRowCount.ImageOptions.LargeImage = CType(resources.GetObject("bsiRowCount.ImageOptions.LargeImage"), System.Drawing.Image)
|
||||
Me.bsiRowCount.Name = "bsiRowCount"
|
||||
Me.bsiRowCount.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
|
||||
'
|
||||
'BbtnitmAHWF1
|
||||
'
|
||||
resources.ApplyResources(Me.BbtnitmAHWF1, "BbtnitmAHWF1")
|
||||
@@ -846,7 +837,6 @@ Partial Class frmMain
|
||||
Me.RibbonStatusBar1.ItemLinks.Add(Me.BSIVERSION1)
|
||||
Me.RibbonStatusBar1.ItemLinks.Add(Me.bsilastsync)
|
||||
Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiDebug)
|
||||
Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiRowCount)
|
||||
resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
|
||||
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
|
||||
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
|
||||
@@ -1772,7 +1762,6 @@ Partial Class frmMain
|
||||
Friend WithEvents barItemGridFontSize As DevExpress.XtraBars.BarEditItem
|
||||
Friend WithEvents cmbGridFontSize As DevExpress.XtraEditors.Repository.RepositoryItemComboBox
|
||||
Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem
|
||||
Friend WithEvents bsiRowCount As DevExpress.XtraBars.BarStaticItem
|
||||
Friend WithEvents BbtnitmAHWF1 As DevExpress.XtraBars.BarButtonItem
|
||||
Friend WithEvents BbtnitmAHWF2 As DevExpress.XtraBars.BarButtonItem
|
||||
Friend WithEvents BbtnitmAHWF3 As DevExpress.XtraBars.BarButtonItem
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -125,7 +125,7 @@
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAAaABCgGgAQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAAdABCgHQAQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||
@@ -1174,42 +1174,6 @@
|
||||
<data name="BarButtonItem8.Caption" xml:space="preserve">
|
||||
<value>BarButtonItem8</value>
|
||||
</data>
|
||||
<data name="bsiRowCount.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABJ0RVh0VGl0
|
||||
bGUATGlzdDtOdW1iZXI7HTbsSAAAAiRJREFUOE+NkctPE1EUxs9ejYgghEeJtrVPhkpbqPVBeRVKhfII
|
||||
CxJ3JsaFiTH+FbKwkY1GFyxkg6YxcelGaRNF/Qt0wR/Qpi3TNn23x/tdnUlHYsIk38yduef8vu/cIWYm
|
||||
XO12+1Oz2fzcarWe49tpJW9oOj46+pIYMXGj0QDkGZ71ev2EqtWqfKJGBwjnnY8L4eN3pmHGJpKs3n3C
|
||||
ys0NVm6ssxJc49Hrq0IxdgdibPXMSyNDgkqlcvB2aIjhIN6fam4Q9jql1egAXGjYHxiUCfC+vPWYhCsJ
|
||||
R3IFVsg1uUyuiTvk9EfpsvO27DmRoFQqHYhoCWxGtx79aZxYIeffRqd/iRzeJRqxB40AuO719fOH0LSK
|
||||
eAIS14CdKhaLUuVyGUZxHYADyeVyyTe9fazNGNl8yA5/lB2+CDu8EbZ7F9k2vsC2a2EeNPtknQ5Aw/tb
|
||||
ITWTyaSQRgC34VIoFJKdUlVVCilQowNQvNvdy7vdPZKM+cIbD8g2vkjCkWyeebo6NidlVWap3zRmPINa
|
||||
rZaAO4S1BKzdF82i0YPGWdloVWbIMjpNl4bdRgASvD5/kfcngyrWYow4IuNcOpXNZlMQxkCNDsDcvw6/
|
||||
fX917gLn8/kkIHOxe2xRZlg4ssUdYrPQFfcUm11T3DNgZ5yDAfDz6+GPl2e7JECMsQ0XuGmjaUqn0ymk
|
||||
QY0OwD9+caaL93yBgkY+reRNJNiBI+bG+t+i/4vpNwwtpR/kM20BAAAAAElFTkSuQmCC
|
||||
</value>
|
||||
</data>
|
||||
<data name="bsiRowCount.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABJ0RVh0VGl0
|
||||
bGUATGlzdDtOdW1iZXI7HTbsSAAAA4hJREFUWEfFldlPU0EUxll81xA2Zafs1BZEBEopZXFBZXGJuK9/
|
||||
iVETAyoYgybG+GBCNER9EQMBkhbwVRZfNBGVFxOWAGEJezjON/fO5dIOLYVYTvLLnZk755zvzpyZG0BE
|
||||
u4p00J9IB/2JdNCfyAZNDIcg4D+ZmksqwPG329n3zmRkTTcBgSpBOwD+Wj59YoGjOSON3qSlsqYmIHBl
|
||||
ZaVheXnZubCw0D0/Py9lbm7OI/BlMRoQT+RzTQ740r9KTGQP3jbBAcnLqu9QWdVtTqmgUqGEc4vslTdV
|
||||
bpD9lELxyeucbOtpggivAoa7uvqaomPpT2dnH/pwWFxcdOYW11BqVgmlmksohZFstrOnnT+TzcWUBEw2
|
||||
juEgKFrHCKxCQJDI55ocOJ5GRFFD+H56EhrJuoqApaWlOohwXerZ2dlNmZmZ6RGgD1/E8boCrjAH2E6L
|
||||
T+C1CDegN9l7XxGm9fUvVfhXr62tcVgbRchNN2fbCNP6+pcqjhazkd4aM2m4s7N/dXXVqfpstgXBPoD5
|
||||
3u8BduadP9vaBl4bDITjByecXxQRCmp6enpTpqampOAdipYVciPiiXyuyQOw7EPt7QMv4xPo+6fWQYhh
|
||||
DkFIbqu4RraKq1RUcYWKTihYj1/WcYmsxy6S9SiopcLyWrKUXyBLGThPxtxyggjEE/ncBOCLm6JiqOvu
|
||||
vV+Tk5M9egFZlpOUmFnISciwMAoU0vMpIS1PIz41j+I0chVSFHAcPQrAWX8cFkn1IRFUty9MKMZFVI+2
|
||||
6zJDpCcmJiZ6AdrYPvYh9Ygn8rkJQNEhkdg3dQVgoghlxeULiOPxItqA3tQ+D7Ad9PG0+KKhQ7sDXO8B
|
||||
1aTBt4hmIp8+MQdJmzPS+e/4d0dHP/psvgggW9I9PoD5PJbIJxWAP9aP1s+DL2LitHuAFU8jigjFND4+
|
||||
3rsZY2NjUvAONYU4HgWgCJ+zX/GzA9HkuP9gCKeCOQTh+BSws1xQyig5xzhL+fYzCsWgRsFWTUdAURXl
|
||||
Mg5bQSUn3WwjiGDxgkU+NwGoekz62vL+W11IuPb/xtcbc8ooLimHcYhiDQzx5GRTTCLIomhBgnmdeGDy
|
||||
LgBLjvP/cG8oDXz4KG5CbEE9nF2XeXR01CMjIyNfAObiaLMj/gjxRD43AdgC3HpYcohhmOGg4mvRyfBc
|
||||
hFswIWY7aKbl0yffDaSD/kQ66E+kg/6DAv4BQH7c9bMbVK0AAAAASUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<data name="BbtnitmAHWF1.Caption" xml:space="preserve">
|
||||
<value>BarButtonItem9</value>
|
||||
</data>
|
||||
@@ -2583,12 +2547,6 @@
|
||||
<data name=">>BarButtonItem8.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>bsiRowCount.Name" xml:space="preserve">
|
||||
<value>bsiRowCount</value>
|
||||
</data>
|
||||
<data name=">>bsiRowCount.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>BbtnitmAHWF1.Name" xml:space="preserve">
|
||||
<value>BbtnitmAHWF1</value>
|
||||
</data>
|
||||
|
||||
@@ -186,7 +186,7 @@ Public Class frmMain
|
||||
omsgTitleAttention = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("MsgboxTitleAttention")
|
||||
|
||||
|
||||
Dim oVErsion = String.Format("{0}.{1}.{2}", My.Application.Info.Version.Major, My.Application.Info.Version.Minor, My.Application.Info.Version.Build)
|
||||
Dim oVErsion = My.Application.Info.Version.ToString 'String.Format("{0}.{1}.{2}", My.Application.Info.Version.Major, My.Application.Info.Version.Minor, My.Application.Info.Version.Build)
|
||||
BSIVERSION1.Caption = oVErsion
|
||||
If ERROR_STATE = "NO DB-CONNECTION" Or ERROR_STATE = "FAILED DBCONNECTION" Then
|
||||
MsgBox(S.Bitte_konfigurieren_Sie_eine_Datenbankverbindung_, MsgBoxStyle.Critical, "Fehlende Konfiguration:")
|
||||
@@ -619,7 +619,7 @@ Public Class frmMain
|
||||
|
||||
Private Function GetLayoutName_GridMain()
|
||||
Dim Filename As String = String.Format("DevExpressGridViewOverview_UserLayout_{0}_{1}.xml", GRID_LOAD_TYPE, USER_LANGUAGE)
|
||||
Return System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
Return System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
End Function
|
||||
|
||||
Private Sub SaveGridLayout()
|
||||
@@ -1005,8 +1005,6 @@ Public Class frmMain
|
||||
|
||||
RestoreLayout()
|
||||
|
||||
|
||||
|
||||
End If
|
||||
|
||||
End If
|
||||
@@ -2143,6 +2141,7 @@ Public Class frmMain
|
||||
LOGGER.Error(ex)
|
||||
End Try
|
||||
End If
|
||||
RestoreLayout()
|
||||
oStopWatch.Done()
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@@ -2297,6 +2296,7 @@ Public Class frmMain
|
||||
If hi.HitTest = GridHitTest.FilterPanelCloseButton Then
|
||||
Ev_Filter_Panel_Closed = True
|
||||
Grid_Reset_Filter()
|
||||
Ev_Filter_Panel_Closed = False
|
||||
End If
|
||||
End If
|
||||
If Not IsNothing(CURRENT_CLICKED_PROFILE_ID) Then
|
||||
@@ -2808,36 +2808,11 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_
|
||||
|
||||
End If
|
||||
GridLayout_Changed("ColumnFilterChanged")
|
||||
RowCount()
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex.Message)
|
||||
End Try
|
||||
End Sub
|
||||
Sub RowCount()
|
||||
Try
|
||||
'Dim oGroupCount As Integer = 0
|
||||
'For index = 0 To GridViewWorkflows.RowCount
|
||||
' Dim oRow = GridViewWorkflows.GetRow(index)
|
||||
' If oRow Is Nothing Then
|
||||
' Continue For
|
||||
' End If
|
||||
' If GridViewWorkflows.GetRowExpanded(index) = True Then
|
||||
' oGroupCount += 1
|
||||
' End If
|
||||
|
||||
'Next
|
||||
Dim oRowCount = GridViewWorkflows.RowCount
|
||||
|
||||
oRowCount = oRowCount '- oGroupCount
|
||||
Dim objectCount_Descr = $"[{oRowCount.ToString}]"
|
||||
objectCount_Descr = String.Format(S.__0___Workflows, objectCount_Descr)
|
||||
|
||||
bsiRowCount.Caption = objectCount_Descr
|
||||
Catch ex As Exception
|
||||
bsiRowCount.Caption = "Error getting RowCount"
|
||||
End Try
|
||||
|
||||
End Sub
|
||||
Sub Create_View_Caption()
|
||||
Try
|
||||
lblCaptionMainGrid.Text = S.Gesamtübersicht
|
||||
@@ -3188,7 +3163,6 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_
|
||||
|
||||
Private Sub GridViewWFItems_SubstituteFilter(sender As Object, e As DevExpress.Data.SubstituteFilterEventArgs) Handles GridViewWorkflows.SubstituteFilter
|
||||
GridLayout_Changed("GridViewWFItems_SubstituteFilter")
|
||||
RowCount()
|
||||
End Sub
|
||||
|
||||
Private Sub BbtnitmAHWF1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BbtnitmAHWF1.ItemClick, BbtnitmAHWF2.ItemClick, BbtnitmAHWF3.ItemClick, BbtnitmAHWF4.ItemClick
|
||||
@@ -3296,14 +3270,4 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_
|
||||
LOGGER.Info("User clicked reset layout")
|
||||
Await GridLayout_Reset()
|
||||
End Sub
|
||||
|
||||
Private Sub GridViewWorkflows_KeyUp(sender As Object, e As KeyEventArgs) Handles GridViewWorkflows.KeyUp
|
||||
If GridViewWorkflows.ActiveFilterEnabled = False Then
|
||||
If DetailLinkActive Then
|
||||
lblCaptionMainGrid.Text = CURRENT_CLICKED_PROFILE_TITLE
|
||||
Else
|
||||
Create_View_Caption()
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
End Class
|
||||
@@ -255,7 +255,7 @@ Public Class frmMonitor
|
||||
Sub LoadGrid1Layout()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid1.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
If File.Exists(xml) Then
|
||||
GridView1.RestoreLayoutFromXml(xml, OptionsLayoutBase.FullLayout)
|
||||
End If
|
||||
@@ -268,7 +268,7 @@ Public Class frmMonitor
|
||||
Sub LoadGrid2Layout()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid2.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
If File.Exists(xml) Then
|
||||
GridView2.RestoreLayoutFromXml(xml, OptionsLayoutBase.FullLayout)
|
||||
End If
|
||||
@@ -281,7 +281,7 @@ Public Class frmMonitor
|
||||
Sub LoadGrid3Layout()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid3.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
If File.Exists(xml) Then
|
||||
GridView3.RestoreLayoutFromXml(xml, OptionsLayoutBase.FullLayout)
|
||||
End If
|
||||
@@ -294,7 +294,7 @@ Public Class frmMonitor
|
||||
Sub LoadGrid4Layout()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid4.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
If File.Exists(xml) Then
|
||||
GridView4.RestoreLayoutFromXml(xml, OptionsLayoutBase.FullLayout)
|
||||
End If
|
||||
@@ -307,9 +307,9 @@ Public Class frmMonitor
|
||||
|
||||
Sub SaveGrid1layout()
|
||||
Try
|
||||
Dim o = CONFIG.UserConfigPath.Replace("UserConfig.xml", "")
|
||||
Dim o = USER_CONFIG_DIRECTORY
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid1.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
GridView1.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@@ -319,7 +319,7 @@ Public Class frmMonitor
|
||||
Sub RemoveLayout()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid1.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
IO.File.Delete(xml)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@@ -329,7 +329,7 @@ Public Class frmMonitor
|
||||
Sub SaveGrid2layout()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid2.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
GridView2.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@@ -339,7 +339,7 @@ Public Class frmMonitor
|
||||
Sub RemoveLayout2()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid2.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
IO.File.Delete(xml)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@@ -349,7 +349,7 @@ Public Class frmMonitor
|
||||
Sub SaveGrid3layout()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid3.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
GridView3.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@@ -359,7 +359,7 @@ Public Class frmMonitor
|
||||
Sub RemoveLayout3()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid3.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
IO.File.Delete(xml)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@@ -369,7 +369,7 @@ Public Class frmMonitor
|
||||
Sub SaveGrid4layout()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid4.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
GridView4.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@@ -379,7 +379,7 @@ Public Class frmMonitor
|
||||
Sub RemoveLayout4()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid4.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
IO.File.Delete(xml)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
|
||||
@@ -126,7 +126,7 @@
|
||||
</data>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="SplitContainerButtons.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>5, 708</value>
|
||||
<value>5, 1032</value>
|
||||
</data>
|
||||
<data name="SplitContainerReject_NotResp.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
@@ -408,7 +408,7 @@
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="btnSave.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>267, 55</value>
|
||||
<value>606, 55</value>
|
||||
</data>
|
||||
<data name="btnSave.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
@@ -444,7 +444,7 @@
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="SplitContainerButtons.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>668, 55</value>
|
||||
<value>1007, 55</value>
|
||||
</data>
|
||||
<data name="SplitContainerButtons.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>45</value>
|
||||
@@ -465,7 +465,7 @@
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="SplitContainer1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 70</value>
|
||||
<value>0, 158</value>
|
||||
</data>
|
||||
<data name="PanelValidatorControlBorder.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left, Right</value>
|
||||
@@ -477,7 +477,7 @@
|
||||
<value>2, 2</value>
|
||||
</data>
|
||||
<data name="PanelValidatorControl.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>664, 615</value>
|
||||
<value>1003, 939</value>
|
||||
</data>
|
||||
<data name="PanelValidatorControl.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>3</value>
|
||||
@@ -498,7 +498,7 @@
|
||||
<value>5, 85</value>
|
||||
</data>
|
||||
<data name="PanelValidatorControlBorder.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>668, 619</value>
|
||||
<value>1007, 943</value>
|
||||
</data>
|
||||
<data name="PanelValidatorControlBorder.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>44</value>
|
||||
@@ -529,7 +529,7 @@
|
||||
<value>5, 33</value>
|
||||
</data>
|
||||
<data name="DESCRIPTIONLabel.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>668, 46</value>
|
||||
<value>1007, 46</value>
|
||||
</data>
|
||||
<data name="DESCRIPTIONLabel.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
@@ -562,7 +562,7 @@
|
||||
<value>5, 5</value>
|
||||
</data>
|
||||
<data name="TITLELabel1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>668, 28</value>
|
||||
<value>1007, 28</value>
|
||||
</data>
|
||||
<data name="TITLELabel1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
@@ -589,7 +589,7 @@
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="PanelControl1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>678, 769</value>
|
||||
<value>1017, 1093</value>
|
||||
</data>
|
||||
<data name="PanelControl1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>25</value>
|
||||
@@ -628,7 +628,7 @@
|
||||
<value>3, 4, 3, 4</value>
|
||||
</data>
|
||||
<data name="DocumentViewerValidator.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>534, 769</value>
|
||||
<value>803, 1093</value>
|
||||
</data>
|
||||
<data name="DocumentViewerValidator.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@@ -658,10 +658,10 @@
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="SplitContainer1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>1216, 769</value>
|
||||
<value>1824, 1093</value>
|
||||
</data>
|
||||
<data name="SplitContainer1.SplitterDistance" type="System.Int32, mscorlib">
|
||||
<value>678</value>
|
||||
<value>1017</value>
|
||||
</data>
|
||||
<data name="SplitContainer1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>37</value>
|
||||
@@ -691,7 +691,7 @@
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="barDockControlTop.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>1216, 0</value>
|
||||
<value>1824, 0</value>
|
||||
</data>
|
||||
<data name=">>barDockControlTop.Name" xml:space="preserve">
|
||||
<value>barDockControlTop</value>
|
||||
@@ -709,10 +709,10 @@
|
||||
<value>Bottom</value>
|
||||
</data>
|
||||
<data name="barDockControlBottom.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 849</value>
|
||||
<value>0, 1273</value>
|
||||
</data>
|
||||
<data name="barDockControlBottom.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>1216, 0</value>
|
||||
<value>1824, 0</value>
|
||||
</data>
|
||||
<data name=">>barDockControlBottom.Name" xml:space="preserve">
|
||||
<value>barDockControlBottom</value>
|
||||
@@ -733,7 +733,7 @@
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="barDockControlLeft.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>0, 849</value>
|
||||
<value>0, 1273</value>
|
||||
</data>
|
||||
<data name=">>barDockControlLeft.Name" xml:space="preserve">
|
||||
<value>barDockControlLeft</value>
|
||||
@@ -751,10 +751,10 @@
|
||||
<value>Right</value>
|
||||
</data>
|
||||
<data name="barDockControlRight.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>1216, 0</value>
|
||||
<value>1824, 0</value>
|
||||
</data>
|
||||
<data name="barDockControlRight.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>0, 849</value>
|
||||
<value>0, 1273</value>
|
||||
</data>
|
||||
<data name=">>barDockControlRight.Name" xml:space="preserve">
|
||||
<value>barDockControlRight</value>
|
||||
@@ -1325,13 +1325,13 @@
|
||||
<value>Combo</value>
|
||||
</data>
|
||||
<data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>1216, 105</value>
|
||||
<value>1824, 158</value>
|
||||
</data>
|
||||
<data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 834</value>
|
||||
<value>0, 1251</value>
|
||||
</data>
|
||||
<data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>1216, 15</value>
|
||||
<value>1824, 22</value>
|
||||
</data>
|
||||
<data name=">>RibbonStatusBar1.Name" xml:space="preserve">
|
||||
<value>RibbonStatusBar1</value>
|
||||
|
||||
@@ -62,6 +62,7 @@ Public Class frmValidator
|
||||
Private Property PROFIL_REJECT_ACTIONS_ATTRIBUTE As String = ""
|
||||
Private Property PROFIL_REJECT_COMMENT_ATTRIBUTE As String = ""
|
||||
Private Property PROFIL_NOT_RESP_COMMENT_ATTR As String = ""
|
||||
Private Property REJECTION_ACTIVE As Boolean = False
|
||||
Private Property oErrMsgMissingInput
|
||||
|
||||
Private Const PMDelimiter As String = "~"
|
||||
@@ -272,9 +273,8 @@ Public Class frmValidator
|
||||
|
||||
PROFIL_REJECT_ACTIONS_ATTRIBUTE = oProfileRow.Item("REJECT_ACTIONS_ATTRIBUTE")
|
||||
PROFIL_REJECT_COMMENT_ATTRIBUTE = oProfileRow.Item("REJECT_COMMENT_ATTRIBUTE")
|
||||
|
||||
PROFIL_NOT_RESP_COMMENT_ATTR = oProfileRow.Item("NOT_RESP_COMMENT_ATTRIBUTE")
|
||||
|
||||
REJECTION_ACTIVE = False
|
||||
PROFIL_LOGINDEX = oProfileRow.Item("LOG_INDEX")
|
||||
CURRENT_PROFILE_LOG_INDEX = PROFIL_LOGINDEX
|
||||
Dim oProfileTitle As String = ""
|
||||
@@ -371,6 +371,7 @@ Public Class frmValidator
|
||||
SplitContainerReject_NotResp.Visible = False
|
||||
SplitContainerButtons.CollapsePanel = SplitCollapsePanel.None
|
||||
SplitContainerButtons.PanelVisibility = SplitPanelVisibility.Panel2
|
||||
|
||||
Else
|
||||
SplitContainerButtons.CollapsePanel = SplitCollapsePanel.Panel1
|
||||
SplitContainerReject_NotResp.Visible = True
|
||||
@@ -380,6 +381,13 @@ Public Class frmValidator
|
||||
SplitContainerButtons.PanelVisibility = SplitPanelVisibility.Both
|
||||
btnReject.Text = oProfileRejectionText
|
||||
btnNotResponsible.Text = oProfileNotResponsibleText
|
||||
If USER_GHOST_MODE_ACTIVE Then
|
||||
btnReject.Enabled = False
|
||||
btnNotResponsible.Enabled = False
|
||||
Else
|
||||
btnReject.Enabled = True
|
||||
btnNotResponsible.Enabled = True
|
||||
End If
|
||||
Else
|
||||
If functBtnNR = True Then
|
||||
Logger.Debug($"Nicht zuständig Button wird eingeblendet!")
|
||||
@@ -388,12 +396,22 @@ Public Class frmValidator
|
||||
btnReject.Visible = False
|
||||
SplitContainerReject_NotResp.Collapsed = True
|
||||
btnNotResponsible.Text = oProfileNotResponsibleText
|
||||
If USER_GHOST_MODE_ACTIVE Then
|
||||
btnNotResponsible.Enabled = False
|
||||
Else
|
||||
btnNotResponsible.Enabled = True
|
||||
End If
|
||||
Else
|
||||
SplitContainerReject_NotResp.CollapsePanel = SplitCollapsePanel.Panel2
|
||||
SplitContainerReject_NotResp.PanelVisibility = SplitPanelVisibility.Panel1
|
||||
SplitContainerReject_NotResp.Collapsed = True
|
||||
btnNotResponsible.Visible = False
|
||||
btnReject.Text = oProfileRejectionText
|
||||
If USER_GHOST_MODE_ACTIVE Then
|
||||
btnReject.Enabled = False
|
||||
Else
|
||||
btnReject.Enabled = True
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
@@ -3283,172 +3301,184 @@ Public Class frmValidator
|
||||
oControlType = "DevExpress.XtraGrid.GridControl"
|
||||
Dim oMyGridControl As GridControl = oControl
|
||||
Dim oDTColumnsPerDevExGrid As DataTable = DT_COLUMNS_GRID.Clone()
|
||||
If oSourceIndexName = "" Then
|
||||
MsgBox("Attention wrong configuration:" & vbNewLine & "for control " & oControl.Name & " no INDEX configured!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical, ADDITIONAL_TITLE)
|
||||
Exit For
|
||||
End If
|
||||
If oSourceIndexName Is Nothing = False Then
|
||||
If oLoadIndex = False Then
|
||||
Logger.Debug("Indexwert soll nicht geladen werden.")
|
||||
Exit Select
|
||||
Try
|
||||
|
||||
If oSourceIndexName = "" Then
|
||||
MsgBox("Attention wrong configuration:" & vbNewLine & "for control " & oControl.Name & " no INDEX configured!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical, ADDITIONAL_TITLE)
|
||||
Exit For
|
||||
End If
|
||||
Logger.Debug($"getting Value for Attribute [{oSourceIndexName}] - oIDBTyp [{oIDBTyp}] - oIDBOverride [{oIDBOverride}]...")
|
||||
' Dim wertWD = CURRENT_WMFILE.GetVariableValue(oSourceIndexName)
|
||||
oValueFromSource = GetVariableValuefromSource(oSourceIndexName, oIDBTyp, oIDBOverride)
|
||||
If oSourceIndexName Is Nothing = False Then
|
||||
If oLoadIndex = False Then
|
||||
Logger.Debug("Indexwert soll nicht geladen werden.")
|
||||
Exit Select
|
||||
End If
|
||||
Logger.Debug($"getting Value for Attribute [{oSourceIndexName}] - oIDBTyp [{oIDBTyp}] - oIDBOverride [{oIDBOverride}]...")
|
||||
' Dim wertWD = CURRENT_WMFILE.GetVariableValue(oSourceIndexName)
|
||||
oValueFromSource = GetVariableValuefromSource(oSourceIndexName, oIDBTyp, oIDBOverride)
|
||||
|
||||
If oValueFromSource Is Nothing = False Then
|
||||
Dim oValueType = oValueFromSource.GetType.ToString
|
||||
Logger.Debug($"oValueType is [{oValueType}]!")
|
||||
'Es wird gegen ein Vektorfeld nachindexiert
|
||||
If oValueType.Contains("System.Object") Or oValueType = "System.Data.DataTable" Or oValueType = "System.String" Then
|
||||
Select Case oTyp
|
||||
If oValueFromSource Is Nothing = False Then
|
||||
Dim oValueType = oValueFromSource.GetType.ToString
|
||||
Logger.Debug($"oValueType is [{oValueType}]!")
|
||||
'Es wird gegen ein Vektorfeld nachindexiert
|
||||
If oValueType.Contains("System.Object") Or oValueType = "System.Data.DataTable" Or oValueType = "System.String" Then
|
||||
Select Case oTyp
|
||||
'Tabellendarstellung
|
||||
Case "TABLE"
|
||||
Dim oExpression = $"CONTROL_ID = {oControlId}"
|
||||
DT_COLUMNS_GRID.Select(oExpression, "SEQUENCE").CopyToDataTable(oDTColumnsPerDevExGrid, LoadOption.PreserveChanges)
|
||||
Case "TABLE"
|
||||
Dim oExpression = $"CONTROL_ID = {oControlId}"
|
||||
DT_COLUMNS_GRID.Select(oExpression, "SEQUENCE").CopyToDataTable(oDTColumnsPerDevExGrid, LoadOption.PreserveChanges)
|
||||
|
||||
Dim oColValuesfromSource As String()
|
||||
Logger.Debug($"DevExpressGrid: {oDTColumnsPerDevExGrid.Rows.Count} Columns configured for control {oControlId}.")
|
||||
Dim oColValuesfromSource As String()
|
||||
Logger.Debug($"DevExpressGrid: {oDTColumnsPerDevExGrid.Rows.Count} Columns configured for control {oControlId}.")
|
||||
|
||||
If oDTColumnsPerDevExGrid.Rows.Count >= 1 Then
|
||||
Dim oDataSource As DataTable = oMyGridControl.DataSource
|
||||
oDataSource.Rows.Clear()
|
||||
If IDB_ACTIVE = False Then
|
||||
Logger.Debug("ValueFromSource contains {0} items", oValueFromSource)
|
||||
If oDTColumnsPerDevExGrid.Rows.Count >= 1 Then
|
||||
Dim oDataSource As DataTable = oMyGridControl.DataSource
|
||||
oDataSource.Rows.Clear()
|
||||
If IDB_ACTIVE = False Then
|
||||
Logger.Debug("ValueFromSource contains {0} items", oValueFromSource)
|
||||
|
||||
For Each Zeile As Object In oValueFromSource
|
||||
Logger.Debug($"vektorrow Value {Zeile.ToString}...")
|
||||
oColValuesfromSource = Split(Zeile, PMDelimiter)
|
||||
For Each Zeile As Object In oValueFromSource
|
||||
Logger.Debug($"vektorrow Value {Zeile.ToString}...")
|
||||
oColValuesfromSource = Split(Zeile, PMDelimiter)
|
||||
|
||||
Dim oNewRow = oDataSource.NewRow()
|
||||
Logger.Debug("Creating new row..")
|
||||
|
||||
For index = 0 To oDTColumnsPerDevExGrid.Rows.Count - 1
|
||||
Logger.Debug("Column Index {0}", index)
|
||||
If oColValuesfromSource.Length > index Then
|
||||
Logger.Debug("Value: {0}", oColValuesfromSource(index))
|
||||
oNewRow.Item(index) = oColValuesfromSource(index)
|
||||
Else
|
||||
Logger.Debug("Value: String.Empty")
|
||||
oNewRow.Item(index) = String.Empty
|
||||
End If
|
||||
Next
|
||||
Logger.Debug("Adding row to grid..")
|
||||
oDataSource.Rows.Add(oNewRow)
|
||||
|
||||
Dim oNewRow = oDataSource.NewRow()
|
||||
Logger.Debug("Creating new row..")
|
||||
|
||||
For index = 0 To oDTColumnsPerDevExGrid.Rows.Count - 1
|
||||
Logger.Debug("Column Index {0}", index)
|
||||
If oColValuesfromSource.Length > index Then
|
||||
Logger.Debug("Value: {0}", oColValuesfromSource(index))
|
||||
oNewRow.Item(index) = oColValuesfromSource(index)
|
||||
Else
|
||||
Logger.Debug("Value: String.Empty")
|
||||
oNewRow.Item(index) = String.Empty
|
||||
End If
|
||||
Next
|
||||
Logger.Debug("Adding row to grid..")
|
||||
oDataSource.Rows.Add(oNewRow)
|
||||
Else
|
||||
If oValueType = "System.String" Then
|
||||
Logger.Debug($"IDB Fill Grid [{oControl.Name}] with String")
|
||||
Logger.Debug($"oValueFromSource [{oValueFromSource}] - PMDelimiter[{PMDelimiter}]")
|
||||
|
||||
oColValuesfromSource = Split(oValueFromSource.ToString, PMDelimiter)
|
||||
If oColValuesfromSource.Length > 8 Then
|
||||
Logger.Warn("Fill Grid Error - Max 8 columns can be configured!")
|
||||
End If
|
||||
|
||||
Dim oRowData As New List(Of Object)
|
||||
|
||||
For index = 1 To oColValuesfromSource.Length
|
||||
Dim oColumnType = oDTColumnsPerDevExGrid.Rows.Item(index - 1).Item("TYPE_COLUMN")
|
||||
Dim oConvertedValue = ClassFormat.GetConvertedValue(oColValuesfromSource(index - 1), oColumnType)
|
||||
oRowData.Add(oConvertedValue)
|
||||
Next
|
||||
|
||||
oDataSource.Rows.Add(oRowData.ToArray())
|
||||
|
||||
|
||||
Next
|
||||
Else
|
||||
If oValueType = "System.String" Then
|
||||
Logger.Debug($"IDB Fill Grid [{oControl.Name}] with String")
|
||||
Logger.Debug($"oValueFromSource [{oValueFromSource}] - PMDelimiter[{PMDelimiter}]")
|
||||
ElseIf oValueType = "System.Data.DataTable" Then
|
||||
Dim oMyDatatable As DataTable = oValueFromSource
|
||||
Logger.Debug($"IDB Fill Grid [{oControl.Name}] with Datatable - Rows: " & oMyDatatable.Rows.Count)
|
||||
For Each oRow As DataRow In oMyDatatable.Rows
|
||||
Try
|
||||
Logger.Debug($"IDB ROW Vector {oRow.Item(0).ToString}...")
|
||||
oColValuesfromSource = Split(oRow.Item(0).ToString, PMDelimiter)
|
||||
|
||||
oColValuesfromSource = Split(oValueFromSource.ToString, PMDelimiter)
|
||||
If oColValuesfromSource.Length > 8 Then
|
||||
Logger.Warn("Fill Grid Error - Max 8 columns can be configured!")
|
||||
If oColValuesfromSource.Length > 8 Then
|
||||
Logger.Warn("Fill Grid with DatatableSplit Error - Max 8 columns can be configured!")
|
||||
End If
|
||||
Logger.Debug($"oColValuesfromSource splitted - Length ({oColValuesfromSource.Length.ToString})")
|
||||
Dim oRowData As New List(Of Object)
|
||||
|
||||
For index = 1 To oColValuesfromSource.Length
|
||||
Try
|
||||
Dim oColumnType = oDTColumnsPerDevExGrid.Rows.Item(index - 1).Item("TYPE_COLUMN")
|
||||
Logger.Debug($"oColumnType of DGView-Column ({oColumnType.ToString})...")
|
||||
Dim oConvertedValue = ClassFormat.GetConvertedValue(oColValuesfromSource(index - 1), oColumnType)
|
||||
oRowData.Add(oConvertedValue)
|
||||
Catch ex As Exception
|
||||
Logger.Warn($"Error while converting/adding Value to oRowData: " & ex.Message)
|
||||
End Try
|
||||
Next
|
||||
oDataSource.Rows.Add(oRowData.ToArray())
|
||||
Catch ex As Exception
|
||||
Logger.Warn($"Error while adding datarow [{oRow.Item(0).ToString}] to Grid: " & ex.Message)
|
||||
End Try
|
||||
|
||||
|
||||
Next
|
||||
End If
|
||||
|
||||
Dim oRowData As New List(Of Object)
|
||||
End If
|
||||
Else
|
||||
Logger.Info($"DevExpressGrid: There are no columns configured/listed for control {oControlId}.")
|
||||
End If
|
||||
|
||||
For index = 1 To oColValuesfromSource.Length
|
||||
Dim oColumnType = oDTColumnsPerDevExGrid.Rows.Item(index - 1).Item("TYPE_COLUMN")
|
||||
Dim oConvertedValue = ClassFormat.GetConvertedValue(oColValuesfromSource(index - 1), oColumnType)
|
||||
oRowData.Add(oConvertedValue)
|
||||
Next
|
||||
Case Else
|
||||
'es handelt sich um ein einfaches Vektorfeld mit einem Wert
|
||||
Dim oDataSource As DataTable = oMyGridControl.DataSource
|
||||
For Each obj As Object In oValueFromSource
|
||||
If obj Is Nothing = False Then
|
||||
oDataSource.Rows.Add(New String() {obj.ToString})
|
||||
'dgv.Rows.Add(New String() {obj.ToString})
|
||||
|
||||
oDataSource.Rows.Add(oRowData.ToArray())
|
||||
|
||||
|
||||
ElseIf oValueType = "System.Data.DataTable" Then
|
||||
Dim oMyDatatable As DataTable = oValueFromSource
|
||||
Logger.Debug($"IDB Fill Grid [{oControl.Name}] with Datatable - Rows: " & oMyDatatable.Rows.Count)
|
||||
For Each oRow As DataRow In oMyDatatable.Rows
|
||||
Try
|
||||
Logger.Debug($"IDB ROW Vector {oRow.Item(0).ToString}...")
|
||||
oColValuesfromSource = Split(oRow.Item(0).ToString, PMDelimiter)
|
||||
|
||||
If oColValuesfromSource.Length > 8 Then
|
||||
Logger.Warn("Fill Grid with DatatableSplit Error - Max 8 columns can be configured!")
|
||||
End If
|
||||
Logger.Debug($"oColValuesfromSource splitted - Length ({oColValuesfromSource.Length.ToString})")
|
||||
Dim oRowData As New List(Of Object)
|
||||
|
||||
For index = 1 To oColValuesfromSource.Length
|
||||
Try
|
||||
Dim oColumnType = oDTColumnsPerDevExGrid.Rows.Item(index - 1).Item("TYPE_COLUMN")
|
||||
Logger.Debug($"oColumnType of DGView-Column ({oColumnType.ToString})...")
|
||||
Dim oConvertedValue = ClassFormat.GetConvertedValue(oColValuesfromSource(index - 1), oColumnType)
|
||||
oRowData.Add(oConvertedValue)
|
||||
Catch ex As Exception
|
||||
Logger.Warn($"Error while converting/adding Value to oRowData: " & ex.Message)
|
||||
End Try
|
||||
Next
|
||||
oDataSource.Rows.Add(oRowData.ToArray())
|
||||
Catch ex As Exception
|
||||
Logger.Warn($"Error while adding datarow [{oRow.Item(0).ToString}] to Grid: " & ex.Message)
|
||||
End Try
|
||||
|
||||
|
||||
Next
|
||||
End If
|
||||
|
||||
End If
|
||||
Else
|
||||
Logger.Info($"DevExpressGrid: There are no columns configured/listed for control {oControlId}.")
|
||||
End If
|
||||
Next
|
||||
End Select
|
||||
Else
|
||||
Logger.Warn($"Could not load Devexpress.Grid [{oControl.Name }] as omytype is [{oValueType}]!")
|
||||
|
||||
Case Else
|
||||
'es handelt sich um ein einfaches Vektorfeld mit einem Wert
|
||||
Dim oDataSource As DataTable = oMyGridControl.DataSource
|
||||
For Each obj As Object In oValueFromSource
|
||||
If obj Is Nothing = False Then
|
||||
oDataSource.Rows.Add(New String() {obj.ToString})
|
||||
'dgv.Rows.Add(New String() {obj.ToString})
|
||||
|
||||
End If
|
||||
|
||||
Next
|
||||
End Select
|
||||
Else
|
||||
Logger.Warn($"Could not load Devexpress.Grid [{oControl.Name }] as omytype is [{oValueType}]!")
|
||||
|
||||
End If
|
||||
|
||||
Else
|
||||
If first = False Then
|
||||
Dim oDataSource As DataTable = oMyGridControl.DataSource
|
||||
|
||||
If oDataSource.Rows.Count > 0 Then
|
||||
oDataSource.Rows.Clear()
|
||||
End If
|
||||
|
||||
End If
|
||||
End If
|
||||
Try
|
||||
'Dim oFilteredDatatable As DataTable = DTGRID_COLUMNS.Clone()
|
||||
'Dim oExpression = $"CONTROL_ID = {oControlRow.Item("GUID")}"
|
||||
'DTGRID_COLUMNS.Select(oExpression, "SEQUENCE").CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges)
|
||||
Dim oMyGridView As DevExpress.XtraGrid.Views.Grid.GridView = oMyGridControl.MainView
|
||||
oMyGridView.OptionsView.ColumnAutoWidth = False
|
||||
'AddHandler oMyGridView.ColumnWidthChanged, AddressOf GridControlColumnWidthChanged
|
||||
For Each oRow As DataRow In oDTColumnsPerDevExGrid.Rows
|
||||
For Each oActGridColumn As DevExpress.XtraGrid.Columns.GridColumn In oMyGridView.Columns
|
||||
Dim oGridDXFieldName = oActGridColumn.FieldName
|
||||
Dim GridDXColumnEditName = oActGridColumn.ColumnEditName
|
||||
If oRow.Item("SPALTENNAME") = oGridDXFieldName Then
|
||||
oActGridColumn.Width = oRow.Item("SPALTENBREITE")
|
||||
Exit For
|
||||
Else
|
||||
If first = False Then
|
||||
Dim oDataSource As DataTable = oMyGridControl.DataSource
|
||||
|
||||
If oDataSource.Rows.Count > 0 Then
|
||||
oDataSource.Rows.Clear()
|
||||
End If
|
||||
|
||||
Next
|
||||
Next
|
||||
Dim i = 0
|
||||
End If
|
||||
End If
|
||||
Try
|
||||
'Dim oFilteredDatatable As DataTable = DTGRID_COLUMNS.Clone()
|
||||
'Dim oExpression = $"CONTROL_ID = {oControlRow.Item("GUID")}"
|
||||
'DTGRID_COLUMNS.Select(oExpression, "SEQUENCE").CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges)
|
||||
Dim oMyGridView As DevExpress.XtraGrid.Views.Grid.GridView = oMyGridControl.MainView
|
||||
oMyGridView.OptionsView.ColumnAutoWidth = False
|
||||
'AddHandler oMyGridView.ColumnWidthChanged, AddressOf GridControlColumnWidthChanged
|
||||
For Each oRow As DataRow In oDTColumnsPerDevExGrid.Rows
|
||||
For Each oActGridColumn As DevExpress.XtraGrid.Columns.GridColumn In oMyGridView.Columns
|
||||
Dim oGridDXFieldName = oActGridColumn.FieldName
|
||||
Dim GridDXColumnEditName = oActGridColumn.ColumnEditName
|
||||
If oRow.Item("SPALTENNAME") = oGridDXFieldName Then
|
||||
oActGridColumn.Width = oRow.Item("SPALTENBREITE")
|
||||
Exit For
|
||||
End If
|
||||
|
||||
Next
|
||||
Next
|
||||
Dim i = 0
|
||||
|
||||
' RestoreDevExpressGridControl_Layout(CURRENT_CLICKED_PROFILE_ID, oControlId, oMyGridView)
|
||||
Catch ex As Exception
|
||||
Logger.Error(ex)
|
||||
End Try
|
||||
End If
|
||||
Catch ex As Exception
|
||||
Logger.Error(ex)
|
||||
Logger.Info(">> Unexpected error in FillIndexValues(GridControl: " & oMyGridControl.Name & "): " & ex.Message, True)
|
||||
Logger.Info(">> Controltype: " & oControlType)
|
||||
Logger.Info(">> Indexname windream: " & oIndexName)
|
||||
errormessage = "Unexpected error in FillIndexValues(Combobox: " & oMyGridControl.Name & "): " & vbNewLine & ex.Message & vbNewLine & "Check Logfile"
|
||||
My.Settings.Save()
|
||||
frmError.ShowDialog()
|
||||
End Try
|
||||
|
||||
' RestoreDevExpressGridControl_Layout(CURRENT_CLICKED_PROFILE_ID, oControlId, oMyGridView)
|
||||
Catch ex As Exception
|
||||
Logger.Error(ex)
|
||||
End Try
|
||||
End If
|
||||
|
||||
Case oControl.GetType = GetType(CheckBox)
|
||||
Logger.Debug("Loading checkbox...")
|
||||
@@ -3795,7 +3825,7 @@ Public Class frmValidator
|
||||
|
||||
Catch ex As Exception
|
||||
Logger.Warn($"Unexpected error in FillIndexValues: [{oControName} -TYPE: {oControlType}-INDEXNAME: {oIndexName}] ERROR: {ex.Message}")
|
||||
errormessage = "Unexpected error in FillIndexValues:" + oControName & vbNewLine & ex.Message & vbNewLine & "Check Logfile"
|
||||
errormessage = $"Unexpected error in FillIndexValues: [{oControName} -TYPE: {oControlType}-INDEXNAME: {oIndexName}] ERROR: {ex.Message}" & vbNewLine & "Check Logfile"
|
||||
My.Settings.Save()
|
||||
frmError.ShowDialog()
|
||||
End Try
|
||||
@@ -4516,12 +4546,17 @@ Public Class frmValidator
|
||||
Dim oSQLCheckCommand As String = IIf(IsDBNull(oControlRow.Item("SQL_UEBERPRUEFUNG")), "", oControlRow.Item("SQL_UEBERPRUEFUNG"))
|
||||
Dim oIsReadOnly As Boolean = CBool(oControlRow.Item("READ_ONLY"))
|
||||
Dim oSaveChangeEnabledFalse As Boolean = CBool(oControlRow.Item("SAVE_CHANGE_ON_ENABLED"))
|
||||
|
||||
'Readonly felder werden über finale indexe gefüllt, nicht mit SetControlData
|
||||
If oIsReadOnly = True And oSaveChangeEnabledFalse = False Then
|
||||
Logger.Debug("ReadOnly field, Skipping.")
|
||||
'Wenn eine Ablehnung aktiv ist und der Index identisch ist, dann skipping
|
||||
If REJECTION_ACTIVE = True And (oIndexName = PROFIL_REJECT_ACTIONS_ATTRIBUTE Or oIndexName = PROFIL_REJECT_COMMENT_ATTRIBUTE) Then
|
||||
Logger.Debug($"Index [{oIndexName}] will be skipped as Rejection is in progress!")
|
||||
Continue For
|
||||
End If
|
||||
'Readonly felder werden über finale indexe gefüllt, nicht mit SetControlData
|
||||
If oIsReadOnly = True And oSaveChangeEnabledFalse = False Then
|
||||
Logger.Debug($"Skipping ReadOnly ControlName [{oDBControlName}] !")
|
||||
Continue For
|
||||
End If
|
||||
|
||||
|
||||
Dim oControlType As String = oControlRow.Item("CTRL_TYPE")
|
||||
Dim oIDBTyp As Integer
|
||||
@@ -5833,7 +5868,7 @@ Public Class frmValidator
|
||||
End Sub
|
||||
Private Function GetXML_OverviewLayoutName(pProfilID As Integer, pControlID As Integer)
|
||||
Dim Filename As String = String.Format($"DevExpressValidatorGridControl_{pProfilID}-{pControlID}.xml")
|
||||
Return System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
Return System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
End Function
|
||||
|
||||
Private Sub BarButtonItem5_ItemClick_1(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem5.ItemClick
|
||||
@@ -5984,9 +6019,15 @@ Public Class frmValidator
|
||||
oNoError = IDBData.SetVariableValue(PROFIL_REJECT_COMMENT_ATTRIBUTE, frmRejCommit.pRejection_Comment)
|
||||
End If
|
||||
End If
|
||||
If Check_UpdateIndexe() = True Then
|
||||
Finish_WFStep(True)
|
||||
If oNoError Then
|
||||
REJECTION_ACTIVE = True
|
||||
If Check_UpdateIndexe() = True Then
|
||||
Finish_WFStep(True)
|
||||
End If
|
||||
Else
|
||||
MsgBox("We are sorry, but an enexpected error in rejection-process occured!" & vbNewLine & "Inform Your admin-team and check Your log. Thank You.", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE)
|
||||
End If
|
||||
|
||||
End If
|
||||
End Sub
|
||||
|
||||
|
||||
@@ -656,7 +656,7 @@ Public Class frmValidatorSearch
|
||||
Show_File_Properties()
|
||||
End Sub
|
||||
Private Function Get_DocGrid_Layout_Filename(oIndex As Integer)
|
||||
Dim oUserConfigPath = CONFIG.UserConfigPath.Replace("UserConfig.xml", "")
|
||||
Dim oUserConfigPath = USER_CONFIG_DIRECTORY
|
||||
Dim oFilename As String = String.Format("GridViewDoc_Search-{0}-{1}-{2}-UserLayout.xml", oIndex, CURRENT_ProfilGUID, USER_LANGUAGE)
|
||||
Dim oPath = System.IO.Path.Combine(oUserConfigPath, oFilename)
|
||||
Return oPath
|
||||
|
||||
Reference in New Issue
Block a user