Compare commits

...

4 Commits

50 changed files with 287697 additions and 416 deletions

View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.0.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: AssemblyVersion("2.5.0.0")>
<Assembly: AssemblyFileVersion("1.5.0.0")>

View File

@@ -1,8 +1,9 @@
Public Class clsCURRENT
Public Shared EXPORTED_FILENAME As String
Public Shared FILE_Extension As String
Public Shared WDLAUFWERK, _profObjekttyp, _profwdSuche, _profDay, _profRunType, _Profilname As String
Public Shared SQLSERVER_CS As String = ""
Public Shared LOG_ERRORS_ONLY As Boolean = True
Public Shared DEBUG As Boolean = False
Public Shared PROFILE_HandledFiles() = Nothing
Public Shared DT_TBWMRH_KONFIGURATION As DataTable = Nothing
Public Shared DT_TBDD_EMAIL As DataTable = Nothing

View File

@@ -133,31 +133,39 @@ Public Class clsDateiverarbeitung
Return String.Empty
End Try
End Function
' Neu geschriebene version 25.03.19
Public Function Export_WMFile2HDD(WMObject As WMObject, ExportPath As String) As Boolean
Public Function Export_WMFile2HDD(pWMObject As WMObject, pExportPath As String, Optional pFilename As String = "") As Boolean
Try
Dim oWMObject As IWMObject6 = DirectCast(WMObject, IWMObject6)
Dim oWMObject As IWMObject6 = DirectCast(pWMObject, IWMObject6)
Dim oFilenameFull As String = oWMObject.aName
Dim oFilenameWM As String = oWMObject.aName
Dim oFilenameExport As String
Dim oSplitIndex = oFilenameFull.LastIndexOf(".")
Dim oSplitIndex
If pFilename = String.Empty Then
oSplitIndex = oFilenameWM.LastIndexOf(".")
Else
oSplitIndex = pFilename.LastIndexOf(".")
End If
Dim oVersion = 1
Dim oFilename As String
If pFilename <> String.Empty Then
oFilename = pFilename.Substring(0, oSplitIndex)
Else
oFilename = oFilenameWM.Substring(0, oSplitIndex)
End If
Dim oFilename = oFilenameFull.Substring(0, oSplitIndex)
Dim oExtension = oFilenameFull.Substring(oSplitIndex)
Logger.Debug("Preparing export of file {0}..", oFilenameFull)
Logger.Debug("Preparing export of WMFile {0}..", oFilenameWM)
Logger.Debug("Filename: {0}", oFilename)
Logger.Debug("Extension: {0}", oExtension)
Logger.Debug("Extension: {0}", clsCURRENT.FILE_Extension)
' build the file path in case the exported file doesn't already exist
oFilenameExport = BuildExportPath(ExportPath, oFilename, oExtension)
oFilenameExport = BuildExportPath(pExportPath, oFilename, clsCURRENT.FILE_Extension)
' Add version until we find the version that does NOT exist
Do While File.Exists(oFilenameExport)
oVersion += 1
oFilenameExport = BuildExportPath(ExportPath, oFilename, oExtension, oVersion)
oFilenameExport = BuildExportPath(pExportPath, oFilename, clsCURRENT.FILE_Extension, oVersion)
Loop
Logger.Debug("File will be exported to {0}", oFilenameExport)
@@ -308,7 +316,7 @@ Public Class clsDateiverarbeitung
Logger.Debug("tempFilename: " & tempFilename)
'Überprüfen ob File existiert
Do While IO.File.Exists(tempFilename) = True
tempFilename = ZielPfad & "\" & Filename & "~" & version & Extension
tempFilename = ZielPfad & "\" & Filename & "_" & version & Extension
version += 1
Loop
Logger.Debug("RenameFile - OLDFilename: " & aktfile_Exportresult & " - NEWFilename: " & Path.GetFileName(tempFilename))
@@ -353,7 +361,7 @@ Public Class clsDateiverarbeitung
Dim version As Integer = 2
'Überprüfen ob File existiert
Do While IO.File.Exists(tempFilename) = True
tempFilename = ZielPfad & "\" & WMvalue & "~" & version & Extension
tempFilename = ZielPfad & "\" & WMvalue & "_" & version & Extension
version += 1
Loop
File.Copy(copybasefile, tempFilename, True)
@@ -647,7 +655,7 @@ Public Class clsDateiverarbeitung
End Function
Public Function REGEX_REPLACE(WMFile As WMObject, _STRING As String)
Try
Logger.Debug("REGEX_String before replacing: '" & _STRING & "'")
Logger.Debug("REGEX_REPLACE before replacing: '" & _STRING & "'")
' Regulären Ausdruck zum Auslesen der windream-Indexe definieren
Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
' einen Regulären Ausdruck laden
@@ -668,7 +676,6 @@ Public Class clsDateiverarbeitung
ElseIf reg_element_Ohne_SZ = "ENV_USERNAME" Then
_STRING = _STRING.Replace(reg_element.Value, Environment.UserName)
Else
Dim wdIndexwert
' den Wert des Indexes für das aktuelle Dokument auslesen
wdIndexwert = WMFile.GetVariableValue(reg_element_Ohne_SZ)
@@ -706,9 +713,8 @@ Public Class clsDateiverarbeitung
_STRING = _STRING.Replace(reg_element.Value, "0")
End If
End If
Next
Logger.Debug("REGEX_REPLACE AFTER replacing: '" & _STRING & "'")
Return _STRING
Catch ex As Exception
Logger.Error(ex)

View File

