From edbd4c8bb71ab14a974a06a60ae5e02fb3bc6664 Mon Sep 17 00:00:00 2001
From: "m.haase" <marco.haase93@web.de>
Date: Mon, 16 Jan 2023 15:58:17 +0100
Subject: [PATCH] Finale anpassungen

---
 DVAG - Mailverteiler.vbproj | 12 ++++++------
 My Project/AssemblyInfo.vb  |  4 ++--
 mail_auslesen.Designer.vb   |  2 +-
 mail_auslesen.vb            |  8 +++++---
 mail_sending.vb             | 20 ++++++++++++--------
 5 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/DVAG - Mailverteiler.vbproj b/DVAG - Mailverteiler.vbproj
index aba7f59..8f72207 100644
--- a/DVAG - Mailverteiler.vbproj	
+++ b/DVAG - Mailverteiler.vbproj	
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <StartupObject>DVAG___Mailverteiler.My.MyApplication</StartupObject>
     <RootNamespace>DVAG___Mailverteiler</RootNamespace>
-    <AssemblyName>DVAG - Mailverteiler</AssemblyName>
+    <AssemblyName>anpassungen</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsForms</MyType>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
@@ -26,7 +26,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.1.2.%2a</ApplicationVersion>
+    <ApplicationVersion>1.1.7.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
@@ -37,7 +37,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>DVAG - Mailverteiler.xml</DocumentationFile>
+    <DocumentationFile>anpassungen.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -47,7 +47,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>DVAG - Mailverteiler.xml</DocumentationFile>
+    <DocumentationFile>anpassungen.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -67,7 +67,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DocumentationFile>DVAG - Mailverteiler.xml</DocumentationFile>
+    <DocumentationFile>anpassungen.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -76,7 +76,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DocumentationFile>DVAG - Mailverteiler.xml</DocumentationFile>
+    <DocumentationFile>anpassungen.xml</DocumentationFile>
     <Optimize>true</Optimize>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DebugType>pdbonly</DebugType>
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index ba401ac..f5ea677 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.1.2.0")>
-<Assembly: AssemblyFileVersion("1.1.2.0")>
+<Assembly: AssemblyVersion("1.1.7.0")>
+<Assembly: AssemblyFileVersion("1.1.7.0")>
diff --git a/mail_auslesen.Designer.vb b/mail_auslesen.Designer.vb
index fbd86ac..fca0eb5 100644
--- a/mail_auslesen.Designer.vb
+++ b/mail_auslesen.Designer.vb
@@ -179,7 +179,7 @@ Partial Class mail_auslesen
         Me.Controls.Add(Me.bt_start)
         Me.Name = "mail_auslesen"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-        Me.Text = "Form1"
+        Me.Text = "Form"
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
diff --git a/mail_auslesen.vb b/mail_auslesen.vb
index 05ef42e..f27c22a 100644
--- a/mail_auslesen.vb
+++ b/mail_auslesen.vb
@@ -197,7 +197,10 @@ Public Class mail_auslesen
 
         End While
 
+        mail_sending.Show()
         mail_sending.bt_start.PerformClick()
+        Me.Hide()
+
 
 
 
@@ -214,6 +217,7 @@ Public Class mail_auslesen
     Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles bt_stop.Click
 
         Timer_mail_auslesen.Stop()
+        Me.Text = "Dienst ist gestoppt"
         My.Settings.mail_auslesen = "0"
     End Sub
 
@@ -226,13 +230,11 @@ Public Class mail_auslesen
     End Function
 
     Private Sub Timer_mail_auslesen_Tick(sender As Object, e As EventArgs) Handles Timer_mail_auslesen.Tick
-
+        Me.Text = "Dienst läuft"
         einlesen()
     End Sub
 
     Private Sub Button1_Click_2(sender As Object, e As EventArgs) Handles Button1.Click
-
-
         einlesen()
     End Sub
 End Class
diff --git a/mail_sending.vb b/mail_sending.vb
index 2e88ddf..84c5bba 100644
--- a/mail_sending.vb
+++ b/mail_sending.vb
@@ -171,9 +171,10 @@ Public Class mail_sending
                     sqlcmd = New MySqlCommand("select email from newsletter union select email from dvag.tl.member where disable = ''", conn)
 
                     'Test
-                ElseIf tb_ak_gruppe.Text Like "Test" Then
+                ElseIf tb_ak_gruppe.Text Like "TEST" Then
                     sqlcmd = New MySqlCommand("SELECT `email` FROM `test`", conn)
 
+
                 Else
 
 
@@ -181,7 +182,7 @@ Public Class mail_sending
                 End If
 
                 rtb_log.Text = rtb_log.Text & DateTime.Now & ": Empfänger SQL gesetzt" & vbNewLine
-                MsgBox(sqlcmd.ToString)
+                'MsgBox(sqlcmd.ToString)
                 rtb_log.ScrollToCaret()
                 Try
 
@@ -195,12 +196,13 @@ Public Class mail_sending
 
 
                     For Each row As DataRow In chemicalInventory.Rows
-                        '   MsgBox(row.Item("email"))
+
                         dr = (row.Item("email"))
                         rtb_empfaengergruppe.Text = rtb_empfaengergruppe.Text & dr & vbNewLine
                     Next
 
 
+
                     Dim last = rtb_empfaengergruppe.Text.LastIndexOf("")
                     If last > 0 Then
 
@@ -244,13 +246,13 @@ Public Class mail_sending
 
 
         System.Windows.Forms.Application.DoEvents()
-        save_log()
+        'save_log()
         mail_versenden()
-        save_log()
+        'save_log()
         update_sql_gesendete_mails()
-        save_log()
+        'save_log()
         felder_leeren()
-        save_log()
+        'save_log()
 
 
 
@@ -329,9 +331,11 @@ Public Class mail_sending
         tb_betreff.Clear()
         rtb_mail_body.Clear()
         lb_id.Text = ""
+        rtb_log.Text = ""
 
-        If My.Settings.mail_auslesen = "1" Then mail_auslesen.Timer_mail_auslesen.Start()
         mail_auslesen.Show()
+        If My.Settings.mail_auslesen = "1" Then mail_auslesen.Timer_mail_auslesen.Start()
+
         Me.Hide()
 
     End Sub