This commit is contained in:
2022-05-19 17:23:41 +02:00
parent 0c23878301
commit 5448240b46
19 changed files with 340 additions and 161 deletions

View File

@@ -589,9 +589,13 @@ Public Class frmAdmin_Globix
Private Sub SimpleButton4_Click(sender As Object, e As EventArgs) Handles SimpleButton4.Click
Try
If Regex.IsMatch(REGEXTextBox.Text, txtDateinameTest.Text) Then
MsgBox("The RegEx resulted in a proper match!", MsgBoxStyle.Information, "Perfect:")
Dim oMsgBox As New Dialog1("The RegEx resulted in a proper match!", "", False)
oMsgBox.ShowDialog()
Else
MsgBox("No Match- There might be an error in the RegEx!", MsgBoxStyle.Information, "Something wrong:")
Dim oMsgBox As New Dialog1("No Match- There might be an error in the RegEx!", "", True)
oMsgBox.ShowDialog()
End If
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Testing Regex: ")

View File

@@ -45,7 +45,8 @@ Public Class frmAdmin_Start
Load_GridData(oDetailData)
Else
MsgBox($"Could not load data for Page [{oKey}] because it does not exist!", MsgBoxStyle.Critical, Text)
Dim oMsgBox As New Dialog1($"Could not load data for Page [{oKey}] because it does not exist!", "Error", True)
oMsgBox.ShowDialog()
End If
End If
End Sub
@@ -64,6 +65,7 @@ Public Class frmAdmin_Start
Else
MsgBox($"Tag [{Page}] not found! Exiting." & vbNewLine &
$"Check the [ENTITY_TITLE] Column in Table [TBZF_ADMIN_SOURCE_SQL]. It must match with the Tag [{Page}] of the corresponding Tree List nodes!", MsgBoxStyle.Critical, Text)
Return False
End If

View File

@@ -98,7 +98,9 @@ Public Class ClassDragDrop
End If
Catch ex As Exception
Logger.Error(ex)
MsgBox("Error in view_MouseMove: " & ex.Message, MsgBoxStyle.Critical)
Dim oMsgBox As New Dialog1("Error in view_MouseMove: " & ex.Message, "", True)
oMsgBox.ShowDialog()
End Try
End Sub

View File

@@ -207,14 +207,8 @@ Public Class ClassInit
Dim oDatatable As DataTable = My.Database.GetDatatableIDB(oSql)
For Each oRow As DataRow In oDatatable.Rows
Dim oCAT_TITLE As String = oRow.Item("CAT_TITLE")
Logger.Debug($"IDB_CATALOG_STRING: {oRow.Item("CAT_STRING")}")
Select Case oCAT_TITLE
Case "AHWF_CMD_USR_SELECT"
AHWF_CMD_USR_SELECT = oRow.Item("CAT_STRING")
Case "AHWF_CMD_LAYOUT_SELECT"
AHWF_CMD_LAYOUT_SELECT = oRow.Item("CAT_STRING")
End Select
Next
Catch ex As InitException
@@ -377,7 +371,8 @@ Public Class ClassInit
Dim oMessage = $"{oMessageStart}{oMessage1}{oMessage2}{oMessageEnd}"
MsgBox(oMessage, MsgBoxStyle.Critical, _MainForm.Text)
Dim oMsgBox As New Dialog1(oMessage, _MainForm.Text, True)
oMsgBox.ShowDialog()
Application.ExitThread()
Else
' Copy back state from MyApplication Helper to My.Application

View File

@@ -34,7 +34,7 @@ Partial Class Dialog1
Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
Me.OK_Button.DialogResult = System.Windows.Forms.DialogResult.Yes
Me.OK_Button.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.OK_Button.Location = New System.Drawing.Point(235, 94)
Me.OK_Button.Location = New System.Drawing.Point(12, 94)
Me.OK_Button.Name = "OK_Button"
Me.OK_Button.Size = New System.Drawing.Size(87, 32)
Me.OK_Button.TabIndex = 0
@@ -65,7 +65,7 @@ Partial Class Dialog1
'
'Panel1
'
Me.Panel1.BackColor = System.Drawing.Color.SteelBlue
Me.Panel1.BackColor = System.Drawing.Color.OrangeRed
Me.Panel1.Controls.Add(Me.lblMeldung)
Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
Me.Panel1.Location = New System.Drawing.Point(0, 0)
@@ -89,7 +89,7 @@ Partial Class Dialog1
Me.MinimizeBox = False
Me.Name = "Dialog1"
Me.ShowInTaskbar = False
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
Me.Text = "Dialog1"
Me.Panel1.ResumeLayout(False)
Me.Panel1.PerformLayout()

View File

