MS
This commit is contained in:
parent
e796fb2ee8
commit
cbbf0011f1
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -24,7 +24,12 @@ Public Class ClassAllgemeineFunktionen
|
||||
If oFilteredDatatable.Rows.Count = 0 Then 'KEIN EINTRAG FÜR SPRACHE
|
||||
oExpression = $"LANGUAGE ='de-DE' AND TITLE = '{pTITLE}'"
|
||||
BASEDATA_DT_GUI_LANGUAGE_PHRASES.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges)
|
||||
Return oFilteredDatatable.Rows(0).Item("STRING1")
|
||||
Try
|
||||
Return oFilteredDatatable.Rows(0).Item("STRING1")
|
||||
Catch ex As Exception
|
||||
Return $"ERR-LANG(NoTranslationFor [{oExpression}]"
|
||||
End Try
|
||||
|
||||
Else
|
||||
Return oFilteredDatatable
|
||||
End If
|
||||
|
||||
@ -485,7 +485,6 @@ Public Class ClassInit
|
||||
Try
|
||||
Dim oStopWatch As New RefreshHelper.SW("InitBasics2")
|
||||
Dim oSql = String.Format("SELECT * FROM VWPM_PROFILE_USER WHERE USER_ID = {0}", USER_ID)
|
||||
'BASEDATA_DT_VW_PROFILE_USER = DataASorDB.GetDatatable("DD_ECM", oSql, "VWPM_PROFILE_USER", $"USER_ID = {USER_ID}")
|
||||
BASEDATA_DT_VW_PROFILE_USER = DatabaseFallback.GetDatatable("VWPM_PROFILE_USER", New GetDatatableOptions(oSql, DatabaseType.ECM) With {
|
||||
.FilterExpression = $"USER_ID = {USER_ID}"
|
||||
})
|
||||
|
||||
1
app/DD_PM_WINDREAM/frmMain.Designer.vb
generated
1
app/DD_PM_WINDREAM/frmMain.Designer.vb
generated
@ -457,6 +457,7 @@ Partial Class frmMain
|
||||
Me.bsiLicenses.Id = 9
|
||||
Me.bsiLicenses.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.security_key
|
||||
Me.bsiLicenses.Name = "bsiLicenses"
|
||||
Me.bsiLicenses.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
|
||||
'
|
||||
'bsiUserLoggedIn
|
||||
'
|
||||
|
||||
@ -125,7 +125,7 @@
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAAWQBCQFkAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAAXQBCQF0AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||
@ -797,33 +797,6 @@
|
||||
<data name="bsiUser.Caption" xml:space="preserve">
|
||||
<value>BarStaticItem1</value>
|
||||
</data>
|
||||
<data name="bsiUser.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
|
||||
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAydEVYdFRpdGxlAEN1c3RvbWVyO0VtcGxveWVlO1Bl
|
||||
cnNvbjtDb250YWN0O1VzZXI7Q2xpZW50fhE26AAAAM1JREFUOE+l0TEOQUEUBdBfiN4ySDQqKvTfGuxF
|
||||
pbEIi5DoRcIa/gqovwKRca/MvMw8/zGhODKZd98NpnDO/eX1MVtstSHs4eIdYAxJzipowQmccoY2SNYq
|
||||
6IJeDnogWatgAk3LNAXJWgVLaFomziRrFYzgAXqZd/xzJWsV0A50Ae+S3KcCPtkNwjLP2c8YzOHo8fyW
|
||||
sQo6sIL4zXnmHWeS1QUD2MAd+LXX0Pd45h1nzDCbFJRwhfCbv2G2jAuqaJirigtqNcxRS8HvXPEEp3w/
|
||||
tQHvKFEAAAAASUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<data name="bsiUser.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
|
||||
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAydEVYdFRpdGxlAEN1c3RvbWVyO0VtcGxveWVlO1Bl
|
||||
cnNvbjtDb250YWN0O1VzZXI7Q2xpZW50fhE26AAAAfhJREFUWEfF1rFLVWEYx3FBFweHwGhVamnIvdUQ
|
||||
CmwI+mOiIUIXwV10cQ8aGoVcbFWCiIYgAiVHsWgwSDj+fofzHN7nvV+vDt7r8Fne87zP99x7HZxomuZW
|
||||
DRw8X9m5jmV5J7/kf+dY3ssLoTtJ9FLcaLiyIc0VtoXu9qKX4kbDhadCQfJSaEcreiluNFzw104x8kFo
|
||||
Ryt6KW40XPguFCM/hHa0opfiRsOFv0Ix8ltoRyt6KW40XKDQZf4J7WhFL8WNhjuLQqFhfId29b0UNxru
|
||||
bApFhvEd2tX3UtxouLMmFBnGd2hX30txo+HOfTkRChHP+g7t6nspbjRceCMUI6+EdrSil+JGw4VHQjHi
|
||||
WdrRil6KGw1XPgoFS7tCd3vRS3Gj4cqCnAmFzc88Q3d70Utxo2HwTE6ljv8RP6M7SfRS3Gj4Enfltfgn
|
||||
+SRv5Z7Q7IDopbjRcGUSzmpTcJZEL8WNhguP5bM8KM5q/uv/Ip6l563opbjB8JysyDeJ33pPpqWenZED
|
||||
iTnfWZV5SbPRS3Erhu7Ilvj/vVhY2pcn4q/bluSr0Kx3eJd3XusFHspPoWW18w49q3mnd/e9FDc9nJVD
|
||||
oQU3wbtno0cvsF4Mj8p69OgFRvnpw2H06AXowo2LHr3AUT08AkfRG3iBccPDccLDccLD8WkmLgAKdExB
|
||||
J+0x6AAAAABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<data name="bsiLicenses.Caption" xml:space="preserve">
|
||||
<value>BarStaticItem2</value>
|
||||
</data>
|
||||
|
||||
@ -2264,7 +2264,8 @@ Public Class frmMain
|
||||
If SQL_PROFILES_USER <> "" Then
|
||||
oSQL = SQL_PROFILES_USER.Replace("@USER_ID", USER_ID)
|
||||
Else
|
||||
oSQL = String.Format("SELECT T.* FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_GET_ACTIVE_PROFILES_USER] ({0}))", USER_ID)
|
||||
oSQL = String.Format("SELECT T.* FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN
|
||||
(SELECT PROFILE_ID FROM [dbo].[FNPM_GET_ACTIVE_PROFILES_USER] ({0}))", USER_ID)
|
||||
End If
|
||||
|
||||
CURR_DT_VWPM_PROFILE_ACTIVE = DatabaseFallback.GetDatatableECM(oSQL)
|
||||
@ -2535,7 +2536,7 @@ Public Class frmMain
|
||||
|
||||
Private Sub bwBasicData_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) Handles bwBasicData.RunWorkerCompleted
|
||||
If USER_IS_ADMIN Then
|
||||
bsiDebug.Caption = $"{ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("LicenseCountCaption")}: {USERCOUNT_LOGGED_IN}"
|
||||
bsiDebug.Caption = $"{ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("NumberUserLoggedIn")}: {USERCOUNT_LOGGED_IN}"
|
||||
End If
|
||||
BarEditItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
|
||||
End Sub
|
||||
|
||||
@ -5179,130 +5179,7 @@ Public Class frmValidator
|
||||
Exit For
|
||||
End If
|
||||
|
||||
'Try
|
||||
' Dim dgv As GridControl = oControl
|
||||
|
||||
' Dim oRowCount As Integer = dgv.DataSource.Rows.Count
|
||||
|
||||
' LOGGER.Debug("Grid Row Count: [{0}]", oRowCount)
|
||||
|
||||
' 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss
|
||||
' If oIsRequired = True And oRowCount = 0 Then
|
||||
' oMissing = True
|
||||
' oErrMsgMissingInput = "Fehlende Eingabe in Tabelle '" & dgv.Name & "'"
|
||||
' oControl.BackColor = Color.Red
|
||||
' LOGGER.Warn(oErrMsgMissingInput)
|
||||
' Exit For
|
||||
|
||||
|
||||
' ElseIf oRowCount > 0 Then
|
||||
' Dim ZeilenGrid As Integer = 0
|
||||
' Dim myVektorArr As String()
|
||||
' 'Jeden Werte des Datagridviews durchlaufen
|
||||
' For Each oRow As DataRow In dgv.DataSource.Rows
|
||||
' Dim exists = False
|
||||
' Select Case oControlType
|
||||
' Case "TABLE"
|
||||
' Dim oRowValue = oRow.Item(0)
|
||||
' If IsNothing(oRowValue) Then
|
||||
' oRowValue = String.Empty
|
||||
' ElseIf IsDBNull(oRowValue) Then
|
||||
' oRowValue = String.Empty
|
||||
' End If
|
||||
' ' MsgBox(row.Cells(0).Value.GetType.ToString)
|
||||
' Dim str As String = String.Empty
|
||||
' 'If oRowValue <> String.Empty Then
|
||||
' 'Das Array anpassen
|
||||
' ReDim Preserve myVektorArr(ZeilenGrid)
|
||||
|
||||
' Dim oValueList As New List(Of String)
|
||||
|
||||
' For Each item In oRow.ItemArray
|
||||
' item = NotNull(item, String.Empty)
|
||||
' If TypeOf item IsNot String Then item.ToString()
|
||||
' oValueList.Add(item)
|
||||
' Next
|
||||
|
||||
' str = String.Join(PMDelimiter, oValueList.ToArray)
|
||||
|
||||
' ' 22.10.2021 Attempt at fixing empty lines appearing in indexes
|
||||
' LOGGER.Debug("Grid Value before saving: [{0}]", str)
|
||||
' If str.Trim.Length = 0 Or str.Trim.Replace(PMDelimiter, "").Length = 0 Then
|
||||
' LOGGER.Debug("Empty line in Grid [{0}]. Skipping.", oControlName)
|
||||
' Continue For
|
||||
' End If
|
||||
|
||||
' 'Den Wert im Array speichern
|
||||
' myVektorArr(ZeilenGrid) = str
|
||||
' ZeilenGrid += 1
|
||||
' 'End If
|
||||
' Case Else
|
||||
' ' MsgBox(row.Cells(0).Value.GetType.ToString)
|
||||
' If oRow.Item(0) Is Nothing = False Then
|
||||
' 'Das Array anpassen
|
||||
' ReDim Preserve myVektorArr(ZeilenGrid)
|
||||
' 'Den Wert im Array speichern
|
||||
' myVektorArr(ZeilenGrid) = oRow.Item(0).Value.ToString
|
||||
' ZeilenGrid += 1
|
||||
' End If
|
||||
' End Select
|
||||
|
||||
' Next
|
||||
|
||||
|
||||
' If IDB_ACTIVE = False Then
|
||||
' If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then
|
||||
' oMissing = True
|
||||
' oErrMsgMissingInput = $"Error while indexing table (1) {dgv.Name} - ERROR: " & idxerr_message
|
||||
' LOGGER.Warn(oErrMsgMissingInput)
|
||||
' Exit For
|
||||
' End If
|
||||
' Else
|
||||
' Dim oMyDT = DT_FOR_ARRAY(myVektorArr)
|
||||
' If oMyDT.Rows.Count > 0 Then
|
||||
' If IDBData.SetVariableValue(oIndexName, oMyDT, True, oIDBTyp) = False Then
|
||||
' oMissing = True
|
||||
' oErrMsgMissingInput = $"Error while indexing table IDB (1) {dgv.Name} - ERROR: " & idxerr_message
|
||||
' LOGGER.Warn(oErrMsgMissingInput)
|
||||
' Exit For
|
||||
' End If
|
||||
' End If
|
||||
' End If
|
||||
|
||||
|
||||
' Else
|
||||
' LOGGER.Debug("Required = False And RowCount > 0")
|
||||
|
||||
' Dim oValue As New List(Of Object) From {String.Empty}
|
||||
|
||||
' If IDB_ACTIVE = False Then
|
||||
' If Indexiere_File(CURRENT_WMFILE, oIndexName, oValue.ToArray) = False Then
|
||||
' oMissing = True
|
||||
' 'oErrorMessage = "Error while indexing der Tabelle - ERROR: " & idxerr_message
|
||||
' oErrMsgMissingInput = $"Error while indexing table (2) {dgv.Name} - ERROR: " & idxerr_message
|
||||
' LOGGER.Warn(oErrMsgMissingInput)
|
||||
' Exit For
|
||||
' End If
|
||||
' Else
|
||||
' Dim oOldAttributeResult = IDBData.GetVariableValue(oIndexName, oIDBTyp)
|
||||
' Dim oTypeOldResult = oOldAttributeResult.GetType.ToString
|
||||
' If oTypeOldResult = "System.Data.DataTable" Then
|
||||
' Dim oDT As DataTable = IDBData.GetVariableValue(oIndexName, oIDBTyp)
|
||||
' If oDT.Rows.Count > 0 Then
|
||||
' LOGGER.Debug("User cleared the grid, so data needs to be erased!")
|
||||
' IDBData.Delete_AttributeData(CURRENT_DOC_ID, oIndexName)
|
||||
' End If
|
||||
' Else
|
||||
' LOGGER.Debug("(String) User cleared the grid, so data needs to be erased!")
|
||||
' IDBData.Delete_AttributeData(CURRENT_DOC_ID, oIndexName)
|
||||
' End If
|
||||
|
||||
' End If
|
||||
|
||||
' End If
|
||||
'Catch ex As Exception
|
||||
' LOGGER.Error(ex)
|
||||
'End Try
|
||||
End Select
|
||||
End If 'End If für Control und ReadOnly = False
|
||||
Next
|
||||
@ -5400,7 +5277,7 @@ Public Class frmValidator
|
||||
For Each oRow As DataRow In pGrid.DataSource.Rows
|
||||
Dim exists = False
|
||||
Select Case pSettings.ControlType
|
||||
Case "TABLE"
|
||||
Case "DevExpress.XtraGrid.GridControl" '"TABLE"
|
||||
Dim oRowValue = oRow.Item(0)
|
||||
If IsNothing(oRowValue) Then
|
||||
oRowValue = String.Empty
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user