Update Test GitWechsel

EDKB18/Batch/EDKB18/EDKB18/bin/Debug/EDKB18.exe.config

@@ -14,7 +14,7 @@
         <value>data source=shu00;initial catalog=edoka;integrated security=SSPI;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29</value>
       </setting>
       <setting name="ConnProd" serializeAs="String">
-        <value>data source=shu00;initial catalog=edoka;integrated security=SSPI;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29</value>
+        <value>data source=shu00;initial catalog=edoka_test;integrated security=SSPI;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29</value>
       </setting>
       <setting name="Vorlagenverzeichnis" serializeAs="String">
         <value>k:\edoka\edkb18</value>

EDKB18/Batch/EDKB18/EDKB18/bin/Release/EDKB18.exe.config

@@ -26,7 +26,7 @@
         <value>20000</value>
       </setting>
       <setting name="Debug" serializeAs="String">
-        <value>False</value>
+        <value>True</value>
       </setting>
     </EDKB18.My.MySettings>
   </userSettings>

EDKB18/Batch/EDKB18/EDKB18/clsdb.vb

@@ -13,7 +13,34 @@ Public Class clsdb
         Connection_Int = New SqlConnection(conn_int)
         Connection_Prod = New SqlConnection(conn_prod)
     End Sub
+    Function update_version(ByVal officevorlagenr As String, ByVal version As String)
+        Dim i As Integer
+        Dim scmCmdToExecute As SqlCommand = New SqlCommand()
+        Dim dtToReturn As DataTable = New DataTable()
+        Dim sdaAdapter As SqlDataAdapter = New SqlDataAdapter(scmCmdToExecute)
+        Try
+            scmCmdToExecute.CommandText = "dbo.sp_vorlagenuebernahme"
+            scmCmdToExecute.CommandType = CommandType.StoredProcedure
+            scmCmdToExecute.Connection = Connection_Prod
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@Fnkt", SqlDbType.Int, 4, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, 21))
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@param1", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, officevorlagenr))
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@param2", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, version))
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@param3", SqlDbType.VarChar, 8000, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, ""))
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@param4", SqlDbType.VarChar, 8000, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, ""))
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@result", SqlDbType.VarChar, 255, ParameterDirection.Output, True, 10, 0, "", DataRowVersion.Proposed, ""))
 
+            Connection_Prod.Open()
+            sdaAdapter.Fill(dtToReturn)
+            Connection_Prod.Close()
+            Return dtToReturn
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        Finally
+            '            DivFnkt.SpaltenTitel_Aktualisieren(Me.DomainList, dtToReturn, "OfficeVorlageDatei")
+            scmCmdToExecute.Dispose()
+            sdaAdapter.Dispose()
+        End Try
+    End Function
     Public Function Get_Vorlagen() As DataTable
         Dim i As Integer
         Dim scmCmdToExecute As SqlCommand = New SqlCommand()

EDKB18/Batch/EDKB18/EDKB18/clsdms.vb

@@ -50,7 +50,7 @@ Public Class clsdms
                 Globals.conn.OpenConnection()
                 If My.Settings.Debug = "False" Then ovd.Update()
                 Globals.conn.CloseConnection(True)
-                s = ovd.daFragabe_am.ToString + "|" + ovd.iFreigabe_durch.ToString + "|" + ovd.iMutierer.ToString + "|" + ovd.daMutiert_am.ToString + "|" + s + "|" + anr
+                s = ovd.daFragabe_am.ToString + "|" + ovd.iFreigabe_durch.ToString + "|" + ovd.iMutierer.ToString + "|" + ovd.daMutiert_am.ToString + "|" + s + "|" + anr + "|" + r.Item("DokVersion").ToString
                 PrintLine(1, Trim(Str(r("nr")) + "|" + s))
             End If
         Next
@@ -198,6 +198,7 @@ Public Class clsdms
                     ovd.Insert()
                     Globals.conn.CloseConnection(True)
                 Else
+
                     ovd.bAktiv = New SqlBoolean(CType(True, Boolean))
                     ovd.bFreigegeben = New SqlBoolean(CType(True, Boolean))
                     ovd.daFragabe_am = New SqlDateTime(CType(splitter(1), DateTime))
