MS Rename taskFlow

app/SetupVS19/Config.wxi

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-  <?define ProgramName="DD_PM_WINDREAM"?>
+  <?define ProgramName="TaskFlow"?>
-  <?define ProductName="Process Manager"?>
+  <?define ProductName="TaskFlow"?>
   <?define Manufacturer="Digital Data"?>
   <?define Description="Beschreibung des Programms"?>
   <?define Comments="Kommentar wie Copyright-Hinweis"?>

app/SetupVS19/Product.wxs

@@ -1,4 +1,4 @@
-<?define ProgramName="DD_ProcessManager"?>
+<?define ProgramName="TaskFlow"?>
 <?define ProductName="TaskFlow"?>
 <?define Manufacturer="Digital Data"?>
 <?define Description="Beschreibung des Programms"?>
@@ -42,7 +42,7 @@
 		</Upgrade>
 
 		<!-- Legt das Icon fest -->
-		<Icon Id="AppIcon.exe" SourceFile="..\DD_PM_WINDREAM\bin\$(var.Configuration)\$(var.ProgramName).exe" />
+		<Icon Id="AppIcon.exe" SourceFile="..\TaskFlow\bin\$(var.Configuration)\$(var.ProgramName).exe" />
 		<!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
 		<Property Id="ARPPRODUCTICON" Value="AppIcon.exe" />
 
@@ -85,8 +85,8 @@
 		<DirectoryRef Id="INSTALLDIR">
 
 			<Component Id="MainApplicationExe" Guid="71B06048-F595-40CE-B429-79C2F2D6001B" KeyPath="yes">
-				<File Id="MainApplicationExe" Source="..\DD_PM_WINDREAM\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes" />
+				<File Id="MainApplicationExe" Source="..\TaskFlow\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes" />
-				<File Id="MainApplicationExeConfig" Source="..\DD_PM_WINDREAM\bin\$(var.Configuration)\$(var.ProgramName).exe.config" Name="$(var.ProgramName).exe.config" KeyPath="no" Checksum="yes" />
+				<File Id="MainApplicationExeConfig" Source="..\TaskFlow\bin\$(var.Configuration)\$(var.ProgramName).exe.config" Name="$(var.ProgramName).exe.config" KeyPath="no" Checksum="yes" />
 				<!--
         <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="no" Target="[#MainApplicationExe]" />
         <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="no" Target="[#MainApplicationExe]" />

app/SetupVS19/SetupVS19.wixproj

@@ -13,12 +13,12 @@
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
-    <LinkerAdditionalOptions>-b "$(SolutionDir)DD_PM_WINDREAM\bin\$(Configuration)"</LinkerAdditionalOptions>
+    <LinkerAdditionalOptions>-b "$(SolutionDir)TaskFlow\bin\$(Configuration)"</LinkerAdditionalOptions>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <LinkerAdditionalOptions>-b "$(SolutionDir)DD_PM_WINDREAM\bin\$(Configuration)"</LinkerAdditionalOptions>
+    <LinkerAdditionalOptions>-b "$(SolutionDir)TaskFlow\bin\$(Configuration)"</LinkerAdditionalOptions>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />
@@ -43,7 +43,7 @@
   </Target>
   <Target Name="BeforeBuild">
     <!-- Get the programs assembly version from the .exe file -->
-    <GetAssemblyIdentity AssemblyFiles="..\DD_PM_WINDREAM\bin\$(Configuration)\DD_ProcessManager.exe">
+    <GetAssemblyIdentity AssemblyFiles="..\TaskFlow\bin\$(Configuration)\TaskFlow.exe">
       <Output TaskParameter="Assemblies" ItemName="AsmInfo" />
     </GetAssemblyIdentity>
     <!-- Store the assembly version number in ProductVersion preprocessor variable -->

app/TaskFlow.sln

@@ -1,12 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
+# Visual Studio Version 17
-VisualStudioVersion = 16.0.29728.190
+VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DD_PM_WINDREAM", "DD_PM_WINDREAM\DD_PM_WINDREAM.vbproj", "{6ACA1432-09A2-47EF-A704-C0AA73905756}"
-EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVS19", "SetupVS19\SetupVS19.wixproj", "{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}"
 EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TaskFlow", "TaskFlow\TaskFlow.vbproj", "{6ACA1432-09A2-47EF-A704-C0AA73905756}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CD_ROM|x86 = CD_ROM|x86
@@ -16,16 +16,6 @@ Global
 		SingleImage|x86 = SingleImage|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6ACA1432-09A2-47EF-A704-C0AA73905756}.CD_ROM|x86.ActiveCfg = Release|x86
