This commit is contained in:
2020-05-31 22:25:35 +02:00
parent 4a358d43fd
commit 083e666fbc
214 changed files with 14292 additions and 4117 deletions

View File

@@ -44,9 +44,9 @@ Public Class cDATENSERVER
Me.da_vorlage = (da_KundenNr <= 0)
Me.da_kategorie = da_kategorie
Me.da_ordner = da_ordner
Me.da_uOrdner1 = If(da_uOrdner1, "")
Me.da_uOrdner2 = If(da_uOrdner2, "")
Me.da_uOrdner3 = If(da_uOrdner3, "")
Me.da_uOrdner1 = replaceInvalidCahr(If(da_uOrdner1, ""))
Me.da_uOrdner2 = replaceInvalidCahr(If(da_uOrdner2, ""))
Me.da_uOrdner3 = replaceInvalidCahr(If(da_uOrdner3, ""))
Me.da_name = da_name
LOAD()
End Sub
@@ -58,9 +58,9 @@ Public Class cDATENSERVER
Me.da_vorlage = (da_KundenNr <= 0)
Me.da_kategorie = da_kategorie
Me.da_ordner = da_ordner
Me.da_uOrdner1 = If(da_uOrdner1, "")
Me.da_uOrdner2 = If(da_uOrdner2, "")
Me.da_uOrdner3 = If(da_uOrdner3, "")
Me.da_uOrdner1 = replaceInvalidCahr(If(da_uOrdner1, ""))
Me.da_uOrdner2 = replaceInvalidCahr(If(da_uOrdner2, ""))
Me.da_uOrdner3 = replaceInvalidCahr(If(da_uOrdner3, ""))
Me.da_name = da_name
Me.da_multifiles = da_multifiles
LOAD()
@@ -102,6 +102,7 @@ Public Class cDATENSERVER
Try
DATA_LIST = New cDatenserverIDCollectionList
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
'MsgBox("SELECT * FROM tblDatenarchiv WHERE da_KundenNr = @da_KundenNr AND da_kategorie = '" & Me.da_kategorie & "' And da_ordner ='" & Me.da_ordner & "' AND da_uOrdner1= '" & Me.da_uOrdner1 & "' AND da_uOrdner2= '" & Me.da_uOrdner2 & "' AND da_uOrdner3= '" & Me.da_uOrdner3 & "' AND da_name='" & Me.da_name & "' ")
Using cmd As New SqlCommand("SELECT * FROM tblDatenarchiv WHERE da_KundenNr = @da_KundenNr AND da_kategorie = @da_kategorie AND da_ordner=@da_ordner AND da_uOrdner1= @da_uOrdner1 AND da_uOrdner2= @da_uOrdner2 AND da_uOrdner3= @da_uOrdner3 AND da_name=@da_name ", conn)
cmd.Parameters.AddWithValue("@da_KundenNr", Me.da_KundenNr)
' cmd.Parameters.AddWithValue("@da_vorlage", Me.da_vorlage)
@@ -189,12 +190,13 @@ Public Class cDATENSERVER
End Try
End Function
Public Shared Function replaceInvalidCahr(ByRef s)
s = s.replace("", "I")
s = s.replace("İ", "I")
s = s.replace("ı", "i")
s = s.replace("", "E")
s = s.replace(",", ".")
Public Shared Function replaceInvalidCahr(ByRef s As String) As String
s = s.Replace("", "I")
s = s.Replace("İ", "I")
s = s.Replace("ı", "i")
s = s.Replace("", "E")
s = s.Replace(",", ".")
@@ -204,7 +206,7 @@ Public Class cDATENSERVER
Return s
End Function
Public Function uploadDataToDATENSERVER(srcPath, Optional bezeichnung = "", Optional endung = "", Optional allowMsg = True, Optional coll_archiv = False) As Boolean
Public Function uploadDataToDATENSERVER(srcPath, Optional bezeichnung = "", Optional endung = "", Optional allowMsg = True, Optional coll_archiv = False, Optional delteFromFileSystem = True) As Boolean
'LAST_ID = -1
If endung = "" Then Dim fi As New IO.DirectoryInfo(srcPath) : endung = fi.Extension
' If bezeichnung = "" Then bezeichnung = System.IO.Path.GetFileName(srcPath) : endung = ""
@@ -218,7 +220,7 @@ Public Class cDATENSERVER
Return False 'NICHT Passiert
End If
End If
DATA_LIST.DELETE_ALL() 'Wenn nur eine Datei existieren darf, müssen zuerst alle Einträge gelöscht werden
DATA_LIST.DELETE_ALL(delteFromFileSystem) 'Wenn nur eine Datei existieren darf, müssen zuerst alle Einträge gelöscht werden
End If
If DATA_LIST.ADD(srcPath, destpath, bezeichnung, "", coll_archiv) Then
@@ -348,7 +350,7 @@ Public Class cDATENSERVER
" VALUES (@da_KundenNr, @da_vorlage, @da_kategorie, @da_ordner, @da_uOrdner1,@da_uOrdner2,@da_uOrdner3,@da_name,@da_info,@da_multifiles)" &
" End " &
" commit tran "
Try
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand(sqlstr, conn)
@@ -1566,15 +1568,22 @@ Public Class cDatenserverIDCollectionList
Function DELETE_ALL() As Boolean
Function DELETE_ALL(Optional delteFromFileSystem = True) As Boolean
Try
While LIST.Count > 0
If LIST(0).DELETE() Then
LIST.RemoveAt(0)
Else
Return False
End If
End While
If delteFromFileSystem Then
LIST.Clear()
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Return SQL.doSQL("DELETE FROM [tblDatenarchiv_Collection] WHERE [coll_daId]=" & coll_daId & " ", "FMZOLL")
Else
While LIST.Count > 0
If LIST(0).DELETE() Then
LIST.RemoveAt(0)
Else
Return False
End If
End While
End If
Return True
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)