@@ -1,7 +1,7 @@
Imports System.Windows.Forms
Public Class Dialog1
Public Sub New(pMessageText As String, pTitle As String)
Public Sub New(pMessageText As String, pTitle As String, IsError As Boolean)
' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent()
@@ -9,6 +9,13 @@ Public Class Dialog1
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
Me.lblMeldung.Text = pMessageText
Me.Text = pTitle
If IsError Then
Panel1.BackColor = Color.Red
Cancel_Button.Visible = False
Else
Panel1.BackColor = Color.OrangeRed
Cancel_Button.Visible = True
End If
End Sub
Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
@@ -21,4 +28,7 @@ Public Class Dialog1
Me.Close()
End Sub
Private Sub Dialog1_Load(sender As Object, e As EventArgs) Handles Me.Load
End Sub
End Class

View File

@@ -54,11 +54,7 @@ Public Class ClassFilehandle
'Dim oBoxOptions = MsgBoxStyle.Question Or MsgBoxStyle.YesNo
ofrmDuplicate.ShowDialog()
'If My.Application.User.Language = "de-DE" Then
' oResult = MsgBox($"Die Datei [{oFilename}] wurde bereits am [{oDate}] verarbeitet. Wollen Sie die gleiche Datei noch einmal verarbeiten?", oBoxOptions, oBoxTitle)
'Else
' oResult = MsgBox($"The file [{oFilename}] has already been processed at [{oDate}]. Do you want to process the same file again?", oBoxOptions, oBoxTitle)
'End If
If ofrmDuplicate.DialogResult = DialogResult.Yes Then
Return True
@@ -124,11 +120,14 @@ Public Class ClassFilehandle
End If
If oTempFilePath.ToUpper.EndsWith(".LNK") Then
Dim oMSG As String
If My.Application.User.Language = "de-DE" Then
MsgBox("Verknüpfungen können nicht abgelegt werden!", MsgBoxStyle.Critical, "Global Indexer")
oMSG = "Verknüpfungen können nicht abgelegt werden!"
Else
MsgBox("Shortcuts cannot be droppped!", MsgBoxStyle.Critical, "Global Indexer")
oMSG = "Shortcuts cannot be droppped!"
End If
Dim oMsgBox As New Dialog1(oMSG, "", True)
oMsgBox.ShowDialog()
Return False
End If

View File