@@ -214,6 +215,13 @@ Public Class clsdms
                     End Try
                     Globals.conn.OpenConnection()
                     ovd.Update()
+                    Try
+                        If splitter(7) <> "" Then
+                            Dim clsdb As New clsdb(conn_int, conn_prod)
+                            clsdb.update_version(ovd.iOffice_vorlagenr.ToString, splitter(7))
+                        End If
+                    Catch
+                    End Try
                     Globals.conn.CloseConnection(True)
                 End If
             End If

EDKB18/Batch/EDKB18/EDKB18/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.vb

@@ -0,0 +1,7 @@
+' <autogenerated/>
+            Option Strict Off
+            Option Explicit On
+
+            Imports System
+            Imports System.Reflection
+            <Assembly: Global.System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName:=".NET Framework 4.5")>

EDKB18/Batch/EDKB18/EDKB18/obj/Debug/EDKB18.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-ff327e975066bc497b66b0574ecd4f992965e82e
+bcaff02c75702405e685b6f9b12d2d098c188c51

EDKB18/Batch/EDKB18/EDKB18/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.vb

@@ -0,0 +1,7 @@
+' <autogenerated/>
+            Option Strict Off
+            Option Explicit On
+
+            Imports System
+            Imports System.Reflection
+            <Assembly: Global.System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName:=".NET Framework 4.5")>

EDKB18/Batch/EDKB18/EDKB18/obj/Release/EDKB18.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-ff327e975066bc497b66b0574ecd4f992965e82e
+5d899d99ee0eed6d725ea390a5897c624f4aa812

EDKB18/Batch/EDKB18/EDKB18/obj/Release/EDKB18.vbproj.FileListAbsolute.txt

@@ -8,4 +8,4 @@ E:\Software-Projekte\EDOKA\batch\EDKB18\Batch\EDKB18\EDKB18\obj\Release\EDKB18.v
 E:\Software-Projekte\EDOKA\batch\EDKB18\Batch\EDKB18\EDKB18\obj\Release\EDKB18.exe
 E:\Software-Projekte\EDOKA\batch\EDKB18\Batch\EDKB18\EDKB18\obj\Release\EDKB18.xml
 E:\Software-Projekte\EDOKA\batch\EDKB18\Batch\EDKB18\EDKB18\obj\Release\EDKB18.pdb
-E:\Software-Projekte\EDOKA\batch\EDKB18\Batch\EDKB18\EDKB18\obj\Release\EDKB18.vbprojAssemblyReference.cache
+E:\Software-Projekte\EDOKA\batch\EDKB18\Batch\EDKB18\EDKB18\obj\Release\EDKB18.vbproj.AssemblyReference.cache

EDKB18/EDKB18/Service1.vb

@@ -25,6 +25,7 @@ Public Class EDKB18
     End Sub
 
     Private Sub CheckTimer_Elapsed(sender As Object, e As ElapsedEventArgs) Handles CheckTimer.Elapsed
+        CheckTimer.Enabled = False
         Verarbeiten("")
     End Sub
 

EDKB18/EDKB18/bin/Debug/EDKB18.exe.config

@@ -23,7 +23,7 @@
                 <value>data source=shu00;initial catalog=edoka_Journale;integrated security=SSPI;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29</value>
             </setting>
             <setting name="Check_Timerintervall" serializeAs="String">
-                <value>20000</value>
+                <value>100</value>
             </setting>
             <setting name="Debug" serializeAs="String">
                 <value>False</value>

EDKB18/EDKB18/clsdb.vb

@@ -14,6 +14,37 @@ Public Class clsdb
         Connection_Prod = New SqlConnection(conn_prod)
     End Sub
 
