From 03f9c33a496c4dcc4b984eacd589aa131328caf6 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Mon, 27 Nov 2017 15:10:09 +0100 Subject: [PATCH] MS-Json --- .../clsDateiverarbeitung.vb | 13 ++ app/ResultHandler_Konfig/clsProfil.vb | 170 ++++++++++-------- app/ResultHandler_Konfig/frmMain.Designer.vb | 144 +++++++-------- app/ResultHandler_Konfig/frmMain.resx | 2 +- app/ResultHandler_Konfig/frmMain.vb | 8 +- 5 files changed, 181 insertions(+), 156 deletions(-) diff --git a/app/ResultHandler_Konfig/clsDateiverarbeitung.vb b/app/ResultHandler_Konfig/clsDateiverarbeitung.vb index 4525ae7..6285a0a 100644 --- a/app/ResultHandler_Konfig/clsDateiverarbeitung.vb +++ b/app/ResultHandler_Konfig/clsDateiverarbeitung.vb @@ -200,6 +200,19 @@ Public Class clsDateiverarbeitung clsLogger.AddError("Unvorhergesehener Fehler: " & ex.Message, "clsDateiverarbeitung.Rename_File_Vektor") End Try End Function + Public Shared Function BNSjsonDownload(WMFile As WMObject) + Try + 'den Wert des Indexes für das aktuelle Dokument auslesen + Dim SENDUNGNR = WMFile.GetVariableValue("SendungNr") + Dim DOKID = WMFile.GetVariableValue("DokumentID") + 'Add Info to JsonArray + '...... + + Catch ex As Exception + clsLogger.AddError("Unvorhergesehener Fehler: " & ex.Message, "BNSjsonDownload") + Return False + End Try + End Function Public Shared Function RUN_ORACLE_COMMAND(WMFile As WMObject, OracleCS As String, OracleCommandRAW As String) Try Dim result = REGEX_REPLACE(WMFile, OracleCommandRAW) diff --git a/app/ResultHandler_Konfig/clsProfil.vb b/app/ResultHandler_Konfig/clsProfil.vb index 8022f1f..095fb66 100644 --- a/app/ResultHandler_Konfig/clsProfil.vb +++ b/app/ResultHandler_Konfig/clsProfil.vb @@ -124,19 +124,26 @@ Public Class clsProfil If DT_PROFIL_JOB.Rows.Count > 0 Then clsLogger.AddDetailLog("DT_PROFIL_JOB.Rows.Count > 0") If clsDateiverarbeitung.InitProfilData = True Then - clsLogger.AddDetailLog("clsDateiverarbeitung.InitProfilData = True") - For Each dok As WMObject In windreamSucheErgebnisse - 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 - Case "Export HDD".ToUpper - clsLogger.AddDetailLog("Case Export HDD") - 'Für jedes Dokument in der Windream-Ergebnisliste - 'For Each dok As WMObject In windreamSucheErgebnisse - ' aktuelles Dokument zum Export bereitstellen - EXPORTED_FILENAME = "" - If clsDateiverarbeitung.Export_File(dok, DR_PR_JB.Item("STRING1")) = True Then - If DT_PROFIL_FILE_JOB.Rows.Count > 0 Then + clsLogger.AddDetailLog("clsDateiverarbeitung.InitProfilData = True") + For Each DR_PR_JB As DataRow In DT_PROFIL_JOB.Rows + Select Case DR_PR_JB.Item("JOB_TYP").ToString.ToUpper + Case "BNS json Download".ToLower + 'ARRAY oder Äqivalent bilden + End Select + Next + + For Each WMdok As WMObject In windreamSucheErgebnisse + 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 + Case "Export HDD".ToUpper + clsLogger.AddDetailLog("Case Export HDD") + 'Für jedes Dokument in der Windream-Ergebnisliste + 'For Each dok As WMObject In windreamSucheErgebnisse + ' aktuelles Dokument zum Export bereitstellen + EXPORTED_FILENAME = "" + If clsDateiverarbeitung.Export_File(WMdok, DR_PR_JB.Item("STRING1")) = True Then + If DT_PROFIL_FILE_JOB.Rows.Count > 0 Then clsLogger.AddDetailLog("Anzahl DT_PROFIL_FILE_JOB.Rows.Count:" & DT_PROFIL_FILE_JOB.Rows.Count) 'Für jeden File-Job Dim FileJobSuccessful As Boolean = True @@ -147,100 +154,109 @@ Public Class clsProfil Exit For End If Select Case DR_PR_FILE_JOB.Item("TYP").ToString.ToLower - Case "Set Index".ToLower - Try - 'Überprüfen ob Value bereits gesetzt wurde? - Dim idxName As String = DR_PR_FILE_JOB.Item("STRING1").ToString - Dim idxvalue As String = DR_PR_FILE_JOB.Item("STRING2").ToString - If idxvalue.Contains("[%DATETIME]") Then - idxvalue = idxvalue.Replace("[%DATETIME]", Now.ToString) - End If - clsLogger.AddDetailLog("Datei soll mit Index '" & idxName & "'indexiert werden...") - Dim arrIndex() As String - ReDim Preserve arrIndex(0) - arrIndex(0) = idxName - clsLogger.AddDetailLog("...nach arrIndex") - - Dim arrValue() As String - - Dim aktvalue As Object - aktvalue = dok.GetVariableValue(idxName) - clsLogger.AddDetailLog("...nach aktValue zuweisen..") - - If aktvalue Is Nothing Then - clsLogger.AddDetailLog("Index '" & idxName & "' ist noch leer.") - ReDim Preserve arrValue(0) - arrValue(0) = idxvalue - Else - clsLogger.AddDetailLog("Index '" & idxName & "' ist bereits gefüllt.") - Dim myArray() - ReDim myArray(0) - myArray(0) = idxvalue - - Dim VektorArray() - VektorArray = Return_VektorArray(dok, idxName, myArray, True) - - If VektorArray Is Nothing = False Then - ReDim arrValue(VektorArray.Length - 1) - Array.Copy(VektorArray, arrValue, VektorArray.Length) - End If + Case "Set Index".ToLower + Try + 'Überprüfen ob Value bereits gesetzt wurde? + Dim idxName As String = DR_PR_FILE_JOB.Item("STRING1").ToString + Dim idxvalue As String = DR_PR_FILE_JOB.Item("STRING2").ToString + If idxvalue.Contains("[%DATETIME]") Then + idxvalue = idxvalue.Replace("[%DATETIME]", Now.ToString) + End If + clsLogger.AddDetailLog("Datei soll mit Index '" & idxName & "'indexiert werden...") + Dim arrIndex() As String + ReDim Preserve arrIndex(0) + arrIndex(0) = idxName + clsLogger.AddDetailLog("...nach arrIndex") - End If + Dim arrValue() As String - If arrValue Is Nothing = False Then - clsWindream_Index.RunIndexing(dok, arrIndex, arrValue, _profObjekttyp) - Else - clsLogger.Add(">> arrValue is nothing - keine Indexierung", False, "clsProfil.Profil_Durchlauf") + Dim aktvalue As Object + aktvalue = WMdok.GetVariableValue(idxName) + clsLogger.AddDetailLog("...nach aktValue zuweisen..") + + If aktvalue Is Nothing Then + clsLogger.AddDetailLog("Index '" & idxName & "' ist noch leer.") + ReDim Preserve arrValue(0) + arrValue(0) = idxvalue + Else + clsLogger.AddDetailLog("Index '" & idxName & "' ist bereits gefüllt.") + Dim myArray() + ReDim myArray(0) + myArray(0) = idxvalue + + Dim VektorArray() + VektorArray = Return_VektorArray(WMdok, idxName, myArray, True) + + If VektorArray Is Nothing = False Then + ReDim arrValue(VektorArray.Length - 1) + Array.Copy(VektorArray, arrValue, VektorArray.Length) End If - Catch ex As Exception - clsLogger.AddError("Unvorhergesehener Fehler: " & ex.Message, "clsProfil.Profil_Durchlauf(SetIndex)") - End Try + End If + + If arrValue Is Nothing = False Then + clsWindream_Index.RunIndexing(WMdok, arrIndex, arrValue, _profObjekttyp) + Else + clsLogger.Add(">> arrValue is nothing - keine Indexierung", False, "clsProfil.Profil_Durchlauf") + End If + + Catch ex As Exception + clsLogger.AddError("Unvorhergesehener Fehler: " & ex.Message, "clsProfil.Profil_Durchlauf(SetIndex)") + End Try Case "Rename File with windream Index".ToLower clsLogger.AddDetailLog("Exportierte Datei soll nach Indexvorgaben umbenannt werden...") - clsDateiverarbeitung.Rename_File(dok, DR_PR_FILE_JOB.Item("STRING1").ToString) + clsDateiverarbeitung.Rename_File(WMdok, DR_PR_FILE_JOB.Item("STRING1").ToString) Case "Rename File with WMVector (only one)".ToLower clsLogger.AddDetailLog("Exportierte Datei soll nach VektorIndexvorgaben umbenannt werden...") - clsDateiverarbeitung.Rename_File_Vektor(dok, DR_PR_FILE_JOB.Item("STRING1").ToString) + clsDateiverarbeitung.Rename_File_Vektor(WMdok, DR_PR_FILE_JOB.Item("STRING1").ToString) Case "Execute Oracle Command".ToLower Try clsLogger.AddDetailLog("Execute Oracle Comman.......") Dim oracleconnectionstring = DR_PR_FILE_JOB.Item("STRING1").ToString Dim oracleCommandRAW = DR_PR_FILE_JOB.Item("STRING2").ToString - FileJobSuccessful = clsDateiverarbeitung.RUN_ORACLE_COMMAND(dok, oracleconnectionstring, oracleCommandRAW) + FileJobSuccessful = clsDateiverarbeitung.RUN_ORACLE_COMMAND(WMdok, oracleconnectionstring, oracleCommandRAW) Catch ex As Exception clsLogger.AddError("Unvorhergesehener Fehler: " & ex.Message, "clsProfil.Profil_Durchlauf(ExecuteOracleCommand)") - End Try + End Try Case "Execute MSSQL Command".ToLower Try Dim MSSQLconnectionstring = DR_PR_FILE_JOB.Item("STRING1").ToString Dim MSSQLCommandRAW = DR_PR_FILE_JOB.Item("STRING2").ToString clsLogger.AddDetailLog("Execute MSSQL Command.......") - FileJobSuccessful = clsDateiverarbeitung.RUN_MSSQL_COMMAND(dok, MSSQLconnectionstring, MSSQLCommandRAW) + FileJobSuccessful = clsDateiverarbeitung.RUN_MSSQL_COMMAND(WMdok, MSSQLconnectionstring, MSSQLCommandRAW) Catch ex As Exception clsLogger.AddError("Unvorhergesehener Fehler: " & ex.Message, "clsProfil.Profil_Durchlauf(ExecuteMSSQLCommand)") - End Try - End Select - 'Abschluss Bearbeitung File Job - clsLogger.WriteLog() - Next - Else - clsLogger.Add(">> KEINE File-JOBS für Profil '" & _Profilname & "' angelegt!", False, "clsProfil.Profil_Durchlauf") + End Try + End Select + 'Abschluss Bearbeitung File Job clsLogger.WriteLog() - End If + Next Else + clsLogger.Add(">> KEINE File-JOBS für Profil '" & _Profilname & "' angelegt!", False, "clsProfil.Profil_Durchlauf") + clsLogger.WriteLog() + End If + Else clsDatatabase.Execute_non_Query("UPDATE TBWMRH_PROFIL SET Running = 0, LETZTER_DURCHLAUF = Getdate() WHERE GUID = " & _profGUID) End If 'Next + Case "BNS json Download".ToLower + clsDateiverarbeitung.BNSjsonDownload(WMdok) - End Select - 'Abschluss Bearbeitung Job - clsLogger.WriteLog() - Next - + End Select + 'Abschluss Bearbeitung Job + clsLogger.WriteLog() Next - Else + Next + For Each DR_PR_JB As DataRow In DT_PROFIL_JOB.Rows + Select Case DR_PR_JB.Item("JOB_TYP").ToString.ToUpper + Case "BNS json Download".ToLower + 'ARRAY Exportieren + Dim Export_Path = DR_PR_JB.Item("STRING1") + + End Select + Next + Else clsLogger.Add(">> Initialisierung Profil nicht erfolgreich", True) clsLogger.WriteLog() End If diff --git a/app/ResultHandler_Konfig/frmMain.Designer.vb b/app/ResultHandler_Konfig/frmMain.Designer.vb index a5adf28..4bbffd4 100644 --- a/app/ResultHandler_Konfig/frmMain.Designer.vb +++ b/app/ResultHandler_Konfig/frmMain.Designer.vb @@ -68,6 +68,8 @@ Partial Class frmMain Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() Me.lblString2 = New System.Windows.Forms.Label() Me.AKTIVCheckBox2 = New System.Windows.Forms.CheckBox() + Me.TBWMRH_PROFIL_JOBBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.MyDataset = New ResultHandler_Konfig.MyDataset() Me.Label4 = New System.Windows.Forms.Label() Me.lblString1 = New System.Windows.Forms.Label() Me.btnJOB_addSpeicherort = New System.Windows.Forms.Button() @@ -94,12 +96,14 @@ Partial Class frmMain Me.ToolStripButton6 = New System.Windows.Forms.ToolStripButton() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripButton7 = New System.Windows.Forms.ToolStripButton() + Me.lblndexname = New System.Windows.Forms.Label() Me.btnTestCon = New System.Windows.Forms.Button() Me.btnFileJob_addIndex = New System.Windows.Forms.Button() Me.cmbFileJob_WHIndexe = New System.Windows.Forms.ComboBox() Me.btnaddDatetime = New System.Windows.Forms.Button() Me.lblString2FileJobs = New System.Windows.Forms.Label() Me.STRING1TextBoxFile_Job = New System.Windows.Forms.TextBox() + Me.TBWMRH_PROFIL_FILE_JOBBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.lblString1FileJobs = New System.Windows.Forms.Label() Me.GEAENDERTWANNTextBox2 = New System.Windows.Forms.TextBox() Me.STRING1ComboBox = New System.Windows.Forms.ComboBox() @@ -126,8 +130,10 @@ Partial Class frmMain Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripButton14 = New System.Windows.Forms.ToolStripButton() Me.Panel1 = New System.Windows.Forms.Panel() + Me.Button2 = New System.Windows.Forms.Button() Me.btn_runProfileManual = New System.Windows.Forms.Button() Me.GEAENDERTWANNTextBox = New System.Windows.Forms.TextBox() + Me.TBWMRH_PROFILBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.NumericUpDown = New System.Windows.Forms.NumericUpDown() Me.lblTimeIntervall = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() @@ -173,6 +179,7 @@ Partial Class frmMain Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.Button1 = New System.Windows.Forms.Button() Me.WD_LAUFWERKTextBox = New System.Windows.Forms.TextBox() + Me.TBWMRH_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.GEAENDERTWANNTextBox3 = New System.Windows.Forms.TextBox() Me.GEAENDERT_WERTextBox = New System.Windows.Forms.TextBox() Me.btnsave_Grundkonfig = New System.Windows.Forms.Button() @@ -180,22 +187,15 @@ Partial Class frmMain Me.LAST_TICKTextBox = New System.Windows.Forms.TextBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.btnDatenbankConnect = New System.Windows.Forms.Button() + Me.txtDatenbank = New System.Windows.Forms.TextBox() Me.Label1 = New System.Windows.Forms.Label() Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog() - Me.lblndexname = New System.Windows.Forms.Label() - Me.txtDatenbank = New System.Windows.Forms.TextBox() - Me.TBWMRH_PROFIL_JOBBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.MyDataset = New ResultHandler_Konfig.MyDataset() - Me.TBWMRH_PROFIL_FILE_JOBBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBWMRH_PROFILBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBWMRH_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBWMRH_KONFIGURATIONTableAdapter = New ResultHandler_Konfig.MyDatasetTableAdapters.TBWMRH_KONFIGURATIONTableAdapter() Me.TableAdapterManager = New ResultHandler_Konfig.MyDatasetTableAdapters.TableAdapterManager() Me.TBWMRH_PROFIL_FILE_JOBTableAdapter = New ResultHandler_Konfig.MyDatasetTableAdapters.TBWMRH_PROFIL_FILE_JOBTableAdapter() Me.TBWMRH_PROFIL_JOBTableAdapter = New ResultHandler_Konfig.MyDatasetTableAdapters.TBWMRH_PROFIL_JOBTableAdapter() Me.TBWMRH_PROFILTableAdapter = New ResultHandler_Konfig.MyDatasetTableAdapters.TBWMRH_PROFILTableAdapter() - Me.Button2 = New System.Windows.Forms.Button() GUIDLabel = New System.Windows.Forms.Label() ProfilnameLabel = New System.Windows.Forms.Label() ObjekttypLabel = New System.Windows.Forms.Label() @@ -233,23 +233,23 @@ Partial Class frmMain Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() + CType(Me.TBWMRH_PROFIL_JOBBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBWMRH_PROFIL_JOBBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit() Me.TBWMRH_PROFIL_JOBBindingNavigator.SuspendLayout() + CType(Me.TBWMRH_PROFIL_FILE_JOBBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPROFIL_FILE_JOBBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit() Me.TBPROFIL_FILE_JOBBindingNavigator.SuspendLayout() Me.Panel1.SuspendLayout() + CType(Me.TBWMRH_PROFILBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.NumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox4.SuspendLayout() CType(Me.TBWMRH_PROFILBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit() Me.TBWMRH_PROFILBindingNavigator.SuspendLayout() Me.TabPage3.SuspendLayout() Me.GroupBox2.SuspendLayout() - Me.GroupBox1.SuspendLayout() - CType(Me.TBWMRH_PROFIL_JOBBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBWMRH_PROFIL_FILE_JOBBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBWMRH_PROFILBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBWMRH_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + Me.GroupBox1.SuspendLayout() Me.SuspendLayout() ' 'GUIDLabel @@ -710,6 +710,16 @@ Partial Class frmMain Me.AKTIVCheckBox2.Text = "Aktiv" Me.AKTIVCheckBox2.UseVisualStyleBackColor = True ' + 'TBWMRH_PROFIL_JOBBindingSource + ' + Me.TBWMRH_PROFIL_JOBBindingSource.DataMember = "TBWMRH_PROFIL_JOB" + Me.TBWMRH_PROFIL_JOBBindingSource.DataSource = Me.MyDataset + ' + 'MyDataset + ' + Me.MyDataset.DataSetName = "MyDataset" + Me.MyDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema + ' 'Label4 ' Me.Label4.AutoSize = True @@ -753,7 +763,7 @@ Partial Class frmMain ' Me.JOB_TYPComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBWMRH_PROFIL_JOBBindingSource, "JOB_TYP", True)) Me.JOB_TYPComboBox.FormattingEnabled = True - Me.JOB_TYPComboBox.Items.AddRange(New Object() {"Export HDD", "Create Mail Attachment"}) + Me.JOB_TYPComboBox.Items.AddRange(New Object() {"Export HDD", "Create Mail Attachment", "BNS json Download"}) Me.JOB_TYPComboBox.Location = New System.Drawing.Point(78, 77) Me.JOB_TYPComboBox.Name = "JOB_TYPComboBox" Me.JOB_TYPComboBox.Size = New System.Drawing.Size(239, 21) @@ -946,6 +956,16 @@ Partial Class frmMain Me.ToolStripButton7.Size = New System.Drawing.Size(23, 22) Me.ToolStripButton7.Text = "Daten speichern" ' + 'lblndexname + ' + Me.lblndexname.AutoSize = True + Me.lblndexname.Location = New System.Drawing.Point(335, 102) + Me.lblndexname.Name = "lblndexname" + Me.lblndexname.Size = New System.Drawing.Size(66, 13) + Me.lblndexname.TabIndex = 47 + Me.lblndexname.Text = "Indexname:" + Me.lblndexname.Visible = False + ' 'btnTestCon ' Me.btnTestCon.Location = New System.Drawing.Point(336, 117) @@ -1007,6 +1027,11 @@ Partial Class frmMain Me.STRING1TextBoxFile_Job.TabIndex = 41 Me.STRING1TextBoxFile_Job.Visible = False ' + 'TBWMRH_PROFIL_FILE_JOBBindingSource + ' + Me.TBWMRH_PROFIL_FILE_JOBBindingSource.DataMember = "TBWMRH_PROFIL_FILE_JOB" + Me.TBWMRH_PROFIL_FILE_JOBBindingSource.DataSource = Me.MyDataset + ' 'lblString1FileJobs ' Me.lblString1FileJobs.AutoSize = True @@ -1280,6 +1305,15 @@ Partial Class frmMain Me.Panel1.Size = New System.Drawing.Size(1071, 224) Me.Panel1.TabIndex = 0 ' + 'Button2 + ' + Me.Button2.Location = New System.Drawing.Point(490, 89) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(75, 23) + Me.Button2.TabIndex = 104 + Me.Button2.Text = "Teste Suche" + Me.Button2.UseVisualStyleBackColor = True + ' 'btn_runProfileManual ' Me.btn_runProfileManual.Image = Global.ResultHandler_Konfig.My.Resources.Resources.arrow_switch @@ -1302,6 +1336,11 @@ Partial Class frmMain Me.GEAENDERTWANNTextBox.Size = New System.Drawing.Size(200, 22) Me.GEAENDERTWANNTextBox.TabIndex = 102 ' + 'TBWMRH_PROFILBindingSource + ' + Me.TBWMRH_PROFILBindingSource.DataMember = "TBWMRH_PROFIL" + Me.TBWMRH_PROFILBindingSource.DataSource = Me.MyDataset + ' 'NumericUpDown ' Me.NumericUpDown.Increment = New Decimal(New Integer() {5, 0, 0, 0}) @@ -1736,6 +1775,11 @@ Partial Class frmMain Me.WD_LAUFWERKTextBox.Size = New System.Drawing.Size(100, 22) Me.WD_LAUFWERKTextBox.TabIndex = 9 ' + 'TBWMRH_KONFIGURATIONBindingSource + ' + Me.TBWMRH_KONFIGURATIONBindingSource.DataMember = "TBWMRH_KONFIGURATION" + Me.TBWMRH_KONFIGURATIONBindingSource.DataSource = Me.MyDataset + ' 'GEAENDERTWANNTextBox3 ' Me.GEAENDERTWANNTextBox3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBWMRH_KONFIGURATIONBindingSource, "GEAENDERTWANN", True)) @@ -1806,29 +1850,6 @@ Partial Class frmMain Me.btnDatenbankConnect.Text = "..." Me.btnDatenbankConnect.UseVisualStyleBackColor = True ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(6, 18) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(108, 13) - Me.Label1.TabIndex = 0 - Me.Label1.Text = "Pfad zu Datenbank:" - ' - 'OpenFileDialog1 - ' - Me.OpenFileDialog1.FileName = "OpenFileDialog1" - ' - 'lblndexname - ' - Me.lblndexname.AutoSize = True - Me.lblndexname.Location = New System.Drawing.Point(335, 102) - Me.lblndexname.Name = "lblndexname" - Me.lblndexname.Size = New System.Drawing.Size(66, 13) - Me.lblndexname.TabIndex = 47 - Me.lblndexname.Text = "Indexname:" - Me.lblndexname.Visible = False - ' 'txtDatenbank ' Me.txtDatenbank.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ResultHandler_Konfig.My.MySettings.Default, "myConnString", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) @@ -1838,30 +1859,18 @@ Partial Class frmMain Me.txtDatenbank.TabIndex = 1 Me.txtDatenbank.Text = Global.ResultHandler_Konfig.My.MySettings.Default.myConnString ' - 'TBWMRH_PROFIL_JOBBindingSource - ' - Me.TBWMRH_PROFIL_JOBBindingSource.DataMember = "TBWMRH_PROFIL_JOB" - Me.TBWMRH_PROFIL_JOBBindingSource.DataSource = Me.MyDataset - ' - 'MyDataset - ' - Me.MyDataset.DataSetName = "MyDataset" - Me.MyDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema - ' - 'TBWMRH_PROFIL_FILE_JOBBindingSource - ' - Me.TBWMRH_PROFIL_FILE_JOBBindingSource.DataMember = "TBWMRH_PROFIL_FILE_JOB" - Me.TBWMRH_PROFIL_FILE_JOBBindingSource.DataSource = Me.MyDataset - ' - 'TBWMRH_PROFILBindingSource + 'Label1 ' - Me.TBWMRH_PROFILBindingSource.DataMember = "TBWMRH_PROFIL" - Me.TBWMRH_PROFILBindingSource.DataSource = Me.MyDataset + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(6, 18) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(108, 13) + Me.Label1.TabIndex = 0 + Me.Label1.Text = "Pfad zu Datenbank:" ' - 'TBWMRH_KONFIGURATIONBindingSource + 'OpenFileDialog1 ' - Me.TBWMRH_KONFIGURATIONBindingSource.DataMember = "TBWMRH_KONFIGURATION" - Me.TBWMRH_KONFIGURATIONBindingSource.DataSource = Me.MyDataset + Me.OpenFileDialog1.FileName = "OpenFileDialog1" ' 'TBWMRH_KONFIGURATIONTableAdapter ' @@ -1888,15 +1897,6 @@ Partial Class frmMain ' Me.TBWMRH_PROFILTableAdapter.ClearBeforeFill = True ' - 'Button2 - ' - Me.Button2.Location = New System.Drawing.Point(490, 89) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(75, 23) - Me.Button2.TabIndex = 104 - Me.Button2.Text = "Teste Suche" - Me.Button2.UseVisualStyleBackColor = True - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1922,14 +1922,18 @@ Partial Class frmMain Me.SplitContainer1.Panel2.PerformLayout() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer1.ResumeLayout(False) + CType(Me.TBWMRH_PROFIL_JOBBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBWMRH_PROFIL_JOBBindingNavigator, System.ComponentModel.ISupportInitialize).EndInit() Me.TBWMRH_PROFIL_JOBBindingNavigator.ResumeLayout(False) Me.TBWMRH_PROFIL_JOBBindingNavigator.PerformLayout() + CType(Me.TBWMRH_PROFIL_FILE_JOBBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPROFIL_FILE_JOBBindingNavigator, System.ComponentModel.ISupportInitialize).EndInit() Me.TBPROFIL_FILE_JOBBindingNavigator.ResumeLayout(False) Me.TBPROFIL_FILE_JOBBindingNavigator.PerformLayout() Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() + CType(Me.TBWMRH_PROFILBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.NumericUpDown, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox4.ResumeLayout(False) Me.GroupBox4.PerformLayout() @@ -1939,13 +1943,9 @@ Partial Class frmMain Me.TabPage3.ResumeLayout(False) Me.GroupBox2.ResumeLayout(False) Me.GroupBox2.PerformLayout() + CType(Me.TBWMRH_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() - CType(Me.TBWMRH_PROFIL_JOBBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBWMRH_PROFIL_FILE_JOBBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBWMRH_PROFILBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBWMRH_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/app/ResultHandler_Konfig/frmMain.resx b/app/ResultHandler_Konfig/frmMain.resx index ccc9885..0997cd1 100644 --- a/app/ResultHandler_Konfig/frmMain.resx +++ b/app/ResultHandler_Konfig/frmMain.resx @@ -215,7 +215,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAI - DAAAAk1TRnQBSQFMAgEBAwEAATABAQEwAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBAwEAATgBAQE4AQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/ResultHandler_Konfig/frmMain.vb b/app/ResultHandler_Konfig/frmMain.vb index 06725de..d397866 100644 --- a/app/ResultHandler_Konfig/frmMain.vb +++ b/app/ResultHandler_Konfig/frmMain.vb @@ -442,12 +442,8 @@ Public Class frmMain btnJOB_addSpeicherort.Visible = True Case 1 lblString1.Text = "Email-Empfänger:" - Case 2 'Oracle - lblString1.Text = "Connection String Oracle" - lblString2.Text = "Command Oracle" - Case 3 'MSSQL - lblString1.Text = "Connection String MSSQL" - lblString2.Text = "Command MSSQL" + Case 2 'json BNS + lblString1.Text = "Speicherort json File:" End Select End Sub