Save_InButtonOverride

MainHandling
This commit is contained in:
SchreiberM 2020-12-18 09:05:51 +01:00
parent a81f6dba11
commit e326a7b660
3 changed files with 31 additions and 16 deletions

View File

@ -86,11 +86,11 @@ Public Class ClassInit
CONNECTION_STRING_READ = CONNECTION_STRING CONNECTION_STRING_READ = CONNECTION_STRING
End If End If
If CONFIG.Config.AppServerConfig <> String.Empty Then If CONFIG.Config.EDMIAppServer <> String.Empty Then
Try Try
Dim oSplit() = CONFIG.Config.AppServerConfig.ToString.Split(";") Dim oSplit() = CONFIG.Config.EDMIAppServer.ToString.Split(";")
Dim oAppServer = oSplit(0) Dim oAppServer = oSplit(0)
Dim oAppServerPort = 9000 Dim oAppServerPort = 9000
If oSplit.Length = 2 Then If oSplit.Length = 2 Then
@ -99,7 +99,7 @@ Public Class ClassInit
_Client = New Client(LOGCONFIG, oAppServer, oAppServerPort) _Client = New Client(LOGCONFIG, oAppServer, oAppServerPort)
If Not IsNothing(_Client) Then If Not IsNothing(_Client) Then
If _Client.Connect() Then If _Client.Connect() Then
APPSERVER_ACTIVE = True EDMIAppServerActive = True
End If End If
End If End If

View File

@ -34,7 +34,7 @@ Public Class frmMain
Private NO_WORKFLOWITEMS As Boolean = False Private NO_WORKFLOWITEMS As Boolean = False
Private InResetlayout As Boolean = False Private InResetlayout As Boolean = False
Private RefreshHelper As RefreshHelper Private RefreshHelper As RefreshHelper
Private _FormValidator As frmValidator
Private FormOpenClose As Boolean = False Private FormOpenClose As Boolean = False
Private FormShown As Boolean = False Private FormShown As Boolean = False
Private GridIsLoaded As Boolean = False Private GridIsLoaded As Boolean = False
@ -166,9 +166,10 @@ Public Class frmMain
End Try End Try
Try Try
bsiLicenses.Caption = "Anzahl Lizenzen: " & LICENSE_COUNT bsiLicenses.Caption = "Anzahl Lizenzen: " & LICENSE_COUNT
LOGGER.Debug("Initializing MainForm....") LOGGER.Debug("Initializing MainForm....")
If ERROR_STATE = "NO USER" Then
If ERROR_STATE = "NO USER" Then
Dim oDT As DataTable = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("No Userconfig") Dim oDT As DataTable = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("No Userconfig")
MsgBox(oDT.Rows(0).Item("STRING1") & vbNewLine & oDT.Rows(0).Item("STRING2"), MsgBoxStyle.Critical, "Exception") MsgBox(oDT.Rows(0).Item("STRING1") & vbNewLine & oDT.Rows(0).Item("STRING2"), MsgBoxStyle.Critical, "Exception")
Me.Close() Me.Close()
@ -1201,7 +1202,9 @@ Public Class frmMain
BASEDATA_DT_PROFILES_SEARCHES_SQL.Select(oExpression, "TAB_INDEX").CopyToDataTable(BASEDATA_DT_PROFILE_SEARCHES_SQL, LoadOption.PreserveChanges) BASEDATA_DT_PROFILES_SEARCHES_SQL.Select(oExpression, "TAB_INDEX").CopyToDataTable(BASEDATA_DT_PROFILE_SEARCHES_SQL, LoadOption.PreserveChanges)
Try Try
frmValidator.Show() _FormValidator = New frmValidator
AddHandler _FormValidator.FormClosed, AddressOf ValidatorClosed
_FormValidator.Show()
Catch ex As Exception Catch ex As Exception
LOGGER.Warn($"Error opening Form frmValidator [{ex.Message}]") LOGGER.Warn($"Error opening Form frmValidator [{ex.Message}]")
LOGGER.Warn($"ex.InnerException.Message [{ex.InnerException.Message}]") LOGGER.Warn($"ex.InnerException.Message [{ex.InnerException.Message}]")
@ -1311,7 +1314,6 @@ Public Class frmMain
OItemScopeInfo = $"groupRowText {groupRowText}" OItemScopeInfo = $"groupRowText {groupRowText}"
LOGGER.Debug($"Item_Scope: groupRowText {groupRowText}") LOGGER.Debug($"Item_Scope: groupRowText {groupRowText}")
oHitProfilID = GridView_Docs.GetRowCellValue(GridView_Docs.GetDataRowHandleByGroupRowHandle(hitInfo.RowHandle), GridView_Docs.Columns("PROFILE_ID")) oHitProfilID = GridView_Docs.GetRowCellValue(GridView_Docs.GetDataRowHandleByGroupRowHandle(hitInfo.RowHandle), GridView_Docs.Columns("PROFILE_ID"))
ElseIf hitInfo.InDataRow Then ElseIf hitInfo.InDataRow Then
GridViewItem_Clicked = "ROW" GridViewItem_Clicked = "ROW"
OItemScopeInfo = "InDataRow" OItemScopeInfo = "InDataRow"
@ -1439,6 +1441,14 @@ Public Class frmMain
End Try End Try
End Sub End Sub
Private Async Sub ValidatorClosed(sender As Object, e As FormClosedEventArgs)
Try
Await Decide_Load(False, True)
If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.LoadViewInfo()
Catch ex As Exception
LOGGER.Error(ex)
End Try
End Sub
Private Function Init_IDB() Private Function Init_IDB()
Try Try
IDBData = New ClassIDBData() IDBData = New ClassIDBData()