@@ -14,126 +14,60 @@ Public Class clsEmail
Sub New(MyLogger As LogConfig)
Logger = MyLogger.GetLogger()
End Sub
Public Function Testmail(ByVal mailSubject As String, ByVal mailBody As String, mailto As String,
mailfrom As String, mailsmtp As String, mailport As Integer, mailUser As String, mailPW As String,
AUTH_TYPE As String, Optional attment As String = "")
Try
Dim oReceipiants As String()
If mailto.Contains(";") Then
oReceipiants = mailto.Split(";")
Else
ReDim Preserve oReceipiants(0)
oReceipiants(0) = mailto
End If
For Each oMailReceipiant As String In oReceipiants
Dim sClient = New Mail.SmtpClient(mailsmtp)
Dim mymesssage As New MailMessage
sClient.Port = mailport
If AUTH_TYPE = "SSL" Then
sClient.EnableSsl = True
Else
sClient.EnableSsl = False
End If
sClient.Credentials = New NetworkCredential(mailUser, mailPW)
sClient.UseDefaultCredentials = False
mymesssage.Body = $"This is the body (text will be replaced within profile)! <br> mailsmtp: {mailsmtp} <br> mailport: {mailport} <br> mailUser: {mailUser} <br> mailPW: XXXX <br> AUTH_TYPE: {AUTH_TYPE}"
Dim htmlView As AlternateView = AlternateView.CreateAlternateViewFromString(mymesssage.Body)
htmlView.ContentType = New System.Net.Mime.ContentType("text/html")
mymesssage.AlternateViews.Add(htmlView)
mymesssage.From = New MailAddress(mailfrom)
mymesssage.Subject = mailSubject
mymesssage.To.Add(New MailAddress(oMailReceipiant))
If attment <> String.Empty Then
Dim oAttment As String = attment.Replace("W:\", "\\windream\objects\")
If System.IO.File.Exists(oAttment) Then
Logger.Info($"working on attachment {oAttment}...")
Dim oAttachment As New System.Net.Mail.Attachment(oAttment)
mymesssage.Attachments.Add(oAttachment)
Else
MsgBox($"Attachment {oAttment.ToString} is not existing - Mail won't be send!")
Return False
End If
End If
sClient.Send(mymesssage)
Logger.Info($"Email has been send to {oMailReceipiant}!!")
Next
Return True
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Critical)
Return False
End Try
End Function
Public Function Email_Send(ByVal mailSubject As String, ByVal mailBody As String, mailto As String,
mailfrom As String, mailsmtp As String, mailport As Integer, mailUser As String, mailPW As String,
AUTH_TYPE As String, Optional attment As String = "", Optional Test As Boolean = False)
Public Function Email_Send(ByVal pMailSubject As String, ByVal pMailBody As String, pMailto As String,
pMailfrom As String, pMailSmtp As String, pMailport As Integer, pMailUser As String, pMailPW As String,
pAUTH_TYPE As String, Optional pAttment As String = "", Optional pTest As Boolean = False)
Try
Dim oError As Boolean = False
Dim oReceipiants As String()
If mailto.Contains(";") Then
oReceipiants = mailto.Split(";")
If pMailto.Contains(";") Then
oReceipiants = pMailto.Split(";")
Else
ReDim Preserve oReceipiants(0)
oReceipiants(0) = mailto
oReceipiants(0) = pMailto
End If
For Each oMailReceipiant As String In oReceipiants
Dim sClient = New Net.Mail.SmtpClient(mailsmtp)
Dim sClient = New Net.Mail.SmtpClient(pMailSmtp)
Dim mymesssage As New MailMessage
sClient.Port = mailport
If AUTH_TYPE = "SSL" Then
sClient.Port = pMailport
If pAUTH_TYPE = "SSL" Then
sClient.EnableSsl = True
Else
sClient.EnableSsl = False
End If
sClient.Credentials = New NetworkCredential(mailUser, mailPW)
sClient.Credentials = New NetworkCredential(pMailUser, pMailPW)
sClient.UseDefaultCredentials = False
If Test = True Then
mymesssage.Body = $"This is the body (text will be replaced within profile)! <br> mailsmtp: {mailsmtp} <br> mailport: {mailport} <br> mailUser: {mailUser} <br> mailPW: XXXX <br> AUTH_TYPE: {AUTH_TYPE}"
If pTest = True Then
mymesssage.Body = $"This is the body (text will be replaced within profile)! <br> mailsmtp: {pMailSmtp} <br> mailport: {pMailport} <br> mailUser: {pMailUser} <br> mailPW: XXXX <br> AUTH_TYPE: {pAUTH_TYPE}"
Else
mymesssage.Body = mailBody
mymesssage.Body = pMailBody
End If
'mymesssage.IsBodyHtml = True
Dim htmlView As AlternateView = AlternateView.CreateAlternateViewFromString(mymesssage.Body)
htmlView.ContentType = New System.Net.Mime.ContentType("text/html")
mymesssage.AlternateViews.Add(htmlView)
attment = attment.Replace("W:\", "\\windream\objects\")
If attment <> String.Empty Then
If System.IO.File.Exists(attment) Then
Logger.Info($"working on attachment {attment.ToString}...")
Dim oAttachment As New System.Net.Mail.Attachment(attment)
'If attment.ToLower.EndsWith("pdf") Then
' oAttachment.ContentType = New Independentsoft.Email.Mime.ContentType("application", "pdf")
'ElseIf attment.ToLower.EndsWith("jpg") Then
' oAttachment.ContentType = New Independentsoft.Email.Mime.ContentType("application", "jpg")
'ElseIf attment.ToLower.EndsWith("docx") Then
' oAttachment.ContentType = New Independentsoft.Email.Mime.ContentType("application", "MS-word")
'End If
pAttment = pAttment.Replace("W:\", "\\windream\objects\")
If pAttment <> String.Empty Then
If System.IO.File.Exists(pAttment) Then
Logger.Debug($"working on attachment {pAttment.ToString}...")
Dim oAttachment As New System.Net.Mail.Attachment(pAttment)
mymesssage.Attachments.Add(oAttachment)
Else
Logger.Warn($"Attachment {attment.ToString} is not existing - Mail won't be send!")
Logger.Warn($"Attachment {pAttment.ToString} is not existing - Mail won't be send!")
oError = True
End If
End If
mymesssage.From = New MailAddress(mailfrom)
mymesssage.Subject = mailSubject
mymesssage.From = New MailAddress(pMailfrom)
mymesssage.Subject = pMailSubject
mymesssage.To.Add(New MailAddress(oMailReceipiant))
sClient.Send(mymesssage)
Logger.Info($"Email successfully send to: [{oMailReceipiant}]!")
Logger.Debug($"Email successfully send to: [{oMailReceipiant}]!")
Next
If oError = False Then
Return True
@@ -147,153 +81,4 @@ Public Class clsEmail
End Try
End Function
Public Function Email_Send_Independentsoft(ByVal mailSubject As String, ByVal mailBody As String, mailto As String,
mailfrom As String, mailsmtp As String, mailport As Integer, mailUser As String, mailPW As String,
AUTH_TYPE As String, Optional attment As String = "")
Try
Logger.Debug($"in Email_Send_Independentsoft..")
Dim empfaenger As String()
If mailto.Contains(";") Then
empfaenger = mailto.Split(";")
Else
ReDim Preserve empfaenger(0)
empfaenger(0) = mailto
End If
Dim _error As Boolean = False
'Für jeden Empfänger eine Neue Mail erzeugen
For Each _mailempfaenger As String In empfaenger
Logger.Debug($"Working on email for {_mailempfaenger}..")
Try
Dim message As New Message()
message.From = New Mailbox(mailfrom, mailfrom)
message.[To].Add(New Mailbox(_mailempfaenger))
message.Subject = mailSubject
Logger.Debug($"Message created..")
Dim textBodyPart As New BodyPart()
textBodyPart.ContentType = New Independentsoft.Email.Mime.ContentType("text", "html", "utf-8")
textBodyPart.ContentTransferEncoding = ContentTransferEncoding.QuotedPrintable
textBodyPart.Body = mailBody
message.BodyParts.Add(textBodyPart)
attment = attment.Replace("W:\", "\\windream\objects\")
If attment <> String.Empty Then
If System.IO.File.Exists(attment) Then
Logger.Info($"working on attachment {attment.ToString}...")
Dim attachment1 As New Independentsoft.Email.Mime.Attachment(attment)
If attment.ToLower.EndsWith("pdf") Then
attachment1.ContentType = New Independentsoft.Email.Mime.ContentType("application", "pdf")
ElseIf attment.ToLower.EndsWith("jpg") Then
attachment1.ContentType = New Independentsoft.Email.Mime.ContentType("application", "jpg")
ElseIf attment.ToLower.EndsWith("docx") Then
attachment1.ContentType = New Independentsoft.Email.Mime.ContentType("application", "MS-word")
End If
message.BodyParts.Add(attachment1)
Else
Logger.Warn($"Attachment {attment.ToString} is not existing - Mail won't be send!")
Return False
End If
End If
Dim client As Smtp.SmtpClient
Try
client = New Smtp.SmtpClient(mailsmtp, mailport)
Catch ex As Exception
Logger.Warn("clsEmail.Create Client: " & ex.Message)
_error = True
Continue For
End Try
'Try
' client.Connect()
'Catch ex As Exception
' Logger.Warn("clsEmail.Client.Connect: " & ex.Message)
' _error = True
' ' Continue For
'End Try
If AUTH_TYPE = "SSL" Then
client.EnableSsl = True
' client.ValidateRemoteCertificate = True
Logger.Info("Authentification via SSL.")
ElseIf AUTH_TYPE = "TLS" Then
' client.ValidateRemoteCertificate = False
client.StartTls()
client.EnableSsl = False
Logger.Info("Authentification via TLS. SSL disabled")
Else
client.EnableSsl = False
Logger.Info("Authentification NONE. SSL disabled")
End If
Try
client.Connect()
Logger.Info("Connected to Client!")
Catch ex As Exception
Logger.Warn("clsEmail.Client.Connect2: " & ex.Message)
_error = True
' Continue For
End Try
Try
If mailsmtp.Contains("office365.com") Then
client.Login(mailUser, mailPW, AuthenticationType.None)
Else
client.Login(mailUser, mailPW)
End If
Logger.Info("Logged in!")
Catch ex As Exception
Try
If mailsmtp.Contains("office365.com") Then
client.Login(mailUser, mailPW, AuthenticationType.Login)
Else
client.Login(mailUser, mailPW, AuthenticationType.None)
End If
Catch ex1 As Exception
Try
client.Login(mailUser, mailPW, AuthenticationType.Login)
Catch ex2 As Exception
Logger.Warn("clsEmail.Client.Login: " & ex.Message)
_error = True
client.Disconnect()
Continue For
End Try
End Try
End Try
Try
client.Send(message)
Logger.Info("Message to " & _mailempfaenger & " has been send.")
_error = False
Catch ex As Exception
Logger.Warn("clsEmail.Client.Send: " & ex.Message)
Try
client.Login(mailUser, mailPW, AuthenticationType.Login)
client.Send(message)
Catch ex1 As Exception
Logger.Warn("clsEmail.Client.Send2: " & ex.Message)
_error = True
client.Disconnect()
Continue For
End Try
End Try
client.Disconnect()
Catch ex As Exception
Logger.Error(ex)
_error = True
End Try
Next
If _error = True Then
Return False
Else
Return True
End If
Catch ex As Exception
Logger.Error(ex)
Return False
End Try
End Function
End Class

View File

@@ -144,7 +144,7 @@ Public Class clsProfil
Return False
End If
If windreamSucheErgebnisse.Count > 0 Then
Logger.Info(windreamSucheErgebnisse.Count & " files shall be worked!")
Logger.Info(windreamSucheErgebnisse.Count & " file(s) shall be worked!")
Logger.Debug("SELECT * FROM TBWMRH_PROFIL_JOB WHERE AKTIV = 1 AND PROFIL_ID = " & _profGUID & " ORDER BY REIHENFOLGE")
Dim DT_PROFIL_JOB As DataTable = _database.Return_Datatable("SELECT * FROM TBWMRH_PROFIL_JOB WHERE AKTIV = 1 AND PROFIL_ID = " & _profGUID & " ORDER BY REIHENFOLGE")
@@ -162,30 +162,45 @@ Public Class clsProfil
Dim CountExportedDoc As Integer = 0
clsCURRENT.PROFILE_HandledFiles = Nothing
Dim oFileRunNo As String
Dim oGesamtFiles As Integer
oGesamtFiles = windreamSucheErgebnisse.Count
Dim oCountDocs As Integer = 0
For Each WMdok As WMObject In windreamSucheErgebnisse
oCountDocs += 1
oFileRunNo = "#DocRun" & oCountDocs.ToString
Logger.Debug($"Working on Doc {oCountDocs.ToString}/{windreamSucheErgebnisse.Count}")
oFileRunNo = "#Doc " & oCountDocs.ToString
Dim oPointIndex = WMdok.aName.LastIndexOf(".")
clsCURRENT.FILE_Extension = WMdok.aName.Substring(oPointIndex)
For Each DR_PR_JB As DataRow In DT_PROFIL_JOB.Rows
Select Case DR_PR_JB.Item("JOB_TYP").ToString.ToUpper
Case "Create Mail Attachment".ToUpper
Logger.Info("JobType: Create Mail Attachment")
Logger.Debug("JobType: Create Mail Attachment")
'XX
Dim Email_Empfänger = DR_PR_JB.Item("STRING1")
Logger.Debug("Email_Empfänger: " & Email_Empfänger)
Dim Email_Betreff = DR_PR_JB.Item("STRING2")
Logger.Debug("Email_Betreff: " & Email_Betreff)
Dim oEmail_Betreff = DR_PR_JB.Item("STRING2")
Logger.Debug("Email_Betreff: " & oEmail_Betreff)
Dim Email_Body = DR_PR_JB.Item("STRING3")
Logger.Debug("Email_Body: " & Email_Body)
Dim EMAIL_PROFIL = DR_PR_JB.Item("STRING4")
Logger.Debug("EMAIL_PROFIL: " & EMAIL_PROFIL)
Dim oRENAMEFILE = DR_PR_JB.Item("STRING5")
Dim oAttachment_FullFilename As String = ""
If Not IsDBNull(oRENAMEFILE) Then
If oRENAMEFILE.ToString <> String.Empty Then
Logger.Debug("Attached file shall be renamed...")
oRENAMEFILE = _dateiverarbeitung.REGEX_REPLACE(WMdok, oRENAMEFILE)
oAttachment_FullFilename = oRENAMEFILE & clsCURRENT.FILE_Extension
Logger.Debug($"oAttachment: {oAttachment_FullFilename}")
End If
End If
If Not IsNothing(clsCURRENT.DT_TBDD_EMAIL) And clsCURRENT.DT_TBDD_EMAIL.Rows.Count >= 1 Then
Dim oAttachment = clsCURRENT.WDLAUFWERK & ":" & WMdok.aPath
If _dateiverarbeitung.Export_WMFile2HDD(WMdok, Path.GetTempPath()) = True Then
oAttachment = clsCURRENT.EXPORTED_FILENAME
If _dateiverarbeitung.Export_WMFile2HDD(WMdok, Path.GetTempPath(), oAttachment_FullFilename) = True Then
oAttachment_FullFilename = clsCURRENT.EXPORTED_FILENAME
Else
Logger.Warn($"Could not create a tempfile...")
FileJobSuccessful = False
@@ -210,27 +225,32 @@ Public Class clsProfil
MAIL_PORT = emailrow.Item("PORT")
End If
Next
Dim wrapper As New clsEncryption("!35452didalog=")
Dim PWPlain = wrapper.DecryptData(MAIL_USER_PW)
If Not IsNothing(PWPlain) Then
MAIL_USER_PW = PWPlain
Logger.Debug("Email-Profil Used: " & EMAIL_PROFIL)
Logger.Debug("EMAIL_AUTH_TYPE: " & MAIL_AUTH_TYPE)
If MAIL_AUTH_TYPE.ToUpper <> "NONE" Then
Dim wrapper As New clsEncryption("!35452didalog=")
Dim PWPlain = wrapper.DecryptData(MAIL_USER_PW)
If Not IsNothing(PWPlain) Then
MAIL_USER_PW = PWPlain
Else
Logger.Warn("PWPlain is Nothing - Could not decrypt passwort188")
Return False
End If
Else
Logger.Warn("PWPlain is Nothing - Could not decrypt passwort188")
Return False
Logger.Debug("## No AUTHENTIFICATION in EMail...!##")
End If
If Email_Empfänger.ToString.Contains("[%") Then
Email_Empfänger = _dateiverarbeitung.REGEX_REPLACE(WMdok, Email_Empfänger)
Logger.Debug("Email_Empfänger: " & Email_Empfänger)
End If
Email_Betreff = _dateiverarbeitung.REGEX_REPLACE(WMdok, Email_Betreff)
oEmail_Betreff = _dateiverarbeitung.REGEX_REPLACE(WMdok, oEmail_Betreff)
Email_Body = _dateiverarbeitung.REGEX_REPLACE(WMdok, Email_Body)
oEmail_Betreff = $"{oEmail_Betreff} [eMail {oCountDocs} von {oGesamtFiles}]"
If _email.Email_Send(oEmail_Betreff, Email_Body, Email_Empfänger, MAILFROM, MAILSMTP, MAIL_PORT, MAIL_USER, MAIL_USER_PW, MAIL_AUTH_TYPE, oAttachment_FullFilename) = True Then
If _email.Email_Send(Email_Betreff, Email_Body, Email_Empfänger, MAILFROM, MAILSMTP, MAIL_PORT, MAIL_USER, MAIL_USER_PW, MAIL_AUTH_TYPE, oAttachment) = True Then
FileJobSuccessful = True
Else
@@ -243,7 +263,7 @@ Public Class clsProfil
End If
Case "Export HDD".ToUpper
Logger.Info($"{oFileRunNo} JobType: Case Export HDD")
Logger.Debug($"{oFileRunNo} JobType: Case Export HDD")
'Für jedes Dokument in der Windream-Ergebnisliste
'For Each dok As WMObject In windreamSucheErgebnisse
' aktuelles Dokument zum Export bereitstellen
@@ -257,7 +277,7 @@ Public Class clsProfil
End If
'Next
Case "BNS json Download".ToUpper
Logger.Info($"{oFileRunNo} JobType: BNS json Download")
Logger.Debug($"{oFileRunNo} JobType: BNS json Download")
FileJobSuccessful = _dateiverarbeitung.BNSjsonDownload(WMdok, DR_PR_JB.Item("STRING1"), DR_PR_JB.Item("STRING2"))
'Case "Send to printer".ToUpper
' Logger.Info("JobType: Send to printer")
@@ -393,7 +413,6 @@ Public Class clsProfil
If arrValue Is Nothing = False Then
' MsgBox("now indexing with: " & idxvalue)
Dim oErrorOccurred = windream_index.RunIndexing(WMdok, arrIndex, arrValue, _profObjekttyp)
' 07.01.2019: Weitere Jobs bei Fehler in RunIndexing überspringen
@@ -610,13 +629,13 @@ Public Class clsProfil
End If
Case "Send to printer".ToUpper
Logger.Info("Working on CASE Send to printer.... ")
Dim printername = DR_PR_JB.Item("STRING1")
Dim oPrintername = DR_PR_JB.Item("STRING1")
For Each oFileString As String In clsCURRENT.PROFILE_HandledFiles
Try
Dim myproc As Process = New Process()
myproc.StartInfo.FileName = """" & oFileString & """"
myproc.StartInfo.Verb = "printto"
myproc.StartInfo.Arguments = printername
myproc.StartInfo.Arguments = oPrintername
myproc.StartInfo.UseShellExecute = True
myproc.Start()
Dim p As Process
@@ -632,6 +651,7 @@ Public Class clsProfil
End If
Loop
Logger.Debug("...process has exited: ")
Logger.Info($"Send2Printer [{ myproc.StartInfo.FileName} # Verb:{myproc.StartInfo.Verb} # Arguments: {myproc.StartInfo.Arguments}]successfull! ")
FileJobSuccessful = True
sw.Stop()
' myproc.Kill()
@@ -644,27 +664,35 @@ Public Class clsProfil
Next
Case "Send InfoMail with WM-Search".ToUpper
Logger.Info("Working on CASE Send InfoMail with WM-Search.... ")
Dim oWMResults As WMObjects = windream.GetSearchDocuments(DR_PR_JB.Item("STRING5"))
If oWMResults Is Nothing Then
Logger.Warn("windreamSucheErgebnisse is nothing ( Send InfoMail with WM-Search)!", True, "clsProfil.Profil_Durchlauf")
Return False
End If
If oWMResults.Count > 0 Then
If _JobWork.New_Mail_with_attachment(DR_PR_JB.Item("STRING1"), DR_PR_JB.Item("STRING2"), DR_PR_JB.Item("STRING3"), DR_PR_JB.Item("STRING4"), clsCURRENT.DT_TBDD_EMAIL, DR_PR_JB.Item("STRING5")) = True Then
FileJobSuccessful = True
If DT_PROFIL_FILE_JOB.Rows.Count > 0 Then
For Each DR_PR_FILE_JOB As DataRow In DT_PROFIL_FILE_JOB.Rows
For Each oWMDoc As WMObject In oWMResults
_dateiverarbeitung.Check_File_job(oWMDoc, DR_PR_FILE_JOB.Item("TYP").ToString.ToLower, DR_PR_FILE_JOB.Item("STRING1").ToString, DR_PR_FILE_JOB.Item("STRING2").ToString, _profObjekttyp, windream_index)
Next
'Dim oWMResults As WMObjects = windream.GetSearchDocuments(DR_PR_JB.Item("STRING5"))
'If oWMResults Is Nothing Then
' Logger.Warn("windreamSucheErgebnisse is nothing ( Send InfoMail with WM-Search)!", True, "clsProfil.Profil_Durchlauf")
' Return False
'End If
Try
If windreamSucheErgebnisse.Count > 0 Then
Logger.Debug("windreamSucheErgebnisse.Count > 0 .... ")
If _JobWork.New_Mail_with_attachment(DR_PR_JB.Item("STRING1"), DR_PR_JB.Item("STRING2"), DR_PR_JB.Item("STRING3"), DR_PR_JB.Item("STRING4"), clsCURRENT.DT_TBDD_EMAIL, DR_PR_JB.Item("STRING5")) = True Then
FileJobSuccessful = True
'If DT_PROFIL_FILE_JOB.Rows.Count > 0 Then
' For Each DR_PR_FILE_JOB As DataRow In DT_PROFIL_FILE_JOB.Rows
' For Each oWMDoc As WMObject In oWMResults
' _dateiverarbeitung.Check_File_job(oWMDoc, DR_PR_FILE_JOB.Item("TYP").ToString.ToLower, DR_PR_FILE_JOB.Item("STRING1").ToString, DR_PR_FILE_JOB.Item("STRING2").ToString, _profObjekttyp, windream_index)
' Next
' Next
'End If
Next
End If
Else
Logger.Info("Attention: Send InfoMail with WM-Search - windreamSucheErgebnisse.Count = 0")
FileJobSuccessful = False
End If
Else
Logger.Info("Send InfoMail with WM-Search - oWMResults.Count = 0")
End If
Catch ex As Exception
Logger.Warn($"Unexpected Error in Case [Send InfoMail with WM-Search] Error: [{ex.Message}]")
FileJobSuccessful = False
End Try
End Select
If FileJobSuccessful = True Then

View File

@@ -286,7 +286,7 @@ Public Class clsWindream_Index
'If indexname = "Tournr" Then
'End If
Logger.Info("Indexierung von Index '" & indexname & "'")
Logger.Debug("Indexierung von Index '" & indexname & "'")
Dim value = aValues(i)
Dim convertValue
@@ -562,7 +562,7 @@ Public Class clsWindream_Index
End If
'Jetzt die Nachindexierung für Vektor-Felder
oDocument.SetVariableValue(aName, myArray)
Logger.Info("'SetVariableValue' für VEKTOR erfolgreich")
Logger.Debug("'SetVariableValue' für VEKTOR erfolgreich")
End If
Else
Logger.Debug("Array der Indexwerte ist leer/Nothing - Keine Nachindexierung")

View File

@@ -6,9 +6,6 @@
</sectionGroup>
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="DDWDResultHandler.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<connectionStrings />
<startup>
@@ -17,10 +14,13 @@
<applicationSettings>
<DDWDResultHandler.My.MySettings>
<setting name="SQLSERVER_CS_RH" serializeAs="String">
<value>Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_RENOLIT;Persist Security Info=True;User ID=sa;Password=dd</value>
<value>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</value>
</setting>
<setting name="SQLSERVER_CS_PMRefresh" serializeAs="String">
<value />
<value>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</value>
</setting>
<setting name="PMREFRESH_INTERVALL" serializeAs="String">
<value>2</value>
</setting>
</DDWDResultHandler.My.MySettings>
</applicationSettings>
@@ -43,11 +43,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<userSettings>
<DDWDResultHandler.My.MySettings>
<setting name="PMREFRESH_INTERVALL" serializeAs="String">
<value />
</setting>
</DDWDResultHandler.My.MySettings>
</userSettings>
</configuration>

View File

@@ -48,11 +48,10 @@ Public Class DDWDResultHandler
' Logger.Warn("Achtung: Es konnte keine Verbindung zur Datenbank '" & My.Settings.SQLSERVER_CS_RH & "' hergestellt werden!")
' Else
If clsCURRENT.LOG_ERRORS_ONLY = False Then
MyLogger.Debug = True
Else
MyLogger.Debug = False
End If
MyLogger.Debug = clsCURRENT.DEBUG
oFirstRun = True
' '#Thread für Durchlauf generieren
DDWDResultHandler.threadResultHandler = New BackgroundWorker()
@@ -96,7 +95,6 @@ Public Class DDWDResultHandler
If My.Settings.SQLSERVER_CS_RH <> "" Then
Logger.Info("Thread ResultHandler will now be started for initial Run..")
threadResultHandler.RunWorkerAsync()
Logger.Info("Thread PM Refresh will be started after 2mins for initial Run..")
End If
End If
@@ -136,7 +134,7 @@ Public Class DDWDResultHandler
_database = New clsDatabase(MyLogger)
If My.Settings.SQLSERVER_CS_RH = "" Then
Logger.Debug("RESULT HANDLER ConString not configured... No Run")
Logger.Warn("RESULT HANDLER ConString not configured... No Run")
Exit Sub
End If
@@ -155,10 +153,10 @@ Public Class DDWDResultHandler
If DT.Rows.Count = 1 Then
clsCURRENT.DT_TBWMRH_KONFIGURATION = DT
clsCURRENT.WDLAUFWERK = clsCURRENT.DT_TBWMRH_KONFIGURATION.Rows(0).Item("WD_LAUFWERK")
DD_WMResulthandler.clsCURRENT.LOG_ERRORS_ONLY = DT.Rows(0).Item("LOG_ERRORS_ONLY")
MyLogger.Debug = DT.Rows(0).Item("LOG_ERRORS_ONLY")
If DD_WMResulthandler.clsCURRENT.LOG_ERRORS_ONLY = False Then
Logger.Debug("Detaillog is ON!")
DD_WMResulthandler.clsCURRENT.DEBUG = Not (DT.Rows(0).Item("LOG_ERRORS_ONLY"))
MyLogger.Debug = Not (DT.Rows(0).Item("LOG_ERRORS_ONLY"))
If DD_WMResulthandler.clsCURRENT.DEBUG = True Then
Logger.Info("Detaillog is ON!")
End If
DD_WMResulthandler.clsCURRENT.WDLAUFWERK = DT.Rows(0).Item("WD_LAUFWERK")
End If
@@ -185,7 +183,7 @@ Public Class DDWDResultHandler
End If
Next
Else
Logger.Info("Keine aktiven Profile WMResulthandler vorhanden")
Logger.Warn("Keine aktiven Profile für WMResulthandler vorhanden")
notcompleted = True
End If
'Try
@@ -205,7 +203,7 @@ Public Class DDWDResultHandler
threadPMRefresh.RunWorkerAsync()
End If
Else
Logger.Warn("clsDatabase konnte nicht initialisiert werden!")
Logger.Warn($"clsDatabase konnte nicht initialisiert werden! {My.Settings.SQLSERVER_CS_RH}")
notcompleted = True
End If
Else

View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.0.0.1")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: AssemblyVersion("2.1.1.0")>
<Assembly: AssemblyFileVersion("2.1.0.0")>

View File

@@ -15,7 +15,7 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -56,8 +56,8 @@ Namespace My
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_RENOLIT;Persist Security In"& _
"fo=True;User ID=sa;Password=dd")> _
Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Secu"& _
"rity Info=True;User ID=sa;Password=dd")> _
Public ReadOnly Property SQLSERVER_CS_RH() As String
Get
Return CType(Me("SQLSERVER_CS_RH"),String)
@@ -66,23 +66,21 @@ Namespace My
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("")> _
Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Secu"& _
"rity Info=True;User ID=sa;Password=dd")> _
Public ReadOnly Property SQLSERVER_CS_PMRefresh() As String
Get
Return CType(Me("SQLSERVER_CS_PMRefresh"),String)
End Get
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("")> _
Public Property PMREFRESH_INTERVALL() As String
Global.System.Configuration.DefaultSettingValueAttribute("2")> _
Public ReadOnly Property PMREFRESH_INTERVALL() As Integer
Get
Return CType(Me("PMREFRESH_INTERVALL"),String)
Return CType(Me("PMREFRESH_INTERVALL"),Integer)
End Get
Set
Me("PMREFRESH_INTERVALL") = value
End Set
End Property
End Class
End Namespace

