diff --git a/app/DD-Record-Organizer/ClassControlBuilder.vb b/app/DD-Record-Organizer/ClassControlBuilder.vb index 288446a..3f3a205 100644 --- a/app/DD-Record-Organizer/ClassControlBuilder.vb +++ b/app/DD-Record-Organizer/ClassControlBuilder.vb @@ -371,7 +371,7 @@ Public Class ClassControlBuilder If Not IsNothing(ctrlvalID) Then If ClassControlCommandsUI.UpdateControlValue(CONTROL_ID, CURRENT_RECORD_ID, value.ToString, CURRENT_ENTITY_ID) = False Then - ClassLogger.Add(" >> Check Update depending control (XX) value as Update was not successful'", False) + ClassLogger.Add(String.Format(" >> ClassControlCommandsUI.UpdateControlValue (1) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value), False) Else ' & upd & "'") End If @@ -379,7 +379,7 @@ Public Class ClassControlBuilder If LogErrorsOnly = False Then ClassLogger.Add(" >> ctrlvalID is Nothing - Attention.....", False, False) If CURRENT_RECORD_ID <> 0 Then If ClassControlCommandsUI.InsertControlValue(CONTROL_ID, CURRENT_RECORD_ID, value, CURRENT_ENTITY_ID) = False Then - ClassLogger.Add(" >> Check Insert depending control (XXX) value as it was nothing and Insert was not successful", False) + ClassLogger.Add(String.Format(" >> ClassControlCommandsUI.InsertControlValue (1) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value), False) End If End If End If @@ -438,7 +438,8 @@ Public Class ClassControlBuilder If ClassControlCommandsUI.InsertControlValue(dependingControlId, CURRENT_RECORD_ID, dateValue, CURRENT_ENTITY_ID) = True Then If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue (DateEdit)!", False) Else - ClassLogger.Add(" >> Check Insert depending control (DateEdit)value as it was nothing and Insert was not successful", False) + ClassLogger.Add(String.Format(" >> ClassControlCommandsUI.InsertControlValue (DateEdit) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, dateValue), False) + End If 'Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", dependingControlId, CURRENT_RECORD_ID, dateValue, USER_USERNAME) 'If ClassDatabase.Execute_non_Query(ins) = True Then @@ -495,7 +496,7 @@ Public Class ClassControlBuilder If ClassControlCommandsUI.UpdateControlValue(dependingControlId, CURRENT_RECORD_ID, value1, CURRENT_ENTITY_ID) = True Then If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was not nothing - Updated the ControlValue'", False) '" & upd) Else - ClassLogger.Add(" >> Check Update depending control (TextBox) value as it was nothing and Update was not successful - Update-Command '", False) ' & upd & "'") + ClassLogger.Add(String.Format(" >> ClassControlCommandsUI.UpdateControlValue (TextBox) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value1), False) End If 'Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", value1, USER_USERNAME, id) 'If ClassDatabase.Execute_non_Query(upd) = True Then @@ -508,7 +509,7 @@ Public Class ClassControlBuilder If ClassControlCommandsUI.InsertControlValue(dependingControlId, CURRENT_RECORD_ID, value1, CURRENT_ENTITY_ID) = True Then If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue (TextBox)!", False) Else - ClassLogger.Add(" >> Check Insert depending control (TextBox) value as it was nothing and Insert was not successful", False) + ClassLogger.Add(String.Format(" >> ClassControlCommandsUI.InsertControlValue (TextBox) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value1), False) End If 'Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", dependingControlId, CURRENT_RECORD_ID, value1, USER_USERNAME) 'If ClassDatabase.Execute_non_Query(ins) = True Then diff --git a/app/DD-Record-Organizer/ClassControlCommandsUI.vb b/app/DD-Record-Organizer/ClassControlCommandsUI.vb index 879673b..3cb1bde 100644 --- a/app/DD-Record-Organizer/ClassControlCommandsUI.vb +++ b/app/DD-Record-Organizer/ClassControlCommandsUI.vb @@ -843,11 +843,15 @@ Public Class ClassControlCommandsUI Public Shared Function UpdateControlValue(ControlID As Integer, RecordID As Integer, Value As String, ENTITY_ID As Integer) Try + Dim CHANGED_WHO = USER_USERNAME Dim converted_value = Check_and_Format_Value(ControlID, RecordID, Value) Dim def = "SELECT FORMAT_TYPE,CONTROL_TYPE_ID FROM TBPMO_CONTROL WHERE GUID = " & ControlID Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}', CHANGE_STEP = {2} WHERE CONTROL_ID = {3} AND RECORD_ID = {4}", converted_value, CHANGED_WHO, CURRENT_CHANGE_STEP, ControlID, RecordID) + If ControlID = 279 Or ControlID = 745 Then + ClassLogger.Add(upd, False, False) + End If If LICENSE_PROXY = True Or clsDatabase.DB_PROXY_INITIALIZED = True Then If ClassDatabase.Execute_non_Query(upd) = True Then Return ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(ENTITY_ID, ControlID, RecordID, converted_value) diff --git a/app/DD-Record-Organizer/DD-Record-Organizer.vbproj b/app/DD-Record-Organizer/DD-Record-Organizer.vbproj index ff7ce85..0fc8814 100644 --- a/app/DD-Record-Organizer/DD-Record-Organizer.vbproj +++ b/app/DD-Record-Organizer/DD-Record-Organizer.vbproj @@ -69,14 +69,6 @@ DD_Icons_ICO_ADDI_1.ico - - False - ..\..\..\DD3rdPartyLibs\Windream\AxInterop.INDEXLib.dll - - - False - ..\..\..\DD3rdPartyLibs\Windream\AxInterop.OBJECTLISTCONTROLLib.dll - ..\..\3rdparty\lib\Commandline\CommandLine.dll @@ -84,8 +76,7 @@ False ..\..\..\DDLibStandards\DD_LIB_Standards\bin\Debug\DD_LIB_Standards.dll - - False + ..\..\..\DDLibraries\app\DD_Libraries\bin\Debug\DD_Rights.dll @@ -187,30 +178,21 @@ ..\..\3rdparty\lib\MSG.NET\Independentsoft.Msg.dll - - False + + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll True - ..\..\..\DD3rdPartyLibs\Windream\Interop.OBJECTLISTCONTROLLib.dll - - False - False - ..\..\..\DD3rdPartyLibs\Windream\Interop.WINDREAMLib.dll - - - False + + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll True - ..\..\..\DD3rdPartyLibs\Windream\Interop.WMOBRWSLib.dll - - False + + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll True - ..\..\..\DD3rdPartyLibs\Windream\Interop.WMOSRCHLib.dll - - False + + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll True - ..\..\..\DD3rdPartyLibs\Windream\Interop.WMOTOOLLib.dll False diff --git a/app/DD-Record-Organizer/My Project/licenses.licx b/app/DD-Record-Organizer/My Project/licenses.licx index 4308626..e12c800 100644 --- a/app/DD-Record-Organizer/My Project/licenses.licx +++ b/app/DD-Record-Organizer/My Project/licenses.licx @@ -1 +1,2 @@ +DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a