From 00db04035972710195bff1edb394cf219eebc92f Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Thu, 15 Sep 2016 14:07:27 +0200 Subject: [PATCH] MS2 --- .../My Project/AssemblyInfo.vb | 2 +- app/DD-Record-Organiser/frmConstructor_Main.vb | 3 ++- app/DD-Record-Organiser/frmWD_IndexFile.vb | 15 ++++++++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/DD-Record-Organiser/My Project/AssemblyInfo.vb b/app/DD-Record-Organiser/My Project/AssemblyInfo.vb index 4255d96..e31869e 100644 --- a/app/DD-Record-Organiser/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organiser/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index aba5f19..3893c22 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -2759,6 +2759,7 @@ Public Class frmConstructor_Main progressLoadEntity.Visible = True labelLoadEntity.Visible = True + Load_Splitter_Layout() If LOCK_CONTROLS_BG_LOAD = True Then SplitContainerMain.Panel2.Enabled = False End If @@ -2773,7 +2774,7 @@ Public Class frmConstructor_Main Catch ex As Exception MsgBox("Error in Load_ViewData:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) End Try - Load_Splitter_Layout() + If LOCK_CONTROLS_BG_LOAD = True Then SplitContainerMain.Panel2.Enabled = True diff --git a/app/DD-Record-Organiser/frmWD_IndexFile.vb b/app/DD-Record-Organiser/frmWD_IndexFile.vb index fe093bc..6bb96d5 100644 --- a/app/DD-Record-Organiser/frmWD_IndexFile.vb +++ b/app/DD-Record-Organiser/frmWD_IndexFile.vb @@ -17,16 +17,21 @@ Public Class frmWD_IndexFile System.Windows.Forms.MessageBox.Show(ex.Message) End Try End Sub - Function WORK_FILE(Filepath As String, Targetpath As String, vDokart_ID As Integer, vDokart As String, multiindex As Boolean) + Function WORK_FILE(ImportFilePath As String, VerzeichnisZiel As String, vDokart_ID As Integer, vDokart As String, multiindex As Boolean) Try CURRENT_DOKARTSTRING = vDokart Dim err As Boolean = False + '################################################################# + 'Name und ZielPfad generieren + '################################################################# If ClassImport_Windream.Name_Generieren(DOCTYPE_IDTextBox.Text) = False Then Return False End If - - Dim streamresult = ClassWindream.Stream_File(Filepath, Targetpath) - 'Dim type = streamresult.GetType + '################################################################# + 'Stream File to windream + '################################################################# + Dim streamresult = ClassWindream.Stream_File(ImportFilePath, VerzeichnisZiel) + '################################################################# If streamresult = True Then Dim sql = "SELECT * FROM TBDD_INDEX_AUTOM WHERE ACTIVE = 1 AND UPPER(INDEXNAME) NOT LIKE UPPER('%ONLY %') AND SQL_ACTIVE = 0 AND DOCTYPE_ID = " & vDokart_ID Dim dt As DataTable = ClassDatabase.Return_Datatable(sql) @@ -499,7 +504,7 @@ Public Class frmWD_IndexFile End If - Else + Else 'No MULTI INDEX If WORK_FILE(Me.txtFilepath.Text, Me.PATHTextBox.Text, doctype_id, My.Settings.WD_INDEXDOKART_SAVE, False) = True Then NEW_FILES_ADDED = True Me.Close()