View File

@@ -3,10 +3,13 @@
<Profiles />
<Settings>
<Setting Name="SQLSERVER_CS_RH" Type="System.String" Scope="Application">
<Value Profile="(Default)">Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_RENOLIT;Persist Security Info=True;User ID=sa;Password=dd</Value>
<Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</Value>
</Setting>
<Setting Name="SQLSERVER_CS_PMRefresh" Type="System.String" Scope="Application">
<Value Profile="(Default)" />
<Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</Value>
</Setting>
<Setting Name="PMREFRESH_INTERVALL" Type="System.Int32" Scope="Application">
<Value Profile="(Default)">2</Value>
</Setting>
</Settings>
</SettingsFile>

View File

@@ -69,7 +69,7 @@
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.5.8\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />

View File

@@ -10,7 +10,7 @@ Public Class clsPMRefresh
Private oConfigIDXName_DocID
Private oConfigIDXName_Created
'Private oConfigWMDrive
Private oConfigLOGERRONLY As Boolean
Private oConfigLOG_DEBUG As Boolean
Sub New(theLogger As LogConfig)
MyLogger = theLogger
Logger = MyLogger.GetLogger()
@@ -32,12 +32,12 @@ Public Class clsPMRefresh
oConfigIDXName_DocID = oDTPM_CONFIG.Rows(0).Item("SERVICE_IDXNAME_DOCID").ToString
oConfigIDXName_Created = oDTPM_CONFIG.Rows(0).Item("SERVICE_IDXNAME_CREATED").ToString
'oConfigWMDrive = oDTPM_CONFIG.Rows(0).Item("SERVICE_WMDRIVE_LETTER").ToString
oConfigLOGERRONLY = oDTPM_CONFIG.Rows(0).Item("SERVICE_LOG_ERRORS_ONLY")
oConfigLOG_DEBUG = Not (oDTPM_CONFIG.Rows(0).Item("SERVICE_LOG_ERRORS_ONLY"))
Dim oSplit As String()
oSplit = oConfigschedule.Split(";")
Dim oTimespan = oSplit(0)
Dim oDays = oSplit(1)
If oConfigLOGERRONLY = False Then
If oConfigLOG_DEBUG = True Then
MyLogger.Debug = True
Logger.Info("Detaillog Service PMRefresh is ON!")
Else
@@ -75,6 +75,8 @@ Public Class clsPMRefresh
Return True
Else
Logger.Info($"No run of PMRefresh as hour is not in timespan ({CInt(Now.Hour)} >= {oMinHour} And {CInt(Now.Hour)} < {oMaxHour})")
Logger.Info($"Check TBPM_KONFIGURATION Column SERVICE_SCHEDULE")
End If
Else
Logger.Info($"No run of PMRefresh as today Is Not configured as RUN")
@@ -97,6 +99,68 @@ Public Class clsPMRefresh
End Try
End Function
Public Function GetSearchDocumentsDTviaSQL(ByVal pSQLCommand As String) As DataTable
Dim dtresult As New DataTable
dtresult.Columns.Add("DOC_ID", GetType(Integer))
dtresult.Columns.Add("PATH", GetType(String))
dtresult.Columns.Add("CREATED", GetType(String))
Try
Dim oSQLRESULT As DataTable = _database.Return_Datatable(pSQLCommand)
If IsNothing(oSQLRESULT) Then
Return dtresult
End If
'If returnDT = True Then
If oSQLRESULT.Rows.Count > 0 Then
For Each oDocRow As DataRow In oSQLRESULT.Rows
Dim oDOC_ID As Int64
Try
oDOC_ID = oDocRow.Item("IDB_OBJ_ID")
Catch ex As Exception
Try
oDOC_ID = oDocRow.Item("DocID")
Catch ex1 As Exception
Logger.Warn("Could not get DocID-Column: " & ex.Message)
Return dtresult
End Try
End Try
Dim oCreated
Try
oCreated = oDocRow.Item("ADDED_WHEN")
Catch ex As Exception
Try
oCreated = oDocRow.Item("AddedWhen")
Catch ex1 As Exception
Logger.Warn($"(GetSearchDocumentsDTviaSQL)Could not get AddedWhen-Column: [{ex.Message}] - SQL-Command: [{pSQLCommand}]")
Return dtresult
End Try
End Try
Dim oPath As String
Try
oPath = oDocRow.Item("DocRelativePath")
Catch ex As Exception
Try
oPath = oDocRow.Item("FULL_FILENAME")
Catch ex1 As Exception
Logger.Warn($"(GetSearchDocumentsDTviaSQL)Could not get FULL_FILENAME-Column: [{ex.Message}] - SQL-Command: [{pSQLCommand}]")
Return dtresult
End Try
End Try
Logger.Debug($"Adding DocInfo {oDOC_ID.ToString}|{oPath}|{oCreated}")
dtresult.Rows.Add(oDOC_ID, oPath, oCreated)
Next
dtresult.AcceptChanges()
End If
Return dtresult
Catch ex As Exception
Logger.Error(ex)
Logger.Warn($"Error Getting Docs via SLQ ({pSQLCommand})")
Return dtresult
End Try
End Function
Public Function Refresh_Data()
Dim oStep As String
Try
@@ -134,7 +198,13 @@ Public Class clsPMRefresh
'---------------------- Die Dateien auslesen ------------------------
Dim oDTWM_Results As DataTable
oStep = "4c"
oDTWM_Results = _windream.GetSearchDocumentsDT(WD_Search, oConfigIDXName_DocID, oConfigIDXName_Created, True)
If WD_Search.Contains("wdf") Or WD_Search.Contains("wdfx") Then
oDTWM_Results = _windream.GetSearchDocumentsDT(WD_Search, oConfigIDXName_DocID, oConfigIDXName_Created, True)
Else
Logger.Debug("Search via SQL")
oDTWM_Results = GetSearchDocumentsDTviaSQL(WD_Search)
End If
oStep = "4d"
Dim oDocCount As Integer = 0
If IsNothing(oDTWM_Results) Then

