edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

neu

Browse Source
This commit is contained in:
Andreas Luxbauer
2020-03-12 14:49:31 +01:00
parent f4c1a74870
commit cc28d5a6cf
197 changed files with 37402 additions and 4503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
View File

@@ -189,13 +189,15 @@ Public Class cDATENSERVER
End Try
End Function
Public Function replaceInvalidCahr(ByRef s)
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(",", ".")
Dim tempBytes = System.Text.Encoding.GetEncoding("ISO-8859-8").GetBytes(s)
s = System.Text.Encoding.UTF8.GetString(tempBytes)
@@ -207,7 +209,6 @@ Public Class cDATENSERVER
If endung = "" Then Dim fi As New IO.DirectoryInfo(srcPath) : endung = fi.Extension
' If bezeichnung = "" Then bezeichnung = System.IO.Path.GetFileName(srcPath) : endung = ""
If bezeichnung = "" Then bezeichnung = da_name
replaceInvalidCahr(bezeichnung)
Dim destpath = DATENVERVER_OPTIONS.getDescPath(rootDir, da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_KundenNr, replaceInvalidCahr(da_name), endung)
genHEADER_DATA()
@@ -219,6 +220,7 @@ Public Class cDATENSERVER
End If
DATA_LIST.DELETE_ALL() '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
Return (destpath <> "")
End If
@@ -313,6 +315,10 @@ Public Class cDATENSERVER
fd.Filter = "PDF|*.PDF"
fd.FilterIndex = 2
fd.DefaultExt = ".pdf"
endung = ".pdf"
Case Else
fd.Title = "Datei auswählen"
End Select
Dim result As DialogResult = fd.ShowDialog()
If result = System.Windows.Forms.DialogResult.OK And fd.FileNames.Count > 0 Then
@@ -405,8 +411,9 @@ Public Class cDATENSERVER
Return ""
End Function
Public Function GET_TOP1_PATH(Optional openFile As Boolean = True) As String
Public Function GET_TOP1_PATH(Optional openFile As Boolean = False) As String
If DATA_LIST.LIST.Count > 0 Then
If openFile Then OPEN(DATA_LIST.LIST(0).coll_id)
Return DATA_LIST.LIST(0).coll_pfad
End If
Return ""
@@ -1330,7 +1337,7 @@ Public Class cDatenarchiv_Collection
Public Function DELETE() As Boolean
Try
If coll_pfad.Contains("\\192.168.0.91\DATENARCHIV\") Then 'Um sicher zu gehen, dass der pfad im richtigem VZ ist.
If coll_pfad.Contains(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir) Then '"\\192.168.0.91\DATENARCHIV\") Then 'Um sicher zu gehen, dass der pfad im richtigem VZ ist.
If My.Computer.FileSystem.FileExists(coll_pfad) Then
saveFileToDel(coll_pfad)
Try
@@ -1469,7 +1476,7 @@ Public Class cDatenserverIDCollectionList
LIST.Clear()
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
'Using cmd As New SqlCommand("SELECT coll_id, coll_daId, da_pfad, da_name FROM tblDatenarchiv_Collection INNER JOIN tblDatenarchiv ON coll_daId=da_id WHERE coll_id=@coll_id ", conn)
Using cmd As New SqlCommand("SELECT coll_id, coll_daId, coll_pfad, coll_bezeichnung,coll_info,coll_archiv FROM tblDatenarchiv_Collection WHERE coll_daId=@coll_daId order by coll_bezeichnung ", conn)
Using cmd As New SqlCommand("SELECT coll_id, coll_daId, coll_pfad, coll_bezeichnung,coll_info,coll_archiv FROM tblDatenarchiv_Collection WHERE coll_daId=@coll_daId order by coll_bezeichnung ", conn) ' order by [coll_date] desc
cmd.Parameters.AddWithValue("@coll_daId", Me.coll_daId)
Dim dr = cmd.ExecuteReader()
'LIST = New List(Of cDatenarchiv_Collection)
@@ -1719,16 +1726,32 @@ Public Class DATENVERVER_OPTIONS
End Function
Shared Function initRootDir() As String
If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
initRootDir = "\\192.168.0.91\DATENARCHIV\DATENARCHIV_TESTSYSTEM\"
Else
initRootDir = "\\192.168.0.91\DATENARCHIV\"
End If
initRootDir = getRootDir()
End Function
Shared Function getRootDir(Optional TESTSYSTEM = Nothing) As String
Dim TS = If(TESTSYSTEM IsNot Nothing, TESTSYSTEM, VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" Then
If TS Then
' getRootDir = "\\192.168.0.91\DATENARCHIV\DATENARCHIV_TESTSYSTEM\"
getRootDir = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\DATENARCHIV_TESTSYSTEM\"
Else
' getRootDir = "\\192.168.0.91\DATENARCHIV\"
getRootDir = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\"
End If
Else
If TS Then
' getRootDir = "\\192.168.0.91\DATENARCHIV\DATENARCHIV_TESTSYSTEM\"
getRootDir = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\DATENARCHIV_TESTSYSTEM\"
Else
' getRootDir = "\\192.168.0.91\DATENARCHIV\"
getRootDir = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\"
End If
End If
End Function
Shared Function getDescPath(rootDir, kategorie, ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, kdnr, bezeichnung, endung, Optional onlyordner = False) As String