neu

Aviso/Anhänge/frmSendungAnhangImport.vb

@@ -154,6 +154,7 @@ Public Class frmSendungAnhangImport
         Dim cntl = getAcitveCntl()
         Dim cntlID = If(cntl IsNot Nothing, getAcitveCntl().FILE_ANHID, -1)
 
+
         For Each u As usrCntlSendungAnhangElement In flpnlAviso.Controls
             If u.ACTIVE Then
                 If u.FILE_TYPE <> "PDF" Then Exit Sub
@@ -203,7 +204,7 @@ Public Class frmSendungAnhangImport
         clearPnlAnfuegen()
         '   initSendungen()
 
-        initFlpANH_LIST()
+        initFlpANH_LIST(, False)
 
         If flpnlAviso.Controls.Count > 0 Then
             If Not setAvtiveById(flpnlAviso, CurrentPageNumber, pages, cntlID) Then
@@ -270,6 +271,8 @@ Public Class frmSendungAnhangImport
 
                 If cbxDelPDF.Checked Then
                     ANH.anh_SendungsId = SendngsId
+                    ANH.anh_Name = getPDFSplitName(ANH.anh_Name)
+
                     ANH.SAVE() 'Eintrag wird überschreiben
                     flpnlAviso.Controls.Remove(u)
                     ' If cbxDelPDF.Checked Then tryDelete(u.FILE_PATH)
@@ -740,7 +743,13 @@ Public Class frmSendungAnhangImport
 
     End Sub
 
-    Sub initFlpANH_LIST(Optional pnl As FlowLayoutPanel = Nothing)
+    Sub initFlpANH_LIST(Optional pnl As FlowLayoutPanel = Nothing, Optional keepActive As Boolean = True)
+        Dim aktiveId = -1
+        For Each i As usrCntlSendungAnhangElement In flpnlAviso.Controls
+            If i.ACTIVE Then
+                aktiveId = i.FILE_ANHID
+            End If
+        Next
         Dim ANH_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge)
         'If cboSendungen._value > 0 Then
         '    VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_BySendung(ANH_LIST, cboSendungen._value) 'LÄDT alle Aviso-Anhänge
@@ -762,6 +771,12 @@ Public Class frmSendungAnhangImport
             USRCNTL.FILE_ANHID = a.anh_id
             USRCNTL.FILE_DOCID = a.anh_docId
 
+            If keepActive Then
+                If a.anh_id = aktiveId Then
+                    USRCNTL.ACTIVE = True
+                End If
+            End If
+
             initElement(USRCNTL)
 
             If If(a.anh_SendungsId, 0) > 0 Then
@@ -935,7 +950,7 @@ Public Class frmSendungAnhangImport
     End Function
 
     Public Shared Function saveToDS(AvisoId, fileName, sourcePath, Art, Typ, Optional ByRef da_id = -1, Optional ByRef anhId = -1, Optional ByRef destPath = "", Optional SendungsId = Nothing) As Boolean
-        Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "AVISO_ANHAENGE", AvisoId, Now.ToString("ddMMyy_HHmmss.sss"), "", fileName, -1, False)
+        Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "AVISO_ANHAENGE", AvisoId, Now.ToString("ddMMyy_HHmmss.ffff"), "", fileName, -1, False)
         If Not DS.uploadDataToDATENSERVER(sourcePath) Then MsgBox("Fehler beim Speichern: Datenserver!") : Return False
         If DS.da_id <= 0 Then MsgBox("Keine DocId!") : Return False
         da_id = DS.da_id
@@ -952,9 +967,12 @@ Public Class frmSendungAnhangImport
 
     Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles btnAddSnd.Click
         Dim f As New frmAddSendnung(AvisoId)
-        f.ShowDialog(Me)
-        initSendungen()
-        initFlpANH_LIST()
+        If f.ShowDialog(Me) = DialogResult.OK Then
+            initSendungen()
+            cboSendungen.changeItem(f.SendungsId)
+            initFlpANH_LIST(flpnlSendungen)
+        End If
+        txtSeiten.Focus()
     End Sub
 
     Private Sub AusZwischenablageeinfügenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AusZwischenablageeinfügenToolStripMenuItem.Click
@@ -1008,6 +1026,7 @@ Public Class frmSendungAnhangImport
                 End If
                 If e.KeyCode = Keys.Add Then
                     btnAddSnd.PerformClick()
+                    e.IsInputKey = True ' Damit Event abgefangen ist, sonst steht "+" im Feld
                 End If
             Else
                 If e.KeyCode = Keys.PageDown Then
@@ -1048,7 +1067,7 @@ Public Class frmSendungAnhangImport
     Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
         If txtSeiten.Text = "" Then Exit Sub
         '   If cboArt._value = "" Then Exit Sub
-        If cboSendungen._value = "" Then Exit Sub
+        ' If cboSendungen._value = "" Then Exit Sub
         If Not checkSeiten() Then Exit Sub
 
         Dim CurrentPageNumber = PdfViewer.CurrentPageNumber
@@ -1060,7 +1079,7 @@ Public Class frmSendungAnhangImport
             If u.ACTIVE Then
                 If u.FILE_TYPE <> "PDF" Then Exit Sub
                 Dim fi As New FileInfo(u.FILE_PATH)
-                Dim SendngsId As Integer = cboSendungen._value
+                '  Dim SendngsId As Integer = cboSendungen._value
                 Dim TMP_Path_Old = u.FILE_PATH
                 Dim TMP_Path_New = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(u.FILE_NAME, fi.Extension,, True, "SendungsAnhaenge")
                 Dim PagesLeft = 0
@@ -1087,7 +1106,7 @@ Public Class frmSendungAnhangImport
         clearPnlAnfuegen()
         '   initSendungen()
 
-        initFlpANH_LIST()
+        initFlpANH_LIST(, False)
 
         If flpnlAviso.Controls.Count > 0 Then
             If Not setAvtiveById(flpnlAviso, CurrentPageNumber, pages, cntlID) Then
@@ -1106,6 +1125,10 @@ Public Class frmSendungAnhangImport
         End If
     End Sub
 
+    Private Sub txtBezeichnung_TextChanged(sender As Object, e As EventArgs)
+
+    End Sub
+
     'Private Sub txtBezeichnung_GotFocus(sender As Object, e As EventArgs) Handles txtBezeichnung.GotFocus
     '    txtBezeichnung.SelectAll()
     'End Sub