View File

@@ -2,5 +2,5 @@
<packages>
<package id="EntityFramework" version="6.2.0" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="NLog" version="4.5.8" targetFramework="net461" />
<package id="NLog" version="4.7.10" targetFramework="net461" />
</packages>

View File

@@ -8,7 +8,7 @@
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
</configSections>
<connectionStrings>
<add name="ResultHandler_Konfig.My.MySettings.SQLSERVER_CS" connectionString="Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_RENOLIT;Persist Security Info=True;User ID=sa;Password=dd"
<add name="ResultHandler_Konfig.My.MySettings.SQLSERVER_CS" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd"
providerName="System.Data.SqlClient" />
</connectionStrings>
<startup>
@@ -22,6 +22,9 @@
<setting name="EmailTestReceipiant" serializeAs="String">
<value />
</setting>
<setting name="Debug_Active" serializeAs="String">
<value>False</value>
</setting>
</ResultHandler_Konfig.My.MySettings>
</userSettings>
<system.data>

View File

@@ -15,7 +15,7 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -57,8 +57,8 @@ Namespace My
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString), _
Global.System.Configuration.DefaultSettingValueAttribute("Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_RENOLIT;Persist Security In"& _
"fo=True;User ID=sa;Password=dd")> _
Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Secu"& _
"rity Info=True;User ID=sa;Password=dd")> _
Public ReadOnly Property SQLSERVER_CS() As String
Get
Return CType(Me("SQLSERVER_CS"),String)
@@ -88,6 +88,18 @@ Namespace My
Me("EmailTestReceipiant") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
Public Property Debug_Active() As Boolean
Get
Return CType(Me("Debug_Active"),Boolean)
End Get
Set
Me("Debug_Active") = value
End Set
End Property
End Class
End Namespace