+    Function update_version(ByVal officevorlagenr As String, ByVal version As String)
+        Dim i As Integer
+        Dim scmCmdToExecute As SqlCommand = New SqlCommand()
+        Dim dtToReturn As DataTable = New DataTable()
+        Dim sdaAdapter As SqlDataAdapter = New SqlDataAdapter(scmCmdToExecute)
+        Try
+            scmCmdToExecute.CommandText = "dbo.sp_vorlagenuebernahme"
+            scmCmdToExecute.CommandType = CommandType.StoredProcedure
+            scmCmdToExecute.Connection = Connection_Prod
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@Fnkt", SqlDbType.Int, 4, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, 21))
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@param1", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, officevorlagenr))
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@param2", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, version))
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@param3", SqlDbType.VarChar, 8000, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, ""))
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@param4", SqlDbType.VarChar, 8000, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, ""))
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@result", SqlDbType.VarChar, 255, ParameterDirection.Output, True, 10, 0, "", DataRowVersion.Proposed, ""))
+
+            Connection_Prod.Open()
+            sdaAdapter.Fill(dtToReturn)
+            Connection_Prod.Close()
+            Return dtToReturn
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        Finally
+            '            DivFnkt.SpaltenTitel_Aktualisieren(Me.DomainList, dtToReturn, "OfficeVorlageDatei")
+            scmCmdToExecute.Dispose()
+            sdaAdapter.Dispose()
+        End Try
+    End Function
+
+
+
     Public Function Get_Vorlagen() As DataTable
         Dim i As Integer
         Dim scmCmdToExecute As SqlCommand = New SqlCommand()

EDKB18/EDKB18/clsdms.vb

@@ -50,7 +50,7 @@ Public Class clsdms
                 Globals.conn.OpenConnection()
                 If My.Settings.Debug = "False" Then ovd.Update()
                 Globals.conn.CloseConnection(True)
-                s = ovd.daFragabe_am.ToString + "|" + ovd.iFreigabe_durch.ToString + "|" + ovd.iMutierer.ToString + "|" + ovd.daMutiert_am.ToString + "|" + s + "|" + anr
+                s = ovd.daFragabe_am.ToString + "|" + ovd.iFreigabe_durch.ToString + "|" + ovd.iMutierer.ToString + "|" + ovd.daMutiert_am.ToString + "|" + s + "|" + anr + "|" + r.Item("DokVersion").ToString
                 PrintLine(1, Trim(Str(r("nr")) + "|" + s))
             End If
         Next
@@ -214,6 +214,14 @@ Public Class clsdms
                     End Try
                     Globals.conn.OpenConnection()
                     ovd.Update()
+                    Try
+                        If splitter(7) <> "" Then
+                            Dim clsdb As New clsdb(conn_int, conn_prod)
+                            clsdb.update_version(ovd.iOffice_vorlagenr.ToString, splitter(7))
+                        End If
+                    Catch
+                    End Try
+
                     Globals.conn.CloseConnection(True)
                 End If
             End If

EDKB18/EDKB18/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.vb

@@ -0,0 +1,7 @@
+' <autogenerated/>
+            Option Strict Off
+            Option Explicit On
+
+            Imports System
+            Imports System.Reflection
+            <Assembly: Global.System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName:=".NET Framework 4")>

EDKB18/EDKB18/obj/Debug/EDKB18.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-aefe5ebd5c793d4546fe24933577c46859620cf6
+13194e8d0bc733cc63592cb09cd0390c510987e6

EDKB18/EDKB18/obj/Debug/EDKB18.vbproj.FileListAbsolute.txt

@@ -8,9 +8,6 @@ E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\bin\Debug\EDKB18.xml
 E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\obj\Debug\EDKB18.exe
 E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\obj\Debug\EDKB18.xml
 E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\obj\Debug\EDKB18.pdb
-E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\bin\Debug\System.Net.Http.dll
-E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\bin\Debug\System.Net.Http.xml
 E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\obj\Debug\EDKB18.ProjectInstaller.resources
-E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\obj\Debug\EDKB18.vbprojResolveAssemblyReference.cache
 E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\obj\Debug\EDKB18.vbproj.CoreCompileInputs.cache
-E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\obj\Debug\EDKB18.vbproj.CopyComplete
+E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\obj\Debug\EDKB18.vbproj.AssemblyReference.cache

EDKB18/EDKB18/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.vb

@@ -0,0 +1,7 @@
+' <autogenerated/>
+            Option Strict Off
+            Option Explicit On
+
+            Imports System
+            Imports System.Reflection
+            <Assembly: Global.System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName:=".NET Framework 4")>