View File

@ -1402,9 +1402,14 @@ Public Class frmValidator
End If End If
Case "Override_Direct".ToUpper Case "Override_Direct".ToUpper
Override = True Override = True
Finish_WFStep(False) If Check_UpdateIndexe() = False Then
Finish_WFStep(False)
End If
Case "Override incFinal".ToUpper Case "Override incFinal".ToUpper
Finish_WFStep(False) If Check_UpdateIndexe() = False Then
Finish_WFStep(False)
End If
Case Else Case Else
MsgBox($"No configured action provided for onCustomButtonClick [{oAction}]", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) MsgBox($"No configured action provided for onCustomButtonClick [{oAction}]", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE)
LOGGER.Warn($"No configured action provided for onCustomButtonClick [{oAction}]") LOGGER.Warn($"No configured action provided for onCustomButtonClick [{oAction}]")
@ -2665,11 +2670,11 @@ Public Class frmValidator
End If End If
LOGGER.Info(oMsg) LOGGER.Info(oMsg)
Dim oROW As DataRow = ClassAllgemeineFunktionen.GUI_LANGUAGE_MSGBOX("frmValidator.NoMoreDocument") Dim oROW As DataRow = ClassAllgemeineFunktionen.GUI_LANGUAGE_MSGBOX("frmValidator.NoMoreDocument")
Try 'Try
MsgBox(oROW.Item("STRING1"), MsgBoxStyle.Information, oROW.Item("STRING2")) ' MsgBox(oROW.Item("STRING1"), MsgBoxStyle.Information, oROW.Item("STRING2"))
Catch ex As Exception 'Catch ex As Exception
MsgBox("No more documents! (No translation so far)" & vbNewLine & "Form will be closed now!", MsgBoxStyle.Information, ADDITIONAL_TITLE) ' MsgBox("No more documents! (No translation so far)" & vbNewLine & "Form will be closed now!", MsgBoxStyle.Information, ADDITIONAL_TITLE)
End Try 'End Try
activate_controls(True) activate_controls(True)
Me.Close() Me.Close()
End If End If