View File

@@ -5,10 +5,10 @@
<Setting Name="SQLSERVER_CS" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;ConnectionString&gt;Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_RENOLIT;Persist Security Info=True;User ID=sa;Password=dd&lt;/ConnectionString&gt;
&lt;ConnectionString&gt;Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
<Value Profile="(Default)">Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_RENOLIT;Persist Security Info=True;User ID=sa;Password=dd</Value>
<Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</Value>
</Setting>
<Setting Name="BNSAPI_HOST" Type="System.String" Scope="User">
<Value Profile="(Default)" />
@@ -16,5 +16,8 @@
<Setting Name="EmailTestReceipiant" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="Debug_Active" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>

View File

@@ -1 +1 @@
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@@ -54,17 +54,24 @@
<ApplicationIcon>ico638.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Data.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Printing.v15.2.Core, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Sparkline.v15.2.Core, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraLayout.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraPrinting.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Data.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Pdf.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Office.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.RichEdit.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.RichEdit.v18.1.Export, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Printing.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Sparkline.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DigitalData.Modules.Logging">
<HintPath>..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Messaging">
<HintPath>..\..\..\DDMonorepo\Message\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
</Reference>

View File

@@ -0,0 +1,235 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{85F6D07F-4C83-41C6-AEF1-66F228C13C25}</ProjectGuid>
<OutputType>WinExe</OutputType>
<StartupObject>ResultHandler_Konfig.My.MyApplication</StartupObject>
<RootNamespace>ResultHandler_Konfig</RootNamespace>
<AssemblyName>ResultHandler_Konfig</AssemblyName>
<FileAlignment>512</FileAlignment>
<MyType>WindowsForms</MyType>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace>
<OutputPath>bin\Debug\</OutputPath>
<DocumentationFile>ResultHandler_Konfig.xml</DocumentationFile>
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<DefineDebug>false</DefineDebug>
<DefineTrace>true</DefineTrace>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DocumentationFile>ResultHandler_Konfig.xml</DocumentationFile>
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
</PropertyGroup>
<PropertyGroup>
<OptionExplicit>On</OptionExplicit>
</PropertyGroup>
<PropertyGroup>
<OptionCompare>Binary</OptionCompare>
</PropertyGroup>
<PropertyGroup>
<OptionStrict>Off</OptionStrict>
</PropertyGroup>
<PropertyGroup>
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>ico638.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Data.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Printing.v15.2.Core, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Sparkline.v15.2.Core, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraLayout.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraPrinting.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DigitalData.Modules.Logging">
<HintPath>..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="Interop.WINDREAMLib">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Interop.WMOBRWSLib">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Interop.WMOSRCHLib">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Interop.WMOTOOLLib">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.5.8\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceProcess" />
<Reference Include="System.Transactions" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
</ItemGroup>
<ItemGroup>
<Import Include="Microsoft.VisualBasic" />
<Import Include="System" />
<Import Include="System.Collections" />
<Import Include="System.Collections.Generic" />
<Import Include="System.Data" />
<Import Include="System.Drawing" />
<Import Include="System.Diagnostics" />
<Import Include="System.Windows.Forms" />
<Import Include="System.Linq" />
<Import Include="System.Xml.Linq" />
<Import Include="System.Threading.Tasks" />
</ItemGroup>
<ItemGroup>
<Compile Include="frmMain.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmMain.Designer.vb">
<DependentUpon>frmMain.vb</DependentUpon>
<SubType>Form</SubType>
</Compile>
<Compile Include="My Project\AssemblyInfo.vb" />
<Compile Include="My Project\Application.Designer.vb">
<AutoGen>True</AutoGen>
<DependentUpon>Application.myapp</DependentUpon>
</Compile>
<Compile Include="My Project\Resources.Designer.vb">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="My Project\Settings.Designer.vb">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<Compile Include="MyDataset.Designer.vb">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>MyDataset.xsd</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="frmMain.resx">
<DependentUpon>frmMain.vb</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="My Project\licenses.licx" />
<EmbeddedResource Include="My Project\Resources.resx">
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.vb</LastGenOutput>
<CustomToolNamespace>My.Resources</CustomToolNamespace>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="My Project\Application.myapp">
<Generator>MyApplicationCodeGenerator</Generator>
<LastGenOutput>Application.Designer.vb</LastGenOutput>
</None>
<None Include="My Project\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<CustomToolNamespace>My</CustomToolNamespace>
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
</None>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<None Include="MyDataset.xsc">
<DependentUpon>MyDataset.xsd</DependentUpon>
</None>
<None Include="MyDataset.xsd">
<SubType>Designer</SubType>
<Generator>MSDataSetGenerator</Generator>
<LastGenOutput>MyDataset.Designer.vb</LastGenOutput>
</None>
<None Include="MyDataset.xss">
<DependentUpon>MyDataset.xsd</DependentUpon>
</None>
<None Include="packages.config" />
<None Include="Resources\flag_green.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\arrow_refresh.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\arrow_switch.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\save.bmp" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\add.png" />
</ItemGroup>
<ItemGroup>
<Content Include="bin\Debug\x64\SQLite.Interop.dll" />
<Content Include="ico638.ico" />
<None Include="Resources\refresh_16xMD.png" />
<None Include="Resources\folder_Open_16xMD.png" />
<None Include="Resources\book_open.png" />
<None Include="Resources\key_go.png" />
<None Include="Resources\email_go.png" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Connected Services\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ClassWMResulthandler\DD_WMResulthandler.vbproj">
<Project>{b3190aec-8dc4-4822-9609-54df5b976262}</Project>
<Name>DD_WMResulthandler</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

