diff --git a/app/SetupVS19/Product.wxs b/app/SetupVS19/Product.wxs index 17b47e0..5eea3d6 100644 --- a/app/SetupVS19/Product.wxs +++ b/app/SetupVS19/Product.wxs @@ -1,5 +1,5 @@ - - + + @@ -42,7 +42,7 @@ - + @@ -85,8 +85,8 @@ - - + + - + diff --git a/app/TaskFlow.sln b/app/TaskFlow.sln index 064e140..7304fed 100644 --- a/app/TaskFlow.sln +++ b/app/TaskFlow.sln @@ -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 diff --git a/app/TaskFlow/ClassSQLEditor.vb b/app/TaskFlow/ClassSQLEditor.vb index 6dde404..b7c1ed6 100644 --- a/app/TaskFlow/ClassSQLEditor.vb +++ b/app/TaskFlow/ClassSQLEditor.vb @@ -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 diff --git a/app/TaskFlow/ClassSQLValue.vb b/app/TaskFlow/ClassSQLValue.vb index 298de3c..32ef9ab 100644 --- a/app/TaskFlow/ClassSQLValue.vb +++ b/app/TaskFlow/ClassSQLValue.vb @@ -7,18 +7,18 @@ Imports System.Drawing.Design 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 \ No newline at end of file diff --git a/app/TaskFlow/ModuleControlProperties.vb b/app/TaskFlow/ModuleControlProperties.vb index 55ee917..eab8a9c 100644 --- a/app/TaskFlow/ModuleControlProperties.vb +++ b/app/TaskFlow/ModuleControlProperties.vb @@ -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 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 - - - <[ReadOnly](True)> - Public Property SQLConnection() As Integer - Get - Return _sql_connection - End Get - Set(value As Integer) - _sql_connection = value - End Set - End Property + ' + ' + '<[ReadOnly](True)> + 'Public Property SQLConnection() As Integer + ' Get + ' Return _sql_connection + ' End Get + ' Set(value As Integer) + ' _sql_connection = value + ' End Set + 'End Property 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 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 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 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 diff --git a/app/TaskFlow/ModuleFinalIndexProperties.vb b/app/TaskFlow/ModuleFinalIndexProperties.vb index f0c8e8e..4087836 100644 --- a/app/TaskFlow/ModuleFinalIndexProperties.vb +++ b/app/TaskFlow/ModuleFinalIndexProperties.vb @@ -11,10 +11,10 @@ Module ModuleFinalIndexProperties <[ReadOnly](True)> Public Property GUID As Integer - - - <[ReadOnly](True)> - Public Property ConnectionId As Integer + ' + ' + '<[ReadOnly](True)> + 'Public Property ConnectionId As Integer Public Property Description As String diff --git a/app/TaskFlow/My Project/AssemblyInfo.vb b/app/TaskFlow/My Project/AssemblyInfo.vb index f412da0..4055fbe 100644 --- a/app/TaskFlow/My Project/AssemblyInfo.vb +++ b/app/TaskFlow/My Project/AssemblyInfo.vb @@ -14,7 +14,7 @@ Imports System.Runtime.InteropServices - + @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index d9feacc..8270885 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -148,7 +148,7 @@ False - + False ..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll diff --git a/app/TaskFlow/frmAdmin_notResponsibleConfig.vb b/app/TaskFlow/frmAdmin_notResponsibleConfig.vb index 90fe59e..d52a6b6 100644 --- a/app/TaskFlow/frmAdmin_notResponsibleConfig.vb +++ b/app/TaskFlow/frmAdmin_notResponsibleConfig.vb @@ -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) diff --git a/app/TaskFlow/frmAdmin_rejectionConfig.vb b/app/TaskFlow/frmAdmin_rejectionConfig.vb index 425fc41..3b9f7cd 100644 --- a/app/TaskFlow/frmAdmin_rejectionConfig.vb +++ b/app/TaskFlow/frmAdmin_rejectionConfig.vb @@ -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) diff --git a/app/TaskFlow/frmAdministration.resx b/app/TaskFlow/frmAdministration.resx index a7bd161..213c085 100644 --- a/app/TaskFlow/frmAdministration.resx +++ b/app/TaskFlow/frmAdministration.resx @@ -3355,7 +3355,7 @@ 3, 3, 3, 3 - 986, 394 + 986, 391 1 @@ -4938,7 +4938,7 @@ Top Kreditoren: True - 180 + 91 7, 16 diff --git a/app/TaskFlow/frmAdministration.vb b/app/TaskFlow/frmAdministration.vb index b57f1b3..ea1695f 100644 --- a/app/TaskFlow/frmAdministration.vb +++ b/app/TaskFlow/frmAdministration.vb @@ -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) diff --git a/app/TaskFlow/frmColumn_Detail.vb b/app/TaskFlow/frmColumn_Detail.vb index 1f0d05d..a465482 100644 --- a/app/TaskFlow/frmColumn_Detail.vb +++ b/app/TaskFlow/frmColumn_Detail.vb @@ -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() diff --git a/app/TaskFlow/frmFormDesigner.vb b/app/TaskFlow/frmFormDesigner.vb index 2af4d97..64392e3 100644 --- a/app/TaskFlow/frmFormDesigner.vb +++ b/app/TaskFlow/frmFormDesigner.vb @@ -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) diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx index 6779dcf..25f92e5 100644 --- a/app/TaskFlow/frmMain.resx +++ b/app/TaskFlow/frmMain.resx @@ -2234,7 +2234,7 @@ Manual - Digital Data - TaskFlow + Digital Data - taskFLOW ImageListProfile diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb index b788e78..b194129 100644 --- a/app/TaskFlow/frmMain.vb +++ b/app/TaskFlow/frmMain.vb @@ -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 = "

