MS Release

This commit is contained in:
SchreiberM 2020-11-20 14:27:56 +01:00
parent cbef1ceebc
commit 8ec1b7b2f1
9 changed files with 2382 additions and 3328 deletions

View File

@ -45,7 +45,7 @@ Public Class ClassAllgemeineFunktionen
Else
If INACTIVITYRecognized = True Then
oSql = $"UPDATE TBDD_USER_LOGIN_OUT SET COMMENT = 'Inactivity Detected' WHERE GUID IN (SELECT GUID FROM TBDD_USER_LOGIN_OUT
WHERE USER_ID = {USER_ID} AND UPPER(MODULE) = UPPER('Process-Manager')"
WHERE USER_ID = {USER_ID} AND UPPER(MODULE) = UPPER('Process-Manager') AND LOGOUT IS NULL)"
ClassDatabase.Execute_non_Query(oSql, "Inactivity insert")
End If

View File

@ -55,8 +55,20 @@
Try
For Each oRow As DataRow In DTVWIDB_BE_ATTRIBUTE.Rows
If oRow.Item("ATTR_TITLE") = indexname Then
Dim oType = oRow.Item("TYP_ID")
Return oType
Try
Dim oType = oRow.Item("TYP_ID")
Return oType
Catch ex As Exception
Try
Dim oType = oRow.Item("TYP_ID")
Return oType
Catch ex1 As Exception
LOGGER.Error(ex)
Return Nothing
End Try
End Try
End If
Next

View File

@ -45,18 +45,18 @@
Dim CON_ID = oMode.Replace("PM.IDB_CONID!", "")
Dim oConString = ClassDatabase.Get_ConnectionString(CON_ID)
CONNECTION_STRING_IDB = oConString
If ClassDatabase.Init(CONNECTION_STRING_IDB_APP_SERVER) = False Then
If ClassDatabase.Init(CONNECTION_STRING_IDB) = False Then
IDB_ACTIVE = False
Else
IDB_ACTIVE = True
LOGGER.Warn($"Got an IDB-ConnID [{CON_ID}] but check DT Attribute is Nothing!!")
LOGGER.Info($"Got an IDB-Connection [{CON_ID}]!")
End If
ElseIf oMode.StartsWith("PM.IDB_APP_SERV_CONID!") Then
Dim CON_ID = oMode.Replace("PM.IDB_APP_SERV_CONID!", "")
Dim oConString = ClassDatabase.Get_ConnectionString(CON_ID)
CONNECTION_STRING_IDB_APP_SERVER = oConString
If ClassDatabase.Init(CONNECTION_STRING_IDB_APP_SERVER) = True Then
CONNECTION_STRING_IDB_APP_SERVER = ""
LOGGER.Info($"Got an IDB APP-Server-Connection [{CON_ID}]!")
End If
ElseIf oMode = "PM.MONITORING" Then
MONITORING_ACTIVE = True
@ -84,6 +84,7 @@
Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_EDITED=", "")
Try
LAST_EDITED_COLUMN = oLEDITEDCOL
LOGGER.Info($"LAST_EDITED_COLUMN: {oLEDITEDCOL}")
Catch ex As Exception
LAST_EDITED_COLUMN = ""
@ -92,6 +93,7 @@
Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_ADDED=", "")
Try
LAST_ADDED_COLUMN = oLEDITEDCOL
LOGGER.Info($"LAST_ADDED_COLUMN: {oLEDITEDCOL}")
Catch ex As Exception
LAST_ADDED_COLUMN = ""
@ -103,6 +105,22 @@
Catch ex As Exception
USE_APPSERVER = False
End Try
ElseIf oMode.StartsWith("PM.SEARCH1") Then
Dim oSearch1 = oMode.Replace("PM.SEARCH1=", "")
Try
SEARCH1 = oSearch1
Catch ex As Exception
SEARCH1 = ""
End Try
ElseIf oMode.StartsWith("PM.SEARCH2") Then
Dim oSearch2 = oMode.Replace("PM.SEARCH2=", "")
Try
SEARCH2 = oSearch2
Catch ex As Exception
SEARCH2 = ""
End Try
Else
LOGGER.Info($"Wrong oMode: {oMode}")

View File

@ -77,6 +77,8 @@ Module ModuleRuntimeVariables
Public LAST_EDITED_COLUMN As String = "NONE"
Public LAST_ADDED_COLUMN As String = "NONE"
Public USE_APPSERVER As Boolean = False
Public SEARCH1 As String = ""
Public SEARCH2 As String = ""
Public LICENSE_COUNT As Integer = 0
Public LICENSE_EXPIRED As Boolean = False

File diff suppressed because it is too large Load Diff

View File

@ -122,7 +122,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
CAAAAk1TRnQBSQFMAgEBAgEAAfQBBAH0AQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAfwBBAH8AQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

File diff suppressed because it is too large Load Diff

View File