View File

@@ -220,7 +220,6 @@ Partial Class frmMain
Me.TBWMRH_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.PDF_TK_LOCATIONTextBox = New System.Windows.Forms.TextBox()
Me.Button3 = New System.Windows.Forms.Button()
Me.Button1 = New System.Windows.Forms.Button()
Me.WD_LAUFWERKTextBox = New System.Windows.Forms.TextBox()
Me.GEAENDERTWANNTextBox3 = New System.Windows.Forms.TextBox()
Me.GEAENDERT_WERTextBox = New System.Windows.Forms.TextBox()
@@ -238,7 +237,7 @@ Partial Class frmMain
Me.Button4 = New System.Windows.Forms.Button()
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.EncryptToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.txtTestmail = New System.Windows.Forms.TextBox()
Me.txtTestmailTo = New System.Windows.Forms.TextBox()
Me.Label1 = New System.Windows.Forms.Label()
Me.btnsendtestmail = New System.Windows.Forms.Button()
Me.GUIDTextBox1 = New System.Windows.Forms.TextBox()
@@ -833,6 +832,7 @@ Partial Class frmMain
Me.ListViewProfile.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.ListViewProfile.FullRowSelect = True
Me.ListViewProfile.GridLines = True
Me.ListViewProfile.HideSelection = False
Me.ListViewProfile.Location = New System.Drawing.Point(3, 31)
Me.ListViewProfile.Name = "ListViewProfile"
Me.ListViewProfile.Size = New System.Drawing.Size(987, 465)
@@ -1083,6 +1083,7 @@ Partial Class frmMain
'
Me.ToolStripTextBox1.AccessibleName = "Position"
Me.ToolStripTextBox1.AutoSize = False
Me.ToolStripTextBox1.Font = New System.Drawing.Font("Segoe UI", 9.0!)
Me.ToolStripTextBox1.Name = "ToolStripTextBox1"
Me.ToolStripTextBox1.Size = New System.Drawing.Size(50, 23)
Me.ToolStripTextBox1.Text = "0"
@@ -1474,6 +1475,7 @@ Partial Class frmMain
'
Me.ToolStripTextBox2.AccessibleName = "Position"
Me.ToolStripTextBox2.AutoSize = False
Me.ToolStripTextBox2.Font = New System.Drawing.Font("Segoe UI", 9.0!)
Me.ToolStripTextBox2.Name = "ToolStripTextBox2"
Me.ToolStripTextBox2.Size = New System.Drawing.Size(50, 23)
Me.ToolStripTextBox2.Text = "0"
@@ -2060,6 +2062,7 @@ Partial Class frmMain
'
Me.BindingNavigatorPositionItem.AccessibleName = "Position"
Me.BindingNavigatorPositionItem.AutoSize = False
Me.BindingNavigatorPositionItem.Font = New System.Drawing.Font("Segoe UI", 9.0!)
Me.BindingNavigatorPositionItem.Name = "BindingNavigatorPositionItem"
Me.BindingNavigatorPositionItem.Size = New System.Drawing.Size(50, 23)
Me.BindingNavigatorPositionItem.Text = "0"
@@ -2223,7 +2226,6 @@ Partial Class frmMain
Me.GroupBox2.Controls.Add(PDF_TK_LOCATIONLabel)
Me.GroupBox2.Controls.Add(Me.PDF_TK_LOCATIONTextBox)
Me.GroupBox2.Controls.Add(Me.Button3)
Me.GroupBox2.Controls.Add(Me.Button1)
Me.GroupBox2.Controls.Add(WD_LAUFWERKLabel)
Me.GroupBox2.Controls.Add(Me.WD_LAUFWERKTextBox)
Me.GroupBox2.Controls.Add(Me.GEAENDERTWANNTextBox3)
@@ -2292,18 +2294,6 @@ Partial Class frmMain
Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button3.UseVisualStyleBackColor = True
'
'Button1
'
Me.Button1.Image = Global.ResultHandler_Konfig.My.Resources.Resources.book_open
Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button1.Location = New System.Drawing.Point(221, 159)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(110, 23)
Me.Button1.TabIndex = 10
Me.Button1.Text = "Open LogFile"
Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button1.UseVisualStyleBackColor = True
'
'WD_LAUFWERKTextBox
'
Me.WD_LAUFWERKTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBWMRH_KONFIGURATIONBindingSource, "WD_LAUFWERK", True))
@@ -2344,7 +2334,9 @@ Partial Class frmMain
'
'LOG_ERRORS_ONLYCheckBox
'
Me.LOG_ERRORS_ONLYCheckBox.Checked = Global.ResultHandler_Konfig.My.MySettings.Default.Debug_Active
Me.LOG_ERRORS_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBWMRH_KONFIGURATIONBindingSource, "LOG_ERRORS_ONLY", True))
Me.LOG_ERRORS_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.ResultHandler_Konfig.My.MySettings.Default, "Debug_Active", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
Me.LOG_ERRORS_ONLYCheckBox.Location = New System.Drawing.Point(9, 158)
Me.LOG_ERRORS_ONLYCheckBox.Name = "LOG_ERRORS_ONLYCheckBox"
Me.LOG_ERRORS_ONLYCheckBox.Size = New System.Drawing.Size(129, 24)
@@ -2372,7 +2364,7 @@ Partial Class frmMain
Me.TabPage4.Controls.Add(Label5)
Me.TabPage4.Controls.Add(Me.txtnewpasswort)
Me.TabPage4.Controls.Add(Me.Button4)
Me.TabPage4.Controls.Add(Me.txtTestmail)
Me.TabPage4.Controls.Add(Me.txtTestmailTo)
Me.TabPage4.Controls.Add(Me.Label1)
Me.TabPage4.Controls.Add(Me.btnsendtestmail)
Me.TabPage4.Controls.Add(GUIDLabel3)
@@ -2409,7 +2401,7 @@ Partial Class frmMain
'
'Button6
'
Me.Button6.Location = New System.Drawing.Point(872, 347)
Me.Button6.Location = New System.Drawing.Point(555, 357)
Me.Button6.Name = "Button6"
Me.Button6.Size = New System.Drawing.Size(30, 23)
Me.Button6.TabIndex = 38
@@ -2418,7 +2410,7 @@ Partial Class frmMain
'
'txtAttachment
'
Me.txtAttachment.Location = New System.Drawing.Point(395, 347)
Me.txtAttachment.Location = New System.Drawing.Point(78, 357)
Me.txtAttachment.Name = "txtAttachment"
Me.txtAttachment.Size = New System.Drawing.Size(471, 22)
Me.txtAttachment.TabIndex = 37
@@ -2426,7 +2418,7 @@ Partial Class frmMain
'Label6
'
Me.Label6.AutoSize = True
Me.Label6.Location = New System.Drawing.Point(392, 331)
Me.Label6.Location = New System.Drawing.Point(75, 341)
Me.Label6.Name = "Label6"
Me.Label6.Size = New System.Drawing.Size(91, 13)
Me.Label6.TabIndex = 36
@@ -2434,7 +2426,7 @@ Partial Class frmMain
'
'Button5
'
Me.Button5.Location = New System.Drawing.Point(294, 381)
Me.Button5.Location = New System.Drawing.Point(284, 391)
Me.Button5.Name = "Button5"
Me.Button5.Size = New System.Drawing.Size(95, 23)
Me.Button5.TabIndex = 35
@@ -2449,7 +2441,7 @@ Partial Class frmMain
Me.AUTH_TYPEComboBox.Items.AddRange(New Object() {"SSL", "TLS", "None"})
Me.AUTH_TYPEComboBox.Location = New System.Drawing.Point(688, 95)
Me.AUTH_TYPEComboBox.Name = "AUTH_TYPEComboBox"
Me.AUTH_TYPEComboBox.Size = New System.Drawing.Size(121, 21)
Me.AUTH_TYPEComboBox.Size = New System.Drawing.Size(178, 21)
Me.AUTH_TYPEComboBox.TabIndex = 34
'
'TBDD_EMAIL_ACCOUNTBindingSource
@@ -2490,19 +2482,22 @@ Partial Class frmMain
Me.EncryptToolStripMenuItem.Size = New System.Drawing.Size(114, 22)
Me.EncryptToolStripMenuItem.Text = "encrypt"
'
'txtTestmail
'txtTestmailTo
'
Me.txtTestmail.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ResultHandler_Konfig.My.MySettings.Default, "EmailTestReceipiant", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
Me.txtTestmail.Location = New System.Drawing.Point(78, 347)
Me.txtTestmail.Name = "txtTestmail"
Me.txtTestmail.Size = New System.Drawing.Size(311, 22)
Me.txtTestmail.TabIndex = 29
Me.txtTestmail.Text = Global.ResultHandler_Konfig.My.MySettings.Default.EmailTestReceipiant
Me.txtTestmailTo.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.txtTestmailTo.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ResultHandler_Konfig.My.MySettings.Default, "EmailTestReceipiant", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
Me.txtTestmailTo.Location = New System.Drawing.Point(78, 315)
Me.txtTestmailTo.Multiline = True
Me.txtTestmailTo.Name = "txtTestmailTo"
Me.txtTestmailTo.Size = New System.Drawing.Size(1300, 23)
Me.txtTestmailTo.TabIndex = 29
Me.txtTestmailTo.Text = Global.ResultHandler_Konfig.My.MySettings.Default.EmailTestReceipiant
'
'Label1
'
Me.Label1.AutoSize = True
Me.Label1.Location = New System.Drawing.Point(75, 331)
Me.Label1.Location = New System.Drawing.Point(75, 299)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(85, 13)
Me.Label1.TabIndex = 28
@@ -2512,7 +2507,7 @@ Partial Class frmMain
'
Me.btnsendtestmail.Image = Global.ResultHandler_Konfig.My.Resources.Resources.email_go
Me.btnsendtestmail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnsendtestmail.Location = New System.Drawing.Point(78, 375)
Me.btnsendtestmail.Location = New System.Drawing.Point(78, 385)
Me.btnsendtestmail.Name = "btnsendtestmail"
Me.btnsendtestmail.Size = New System.Drawing.Size(200, 35)
Me.btnsendtestmail.TabIndex = 27
@@ -2535,7 +2530,7 @@ Partial Class frmMain
Me.NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_ACCOUNTBindingSource, "NAME", True))
Me.NAMETextBox.Location = New System.Drawing.Point(78, 54)
Me.NAMETextBox.Name = "NAMETextBox"
Me.NAMETextBox.Size = New System.Drawing.Size(276, 22)
Me.NAMETextBox.Size = New System.Drawing.Size(588, 22)
Me.NAMETextBox.TabIndex = 6
'
'EMAIL_FROMTextBox
@@ -2692,6 +2687,7 @@ Partial Class frmMain
'
Me.ToolStripTextBox3.AccessibleName = "Position"
Me.ToolStripTextBox3.AutoSize = False
Me.ToolStripTextBox3.Font = New System.Drawing.Font("Segoe UI", 9.0!)
Me.ToolStripTextBox3.Name = "ToolStripTextBox3"
Me.ToolStripTextBox3.Size = New System.Drawing.Size(50, 23)
Me.ToolStripTextBox3.Text = "0"
@@ -2987,7 +2983,6 @@ Partial Class frmMain
Friend WithEvents TBWMRH_PROFIL_FILE_JOBTableAdapter As MyDatasetTableAdapters.TBWMRH_PROFIL_FILE_JOBTableAdapter
Friend WithEvents TBWMRH_PROFIL_JOBTableAdapter As MyDatasetTableAdapters.TBWMRH_PROFIL_JOBTableAdapter
Friend WithEvents WD_LAUFWERKTextBox As TextBox
Friend WithEvents Button1 As Button
Friend WithEvents lblString2 As Label
Friend WithEvents btnTestCon As Button
Friend WithEvents lblndexname As Label
@@ -3027,7 +3022,7 @@ Partial Class frmMain
Friend WithEvents CHANGED_WHOTextBox As TextBox
Friend WithEvents CHANGED_WHENTextBox As TextBox
Friend WithEvents btnsendtestmail As Button
Friend WithEvents txtTestmail As TextBox
Friend WithEvents txtTestmailTo As TextBox
Friend WithEvents Label1 As Label
Friend WithEvents Button4 As Button
Friend WithEvents txtnewpasswort As TextBox