Link zur Datei

" Dim oLink2 = "Link zur Datei" 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 diff --git a/app/TaskFlow/frmRejectionCommit.Designer.vb b/app/TaskFlow/frmRejectionCommit.Designer.vb index e3d93c4..6fea619 100644 --- a/app/TaskFlow/frmRejectionCommit.Designer.vb +++ b/app/TaskFlow/frmRejectionCommit.Designer.vb @@ -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" ' diff --git a/app/TaskFlow/frmRejectionCommit.resx b/app/TaskFlow/frmRejectionCommit.resx index b332a76..d163591 100644 --- a/app/TaskFlow/frmRejectionCommit.resx +++ b/app/TaskFlow/frmRejectionCommit.resx @@ -339,7 +339,7 @@ 586, 24 - 5 + 0 cmbReason @@ -390,7 +390,7 @@ 586, 158 - 8 + 1 txtComment diff --git a/app/TaskFlow/frmValidator.resx b/app/TaskFlow/frmValidator.resx index 920e339..b7fab94 100644 --- a/app/TaskFlow/frmValidator.resx +++ b/app/TaskFlow/frmValidator.resx @@ -288,7 +288,7 @@ 0 - Nicht zuständig + moi btnNotResponsible @@ -637,7 +637,7 @@ DocumentViewerValidator - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.8.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.7.0, Culture=neutral, PublicKeyToken=null SplitContainer1.Panel2 diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index 6359c81..f8a1fc4 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -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}") diff --git a/app/TaskFlow/frmYesNo.Designer.vb b/app/TaskFlow/frmYesNo.Designer.vb index d296a3f..a51ee36 100644 --- a/app/TaskFlow/frmYesNo.Designer.vb +++ b/app/TaskFlow/frmYesNo.Designer.vb @@ -1,6 +1,6 @@  _ Partial Class frmYesNo - Inherits System.Windows.Forms.Form + Inherits DevExpress.XtraEditors.XtraForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. _ @@ -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) diff --git a/app/TaskFlow/frmYesNo.resx b/app/TaskFlow/frmYesNo.resx index a1adfbc..c2424e8 100644 --- a/app/TaskFlow/frmYesNo.resx +++ b/app/TaskFlow/frmYesNo.resx @@ -199,7 +199,7 @@ 209, 48 - 0 + 1 TableLayoutPanel1 @@ -333,7 +333,7 @@ 428, 139 - 5 + 0 txtReason @@ -372,6 +372,6 @@ frmYesNo - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file