@@ -80,7 +80,9 @@ Public Class ClassFolderwatcher
End If
Catch ex As Exception
Logger.Error(ex.Message)
MsgBox("Error in StartStop_FolderWatch:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
Dim oMsgBox As New Dialog1("Error in StartStop_FolderWatch:" & vbNewLine & ex.Message, "", True)
oMsgBox.ShowDialog()
End Try
End Function
Public Function StartStop_FolderWatchSCAN() As Integer

View File

@@ -259,6 +259,8 @@ Public Class ClassValidator
End Function
Private Sub ShowValidationMessage()
MsgBox(ClassConstants.TEXT_MISSING_INPUT, MsgBoxStyle.Exclamation, ClassConstants.TITLE_MISSING_INPUT)
'MsgBox(ClassConstants.TEXT_MISSING_INPUT, MsgBoxStyle.Exclamation, ClassConstants.TITLE_MISSING_INPUT)
Dim oMsgBox As New Dialog1(ClassConstants.TITLE_MISSING_INPUT & vbNewLine & ClassConstants.TEXT_MISSING_INPUT, "", True)
oMsgBox.ShowDialog()
End Sub
End Class

View File

@@ -44,12 +44,15 @@ Public Class frmGlobixBasicConfig
Logger.Info(">> Unexpected error in CheckFolder: " & pMypath)
Logger.Error(ex.Message)
Logger.Info(" >> " & ex.Message)
If My.Application.User.Language = "de-DE" Then
MsgBox("Unexpected error in ECheckFolder: " & pMypath & vbNewLine & "Bitte überprüfen Sie die Rechte!" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
Else
MsgBox("Error in creating Hotfolder: " & pMypath & vbNewLine & "Please check the rights!" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End If
Dim otext As String
If My.Application.User.Language = "de-DE" Then
otext = "Unexpected error in ECheckFolder: " & pMypath & vbNewLine & "Bitte überprüfen Sie die Rechte!" & vbNewLine & ex.Message
Else
otext = "Error in creating Hotfolder: " & pMypath & vbNewLine & "Please check the rights!" & vbNewLine & ex.Message
End If
Dim oMsgBox As New Dialog1("No Match- There might be an error in the RegEx!", "", True)
oMsgBox.ShowDialog()
Exit Sub
End Try

View File

@@ -463,12 +463,14 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I
oControl = oControls.AddDateTimePicker(oControlName, oControlPosition, oDataType)
Case Else
Dim omsg As String
If My.Application.User.Language = "de-DE" Then
MsgBox("Bitte überprüfen Sie den Datentyp des hinterlegten Indexwertes!", MsgBoxStyle.Critical, "Achtung:")
omsg = "Bitte überprüfen Sie den Datentyp des hinterlegten Indexwertes!"
Else
MsgBox("Please check Datatype of Indexvalue!", MsgBoxStyle.Critical, "Warning:")
omsg = "Please check Datatype of Indexvalue!"
End If
Dim oMsgBox As New Dialog1(omsg, "", True)
oMsgBox.ShowDialog()
Logger.Warn("DataType [{0}] not implemented!", oIndex.DataType)
End Select
@@ -647,24 +649,30 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I
Private Sub frmGlobix_Index_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
If File.Exists(My.Application.Globix.CurrentWorkfile.FilePath) Then
Dim oMsg As String
Select Case CancelAttempts
Case 0
If My.Application.User.Language = "de-DE" Then
MsgBox("Bitte indexieren Sie die Datei vollständig!" & vbNewLine & "(Abbruch 1 des Indexierungsvorgangs)", MsgBoxStyle.Information)
oMsg = "Bitte indexieren Sie die Datei vollständig!" & vbNewLine & "(Abbruch 1 des Indexierungsvorgangs)"
Else
MsgBox("Please Index file completely" & vbNewLine & "(Abort 1 of Indexdialog)", MsgBoxStyle.Information)
oMsg = "Please Index file completely" & vbNewLine & "(Abort 1 of Indexdialog)"
End If
Dim oMsgBox As New Dialog1(oMsg, "", False)
oMsgBox.Cancel_Button.Visible = False
oMsgBox.ShowDialog()
CancelAttempts += 1
e.Cancel = True
Case 1
Dim result As MsgBoxResult
If My.Application.User.Language = "de-DE" Then
result = MessageBox.Show("Sie brechen nun zum zweiten Mal den Indexierungsvorgang ab!" & vbNewLine & "Wollen Sie die Indexierung aller Dateien abbrechen?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
Else
result = MessageBox.Show("You abort the indexdialog for the 2nd time!" & vbNewLine & "Do You want to abort indexing?", "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
End If
If result = MsgBoxResult.Yes Then
If My.Application.User.Language = "de-DE" Then
oMsg = "Sie brechen nun zum zweiten Mal den Indexierungsvorgang ab!" & vbNewLine & "Wollen Sie die Indexierung aller Dateien abbrechen?"
Else
oMsg = "You abort the indexdialog for the 2nd time!" & vbNewLine & "Do You want to abort indexing?"
End If
Dim oMsgBox As New Dialog1(oMsg, "", False)
oMsgBox.Cancel_Button.Visible = True
If oMsgBox.DialogResult = DialogResult.Yes Then
Dim containsfw_file As Boolean = False
Try
My.Application.Globix.ABORT_INDEXING = True

View File

@@ -71,8 +71,8 @@ Namespace My
End Function
Public Function GetAdHocWorkflow(pObjectID As Long) As AdHocWorkflow
Return New AdHocWorkflow With {
.AHWF_CMD_LAYOUT_SELECT = AHWF_CMD_LAYOUT_SELECT,
.AHWF_CMD_USR_SELECT = AHWF_CMD_USR_SELECT,
.AHWF_CMD_LAYOUT_SELECT = SQL_AHW_LAYOUT_SELECT,
.AHWF_CMD_USR_SELECT = SQL_AHW_USR_SELECT,
.OBJECT_ID = pObjectID
}
End Function

View File

@@ -309,12 +309,14 @@ Public Class frmFlowForm
Dim oFileExclusions As New ClassExclusions()
If oFileExclusions.Load() = False Then
Dim oMsg As String
If My.Application.User.Language = "de-DE" Then
MsgBox("Die Ausschlusskriterien für Dateien in Folderwatch konnten nicht angelegt werden!", MsgBoxStyle.Information)
oMsg = "Die Ausschlusskriterien für Dateien in Folderwatch konnten nicht angelegt werden!"
Else
MsgBox("File-Exclusions in Folderwatch could not be created!", MsgBoxStyle.Information)
oMsg = "File-Exclusions in Folderwatch could not be created!"
End If
Dim oMsgBox As New Dialog1(oMsg, "Error", True)
oMsgBox.ShowDialog()
End If
Init_Folderwatch()
@@ -506,7 +508,7 @@ Public Class frmFlowForm
If My.Application.User.Language <> "de-DE" Then
oTitle = "Exit Zooflow"
End If
Dim oMsgBox As New Dialog1(omessage, oTitle)
Dim oMsgBox As New Dialog1(omessage, oTitle, False)
oMsgBox.ShowDialog()
If oMsgBox.DialogResult = DialogResult.OK Then
@@ -611,7 +613,8 @@ Public Class frmFlowForm
End If
If TheFormIsAlreadyLoaded("frmIndexFileList") Then
Cursor = Cursors.Default
MsgBox("Please index the active file first!", MsgBoxStyle.Exclamation, "Drag 'n Drop not allowed!")
Dim oMsgBox As New Dialog1("Please index the active file first!", "Drag 'n Drop not allowed!", True)
oMsgBox.ShowDialog()
Exit Function
End If
@@ -914,7 +917,8 @@ Public Class frmFlowForm
If ex.Message.Contains("Sammlung wurde geändert") Or ex.Message.Contains("Enumeration") Then
Else
MsgBox("Error in Work FolderWatch-File:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
Dim oMsgBox As New Dialog1("Error in Work FolderWatch-File:" & vbNewLine & ex.Message, "Drag 'n Drop not allowed!", True)
oMsgBox.ShowDialog()
End If
End Try

View File

@@ -1,9 +1,9 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
Partial Class frmtest
Inherits System.Windows.Forms.Form
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
<System.Diagnostics.DebuggerNonUserCode()> _
<System.Diagnostics.DebuggerNonUserCode()>
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
Try
If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class frmtest
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.Label2 = New System.Windows.Forms.Label()
Me.txtFile2Import = New System.Windows.Forms.TextBox()
@@ -39,7 +39,7 @@ Partial Class frmtest
Me.txtDoctypeID = New System.Windows.Forms.TextBox()
Me.Label3 = New System.Windows.Forms.Label()
Me.Button1 = New System.Windows.Forms.Button()
Me.txtObjectID = New System.Windows.Forms.TextBox()
Me.TextBox1 = New System.Windows.Forms.TextBox()
Me.SuspendLayout()
'
'Label2
@@ -152,7 +152,6 @@ Partial Class frmtest
'
'txtIDB_OBJ_ID
'
Me.txtIDB_OBJ_ID.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.DigitalData.GUIs.ZooFlow.Settings.Default, "IDBOBJID", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
Me.txtIDB_OBJ_ID.Location = New System.Drawing.Point(137, 38)
Me.txtIDB_OBJ_ID.Name = "txtIDB_OBJ_ID"
Me.txtIDB_OBJ_ID.Size = New System.Drawing.Size(100, 20)
@@ -183,19 +182,19 @@ Partial Class frmtest
Me.Button1.Text = "AdhocWorkflow"
Me.Button1.UseVisualStyleBackColor = True
'
'txtObjectID
'TextBox1
'
Me.txtObjectID.Location = New System.Drawing.Point(174, 193)
Me.txtObjectID.Name = "txtObjectID"
Me.txtObjectID.Size = New System.Drawing.Size(118, 20)
Me.txtObjectID.TabIndex = 25
Me.TextBox1.Location = New System.Drawing.Point(172, 194)
Me.TextBox1.Name = "TextBox1"
Me.TextBox1.Size = New System.Drawing.Size(189, 20)
Me.TextBox1.TabIndex = 25
'
'frmtest
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(865, 450)
Me.Controls.Add(Me.txtObjectID)
Me.Controls.Add(Me.TextBox1)
Me.Controls.Add(Me.Button1)
Me.Controls.Add(Me.Label3)
Me.Controls.Add(Me.txtDoctypeID)
@@ -235,5 +234,5 @@ Partial Class frmtest
Friend WithEvents txtDoctypeID As TextBox
Friend WithEvents Label3 As Label
Friend WithEvents Button1 As Button
Friend WithEvents txtObjectID As TextBox
Friend WithEvents TextBox1 As TextBox
End Class

View File

@@ -75,7 +75,7 @@ Public Class frmtest
End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
AdHoc_Workflow = My.Application.GetAdHocWorkflow(txtObjectID.Text)
AdHoc_Workflow = My.Application.GetAdHocWorkflow(TextBox1.Text)
Dim oForm As New frmWorkflow_Adhoc_start(My.LogConfig, Environment, AdHoc_Workflow)
oForm.Show()
oForm.BringToFront()

View File

@@ -10,9 +10,6 @@ Module modCurrent
Public Property NI_MESSAGE As String = ""
Public Property NI_TYPE As String = "INFO"
Public Property GLOBIX_JUMP_DOCTYPE_ID As Integer
Public Property AHWF_CMD_USR_SELECT As String
Public Property AHWF_CMD_LAYOUT_SELECT As String
Public Property SQL_FLOW_SEARCH_BASE As String
Public Property SQL_AHW_LAYOUT_SELECT As String
Public Property SQL_AHW_USR_SELECT As String