@ -212,9 +212,36 @@ Public Class frmMain
Else
RibbonPageGroup2.Visible = True
End If
Try
If SEARCH1 <> String.Empty Then
Dim oindex = SEARCH1.IndexOf("~")
Dim oCaption = SEARCH1.Substring(0, oindex)
End If
Dim oCommand = SEARCH1.Replace(oCaption + "~", "")
SearchItem1.Caption = oCaption
SearchItem1.Tag = oCommand
SearchItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
End If
Catch ex As Exception
End Try
Try
If SEARCH2 <> String.Empty Then
Dim oindex = SEARCH2.IndexOf("~")
Dim oCaption = SEARCH2.Substring(0, oindex)
Dim oCommand = SEARCH2.Replace(oCaption + "~", "")
SearchItem2.Caption = oCaption
SearchItem2.Tag = oCommand
SearchItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
End If
Catch ex As Exception
End Try
End If
Catch ex As Exception
LOGGER.Error(ex)
MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in User Check:")
@ -1545,12 +1572,14 @@ Public Class frmMain
Dim oADDED = GET_LAST_ADDED(CURR_DT_OVERVIEW)
Dim oChanged = GET_LAST_CHANGED(CURR_DT_OVERVIEW)
If oADDED = OVERVIEW_ADDED_WHEN And oChanged = OVERVIEW_CHANGED_WHEN Then
LOGGER.Info("No changes on OverviewHash - so exit Refresh")
LOGGER.Info("No changes on OverviewHash - so exit Load_Grid_overview")
If ForceReload = False Then
Exit Function
End If
Else
LOGGER.Info("Differences on OverviewHash")
LOGGER.Debug($"oADDED/OVERVIEW_ADDED_WHEN: {oADDED}/{OVERVIEW_ADDED_WHEN}#oADDED/OVERVIEW_ADDED_WHEN: {oChanged}/{OVERVIEW_CHANGED_WHEN}")
OVERVIEW_ADDED_WHEN = oADDED
OVERVIEW_CHANGED_WHEN = oChanged
End If
@ -2337,6 +2366,7 @@ Public Class frmMain
End If
Hide()
ClassAllgemeineFunktionen.LoginOut("LOGOUT")
TimerInactivity.Stop()
MsgBox(omsg, MsgBoxStyle.Information, ADDITIONAL_TITLE)
Application.Exit()
Catch ex As Exception
@ -2344,4 +2374,21 @@ Public Class frmMain
End Try
End Sub
Private Sub BarButtonItem3_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SearchItem1.ItemClick
Try
Dim oTag = SearchItem1.Tag
Dim _SPLIT As String()
_SPLIT = oTag.Split("%")
Dim oPath = LTrim(RTrim(_SPLIT(0).ToString))
Dim MyProcess As New Process()
MyProcess.StartInfo.FileName = oPath
MyProcess.StartInfo.Arguments = LTrim(RTrim(_SPLIT(1).ToString))
MyProcess.Start() 'Startet den Prozess
Catch ex As Exception
LOGGER.Error(ex.Message)
End Try
End Sub
End Class

View File

@ -76,6 +76,7 @@ Public Class frmValidator
Private Override As Boolean = False
Private OverrideAll As Boolean = False
Private Override_SQLCommand As String = ""
Private listChangedLookup As New List(Of String)
Private ControlHandleStarted As Boolean = False
@ -965,6 +966,7 @@ Public Class frmValidator
End If
oMyControl = lookup
AddHandler lookup.SelectedValuesChanged, AddressOf LookupListChanged
'Wenn Multiselect false dann prüfen ob abhängiges Control
If CBool(oControlRow.Item("MULTISELECT")) = False Then
Dim oFilteredData As DataTable = DTCONTROLS.Clone()
@ -1496,6 +1498,20 @@ Public Class frmValidator
LOGGER.Error(ex)
End Try
End Sub
Public Sub LookupListChanged(sender As Object, SelectedValues As List(Of String))
If FormLoaded = False Then
Exit Sub
End If
LOGGER.Debug("LookupListChanged")
Dim oLookup As LookupControl2 = sender
Try
listChangedLookup.Add(oLookup.Name)
Catch ex As Exception
LOGGER.Error(ex)
End Try
End Sub
Public Sub onCheckBox_CheckedChange(sender As Object, e As EventArgs)
LOGGER.Debug("onCheckBox_CheckedChange")
@ -4261,10 +4277,10 @@ Public Class frmValidator
Else
If lookup.MultiSelect = True Then
Dim Zeilen As Integer = lookup.SelectedValues.Count
Dim oLookupRows As Integer = lookup.SelectedValues.Count
'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss
If Zeilen > 0 Then
If oLookupRows > 0 Then
Dim ZeilenGrid As Integer = 0
Dim myVektorArr As String()
'Jeden Werte des Datagridviews durchlaufen
@ -4302,9 +4318,14 @@ Public Class frmValidator
oErrMsgMissingInput = "Error while indexing von LookupGrid - ERROR: " & idxerr_message
Exit For
End If
Else
For Each ochangedLookub In listChangedLookup
If lookup.Name = ochangedLookub Then
IDBData.Delete_AttributeData(CURRENT_DOC_ID, oIndexName)
Exit For
End If
Next
End If
End If
@ -4315,6 +4336,12 @@ Public Class frmValidator
oErrMsgMissingInput = $"Could not get FirstOrDefault-Value of LookUpGrid! - LookUPGridName: {lookup.Name}"
Exit For
ElseIf IsNothing(oMyInput) And oIsRequired = False Then
For Each ochangedLookub In listChangedLookup
If lookup.Name = ochangedLookub Then
IDBData.Delete_AttributeData(CURRENT_DOC_ID, oIndexName)
Exit For
End If
Next
Continue For
End If
'den aktuellen Wert in windream auslesen
@ -5345,6 +5372,7 @@ Public Class frmValidator
Catch ex As Exception
End Try
listChangedLookup.Clear()
SetStatusLabel("All Data refreshed", "Yellow")
End Sub