MS SQL ConnectionID raus aus Commands
This commit is contained in:
Developer01
parent
89313eb0b6
commit
85bc215cd0
@ -1,5 +1,5 @@
|
||||
<?define ProgramName="TaskFlow"?>
|
||||
<?define ProductName="TaskFlow"?>
|
||||
<?define ProgramName="taskFLOW"?>
|
||||
<?define ProductName="taskFLOW"?>
|
||||
<?define Manufacturer="Digital Data"?>
|
||||
<?define Description="Beschreibung des Programms"?>
|
||||
<?define Comments="Kommentar wie Copyright-Hinweis"?>
|
||||
@ -42,7 +42,7 @@
|
||||
</Upgrade>
|
||||
|
||||
<!-- Legt das Icon fest -->
|
||||
<Icon Id="AppIcon.exe" SourceFile="..\TaskFlow\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="..\TaskFlow\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" 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" />
|
||||
<File Id="MainApplicationExe" Source="..\taskFLOW\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" 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]" />
|
||||
@ -158,6 +158,15 @@
|
||||
<File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.dll" />
|
||||
<File Id="GdPicture.NET.14.Common" Name="GdPicture.NET.14.Common.dll" />
|
||||
<File Id="GdPicture.NET.14.Imaging.Rendering" Name="GdPicture.NET.14.Imaging.Rendering.dll" />
|
||||
<File Id="GdPicture.NET.14.Document" Name="GdPicture.NET.14.Document.dll" />
|
||||
<File Id="GdPicture.NET.14.PDF" Name="GdPicture.NET.14.PDF.dll" />
|
||||
<File Id="GdPicture.NET.14.Imaging.Formats" Name="GdPicture.NET.14.Imaging.Formats.dll" />
|
||||
<File Id="GdPicture.NET.14.RTF" Name="GdPicture.NET.14.RTF.dll" />
|
||||
<File Id="GdPicture.NET.14.OpenDocument" Name="GdPicture.NET.14.OpenDocument.dll" />
|
||||
<File Id="GdPicture.NET.14.OpenXML" Name="GdPicture.NET.14.OpenXML.dll" />
|
||||
<File Id="GdPicture.NET.14.Email" Name="GdPicture.NET.14.Email.dll" />
|
||||
<File Id="GdPicture.NET.14.HTML" Name="GdPicture.NET.14.HTML.dll" />
|
||||
|
||||
</Component>
|
||||
|
||||
<Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
|
||||
|
||||
@ -13,12 +13,12 @@
|
||||
<OutputPath>bin\$(Configuration)\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
||||
<DefineConstants>Debug</DefineConstants>
|
||||
<LinkerAdditionalOptions>-b "$(SolutionDir)TaskFlow\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)TaskFlow\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="..\TaskFlow\bin\$(Configuration)\TaskFlow.exe">
|
||||
<GetAssemblyIdentity AssemblyFiles="..\taskFLOW\bin\$(Configuration)\TaskFlow.exe">
|
||||
<Output TaskParameter="Assemblies" ItemName="AsmInfo" />
|
||||
</GetAssemblyIdentity>
|
||||
<!-- Store the assembly version number in ProductVersion preprocessor variable -->
|
||||
|
||||
@ -5,7 +5,7 @@ VisualStudioVersion = 17.3.32929.385
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
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}"
|
||||
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "taskFLOW", "TaskFlow\taskFLOW.vbproj", "{6ACA1432-09A2-47EF-A704-C0AA73905756}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
|
||||
@ -16,13 +16,13 @@ Public Class ClassSQLEditor
|
||||
|
||||
Dim oValueObject = DirectCast(value, SQLValue)
|
||||
Dim oSQLString As String = oValueObject.Value
|
||||
Dim oSQLConnection As Integer = oValueObject.ConnectionId
|
||||
'Dim oSQLConnection As Integer = oValueObject.ConnectionId
|
||||
|
||||
If oService IsNot Nothing AndAlso oSQLString IsNot Nothing Then
|
||||
'CURRENT_DESIGN_TYPE = "INPUT_INDEX"
|
||||
Using oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM)
|
||||
oForm.SQLCommand = oSQLString
|
||||
oForm.SQLConnection = oSQLConnection
|
||||
oForm.SQLConnection = 0 'oSQLConnection
|
||||
|
||||
oForm.PlaceholdersManualPrefix = "CTRL"
|
||||
oForm.PlaceholdersManualTitle = "Controls"
|
||||
@ -30,7 +30,7 @@ Public Class ClassSQLEditor
|
||||
ToDictionary(Function(name) name, Function(name) name)
|
||||
|
||||
If oService.ShowDialog(oForm) = DialogResult.OK Then
|
||||
Dim sql As New SQLValue(oForm.SQLCommand, oForm.SQLConnection)
|
||||
Dim sql As New SQLValue(oForm.SQLCommand) ', oForm.SQLConnection
|
||||
' CURRENT_CONN_ID_FINAL_INDEX = oForm.SQLConnection
|
||||
' CURRENT_CONN_ID = oForm.SQLConnection
|
||||
value = sql
|
||||
|
||||
@ -7,18 +7,18 @@ Imports System.Drawing.Design
|
||||
<TypeConverter(GetType(SQLTypeConverter))>
|
||||
Public Class SQLValue
|
||||
Public Property Value As String
|
||||
Public Property ConnectionId As Integer
|
||||
'Public Property ConnectionId As Integer
|
||||
|
||||
Public Sub New()
|
||||
Value = ""
|
||||
End Sub
|
||||
|
||||
Public Sub New(value As String)
|
||||
Me.Value = value
|
||||
End Sub
|
||||
'Public Sub New(value As String)
|
||||
' Me.Value = value
|
||||
'End Sub
|
||||
|
||||
Public Sub New(pValue As String, pConnectionId As Integer)
|
||||
Public Sub New(pValue As String) ', pConnectionId As Integer)
|
||||
Value = pValue
|
||||
ConnectionId = pConnectionId
|
||||
' ConnectionId = pConnectionId
|
||||
End Sub
|
||||
End Class
|
||||
@ -84,7 +84,7 @@ Public Module ModuleControlProperties
|
||||
|
||||
Private _index_type As String
|
||||
Private _sql_command As String
|
||||
Friend _sql_connection As Integer = 0
|
||||
'Friend _sql_connection As Integer = 0
|
||||
Private _Enable_SQL As String
|
||||
Private _Enable_SQL_ONLOAD As String
|
||||
Private _default_value
|
||||
@ -124,36 +124,37 @@ Public Module ModuleControlProperties
|
||||
<Category(ClassConstants.CAT_DATA)>
|
||||
Public Property SQLCommand() As SQLValue
|
||||
Get
|
||||
Return New SQLValue(NotNull(_sql_command, ""), _sql_connection)
|
||||
Return New SQLValue(NotNull(_sql_command, "")) ', _sql_connection
|
||||
End Get
|
||||
Set(ByVal value As SQLValue)
|
||||
_sql_command = value.Value
|
||||
SQLConnection = value.ConnectionId
|
||||
'SQLConnection = value.ConnectionId
|
||||
|
||||
End Set
|
||||
End Property
|
||||
|
||||
<DisplayName("SQL Connection")>
|
||||
<Category(ClassConstants.CAT_INFORMATION)>
|
||||
<[ReadOnly](True)>
|
||||
Public Property SQLConnection() As Integer
|
||||
Get
|
||||
Return _sql_connection
|
||||
End Get
|
||||
Set(value As Integer)
|
||||
_sql_connection = value
|
||||
End Set
|
||||
End Property
|
||||
'<DisplayName("SQL Connection")>
|
||||
'<Category(ClassConstants.CAT_INFORMATION)>
|
||||
'<[ReadOnly](True)>
|
||||
'Public Property SQLConnection() As Integer
|
||||
' Get
|
||||
' Return _sql_connection
|
||||
' End Get
|
||||
' Set(value As Integer)
|
||||
' _sql_connection = value
|
||||
' End Set
|
||||
'End Property
|
||||
|
||||
<DisplayName("Enable On Change SQL")>
|
||||
<Description("SQL Command that determines if a control should be enabled/disabled when another, referenced control changes. Should return 0 or 1. Can include a Control-Placeholder.")>
|
||||
<Category(ClassConstants.CAT_BEHAVIOUR)>
|
||||
Public Property Enable_SQL() As SQLValue
|
||||
Get
|
||||
Return New SQLValue(NotNull(_Enable_SQL, ""), _sql_connection)
|
||||
Return New SQLValue(NotNull(_Enable_SQL, "")) ', _sql_connection
|
||||
End Get
|
||||
Set(ByVal value As SQLValue)
|
||||
_Enable_SQL = value.Value
|
||||
SQLConnection = value.ConnectionId
|
||||
'SQLConnection = value.ConnectionId
|
||||
End Set
|
||||
End Property
|
||||
|
||||
@ -162,11 +163,11 @@ Public Module ModuleControlProperties
|
||||
<Category(ClassConstants.CAT_BEHAVIOUR)>
|
||||
Public Property Enable_SQL_OnLoad() As SQLValue
|
||||
Get
|
||||
Return New SQLValue(NotNull(_Enable_SQL_ONLOAD, ""), _sql_connection)
|
||||
Return New SQLValue(NotNull(_Enable_SQL_ONLOAD, "")) ', _sql_connection
|
||||
End Get
|
||||
Set(ByVal value As SQLValue)
|
||||
_Enable_SQL_ONLOAD = value.Value
|
||||
SQLConnection = value.ConnectionId
|
||||
'SQLConnection = value.ConnectionId
|
||||
End Set
|
||||
End Property
|
||||
|
||||
@ -189,11 +190,11 @@ Public Module ModuleControlProperties
|
||||
<Category(ClassConstants.CAT_BEHAVIOUR)>
|
||||
Public Property SetControlData As SQLValue
|
||||
Get
|
||||
Return New SQLValue(_set_control_data, _sql_connection)
|
||||
Return New SQLValue(_set_control_data) ', _sql_connection
|
||||
End Get
|
||||
Set(value As SQLValue)
|
||||
_set_control_data = value.Value
|
||||
SQLConnection = value.ConnectionId
|
||||
'SQLConnection = value.ConnectionId
|
||||
End Set
|
||||
End Property
|
||||
End Class
|
||||
@ -345,11 +346,11 @@ Public Module ModuleControlProperties
|
||||
<Category(ClassConstants.CAT_VALIDATION)>
|
||||
Public Property Override_SQL() As SQLValue
|
||||
Get
|
||||
Return New SQLValue(NotNull(_Override_SQL, ""), _sql_connection)
|
||||
Return New SQLValue(NotNull(_Override_SQL, "")) ', _sql_connection
|
||||
End Get
|
||||
Set(ByVal value As SQLValue)
|
||||
_Override_SQL = value.Value
|
||||
SQLConnection = value.ConnectionId
|
||||
'SQLConnection = value.ConnectionId
|
||||
End Set
|
||||
End Property
|
||||
End Class
|
||||
|
||||
@ -11,10 +11,10 @@ Module ModuleFinalIndexProperties
|
||||
<[ReadOnly](True)>
|
||||
Public Property GUID As Integer
|
||||
|
||||
<DisplayName("Connection ID")>
|
||||
<Category(ClassConstants.CAT_INFORMATION)>
|
||||
<[ReadOnly](True)>
|
||||
Public Property ConnectionId As Integer
|
||||
'<DisplayName("Connection ID")>
|
||||
'<Category(ClassConstants.CAT_INFORMATION)>
|
||||
'<[ReadOnly](True)>
|
||||
'Public Property ConnectionId As Integer
|
||||
|
||||
<Category(ClassConstants.CAT_GENERAL)>
|
||||
Public Property Description As String
|
||||
|
||||
@ -14,7 +14,7 @@ Imports System.Runtime.InteropServices
|
||||
<Assembly: AssemblyCompany("Digital Data")>
|
||||
<Assembly: AssemblyProduct("taskFLOW")>
|
||||
<Assembly: AssemblyCopyright("Copyright © Digital Data 2025")>
|
||||
<Assembly: AssemblyTrademark("2.5.0.0")>
|
||||
<Assembly: AssemblyTrademark("2.5.4.0")>
|
||||
|
||||
<Assembly: ComVisible(False)>
|
||||
|
||||
@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.5.3.0")>
|
||||
<Assembly: AssemblyVersion("2.5.4.0")>
|
||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||
<Assembly: NeutralResourcesLanguage("")>
|
||||
|
||||
@ -148,7 +148,7 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="DevExpress.XtraVerticalGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DigitalData.Controls.DocumentViewer, Version=1.9.4.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<Reference Include="DigitalData.Controls.DocumentViewer, Version=1.9.6.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
|
||||
</Reference>
|
||||
|
||||
@ -109,7 +109,7 @@ Public Class frmAdmin_notResponsibleConfig
|
||||
Dim oldSQL = oNotResponsible_SQL
|
||||
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
|
||||
.SQLCommand = oNotResponsible_SQL,
|
||||
.SQLConnection = 1,
|
||||
.SQLConnection = 0,
|
||||
.PlaceholdersManualPrefix = "CTRL",
|
||||
.PlaceholdersManualTitle = "Controls",
|
||||
.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name)
|
||||
|
||||
@ -38,7 +38,7 @@ Public Class frmAdmin_rejectionConfig
|
||||
Dim oldSQL = oRej_SQL
|
||||
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
|
||||
.SQLCommand = oldSQL,
|
||||
.SQLConnection = 1,
|
||||
.SQLConnection = 0,
|
||||
.PlaceholdersManualPrefix = "CTRL",
|
||||
.PlaceholdersManualTitle = "Controls",
|
||||
.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name)
|
||||
@ -71,7 +71,7 @@ Public Class frmAdmin_rejectionConfig
|
||||
Dim oldSQL = oRej_SQL_Reasons
|
||||
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
|
||||
.SQLCommand = oRej_SQL_Reasons,
|
||||
.SQLConnection = 1,
|
||||
.SQLConnection = 0,
|
||||
.PlaceholdersManualPrefix = "CTRL",
|
||||
.PlaceholdersManualTitle = "Controls",
|
||||
.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name)
|
||||
|
||||
@ -3355,7 +3355,7 @@
|
||||
<value>3, 3, 3, 3</value>
|
||||
</data>
|
||||
<data name="TabPage12.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>986, 394</value>
|
||||
<value>986, 391</value>
|
||||
</data>
|
||||
<data name="TabPage12.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
@ -4938,7 +4938,7 @@ Top Kreditoren: </value>
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>180</value>
|
||||
<value>91</value>
|
||||
</metadata>
|
||||
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
|
||||
<value>7, 16</value>
|
||||
|
||||
@ -672,7 +672,7 @@ Public Class frmAdministration
|
||||
Dim guid As Integer = focusedRow.Item("GUID")
|
||||
Dim index As String = NotNull(focusedRow.Item("INDEXNAME"), Nothing)
|
||||
Dim sqlCommand As String = NotNull(focusedRow.Item("SQL_COMMAND"), "")
|
||||
Dim connectionId As Integer = NotNull(focusedRow.Item("CONNECTION_ID"), 0)
|
||||
' Dim connectionId As Integer = NotNull(focusedRow.Item("CONNECTION_ID"), 0)
|
||||
Dim value As String = NotNull(focusedRow.Item("VALUE"), "")
|
||||
Dim active As Boolean = NotNull(focusedRow.Item("ACTIVE"), True)
|
||||
Dim description As String = NotNull(focusedRow.Item("DESCRIPTION"), "")
|
||||
@ -686,8 +686,7 @@ Public Class frmAdministration
|
||||
Dim obj As New FinalIndexProperties With {
|
||||
.GUID = guid,
|
||||
.IndexName = index,
|
||||
.SQLCommand = New SQLValue(sqlCommand, connectionId),
|
||||
.ConnectionId = connectionId,
|
||||
.SQLCommand = New SQLValue(sqlCommand),
|
||||
.Description = description,
|
||||
.Active = active,
|
||||
.AllowAddNewValues = allowNewValues,
|
||||
@ -755,12 +754,8 @@ Public Class frmAdministration
|
||||
Dim value As SQLValue = oValue
|
||||
|
||||
If value.Value <> String.Empty Then
|
||||
'obj.ConnectionId = CURRENT_CONN_ID_FINAL_INDEX
|
||||
obj.StringValue = "SQL-Command"
|
||||
obj.ConnectionId = value.ConnectionId
|
||||
|
||||
'obj.FloatValue = 0
|
||||
' obj.IntegerValue = 0
|
||||
'obj.ConnectionId = value.ConnectionId
|
||||
End If
|
||||
|
||||
pgFinalIndexes.Refresh()
|
||||
@ -799,12 +794,8 @@ Public Class frmAdministration
|
||||
Dim value As SQLValue = e.ChangedItem.Value
|
||||
|
||||
If value.Value <> String.Empty Then
|
||||
'obj.ConnectionId = CURRENT_CONN_ID_FINAL_INDEX
|
||||
obj.StringValue = "SQL-Command"
|
||||
obj.ConnectionId = value.ConnectionId
|
||||
|
||||
'obj.FloatValue = 0
|
||||
' obj.IntegerValue = 0
|
||||
'obj.ConnectionId = value.ConnectionId
|
||||
End If
|
||||
|
||||
propertyGrid.Refresh()
|
||||
@ -1006,7 +997,7 @@ Public Class frmAdministration
|
||||
Dim oSQL = BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW")
|
||||
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
|
||||
.SQLCommand = oSQL,
|
||||
.SQLConnection = 1
|
||||
.SQLConnection = 0
|
||||
}
|
||||
oForm.ShowDialog()
|
||||
|
||||
@ -1069,7 +1060,7 @@ Public Class frmAdministration
|
||||
Dim oProfileId As Integer = PROFILGUIDTextBox.Text
|
||||
|
||||
'Dim connectionId As Integer = obj.ConnectionId
|
||||
Dim connectionId As Integer = NotNull(obj.SQLCommand.ConnectionId, 1)
|
||||
' Dim connectionId As Integer = NotNull(obj.SQLCommand.ConnectionId, 1)
|
||||
Dim sqlCommand As String = NotNull(obj.SQLCommand.Value, String.Empty).Replace("'", "''")
|
||||
|
||||
Dim indexName As String = NotNull(obj.IndexName, String.Empty)
|
||||
@ -1108,7 +1099,7 @@ Public Class frmAdministration
|
||||
End If
|
||||
|
||||
Dim sql As String = $"INSERT INTO TBPM_PROFILE_FINAL_INDEXING (PROFIL_ID, CONNECTION_ID, SQL_COMMAND, INDEXNAME, VALUE, ACTIVE, PREVENT_DUPLICATES, ALLOW_NEW_VALUES, ADDED_WHO,IF_VEKTOR_BEHAVIOUR,DESCRIPTION,SEQUENCE,CONTINUE_INDETERMINED)
|
||||
VALUES ({oProfileId}, {connectionId}, '{sqlCommand}', '{indexName}', '{value}', {active}, {preventDuplicates}, {AllowAddNewValues}, '{addedWho}','{IF_VEKTOR_BEHAVIOUR}','{oDescription}',{pSequence},{oContinueOIdS})"
|
||||
VALUES ({oProfileId}, 0, '{sqlCommand}', '{indexName}', '{value}', {active}, {preventDuplicates}, {AllowAddNewValues}, '{addedWho}','{IF_VEKTOR_BEHAVIOUR}','{oDescription}',{pSequence},{oContinueOIdS})"
|
||||
|
||||
If DatabaseFallback.ExecuteNonQueryECM(sql) Then
|
||||
tsbStaticInfo.Caption = $"Final index added - {Now.ToLongTimeString}"
|
||||
@ -1116,7 +1107,7 @@ Public Class frmAdministration
|
||||
End If
|
||||
Else
|
||||
Dim sql As String = $"UPDATE TBPM_PROFILE_FINAL_INDEXING
|
||||
SET CONNECTION_ID = {connectionId}, SQL_COMMAND = '{sqlCommand}', INDEXNAME = '{indexName}', CHANGED_WHO = '{addedWho}', DESCRIPTION = '{oDescription}',
|
||||
SET CONNECTION_ID = 0, SQL_COMMAND = '{sqlCommand}', INDEXNAME = '{indexName}', CHANGED_WHO = '{addedWho}', DESCRIPTION = '{oDescription}',
|
||||
VALUE = '{value}', ACTIVE = {active}, ALLOW_NEW_VALUES = {AllowAddNewValues}, PREVENT_DUPLICATES = {preventDuplicates},IF_VEKTOR_BEHAVIOUR = '{IF_VEKTOR_BEHAVIOUR}', [SEQUENCE] = {oSequence}, CONTINUE_INDETERMINED = {oContinueOIdS}
|
||||
WHERE GUID = {guid}"
|
||||
|
||||
@ -1156,7 +1147,7 @@ Public Class frmAdministration
|
||||
Try
|
||||
Dim oSQL = BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW")
|
||||
CURRENT_DESIGN_TYPE = "SQL_OVERVIEW"
|
||||
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {.SQLCommand = oSQL, .SQLConnection = 1}
|
||||
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {.SQLCommand = oSQL, .SQLConnection = 0}
|
||||
oForm.ShowDialog()
|
||||
|
||||
If oForm.DialogResult = DialogResult.OK Then
|
||||
@ -1178,7 +1169,7 @@ Public Class frmAdministration
|
||||
Dim oldSQL = DatabaseFallback.GetScalarValueECM(oSQL)
|
||||
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
|
||||
.SQLCommand = oldSQL,
|
||||
.SQLConnection = 1,
|
||||
.SQLConnection = 0,
|
||||
.PlaceholdersManualPrefix = "CTRL",
|
||||
.PlaceholdersManualTitle = "Controls",
|
||||
.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name)
|
||||
|
||||
@ -123,7 +123,7 @@ Public Class frmColumn_Detail
|
||||
CURRENT_INDEX_ID = GUIDTextBox.Text
|
||||
Dim oForm2 As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
|
||||
.SQLCommand = SQL_COMMANDTextBox.Text,
|
||||
.SQLConnection = 1
|
||||
.SQLConnection = 0
|
||||
}
|
||||
oForm2.ShowDialog()
|
||||
|
||||
@ -172,7 +172,7 @@ Public Class frmColumn_Detail
|
||||
CURRENT_INDEX_ID = GUIDTextBox.Text
|
||||
Dim oForm2 As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
|
||||
.SQLCommand = SQL_COMMANDTextBox.Text,
|
||||
.SQLConnection = 1
|
||||
.SQLConnection = 0
|
||||
}
|
||||
oForm2.ShowDialog()
|
||||
|
||||
|
||||
@ -598,9 +598,9 @@ Public Class frmFormDesigner
|
||||
obj.DefaultValue = NotNull(row.Item("DEFAULT_VALUE"), Nothing)
|
||||
|
||||
' Default value for ConnectionID
|
||||
Dim oConnectionId = row.ItemEx("CONNECTION_ID", 0)
|
||||
obj.SQLCommand = New SQLValue(row.Item("SQL_UEBERPRUEFUNG"), oConnectionId)
|
||||
obj.SQLConnection = oConnectionId
|
||||
'Dim oConnectionId = row.ItemEx("CONNECTION_ID", 0)
|
||||
obj.SQLCommand = New SQLValue(row.Item("SQL_UEBERPRUEFUNG")) ', oConnectionId
|
||||
' obj.SQLConnection = oConnectionId
|
||||
Return obj
|
||||
End Function
|
||||
|
||||
@ -660,7 +660,7 @@ Public Class frmFormDesigner
|
||||
Dim check As CheckBox = sender
|
||||
Dim checkProps As CheckboxProperties = CreatePropsObjectWithIndicies(New CheckboxProperties, oRow, Source_AllIndicies)
|
||||
checkProps.Text = check.Text
|
||||
checkProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
|
||||
checkProps.Enable_SQL = New SQLValue(oRow.Item("SQL_ENABLE"))
|
||||
checkProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
|
||||
checkProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), ""))
|
||||
props = checkProps
|
||||
@ -933,7 +933,7 @@ Public Class frmFormDesigner
|
||||
Dim v As SQLValue = value
|
||||
escapedValue = $"'{v.Value.Replace("'", "''")}'"
|
||||
|
||||
UpdateSingleValue("CONNECTION_ID", v.ConnectionId)
|
||||
'UpdateSingleValue("CONNECTION_ID", v.ConnectionId)
|
||||
End If
|
||||
|
||||
Try
|
||||
@ -984,7 +984,7 @@ Public Class frmFormDesigner
|
||||
Dim oldSQL = DatabaseFallback.GetScalarValueECM(oSQL)
|
||||
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
|
||||
.SQLCommand = oldSQL,
|
||||
.SQLConnection = 1,
|
||||
.SQLConnection = 0,
|
||||
.PlaceholdersManualPrefix = "CTRL",
|
||||
.PlaceholdersManualTitle = "Controls",
|
||||
.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name)
|
||||
|
||||
@ -2234,7 +2234,7 @@
|
||||
<value>Manual</value>
|
||||
</data>
|
||||
<data name="$this.Text" xml:space="preserve">
|
||||
<value>Digital Data - TaskFlow</value>
|
||||
<value>Digital Data - taskFLOW</value>
|
||||
</data>
|
||||
<data name=">>ImageListProfile.Name" xml:space="preserve">
|
||||
<value>ImageListProfile</value>
|
||||
|
||||
@ -134,7 +134,7 @@ Public Class frmMain
|
||||
End If
|
||||
Try
|
||||
ClassAllgemeineFunktionen.LoginOut("LOGOUT")
|
||||
LOGGER.Info("TaskFlow closed - " & Now, False)
|
||||
LOGGER.Info("taskFLOW closed - " & Now, False)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
End Try
|
||||
@ -3037,7 +3037,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
|
||||
Dim oLink = "<HTML><body><p><a href=" + "file:///" + oFilePath + ">Link zur Datei</a></p></body></HTML>"
|
||||
Dim oLink2 = "<a href=" + "file:///" + oFilePath + ">Link zur Datei</a>"
|
||||
If Not IsNothing(oFilePath) Then
|
||||
Process.Start($"mailto:{oReceipiant}?subject=Link aus TaskFlow Manager&body={oLink}")
|
||||
Process.Start($"mailto:{oReceipiant}?subject=Link aus taskFLOW Manager&body={oLink}")
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
2
app/TaskFlow/frmRejectionCommit.Designer.vb
generated
2
app/TaskFlow/frmRejectionCommit.Designer.vb
generated
@ -89,6 +89,8 @@ Partial Class frmRejectionCommit
|
||||
'
|
||||
'txtComment
|
||||
'
|
||||
Me.txtComment.AcceptsReturn = True
|
||||
Me.txtComment.AcceptsTab = True
|
||||
resources.ApplyResources(Me.txtComment, "txtComment")
|
||||
Me.txtComment.Name = "txtComment"
|
||||
'
|
||||
|
||||
@ -339,7 +339,7 @@
|
||||
<value>586, 24</value>
|
||||
</data>
|
||||
<data name="cmbReason.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>5</value>
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>cmbReason.Name" xml:space="preserve">
|
||||
<value>cmbReason</value>
|
||||
@ -390,7 +390,7 @@
|
||||
<value>586, 158</value>
|
||||
</data>
|
||||
<data name="txtComment.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>8</value>
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name=">>txtComment.Name" xml:space="preserve">
|
||||
<value>txtComment</value>
|
||||
|
||||
@ -288,7 +288,7 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="btnNotResponsible.Text" xml:space="preserve">
|
||||
<value>Nicht zuständig</value>
|
||||
<value>moi</value>
|
||||
</data>
|
||||
<data name=">>btnNotResponsible.Name" xml:space="preserve">
|
||||
<value>btnNotResponsible</value>
|
||||
@ -637,7 +637,7 @@
|
||||
<value>DocumentViewerValidator</value>
|
||||
</data>
|
||||
<data name=">>DocumentViewerValidator.Type" xml:space="preserve">
|
||||
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.8.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.7.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>DocumentViewerValidator.Parent" xml:space="preserve">
|
||||
<value>SplitContainer1.Panel2</value>
|
||||
|
||||
@ -528,9 +528,9 @@ Public Class frmValidator
|
||||
If CURRENT_DOC_GUID <> 0 Then
|
||||
Try
|
||||
If _ItemWorked = False Then
|
||||
Dim sql = $"UPDATE TBPM_PROFILE_FILES Set IN_WORK = 0, IN_WORK_WHEN = NULL, WORK_USER = NULL WHERE GUID = {CURRENT_DOC_GUID}"
|
||||
DatabaseFallback.ExecuteNonQueryECM(sql)
|
||||
'PRTF_PROFILE_FILES_WORK("FreeFile")
|
||||
'Dim sql = $"UPDATE TBPM_PROFILE_FILES Set IN_WORK = 0, IN_WORK_WHEN = NULL, WORK_USER = NULL WHERE GUID = {CURRENT_DOC_GUID}"
|
||||
'DatabaseFallback.ExecuteNonQueryECM(sql)
|
||||
PRTF_PROFILE_FILES_WORK("FreeFile")
|
||||
End If
|
||||
|
||||
|
||||
@ -2644,9 +2644,9 @@ Public Class frmValidator
|
||||
End If
|
||||
|
||||
' >> >> >> >> >> >>##### Das Dokument in Bearbeitung nehmen ###########################
|
||||
'PRTF_PROFILE_FILES_WORK("InWork")
|
||||
Dim sql = $"UPDATE TBPM_PROFILE_FILES Set IN_WORK = 1, IN_WORK_WHEN = GETDATE(), WORK_USER = '{USER_USERNAME}' WHERE GUID = {CURRENT_DOC_GUID}"
|
||||
DatabaseFallback.ExecuteNonQueryECM(sql)
|
||||
PRTF_PROFILE_FILES_WORK("InWork")
|
||||
'Dim sql = $"UPDATE TBPM_PROFILE_FILES Set IN_WORK = 1, IN_WORK_WHEN = GETDATE(), WORK_USER = '{USER_USERNAME}' WHERE GUID = {CURRENT_DOC_GUID}"
|
||||
'DatabaseFallback.ExecuteNonQueryECM(sql)
|
||||
|
||||
' ############ Infos eintragen #################
|
||||
' txtDateipfad.Text = Document_Path
|
||||
@ -4535,8 +4535,8 @@ Public Class frmValidator
|
||||
MsgBox("Unhandled error occured in Finish Workflow-Step...Please check your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE)
|
||||
_ItemWorked = False
|
||||
Else
|
||||
'PRTF_PROFILE_FILES_WORK("Worked")
|
||||
Logger.Debug("Validation of document ended successfully!")
|
||||
PRTF_PROFILE_FILES_WORK("Worked")
|
||||
Dim oPROCSQL = $"EXEC PRPM_CHECK_NEXT_WF {CURRENT_DOC_GUID}"
|
||||
If DatabaseFallback.ExecuteNonQueryECM(oPROCSQL) = False Then
|
||||
Logger.Warn($"Attention: Error executing proc {oPROCSQL}")
|
||||
|
||||
7
app/TaskFlow/frmYesNo.Designer.vb
generated
7
app/TaskFlow/frmYesNo.Designer.vb
generated
@ -1,6 +1,6 @@
|
||||
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
|
||||
Partial Class frmYesNo
|
||||
Inherits System.Windows.Forms.Form
|
||||
Inherits DevExpress.XtraEditors.XtraForm
|
||||
|
||||
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
|
||||
<System.Diagnostics.DebuggerNonUserCode()> _
|
||||
@ -79,15 +79,16 @@ Partial Class frmYesNo
|
||||
'
|
||||
'txtReason
|
||||
'
|
||||
Me.txtReason.AcceptsReturn = True
|
||||
Me.txtReason.AcceptsTab = True
|
||||
resources.ApplyResources(Me.txtReason, "txtReason")
|
||||
Me.txtReason.Name = "txtReason"
|
||||
'
|
||||
'frmYesNo
|
||||
'
|
||||
Me.AcceptButton = Me.OK_Button
|
||||
Me.Appearance.Options.UseFont = True
|
||||
resources.ApplyResources(Me, "$this")
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||
Me.CancelButton = Me.Cancel_Button
|
||||
Me.Controls.Add(Me.txtReason)
|
||||
Me.Controls.Add(Me.LabelControl1)
|
||||
Me.Controls.Add(Me.txtQuestion)
|
||||
|
||||
@ -199,7 +199,7 @@
|
||||
<value>209, 48</value>
|
||||
</data>
|
||||
<data name="TableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name=">>TableLayoutPanel1.Name" xml:space="preserve">
|
||||
<value>TableLayoutPanel1</value>
|
||||
@ -333,7 +333,7 @@
|
||||
<value>428, 139</value>
|
||||
</data>
|
||||
<data name="txtReason.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>5</value>
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>txtReason.Name" xml:space="preserve">
|
||||
<value>txtReason</value>
|
||||
@ -372,6 +372,6 @@
|
||||
<value>frmYesNo</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
</root>
|
||||
Loading…
x
Reference in New Issue
Block a user