-		{6ACA1432-09A2-47EF-A704-C0AA73905756}.CD_ROM|x86.Build.0 = Release|x86
-		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Debug|x86.ActiveCfg = Debug|x86
-		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Debug|x86.Build.0 = Debug|x86
-		{6ACA1432-09A2-47EF-A704-C0AA73905756}.DVD-5|x86.ActiveCfg = Debug|x86
-		{6ACA1432-09A2-47EF-A704-C0AA73905756}.DVD-5|x86.Build.0 = Debug|x86
-		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Release|x86.ActiveCfg = Release|x86
-		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Release|x86.Build.0 = Release|x86
-		{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.ActiveCfg = Release|x86
-		{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.Build.0 = Release|x86
 		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.CD_ROM|x86.ActiveCfg = Release|x86
 		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.CD_ROM|x86.Build.0 = Release|x86
 		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.Debug|x86.ActiveCfg = Debug|x86
@@ -36,6 +26,16 @@ Global
 		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.Release|x86.Build.0 = Release|x86
 		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.SingleImage|x86.ActiveCfg = Release|x86
 		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.SingleImage|x86.Build.0 = Release|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.CD_ROM|x86.ActiveCfg = Debug|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.CD_ROM|x86.Build.0 = Debug|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Debug|x86.ActiveCfg = Debug|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Debug|x86.Build.0 = Debug|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.DVD-5|x86.ActiveCfg = Debug|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.DVD-5|x86.Build.0 = Debug|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Release|x86.ActiveCfg = Release|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Release|x86.Build.0 = Release|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.ActiveCfg = Debug|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.Build.0 = Debug|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

app/TaskFlow/ClassAllgemeineFunktionen.vb

@@ -65,17 +65,17 @@ Public Class ClassAllgemeineFunktionen
             End If
             Dim oSql As String
             If LoginorOut = "LOGIN" Then
-                oSql = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME,LANGUAGE_OVERRIDE) VALUES 
+                oSql = String.Format($"INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME,LANGUAGE_OVERRIDE) VALUES 
-                    ({0},{1},'Process-Manager','{2}','{3}','{4}')", USER_ID, 1, My.Application.Info.Version.ToString, Environment.MachineName, My.Settings.SYS_Override_Language)
+                    ({USER_ID},1,'{MODULE_PM}','{My.Application.Info.Version.ToString}','{Environment.MachineName}','{My.Settings.SYS_Override_Language}')")
             Else
                 If INACTIVITYRecognized = True Then
-                    oSql = $"UPDATE TBDD_USER_LOGIN_OUT SET COMMENT = 'Inactivity Detected',LOGOUT = GETDATE() WHERE USER_ID = {USER_ID} AND UPPER(MODULE) = UPPER('Process-Manager') AND LOGOUT IS NULL"
+                    oSql = $"UPDATE TBDD_USER_LOGIN_OUT SET COMMENT = 'Inactivity Detected',LOGOUT = GETDATE() WHERE USER_ID = {USER_ID} AND MODULE = '{MODULE_PM}' AND LOGOUT IS NULL"
                     If DatabaseFallback.ExecuteNonQueryECM(oSql) = True Then
 
                     End If
                 End If
 
-                    oSql = $"DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = {USER_ID} AND UPPER(MODULE) = UPPER('Process-Manager')"
+                oSql = $"DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = {USER_ID} AND MODULE = '{MODULE_PM}'"
             End If
             If DatabaseFallback.ExecuteNonQueryECM(oSql) = True Then
                 LOGGER.Debug($"{LoginorOut} of User successfully!")

app/TaskFlow/ClassInit.vb

@@ -283,10 +283,10 @@ Public Class ClassInit
 
             Try
                 Dim oSQLSW As New RefreshHelper.SW("VWDD_USER_CLIENT")
-                oSQL = $"SELECT * FROM VWDD_USER_CLIENT WHERE UPPER(USERNAME) = UPPER('{USER_USERNAME}')"
+                oSQL = $"SELECT * FROM VWDD_USER_CLIENT WHERE USERNAME = '{USER_USERNAME}'"
 
                 DT_CLIENT_USER = DatabaseFallback.GetDatatable("VWDD_USER_CLIENT", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
-                    .FilterExpression = $"USERNAME like '{USER_USERNAME}'"
+                    .FilterExpression = $"USERNAME = '{USER_USERNAME}'"
                 })
                 'DT_CLIENT_USER = DataASorDB.GetDatatable("DD_ECM", oSQL, "VWDD_USER_CLIENT", $"USERNAME like '{USER_USERNAME}'")
                 oSQLSW.Done()

app/TaskFlow/ModuleMySettings.vb

@@ -1,5 +1,5 @@
 Module ModuleMySettings
-    ' Connection String
+    Public Property MODULE_PM As String = "Process-Manager"
     Public Property SOURCE_INIT As Boolean = False
     Public Property CONNECTION_STRING_ECM As String = ""
     Public Property CONNECTION_STRING_IDB As String = ""
@@ -22,4 +22,5 @@
     Public Property VERSION_DELIMITER As String = "~"
     Public Property FILE_DELIMITER As String = "_"
     Public Property WMSESSION_STARTSTOP_STARTUP As Boolean = False
+
 End Module