From 385d7efe1fb98a057f4d3b792080db319a143d7f Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 10 Dec 2025 09:12:13 +0100 Subject: [PATCH] Addin --- VERAGAddIn/frmAvisoFormularAnfügen.vb | 28 ++++++++++++++++----------- VERAGAddIn/rbnVERAG.vb | 19 +++++++++++------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/VERAGAddIn/frmAvisoFormularAnfügen.vb b/VERAGAddIn/frmAvisoFormularAnfügen.vb index d21da76..626b899 100644 --- a/VERAGAddIn/frmAvisoFormularAnfügen.vb +++ b/VERAGAddIn/frmAvisoFormularAnfügen.vb @@ -174,14 +174,20 @@ Public Class frmAvisoFormularAnfuegen Select Case button.Name Case "btnVertraege" + UsrCntlVertraege1.dgvVertraegeNew.GetOrder() UsrCntlVertraege1.initDGVVertraege(KdNr) - If UsrCntlVertraege1.dgvVertraege.SelectedRows.Count < 1 Then + UsrCntlVertraege1.dgvVertraegeNew.SetOrder() + + If UsrCntlVertraege1.dgvVertraegeNew.SelectedRows.Count < 1 Then MsgBox("Bitte einen Vertrag markieren") End If Case "btnGestellungsgarantien" + UsrCntlGestellungsgarantien1.dgvGestGarantieNew.GetOrder() UsrCntlGestellungsgarantien1.initDGVGestGarantie(KdNr) - If UsrCntlGestellungsgarantien1.dgvGestGarantie.SelectedRows.Count < 1 Then + UsrCntlGestellungsgarantien1.dgvGestGarantieNew.SetOrder() + + If UsrCntlGestellungsgarantien1.dgvGestGarantieNew.SelectedRows.Count < 1 Then MsgBox("Bitte eine Gestellung markieren") End If End Select @@ -226,13 +232,13 @@ Public Class frmAvisoFormularAnfuegen setAvisoIdForVertrage() - ElseIf UsrCntlVertraege1.dgvVertraege.SelectedRows.Count = 1 Then + ElseIf UsrCntlVertraege1.dgvVertraegeNew.SelectedRows.Count = 1 Then - For Each row As DataGridViewRow In UsrCntlVertraege1.dgvVertraege.SelectedRows + For Each row As DataGridViewRow In UsrCntlVertraege1.dgvVertraegeNew.SelectedRows If row.Cells("kv_datenarchivId").Value Is DBNull.Value Or row.Cells("kv_datenarchivId").Value Is Nothing Then setAvisoIdForVertrage() Else - Dim response = MsgBox("Der markierte Vertrag besitzt bereit einen Anhang!" & vbCrLf & "Soll der Anhang ersetzt werden?", vbYesNoCancel) + Dim response = MsgBox("Der markierte Vertrag besitzt bereits einen Anhang!" & vbCrLf & "Soll der Anhang ersetzt werden?", vbYesNoCancel) If response = vbYes Then setAvisoIdForVertrage() enableOverwritting = True @@ -262,9 +268,9 @@ Public Class frmAvisoFormularAnfuegen setAvisoIdForGestellungen() Me.DialogResult = DialogResult.OK - ElseIf UsrCntlGestellungsgarantien1.dgvGestGarantie.SelectedRows.Count = 1 Then + ElseIf UsrCntlGestellungsgarantien1.dgvGestGarantieNew.SelectedRows.Count = 1 Then - For Each row As DataGridViewRow In UsrCntlGestellungsgarantien1.dgvGestGarantie.SelectedRows + For Each row As DataGridViewRow In UsrCntlGestellungsgarantien1.dgvGestGarantieNew.SelectedRows If row.Cells("kv_datenarchivId").Value Is DBNull.Value Or row.Cells("kv_datenarchivId").Value Is Nothing Then setAvisoIdForGestellungen() @@ -299,8 +305,8 @@ Public Class frmAvisoFormularAnfuegen Private Sub setAvisoIdForGestellungen() If UsrCntlGestellungsgarantien1.Gid > 0 Then AvisoId = UsrCntlGestellungsgarantien1.Gid - ElseIf UsrCntlGestellungsgarantien1.dgvGestGarantie.SelectedRows.Count = 1 Then - AvisoId = UsrCntlGestellungsgarantien1.dgvGestGarantie.SelectedRows(0).Cells("gg_id").Value + ElseIf UsrCntlGestellungsgarantien1.dgvGestGarantieNew.SelectedRows.Count = 1 Then + AvisoId = UsrCntlGestellungsgarantien1.dgvGestGarantieNew.SelectedRows(0).Cells("gg_id").Value End If End Sub @@ -308,8 +314,8 @@ Public Class frmAvisoFormularAnfuegen Private Sub setAvisoIdForVertrage() If UsrCntlVertraege1.Vid > 0 Then AvisoId = UsrCntlVertraege1.Vid - ElseIf UsrCntlVertraege1.dgvVertraege.SelectedRows.Count = 1 Then - AvisoId = UsrCntlVertraege1.dgvVertraege.SelectedRows(0).Cells("kv_id").Value + ElseIf UsrCntlVertraege1.dgvVertraegeNew.SelectedRows.Count = 1 Then + AvisoId = UsrCntlVertraege1.dgvVertraegeNew.SelectedRows(0).Cells("kv_id").Value End If If AvisoId > 0 Then avisoIdSet = True diff --git a/VERAGAddIn/rbnVERAG.vb b/VERAGAddIn/rbnVERAG.vb index 653b94e..7f0e5f0 100644 --- a/VERAGAddIn/rbnVERAG.vb +++ b/VERAGAddIn/rbnVERAG.vb @@ -1,13 +1,13 @@ Option Explicit On -Imports VERAG_PROG_ALLGEMEIN -Imports Microsoft.Office.Tools.Ribbon -Imports System.Windows.Forms -Imports Microsoft.Office.Interop -Imports System.Runtime.InteropServices -Imports System.Text.RegularExpressions Imports System.Net Imports System.Reflection +Imports System.Runtime.InteropServices +Imports System.Text.RegularExpressions +Imports System.Windows.Forms +Imports Microsoft.Office.Interop +Imports Microsoft.Office.Tools.Ribbon +Imports VERAG_PROG_ALLGEMEIN Public Class VERAGRibbon @@ -498,7 +498,12 @@ Public Class AVISO_Mail_Functions specialFolder = "OutlookAttach\Outlook_" & Now.ToString("ddMMyy_HHmmss.ffff") End While 'Dim iof As New IO.FileInfo(attachment.PathName) - Dim TMP_PATH As String = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(attachment.FileName, "", False, False, specialFolder) + Dim fileName As String = attachment.FileName + fileName = Left(Regex.Replace(fileName, "[\/\\\:\?!€,&'\*\<\>\|""]", ""), 100).Replace("""", "").Replace(vbTab, "_") + fileName = fileName.Replace("""", "") + fileName = fileName.Replace("“", "") + fileName = fileName.Replace("”", "") + Dim TMP_PATH As String = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(fileName, "", False, False, specialFolder) attachment.SaveAsFile(TMP_PATH) Dim iof As New IO.FileInfo(TMP_PATH)