View File

@@ -260,7 +260,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAI
DAAAAk1TRnQBSQFMAgEBAwEAAXgBAwF4AQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DAAAAk1TRnQBSQFMAgEBAwEAAZgBAwGYAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

View File

@@ -1,5 +1,6 @@
Imports System.ServiceProcess
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Messaging
Imports DD_WMResulthandler
Imports System.Net.Mail
Imports System.Net
@@ -8,7 +9,6 @@ Public Class frmMain
Private _windream As clsWindream_allgemein
Private _database As clsDatabase
Private _profil As clsProfil
Private _email As clsEmail
Dim MyLogger As LogConfig
Dim Logger As Logger
Dim switchRecord As Boolean = True
@@ -30,12 +30,16 @@ Public Class frmMain
' DB_Path()
' End If
'End If
MyLogger = New LogConfig(LogConfig.PathType.AppData, Nothing, "Log")
MyLogger = New LogConfig(LogConfig.PathType.CustomPath,
Application.LocalUserAppDataPath & "\Log",
Nothing,
My.Application.Info.CompanyName,
My.Application.Info.ProductName)
MyLogger.Debug = True
Logger = MyLogger.GetLogger()
Load_Constring()
_database = New clsDatabase(MyLogger)
_email = New clsEmail(MyLogger)
Logger.Info("Konfig started: " & Now.ToString)
Logger.Info("WMKonfig started: " & Now.ToString)
Try
' Windream instanziieren
_windream = New clsWindream_allgemein(MyLogger)
@@ -503,8 +507,10 @@ Public Class frmMain
lblString4.Visible = True
STRING3TextBox.Visible = False
STRING3TextBox1.Visible = True
STRING4TextBox.Visible = True
STRING5TextBox.Visible = True
lblString5.Text = "Benennung Datei:"
lblString5.Visible = True
Case "BNS json Download".ToUpper 'json BNS
lblString1.Text = "User Kunde:"
STRING1TextBox.Visible = True
@@ -676,7 +682,7 @@ Public Class frmMain
clsCURRENT.DT_TBWMRH_KONFIGURATION = DT
clsCURRENT.WDLAUFWERK = clsCURRENT.DT_TBWMRH_KONFIGURATION.Rows(0).Item("WD_LAUFWERK")
DD_WMResulthandler.clsCURRENT.LOG_ERRORS_ONLY = DT.Rows(0).Item("LOG_ERRORS_ONLY")
MyLogger.Debug = DT.Rows(0).Item("LOG_ERRORS_ONLY")
'MyLogger.Debug = DT.Rows(0).Item("LOG_ERRORS_ONLY")
If DD_WMResulthandler.clsCURRENT.LOG_ERRORS_ONLY = False Then
Logger.Debug("Detaillog is ON!")
End If
@@ -741,7 +747,7 @@ Public Class frmMain
End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
Private Sub Button1_Click(sender As Object, e As EventArgs)
Try
Process.Start(MyLogger.LogFile)
Catch ex As Exception
@@ -843,7 +849,7 @@ Public Class frmMain
mymesssage.From = New MailAddress(EMAIL_FROMTextBox.Text)
mymesssage.Subject = "TestSubject from RAW Method"
mymesssage.To.Add(New MailAddress(txtTestmail.Text))
mymesssage.To.Add(New MailAddress(txtTestmailTo.Text))
If txtAttachment.Text <> String.Empty Then
Dim oAttment As String = txtAttachment.Text.Replace("W:\", "\\windream\objects\")
@@ -869,22 +875,21 @@ Public Class frmMain
End Sub
Private Sub btnsendtestmail_Click(sender As Object, e As EventArgs) Handles btnsendtestmail.Click
Dim _ss2email As New Email(MyLogger)
If txtTestmail.Text <> String.Empty Then
If txtTestmailTo.Text <> String.Empty Then
My.Settings.Save()
Dim wrapper As New clsEncryption("!35452didalog=")
Dim PWPlain = wrapper.DecryptData(EMAIL_PWTextBox.Text)
If _email.Email_Send("Testmail from GUI WMResultHandler", "This is the body (text will be replaced within profile)", txtTestmail.Text,
EMAIL_FROMTextBox.Text, EMAIL_SMTPTextBox.Text, PORTTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, txtAttachment.Text, True) = True Then
If _ss2email.NewEmail(txtTestmailTo.Text, "Testmail from GUI WMResultHandler", "This is the body (text will be replaced within profile)", EMAIL_FROMTextBox.Text, EMAIL_SMTPTextBox.Text,
PORTTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, "GUI WMRH - Test") = True Then
MsgBox("Email(s) has/have been sent successfully.", MsgBoxStyle.Information)
Else
MsgBox("Could not send the testmail. Please check the log.", MsgBoxStyle.Exclamation)
End If
End If
End Sub
Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
@@ -987,7 +992,8 @@ Public Class frmMain
End Sub
Private Sub LOG_ERRORS_ONLYCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles LOG_ERRORS_ONLYCheckBox.CheckedChanged
My.Settings.Debug_Active = LOG_ERRORS_ONLYCheckBox.Checked
My.Settings.Save()
End Sub
Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click

BIN
app/packages/NLog.4.7.10/.signature.p7s vendored Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

29217
app/packages/NLog.4.7.10/lib/net35/NLog.xml vendored Normal file

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

29646
app/packages/NLog.4.7.10/lib/net45/NLog.xml vendored Normal file

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

21926
app/packages/NLog.4.7.10/lib/sl4/NLog.xml vendored Normal file

File diff suppressed because it is too large Load Diff

Binary file not shown.

22092
app/packages/NLog.4.7.10/lib/sl5/NLog.xml vendored Normal file

File diff suppressed because it is too large Load Diff

Binary file not shown.

21268
app/packages/NLog.4.7.10/lib/wp8/NLog.xml vendored Normal file

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff