From 0382bf7e6dd91abb5121a509f19962802c01cc1d Mon Sep 17 00:00:00 2001
From: JenneJ <j.jenne@didalog.de>
Date: Fri, 3 Jun 2016 13:01:22 +0200
Subject: [PATCH] jj  02.06

---
 app/DD-Record-Organiser/ClassDatabase.vb      | 25 +++++++++++++++++++
 .../ModuleHelperMethods.vb                    |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/DD-Record-Organiser/ClassDatabase.vb b/app/DD-Record-Organiser/ClassDatabase.vb
index b77d353..5dfe6e1 100644
--- a/app/DD-Record-Organiser/ClassDatabase.vb
+++ b/app/DD-Record-Organiser/ClassDatabase.vb
@@ -56,6 +56,8 @@ Public Class ClassDatabase
     End Function
     Public Shared Function Return_Datatable(Select_anweisung As String, Optional CallMethod As String = "")
         Try
+            Dim sw As New SW("Return_Datatable: " & Select_anweisung)
+
             Dim SQLconnect As New SqlClient.SqlConnection
             Dim SQLcommand As SqlClient.SqlCommand
             SQLconnect.ConnectionString = connectionString
@@ -67,6 +69,9 @@ Public Class ClassDatabase
             Dim dt As DataTable = New DataTable()
             adapter1.Fill(dt)
             SQLconnect.Close()
+
+            sw.Done()
+
             Return dt
         Catch ex As Exception
             MsgBox("Error in Return_Datatable: " & ex.Message & vbNewLine & vbNewLine & Select_anweisung & vbNewLine & vbNewLine & "Call-Method: " & CallMethod, MsgBoxStyle.Critical)
@@ -114,6 +119,8 @@ Public Class ClassDatabase
     End Function
     Public Shared Function Return_Datatable_CS(Select_anweisung As String, ConString As String, Optional userInput As Boolean = False)
         Try
+            Dim sw As New SW("Return_Datatable_CS: " & Select_anweisung)
+
             Dim SQLconnect As New SqlClient.SqlConnection
             Dim SQLcommand As SqlClient.SqlCommand
             SQLconnect.ConnectionString = ConString
@@ -125,6 +132,9 @@ Public Class ClassDatabase
             Dim dt As DataTable = New DataTable()
             adapter1.Fill(dt)
             SQLconnect.Close()
+
+            sw.Done()
+
             Return dt
         Catch ex As Exception
             If userInput = True Then
@@ -137,6 +147,8 @@ Public Class ClassDatabase
     End Function
     Public Shared Function Execute_non_Query(ExecuteCMD As String, Optional Userinput As Boolean = False)
         Try
+            Dim sw As New SW("Execute_non_Query: " & ExecuteCMD)
+
             Dim SQLconnect As New SqlClient.SqlConnection
             Dim SQLcommand As SqlClient.SqlCommand
             SQLconnect.ConnectionString = MyConnectionString
@@ -148,6 +160,9 @@ Public Class ClassDatabase
             SQLcommand.ExecuteNonQuery()
             SQLcommand.Dispose()
             SQLconnect.Close()
+
+            sw.Done()
+
             Return True
         Catch ex As Exception
             If Userinput = True Then
@@ -161,6 +176,8 @@ Public Class ClassDatabase
     End Function
     Public Shared Function Execute_non_Query_withConn(ExecuteCMD As String, ConnID As Integer)
         Try
+            Dim sw As New SW("Execute_non_Query_withConn: " & ExecuteCMD)
+
             Dim connectionString As String
             connectionString = ClassDatabase.GetConnectionString(ConnID)
             If connectionString <> "" Then
@@ -174,6 +191,9 @@ Public Class ClassDatabase
                 SQLcommand.ExecuteNonQuery()
                 SQLcommand.Dispose()
                 SQLconnect.Close()
+
+                sw.Done()
+
                 Return True
             Else
                 MsgBox("No ConnectionID for Conn-ID: " & ConnID.ToString, MsgBoxStyle.Exclamation)
@@ -223,6 +243,8 @@ Public Class ClassDatabase
     Public Shared Function Execute_Scalar(cmdscalar As String, Optional Userinput As Boolean = False)
         Dim result
         Try
+            Dim sw As New SW("Execute_Scalar: " & cmdscalar)
+
             Dim SQLconnect As New SqlClient.SqlConnection
             Dim SQLcommand As SqlClient.SqlCommand
             SQLconnect.ConnectionString = connectionString
@@ -233,6 +255,9 @@ Public Class ClassDatabase
             result = SQLcommand.ExecuteScalar()
             SQLcommand.Dispose()
             SQLconnect.Close()
+
+            sw.Done()
+
             Return result
         Catch ex As Exception
             If Userinput = True Then
diff --git a/app/DD-Record-Organiser/ModuleHelperMethods.vb b/app/DD-Record-Organiser/ModuleHelperMethods.vb
index 2c06f6a..0808953 100644
--- a/app/DD-Record-Organiser/ModuleHelperMethods.vb
+++ b/app/DD-Record-Organiser/ModuleHelperMethods.vb
@@ -407,7 +407,7 @@
 
         Public Function Done() As Long
             stopwatch.Stop()
-            Dim message = String.Format("{0} took {1} milliseconds to complete", label, stopwatch.ElapsedMilliseconds)
+            Dim message = String.Format("{0, 5}ms || {1}", stopwatch.ElapsedMilliseconds, label)
             Console.WriteLine(message)
             If LogErrorsOnly = False Then ClassLogger.Add(message, False)
             Return stopwatch.ElapsedMilliseconds