AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://jennej@172.24.11.74:90/scm/git/RecordOrganizer

Browse Source
This commit is contained in:
JenneJ 2016-09-15 16:42:06 +02:00
commit 2760aada8c
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/DD-Record-Organiser/My Project/AssemblyInfo.vb
View File

@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.4.7.4")>
<Assembly: AssemblyVersion("2.4.7.5")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguageAttribute("")>

3
app/DD-Record-Organiser/frmConstructor_Main.vb
View File

@ -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

15
app/DD-Record-Organiser/frmWD_IndexFile.vb
View File

@ -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()