diff --git a/app/DD-Record-Organiser/ClassControlBuilder.vb b/app/DD-Record-Organiser/ClassControlBuilder.vb index 4583291..49385f7 100644 --- a/app/DD-Record-Organiser/ClassControlBuilder.vb +++ b/app/DD-Record-Organiser/ClassControlBuilder.vb @@ -389,8 +389,6 @@ Public Class ClassControlBuilder If CURRENT_RECORD_ID <> 0 Then If ClassControlCommandsUI.InsertControlValue(CONTROL_ID, CURRENT_RECORD_ID, value) = False Then ClassLogger.Add(" >> Check Insert depending control (XXX) value as it was nothing and Insert was not successful", False) - Else - ClassProxy.Refresh_Control_Data() End If End If @@ -544,7 +542,6 @@ Public Class ClassControlBuilder End If Next - ClassProxy.Refresh_Control_Data() Catch ex As Exception MsgBox("Unexpected error in DependingControls - " & CONTROL_ID.ToString & ": " & ex.Message, MsgBoxStyle.Critical) End Try diff --git a/app/DD-Record-Organiser/ClassControlCommandsUI.vb b/app/DD-Record-Organiser/ClassControlCommandsUI.vb index 12d6953..593caf5 100644 --- a/app/DD-Record-Organiser/ClassControlCommandsUI.vb +++ b/app/DD-Record-Organiser/ClassControlCommandsUI.vb @@ -332,7 +332,6 @@ Public Class ClassControlCommandsUI Dim ADDED_WHO As String = USER_USERNAME If LogErrorsOnly = False Then ClassLogger.Add(" >> (SaveRecord) Update RecordID: " & RecordID, False) UpdateAllControls(FormID, RecordID, _CtrlBuilder.AllControls) - ClassProxy.Refresh_Control_Data() Return "Datensatz aktualisiert - " & Now 'End If Catch ex As Exception @@ -429,7 +428,6 @@ Public Class ClassControlCommandsUI Else SQL = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (RECORD_ID, CONTROL_ID, VALUE, ADDED_WHO) VALUES ({0}, {1}, '{2}', '{3}')", RecordID, ControlID, VALUE, USER_USERNAME) End If - ClassProxy.Refresh_Control_Data() ClassDatabase.Execute_non_Query(SQL) Catch ex As Exception MsgBox("Error in LinkImage: " & vbNewLine & ex.Message) @@ -538,7 +536,9 @@ Public Class ClassControlCommandsUI 'Exit Sub - Zuviel des guten Continue For End If - InsertControlValue(CONTROL_ID, RecordID, CONTROL_VALUE) + If CONTROL_VALUE <> "" Then + InsertControlValue(CONTROL_ID, RecordID, CONTROL_VALUE) + End If End If Else ' Update Control If Not IsNothing(CONTROL_VALUE) Then @@ -580,24 +580,21 @@ Public Class ClassControlCommandsUI 'Dim values As New List(Of String)(value.Split(";")) Dim AddValues = values.Except(oldValues) Dim RemoveValues = oldValues.Except(values) - Dim FORMAT_TYPE As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE FROM TBPMO_CONTROL WHERE GUID = " & ControlId, True) - For Each _addValue As String In AddValues If Not _addValue = "" Then - Select Case FORMAT_TYPE - Case "Currency" - _addValue = Decimal.Parse(_addValue, Globalization.NumberStyles.Currency).ToString - Case "Decimal" - _addValue = Decimal.Parse(_addValue, Globalization.NumberStyles.Integer) - End Select - Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE,ADDED_WHO) VALUES({0}, {1}, '{2}','{3}')", ControlId, RecordId, _addValue, USER_USERNAME) - ClassDatabase.Execute_non_Query(ins) + Dim converted_value = Check_and_Format_Value(ControlId, RecordId, _addValue) + If Not IsNothing(converted_value) Then + Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE,ADDED_WHO) VALUES({0}, {1}, '{2}','{3}')", ControlId, RecordId, converted_value, USER_USERNAME) + ClassDatabase.Execute_non_Query(ins) + ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, ControlId, RecordId, converted_value) + End If End If Next For Each v As String In RemoveValues ClassDatabase.Execute_non_Query(String.Format("DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1} AND VALUE = '{2}'", ControlId, RecordId, v)) + ClassProxy.PRPROXY_CONTROL_DEL(RecordId, CURRENT_ENTITY_ID, ControlId) Next - ClassProxy.Refresh_Control_Data() + Catch ex As Exception MsgBox("Error in UpdateMultipleValues:" & vbNewLine & ex.Message) End Try @@ -781,11 +778,19 @@ Public Class ClassControlCommandsUI Return Nothing End Select End Function - - Public Shared Function InsertControlValue(ControlID As Integer, RecordID As Integer, Value As String) + Public Shared Function Check_and_Format_Value(ControlID As Integer, RecordID As Integer, Value As String) Try - Dim AddedWho = USER_USERNAME - Dim FORMAT_TYPE As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE FROM TBPMO_CONTROL WHERE GUID = " & ControlID, True) + Dim expression As String + expression = "GUID = " & ControlID + Dim CONTROL_ROW() As DataRow + ' Use the Select method to find all rows matching the filter. + CONTROL_ROW = CURRENT_TBPMO_CONTROL.Select(expression) + Dim i As Integer + Dim FORMAT_TYPE As String, CONTROL_TYPE As Integer + For i = 0 To CONTROL_ROW.GetUpperBound(0) + FORMAT_TYPE = CONTROL_ROW(i)("FORMAT_TYPE") + CONTROL_TYPE = CONTROL_ROW(i)("CONTROL_TYPE_ID") + Next Select Case FORMAT_TYPE Case "Currency" @@ -799,11 +804,32 @@ Public Class ClassControlCommandsUI End If End Select - Dim ins As String = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES ({0}, {1}, '{2}', '{3}')", ControlID, RecordID, Value, AddedWho) - ClassProxy.Refresh_Control_Data() - Return ClassDatabase.Execute_non_Query(ins) + Select Case CONTROL_TYPE + Case 4 + Dim oDate = ClassHelper.Convert_to_Database_Date(Value) + Value = oDate.ToString() + End Select + Return Value Catch ex As Exception - ClassLogger.Add("Unerwarteter Fehler in InsertControlValue: " & ex.Message, True) + MsgBox("Unexpected Error in Check_and_Format_Value: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + ClassLogger.Add("Unexpected Error in Check_and_Format_Value: " & ex.Message, True) + Return Nothing + End Try + End Function + Public Shared Function InsertControlValue(ControlID As Integer, RecordID As Integer, Value As String) + Try + Dim AddedWho = USER_USERNAME + Dim converted_value = Check_and_Format_Value(ControlID, RecordID, Value) + If Not IsNothing(converted_value) Then + Dim ins As String = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES ({0}, {1}, '{2}', '{3}')", ControlID, RecordID, converted_value, AddedWho) + ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, ControlID, RecordID, converted_value) + Return ClassDatabase.Execute_non_Query(ins) + Else + Return False + End If + Catch ex As Exception + MsgBox("Unexpected Error in inserting Control-Value: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + ClassLogger.Add("Unexpected Error in inserting Control-Value: " & ex.Message, True) Return False End Try End Function @@ -811,27 +837,13 @@ Public Class ClassControlCommandsUI Public Shared Function UpdateControlValue(ControlID As Integer, RecordID As Integer, Value As String) 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 DT_FORMAT_TYPE As DataTable = ClassDatabase.Return_Datatable(def, True) - Dim FORMAT_TYPE As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE,CONTROL_TYPE_ID FROM TBPMO_CONTROL WHERE GUID = " & ControlID, True) - - If Not Value = String.Empty Then - Select Case DT_FORMAT_TYPE.Rows(0).Item(0).ToString ' FORMAT_TYPE - Case "Currency" - Value = Decimal.Parse(Value, Globalization.NumberStyles.Currency).ToString - Case "Decimal" - Value = Decimal.Parse(Value, Globalization.NumberStyles.Integer) - End Select - Select Case DT_FORMAT_TYPE.Rows(0).Item(1) - Case 4 'DateEdit - Value = ClassHelper.Convert_Date(Value, "yyyy-MM-dd") - - End Select - End If 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}", _ - Value, CHANGED_WHO, CURRENT_CHANGE_STEP, ControlID, RecordID) - ClassProxy.Refresh_Control_Data() + converted_value, CHANGED_WHO, CURRENT_CHANGE_STEP, ControlID, RecordID) + ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, ControlID, RecordID, converted_value) Return ClassDatabase.Execute_non_Query(upd) Catch ex As Exception diff --git a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb index 70a7c0a..13c36a0 100644 --- a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb +++ b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb @@ -59,7 +59,7 @@ Public Class ClassDOC_SEARCH Dim SQL_DOC_SEARCH If CURRENT_SEARCH_TYPE = "ENTITY" Then - SQL_DOC_SEARCH = String.Format("SELECT T.*," & vbNewLine & _ + SQL_DOC_SEARCH = String.Format("SELECT DISTINCT T.*," & vbNewLine & _ "[dbo].[FNPMO_GET_CONTROL_VALUES_DOC_ENTITY] ({3},T.DocID,{0}) AS OPTION1," & vbNewLine & _ "[dbo].[FNPMO_GET_CONTROL_VALUES_DOC_ENTITY] ({4},T.DocID,{0}) AS OPTION2," & vbNewLine & _ "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX1') AS DOCIDX1," & vbNewLine & _ @@ -97,7 +97,7 @@ Public Class ClassDOC_SEARCH End If ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then - SQL_DOC_SEARCH = String.Format("SELECT T.* ," & vbNewLine & _ + SQL_DOC_SEARCH = String.Format("SELECT DISTINCT T.* ," & vbNewLine & _ "ISNULL(T1.VALUE,'') AS OPTION1," & vbNewLine & _ "ISNULL(T2.VALUE,'') AS OPTION2," & vbNewLine & _ "ISNULL(T3.VALUE,'') AS OPTION3," & vbNewLine & _ @@ -128,7 +128,6 @@ Public Class ClassDOC_SEARCH "LEFT JOIN TBPMO_CONTROL_VALUE T3 ON TRL.RECORD_ID = T3.RECORD_ID AND T3.CONTROL_ID = {4} " & vbNewLine & _ "LEFT JOIN TBPMO_CONTROL_VALUE T4 ON TRL.RECORD_ID = T4.RECORD_ID AND T4.CONTROL_ID = {5} " & vbNewLine & _ "WHERE TRL.RECORD_ID = {0} AND TR.FORM_ID = {1} AND TRIGHTS.dwUserOrGroupID = {6}", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE, VALUE_CONF1, VALUE_CONF2, VALUE_CONF3, VALUE_CONF4) - Return ClassDatabase.Return_Datatable(SQL_DOC_SEARCH, True) ElseIf CURRENT_SEARCH_TYPE = "FULLTEXT" Then Dim sqlft = SQL_FULLTEXT sqlft = sqlft.Replace("@FULLTEXT", CURRENT_FULLTEXT_PATTERN) @@ -154,7 +153,7 @@ Public Class ClassDOC_SEARCH "T.DocID IN ({5}" & vbNewLine & _ "))", ENTITY_ID, USER_LANGUAGE, USERID_FK_INT_ECM, OPTION1, OPTION2, sqlft, CURRENT_FULLTEXT_PATTERN) ElseIf CURRENT_SEARCH_TYPE = "NODE_DOWN" Then - SQL_DOC_SEARCH = String.Format("SELECT T.* ," & vbNewLine & _ + SQL_DOC_SEARCH = String.Format("SELECT DISTINCT T.* ," & vbNewLine & _ "ISNULL(T1.VALUE,'') AS OPTION1," & vbNewLine & _ "ISNULL(T2.VALUE,'') AS OPTION2," & vbNewLine & _ "ISNULL(T3.VALUE,'') AS OPTION3," & vbNewLine & _ @@ -430,7 +429,15 @@ Public Class ClassDOC_SEARCH Public Shared Function CREATE_DOC_RELATED_LINKS(DOC_ID As Integer, RECORD_ID As Integer) Try Dim execute = String.Format("EXEC [dbo].[PRPMO_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME) - Return ClassDatabase.Execute_non_Query_withConn(execute, 1) + If ClassDatabase.Execute_non_Query(execute) = True Then + If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then + execute = String.Format("EXEC [dbo].[PRPROXY_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME) + ClassDatabase.Execute_non_Query(execute, True) + Return True + Else + Return False + End If + End If Catch ex As Exception MsgBox("Unexpected Error in CREATE_DOC_RELATED_LINKS: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) Return False diff --git a/app/DD-Record-Organiser/ClassFileResult.vb b/app/DD-Record-Organiser/ClassFileResult.vb index a6b1676..cdbbbb6 100644 --- a/app/DD-Record-Organiser/ClassFileResult.vb +++ b/app/DD-Record-Organiser/ClassFileResult.vb @@ -11,6 +11,9 @@ upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET IN_WORK = {0}, IN_WORK_USER = '{1}', IN_WORK_COMMENT = '{2}' WHERE DocID = {3}", state, USER_USERNAME, comment, DocID) End If If ClassDatabase.Execute_non_Query(upd) = True Then + If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then + ClassDatabase.Execute_non_Query(upd, True) + End If InWork = True Return True Else @@ -25,7 +28,14 @@ Try Dim upd As String upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET DISPLAY_NAME = '{0}' WHERE DocID = {1}", Displayname, DocID) - Return ClassDatabase.Execute_non_Query(upd) + If ClassDatabase.Execute_non_Query(upd) = True Then + If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then + ClassDatabase.Execute_non_Query(upd, True) + End If + Return True + Else + Return False + End If Catch ex As Exception ClassLogger.Add("Unexpected Error in Set_Displayname: " & ex.Message, True) Return False @@ -74,7 +84,11 @@ Public Shared Function Delete_ResultFile(RESULT_DOC_ID, RECORD_ID, DELETE_FILE) Try Dim proc = String.Format("EXEC PRPMO_DELETE_RESULTFILE {0},{1},{2}", RESULT_DOC_ID, RECORD_ID, DELETE_FILE) - If ClassDatabase.Execute_non_Query_withConn(proc, 1) = True Then + If ClassDatabase.Execute_non_Query(proc) = True Then + If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then + proc = String.Format("EXEC PRPROXY_DOC_CHECK_DELETE {0}", RESULT_DOC_ID) + ClassDatabase.Execute_non_Query(proc, True) + End If Return True Else Return False diff --git a/app/DD-Record-Organiser/ClassFunctionCommands.vb b/app/DD-Record-Organiser/ClassFunctionCommands.vb index 7466ab6..76460b7 100644 --- a/app/DD-Record-Organiser/ClassFunctionCommands.vb +++ b/app/DD-Record-Organiser/ClassFunctionCommands.vb @@ -62,53 +62,10 @@ End Try End Function - Public Shared Function DeleteFunction(ControlId As Integer) - Try - Dim SQL As String = "DELETE FROM TBPMO_FUNCTION_GENERAL WHERE CONTROL_ID = " & ControlId - ClassDatabase.Execute_non_Query(SQL) - Return True - Catch ex As Exception - MsgBox("Fehler beim Löschen der KalenderFunktion:" & vbNewLine & ex.Message) - End Try - End Function - - Public Shared Function InsertValue(ControlID As Integer, RecordID As Integer, Value As Object) - Try - Dim SQL As String = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE) VALUES({0}, {1}, '{2}')", ControlID, RecordID, Value) - If ClassDatabase.Execute_non_Query(SQL) = True Then - Return True - Else : Return False - End If - Catch ex As Exception - MsgBox("Fehler bei InsertValue:" & vbNewLine & ex.Message) - Return False - End Try - End Function - - Public Shared Function UpdateValue(ControlID As Integer, RecordID As Integer, Value As Object) - Try - Dim SQL As String = String.Format("SELECT COUNT(*) FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", ControlID, RecordID) - Dim ValueExists = ClassDatabase.Execute_Scalar(SQL) - - If ValueExists = 0 Then - Return InsertValue(ControlID, RecordID, Value) - Else - SQL = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}',CHANGED_WHO = '{1}' WHERE CONTROL_ID = {2} AND RECORD_ID = {3}", Value, USER_USERNAME, ControlID, RecordID) - If ClassDatabase.Execute_non_Query(SQL) = True Then - Return True - Else : Return False - End If - End If - Catch ex As Exception - MsgBox("Fehler bei UpdateValue:" & vbNewLine & ex.Message) - Return False - End Try - End Function - Public Shared Function GETCONTROL_ID_FOR_COL_NAME(FORM_ID As Integer, Column_Name As String) Try Dim SQL As String = "SELECT GUID FROM TBPMO_CONTROL WHERE FORM_ID = " & FORM_ID & " AND COL_NAME = '" & Column_Name & "'" - Dim result = ClassDatabase.Execute_Scalar(SQL) + Dim result = ClassDatabase.Execute_Scalar(SQL, True) Return result Catch ex As Exception MsgBox("Error in GETCONTROL_ID_FOR_COL_NAME:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) diff --git a/app/DD-Record-Organiser/ClassHelper.vb b/app/DD-Record-Organiser/ClassHelper.vb index 4144de7..746be68 100644 --- a/app/DD-Record-Organiser/ClassHelper.vb +++ b/app/DD-Record-Organiser/ClassHelper.vb @@ -28,6 +28,17 @@ Public Class ClassHelper End If End If End Function + Public Shared Function Convert_to_Database_Date(input As String) + Try + Dim dt As Date = CDate(input) + Dim result = dt.ToString("yyyy-MM-dd", Nothing) + Return result + Catch ex As Exception + ClassLogger.Add("Unexpected Error while converting value '" & input & "' to date(Convert_to_Database_Date)....." & ex.Message, False) + Return input + End Try + + End Function Public Shared Function Get_TempFilename() 'Eine tempfile generieren Dim tempFilename = My.Computer.FileSystem.GetTempFileName() @@ -216,13 +227,14 @@ Public Class ClassHelper Try Dim DeleteRecordSQL = String.Format("EXEC [dbo].[PRPMO_DELETE_RECORD] {0}, '{1}'", SELECTED_RECORD_ID, USER_USERNAME) Dim result As Boolean = ClassDatabase.Execute_non_Query_withConn(DeleteRecordSQL, 1) - If result = False Then Dim msg = "Der Datensatz '" & SELECTED_RECORD_ID & "' konnte nicht gelöscht werden. Überprüfen Sie das log" If USER_LANGUAGE <> "de-DE" Then msg = "The record '" & SELECTED_RECORD_ID & "' could not be deleted. Check the log" End If MsgBox(msg, MsgBoxStyle.Exclamation) + Else + ClassProxy.PRPROXY_RECORD_DEL(SELECTED_RECORD_ID, CURRENT_ENTITY_ID) End If Return result @@ -231,19 +243,17 @@ Public Class ClassHelper Return False End Try End Function - Public Shared Sub MSGBOX_Handler(type As String, Caption As String, lbl1 As String, txt1 As String, Optional lbl2 As String = "", Optional txt2 As String = "") - MSG_TYPE = type - MSG_TITLE = Caption - If lbl2 = String.Empty Then - MSG_LABLE2 = String.Empty - MSG_ERROR2 = String.Empty - Else - MSG_LABLE2 = lbl2 - MSG_ERROR2 = txt2 + Public Shared Sub MSGBOX_Handler(type As String, Caption As String, info1 As String, Optional info2 As String = "") + Dim msg = info1 + If info2 <> "" Then + msg &= vbNewLine & vbNewLine & info2 + End If + If type = "ERROR" Then + MessageBox.Show(Caption, msg, MessageBoxButtons.OK, MessageBoxIcon.Error) + ClassLogger.Add(msg, True) + ElseIf type = "INFO" Then + MessageBox.Show(Caption, msg, MessageBoxButtons.OK, MessageBoxIcon.Information) End If - MSG_LABLE1 = lbl1 - MSG_ERROR1 = txt1 - frmMessageBox.ShowDialog() End Sub End Class diff --git a/app/DD-Record-Organiser/ClassInit.vb b/app/DD-Record-Organiser/ClassInit.vb index 514539d..392eb81 100644 --- a/app/DD-Record-Organiser/ClassInit.vb +++ b/app/DD-Record-Organiser/ClassInit.vb @@ -21,10 +21,10 @@ Public Class ClassInit End If clsDatabase.GUI = True If MyConnectionString <> String.Empty Then - dbResult = clsDatabase.Init(MyConnectionString) + dbResult = clsDatabase.Init(MyConnectionString, ClassProxy.MyPROXYConnectionString) Else frmConfig_Basic.ShowDialog() - dbResult = clsDatabase.Init(MyConnectionString) + dbResult = clsDatabase.Init(MyConnectionString, ClassProxy.MyPROXYConnectionString) End If ClassDatabase.Init() If dbResult = False Then @@ -103,6 +103,9 @@ Public Class ClassInit WD_UNICODE = KONFIG_DT.Rows(0).Item("WD_UNICODE") SQL_FULLTEXT = KONFIG_DT.Rows(0).Item("SQL_FULLTEXT") End If + + sql = "SELECT * FROM TBPMO_CONTROL" + CURRENT_TBPMO_CONTROL = ClassDatabase.Return_Datatable(sql, True) Catch ex As Exception MsgBox("Unexpected Error in InitBasics2:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try @@ -231,6 +234,9 @@ Public Class ClassInit End Try End If + If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then + SQL_FULLTEXT = "SELECT DISTINCT [dwDocID] FROM [dbo].FullText WHERE CONTAINS([Text], '""*@FULLTEXT*""')" + End If Return True 'LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & anzahl.ToString End If diff --git a/app/DD-Record-Organiser/ClassProxy.vb b/app/DD-Record-Organiser/ClassProxy.vb index ae03a05..141f032 100644 --- a/app/DD-Record-Organiser/ClassProxy.vb +++ b/app/DD-Record-Organiser/ClassProxy.vb @@ -6,7 +6,7 @@ Return False End If Dim sel = "DECLARE @return_value int" & vbNewLine & _ - "EXEC @return_value = [dbo].[PRROXY_SYNC_OBJECTS]" & vbNewLine & _ + "EXEC @return_value = [dbo].[PRPROXY_SYNC_OBJECTS]" & vbNewLine & _ "SELECT 'Return Value' = @return_value" Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) If Not IsNothing(Result) Then @@ -19,12 +19,12 @@ Return False End If End Function - Public Shared Function Refresh_Object_Change_Data() + Public Shared Function PRPROXY_SYNC_DOC_OBJECTS() If LICENSE_SITE_PROXY = False Or ClassProxy.MyPROXYConnectionString = String.Empty Then Return False End If Dim sel = "DECLARE @return_value int" & vbNewLine & _ - "EXEC @return_value = [dbo].[PRROXY_SYNC_OBJECTS_CHANGES]" & vbNewLine & _ + "EXEC @return_value = [dbo].[PRPROXY_SYNC_DOC_OBJECTS]" & vbNewLine & _ "SELECT 'Return Value' = @return_value" Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) If Not IsNothing(Result) Then @@ -37,13 +37,13 @@ Return False End If End Function - Public Shared Function Refresh_Doc_Data() + Public Shared Function PRPROXY_RECORD_DEL(RECID As Integer, ENTITY_ID As Integer) If LICENSE_SITE_PROXY = False Or ClassProxy.MyPROXYConnectionString = String.Empty Then Return False End If - Dim sel = "DECLARE @return_value int" & vbNewLine & _ - "EXEC @return_value = [dbo].[PRROXY_SYNC_DOC_OBJECTS]" & vbNewLine & _ - "SELECT 'Return Value' = @return_value" + Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _ + "EXEC @return_value = [dbo].[PRPROXY_RECORD_DEL] {0},{1} " & vbNewLine & _ + "SELECT 'Return Value' = @return_value", RECID, ENTITY_ID) Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) If Not IsNothing(Result) Then If Result.Rows(0).Item(0) = 0 Then @@ -55,13 +55,49 @@ Return False End If End Function - Public Shared Function Refresh_Control_Data() + Public Shared Function PRPROXY_RECORD_UPD_INS(ENT_ID As Integer, RECID As Integer) If LICENSE_SITE_PROXY = False Or ClassProxy.MyPROXYConnectionString = String.Empty Then Return False End If - Dim sel = "DECLARE @return_value int" & vbNewLine & _ - "EXEC @return_value = [dbo].[PRROXY_SYNC_OBJECTS_CONTROL_VALUES] " & CURRENT_ENTITY_ID & vbNewLine & _ - "SELECT 'Return Value' = @return_value" + Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _ + "EXEC @return_value = [dbo].[PRPROXY_RECORD_UPD_INS] {0},{1} " & vbNewLine & _ + "SELECT 'Return Value' = @return_value", ENT_ID, RECID) + Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) + If Not IsNothing(Result) Then + If Result.Rows(0).Item(0) = 0 Then + Return True + Else + Return False + End If + Else + Return False + End If + End Function + Public Shared Function PRPROXY_RECORD_CONNECT(PARENT_RECID As Integer, RECID As Integer) + If LICENSE_SITE_PROXY = False Or ClassProxy.MyPROXYConnectionString = String.Empty Then + Return False + End If + Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _ + "EXEC @return_value = [dbo].[PRPROXY_RECORD_CONNECT] {0},{1} " & vbNewLine & _ + "SELECT 'Return Value' = @return_value", PARENT_RECID, RECID) + Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) + If Not IsNothing(Result) Then + If Result.Rows(0).Item(0) = 0 Then + Return True + Else + Return False + End If + Else + Return False + End If + End Function + Public Shared Function PRPROXY_CONTROL_DEL(REC_ID As Integer, ENT_ID As Integer, CONTROL_ID As Integer) + If LICENSE_SITE_PROXY = False Or ClassProxy.MyPROXYConnectionString = String.Empty Then + Return False + End If + Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _ + "EXEC @return_value = [dbo].[PRPROXY_CONTROL_DEL] {0},{1},{2}" & vbNewLine & _ + "SELECT 'Return Value' = @return_value", REC_ID, ENT_ID, CONTROL_ID) Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) If Not IsNothing(Result) Then If Result.Rows(0).Item(0) = 0 Then @@ -78,7 +114,7 @@ Return False End If Dim sel = "DECLARE @return_value int" & vbNewLine & _ - "EXEC @return_value = [dbo].[PRROXY_SYNC_WORKFLOWS]" & vbNewLine & _ + "EXEC @return_value = [dbo].[PRPROXY_SYNC_WORKFLOWS]" & vbNewLine & _ "SELECT 'Return Value' = @return_value" Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) If Not IsNothing(Result) Then @@ -91,12 +127,12 @@ Return False End If End Function - Public Shared Function PRROXY_SYNC_DETAIL_OBJECT(Objectname As String) + Public Shared Function PRPROXY_SYNC_DETAIL_OBJECT(Objectname As String) If LICENSE_SITE_PROXY = False Or ClassProxy.MyPROXYConnectionString = String.Empty Then Return False End If Dim sel = "DECLARE @return_value int" & vbNewLine & _ - "EXEC @return_value = [dbo].[PRROXY_SYNC_DETAIL_OBJECT] '" & Objectname & "'" & vbNewLine & _ + "EXEC @return_value = [dbo].[PRPROXY_SYNC_DETAIL_OBJECT] '" & Objectname & "'" & vbNewLine & _ "SELECT 'Return Value' = @return_value" Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) If Not IsNothing(Result) Then @@ -109,4 +145,24 @@ Return False End If End Function + Public Shared Function PRPROXY_CONTROL_VALUE_UPD_INS(EntityID As Integer, ControlID As Integer, RecordID As Integer, Value As String) + If LICENSE_SITE_PROXY = False Or ClassProxy.MyPROXYConnectionString = String.Empty Then + Return False + End If + Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _ + "EXEC @return_value = [dbo].[PRPROXY_CONTROL_VALUE_UPD_INS] {0},{1},{2},'{3}','{4}'" & vbNewLine & _ + "SELECT 'Return Value' = @return_value", EntityID, ControlID, RecordID, Value, USER_USERNAME) + Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) + If Not IsNothing(Result) Then + If Result.Rows(0).Item(0) = 0 Then + Return True + Else + Return False + End If + Else + Return False + End If + End Function + + End Class diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index 8b6ab5a..3fd9250 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -1096,6 +1096,7 @@ MSDataSetGenerator Designer + DD_DMSDataSet1.Designer.vb DD_DMSDataSet.xsd diff --git a/app/DD-Record-Organiser/DD_DMSDataSet.xsd b/app/DD-Record-Organiser/DD_DMSDataSet.xsd index c9bbb0d..82308b2 100644 --- a/app/DD-Record-Organiser/DD_DMSDataSet.xsd +++ b/app/DD-Record-Organiser/DD_DMSDataSet.xsd @@ -3474,6 +3474,132 @@ WHERE (RECORD_ID IN + + + + + + DELETE FROM [TBPMO_APPOINTMENTS] WHERE (([UniqueID] = @Original_UniqueID) AND ((@IsNull_Type = 1 AND [Type] IS NULL) OR ([Type] = @Original_Type)) AND ((@IsNull_StartDate = 1 AND [StartDate] IS NULL) OR ([StartDate] = @Original_StartDate)) AND ((@IsNull_EndDate = 1 AND [EndDate] IS NULL) OR ([EndDate] = @Original_EndDate)) AND ((@IsNull_AllDay = 1 AND [AllDay] IS NULL) OR ([AllDay] = @Original_AllDay)) AND ((@IsNull_Subject = 1 AND [Subject] IS NULL) OR ([Subject] = @Original_Subject)) AND ((@IsNull_Location = 1 AND [Location] IS NULL) OR ([Location] = @Original_Location)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_Label = 1 AND [Label] IS NULL) OR ([Label] = @Original_Label)) AND ((@IsNull_ResourceID = 1 AND [ResourceID] IS NULL) OR ([ResourceID] = @Original_ResourceID))) + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO [TBPMO_APPOINTMENTS] ([Type], [StartDate], [EndDate], [AllDay], [Subject], [Location], [Description], [Status], [Label], [ResourceID], [ResourceIDs], [ReminderInfo], [RecurrenceInfo], [CustomField1], [CustomField2]) VALUES (@Type, @StartDate, @EndDate, @AllDay, @Subject, @Location, @Description, @Status, @Label, @ResourceID, @ResourceIDs, @ReminderInfo, @RecurrenceInfo, @CustomField1, @CustomField2); +SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Description, Status, Label, ResourceID, ResourceIDs, ReminderInfo, RecurrenceInfo, CustomField1, CustomField2 FROM TBPMO_APPOINTMENTS WHERE (UniqueID = SCOPE_IDENTITY()) + + + + + + + + + + + + + + + + + + + + + + SELECT T.UniqueID, T.Type, T.StartDate, T.EndDate, T.AllDay, T.Subject, T.Location, T.Description, T.Status, T.Label, T.ResourceID, T.ResourceIDs, T.ReminderInfo, T.RecurrenceInfo, T.CustomField1, + T.CustomField2 +FROM TBPMO_APPOINTMENTS AS T INNER JOIN + TBPMO_RECORD AS T1 ON T.CustomField1 = T1.GUID + + + + + + UPDATE [TBPMO_APPOINTMENTS] SET [Type] = @Type, [StartDate] = @StartDate, [EndDate] = @EndDate, [AllDay] = @AllDay, [Subject] = @Subject, [Location] = @Location, [Description] = @Description, [Status] = @Status, [Label] = @Label, [ResourceID] = @ResourceID, [ResourceIDs] = @ResourceIDs, [ReminderInfo] = @ReminderInfo, [RecurrenceInfo] = @RecurrenceInfo, [CustomField1] = @CustomField1, [CustomField2] = @CustomField2 WHERE (([UniqueID] = @Original_UniqueID) AND ((@IsNull_Type = 1 AND [Type] IS NULL) OR ([Type] = @Original_Type)) AND ((@IsNull_StartDate = 1 AND [StartDate] IS NULL) OR ([StartDate] = @Original_StartDate)) AND ((@IsNull_EndDate = 1 AND [EndDate] IS NULL) OR ([EndDate] = @Original_EndDate)) AND ((@IsNull_AllDay = 1 AND [AllDay] IS NULL) OR ([AllDay] = @Original_AllDay)) AND ((@IsNull_Subject = 1 AND [Subject] IS NULL) OR ([Subject] = @Original_Subject)) AND ((@IsNull_Location = 1 AND [Location] IS NULL) OR ([Location] = @Original_Location)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_Label = 1 AND [Label] IS NULL) OR ([Label] = @Original_Label)) AND ((@IsNull_ResourceID = 1 AND [ResourceID] IS NULL) OR ([ResourceID] = @Original_ResourceID))); +SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Description, Status, Label, ResourceID, ResourceIDs, ReminderInfo, RecurrenceInfo, CustomField1, CustomField2 FROM TBPMO_APPOINTMENTS WHERE (UniqueID = @UniqueID) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3482,7 +3608,7 @@ WHERE (RECORD_ID IN - + @@ -3523,7 +3649,7 @@ WHERE (RECORD_ID IN - + @@ -3601,7 +3727,7 @@ WHERE (RECORD_ID IN - + @@ -3696,7 +3822,7 @@ WHERE (RECORD_ID IN - + @@ -3719,7 +3845,7 @@ WHERE (RECORD_ID IN - + @@ -3764,7 +3890,7 @@ WHERE (RECORD_ID IN - + @@ -3802,7 +3928,7 @@ WHERE (RECORD_ID IN - + @@ -3837,7 +3963,7 @@ WHERE (RECORD_ID IN - + @@ -3881,7 +4007,7 @@ WHERE (RECORD_ID IN - + @@ -3902,7 +4028,7 @@ WHERE (RECORD_ID IN - + @@ -3939,7 +4065,7 @@ WHERE (RECORD_ID IN - + @@ -3984,7 +4110,7 @@ WHERE (RECORD_ID IN - + @@ -4051,7 +4177,7 @@ WHERE (RECORD_ID IN - + @@ -4088,7 +4214,7 @@ WHERE (RECORD_ID IN - + @@ -4144,7 +4270,7 @@ WHERE (RECORD_ID IN - + @@ -4183,7 +4309,7 @@ WHERE (RECORD_ID IN - + @@ -4307,7 +4433,7 @@ WHERE (RECORD_ID IN - + @@ -4405,7 +4531,7 @@ WHERE (RECORD_ID IN - + @@ -4435,7 +4561,7 @@ WHERE (RECORD_ID IN - + @@ -4472,7 +4598,7 @@ WHERE (RECORD_ID IN - + @@ -4509,7 +4635,7 @@ WHERE (RECORD_ID IN - + @@ -4541,7 +4667,7 @@ WHERE (RECORD_ID IN - + @@ -4561,7 +4687,7 @@ WHERE (RECORD_ID IN - + @@ -4607,7 +4733,7 @@ WHERE (RECORD_ID IN - + @@ -4665,7 +4791,7 @@ WHERE (RECORD_ID IN - + @@ -4822,7 +4948,7 @@ WHERE (RECORD_ID IN - + @@ -4847,7 +4973,7 @@ WHERE (RECORD_ID IN - + @@ -4882,7 +5008,7 @@ WHERE (RECORD_ID IN - + @@ -4911,7 +5037,7 @@ WHERE (RECORD_ID IN - + @@ -4971,7 +5097,7 @@ WHERE (RECORD_ID IN - + @@ -5044,7 +5170,7 @@ WHERE (RECORD_ID IN - + @@ -5151,7 +5277,7 @@ WHERE (RECORD_ID IN - + @@ -5245,7 +5371,7 @@ WHERE (RECORD_ID IN - + @@ -5284,7 +5410,7 @@ WHERE (RECORD_ID IN - + @@ -5302,7 +5428,7 @@ WHERE (RECORD_ID IN - + @@ -5348,7 +5474,7 @@ WHERE (RECORD_ID IN - + @@ -5362,7 +5488,7 @@ WHERE (RECORD_ID IN - + @@ -5414,7 +5540,7 @@ WHERE (RECORD_ID IN - + @@ -5458,7 +5584,7 @@ WHERE (RECORD_ID IN - + @@ -5490,7 +5616,7 @@ WHERE (RECORD_ID IN - + @@ -5572,7 +5698,7 @@ WHERE (RECORD_ID IN - + @@ -5624,7 +5750,7 @@ WHERE (RECORD_ID IN - + @@ -5715,7 +5841,7 @@ WHERE (RECORD_ID IN - + @@ -5746,7 +5872,7 @@ WHERE (RECORD_ID IN - + @@ -5784,7 +5910,7 @@ WHERE (RECORD_ID IN - + @@ -5826,7 +5952,7 @@ WHERE (RECORD_ID IN - + @@ -5840,7 +5966,7 @@ WHERE (RECORD_ID IN - + @@ -5869,7 +5995,7 @@ WHERE (RECORD_ID IN - + @@ -5907,7 +6033,7 @@ WHERE (RECORD_ID IN - + @@ -5925,7 +6051,7 @@ WHERE (RECORD_ID IN - + @@ -5963,6 +6089,76 @@ WHERE (RECORD_ID IN + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6137,30 +6333,34 @@ WHERE (RECORD_ID IN + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/DD-Record-Organiser/DD_DMSDataSet.xss b/app/DD-Record-Organiser/DD_DMSDataSet.xss index 81eb0e6..85c4d90 100644 --- a/app/DD-Record-Organiser/DD_DMSDataSet.xss +++ b/app/DD-Record-Organiser/DD_DMSDataSet.xss @@ -4,61 +4,62 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + 437 @@ -74,7 +75,7 @@ - + 1701 @@ -86,7 +87,7 @@ - + 1627 @@ -98,7 +99,7 @@ - + 710 @@ -114,7 +115,7 @@ - + 1374 @@ -130,7 +131,7 @@ - + 842 @@ -142,7 +143,7 @@ - + 107 @@ -162,7 +163,7 @@ - + 1632 @@ -174,7 +175,7 @@ - + 1358 @@ -186,7 +187,7 @@ - + 601 @@ -202,7 +203,7 @@ - + 618 @@ -214,7 +215,7 @@ - + 2461 @@ -230,7 +231,7 @@ - + 2358 @@ -242,7 +243,7 @@ - + 2134 @@ -258,7 +259,7 @@ - + 2142 @@ -274,7 +275,7 @@ - + 141 @@ -290,7 +291,7 @@ - + 22 @@ -310,7 +311,7 @@ - + 14 @@ -330,7 +331,7 @@ - + 389 @@ -346,7 +347,7 @@ - + 158 @@ -366,7 +367,7 @@ - + 961 diff --git a/app/DD-Record-Organiser/ModuleRuntimeVariables.vb b/app/DD-Record-Organiser/ModuleRuntimeVariables.vb index 973fb4a..e3a942d 100644 --- a/app/DD-Record-Organiser/ModuleRuntimeVariables.vb +++ b/app/DD-Record-Organiser/ModuleRuntimeVariables.vb @@ -73,6 +73,7 @@ Public DTEXCLUDE_FILES As DataTable Public LANGUAGE_CHANGED As Boolean = False 'DATATABLES + Public CURRENT_TBPMO_CONTROL As DataTable Public CURRENT_SCAN_TABLE As DataTable Public CURRENT_TASKS_GENERAL As DataTable diff --git a/app/DD-Record-Organiser/frmChooseParentRecord.vb b/app/DD-Record-Organiser/frmChooseParentRecord.vb index eb0e847..271801f 100644 --- a/app/DD-Record-Organiser/frmChooseParentRecord.vb +++ b/app/DD-Record-Organiser/frmChooseParentRecord.vb @@ -24,7 +24,7 @@ Public Class frmChooseParentRecord Sub HideColumns() Try Dim SQL As String = "SELECT CONTROL_ID, CONTROL_COL_NAME, CONTROL_SHOW_COLUMN FROM VWPMO_CONTROL_SCREEN WHERE CONTROL_SHOW_COLUMN = 0 AND FORM_ID = " & CURRENT_PARENT_ENTITY_ID - Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL) + Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL, True) Dim cols As DevExpress.XtraGrid.Columns.GridColumnCollection = GridView.Columns diff --git a/app/DD-Record-Organiser/frmConfig_Basic.vb b/app/DD-Record-Organiser/frmConfig_Basic.vb index 1ecc078..8729d43 100644 --- a/app/DD-Record-Organiser/frmConfig_Basic.vb +++ b/app/DD-Record-Organiser/frmConfig_Basic.vb @@ -1,6 +1,6 @@ Imports System.Threading Imports System.Globalization - +Imports DD_LIB_Standards Public Class frmConfig_Basic Dim formloaded As Boolean = False Private email As New ClassEmail @@ -35,6 +35,7 @@ Public Class frmConfig_Basic ClassDatabase.Init() Else ClassProxy.MyPROXYConnectionString = con + clsDatabase.Init(MyConnectionString, ClassProxy.MyPROXYConnectionString) End If My.Settings.Save() @@ -513,6 +514,7 @@ Public Class frmConfig_Basic SaveMySettingsValue("MyProxyConnectionString", "", "ConfigMain") ClassProxy.MyPROXYConnectionString = "" Refresh_Proxy() + CONNECTION_CHANGED = True End Sub Private Sub txtLinkedServer_Leave(sender As Object, e As EventArgs) Handles txtLinkedServer.Leave diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index 4fe30c4..ea5488c 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -266,7 +266,7 @@ Public Class frmConstructor_Main Init_Grid_Control() Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error while Loading Form part 1: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try ' Hintergrund Bild initialisieren @@ -323,7 +323,7 @@ Public Class frmConstructor_Main Next TreeViewMain.ImageList = TREEVIEW_IMAGELIST Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Adding NodeConfigurations to TreeView: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Adding NodeConfigurations to TreeView: ") End Try @@ -369,8 +369,7 @@ Public Class frmConstructor_Main sw.Reset() If LogErrorsOnly = False Then ClassLogger.Add(" >> Form Load took " & Format(elapsed, "0.000000000") & " seconds", False) Catch ex As System.Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Loading Form part 2: ", ex.Message) - System.Windows.Forms.MessageBox.Show(ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Loading Form part 2") End Try Me.Cursor = Cursors.Default End Sub @@ -384,7 +383,7 @@ Public Class frmConstructor_Main Dim XMLPath = System.IO.Path.Combine(Application.UserAppDataPath(), Filename) grvwGridPos.SaveLayoutToXml(XMLPath) Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Save PosGrid Layout: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub Sub Load_POSGrid_Layout() @@ -402,7 +401,7 @@ Public Class frmConstructor_Main End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Load PosGrid Layout: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub Sub Save_Grid_Layout() @@ -415,7 +414,7 @@ Public Class frmConstructor_Main grvwGrid.SaveLayoutToXml(XMLPath) ' Update_Status_Label(True, "Grid Layout Loaded") Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Save Grid Layout: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub Sub Save_DocGrid_Layout() @@ -428,8 +427,7 @@ Public Class frmConstructor_Main GridViewDoc_Search.SaveLayoutToXml(XMLPath) ' Update_Status_Label(True, "Grid Layout Loaded") Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Save DocGrid Layout: ", ex.Message) - + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub Sub Load_DocGrid_Layout() @@ -444,7 +442,7 @@ Public Class frmConstructor_Main End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Load DocGrid Layout: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub Sub Load_Grid_Layout() @@ -455,7 +453,7 @@ Public Class frmConstructor_Main grvwGrid.GuessAutoFilterRowValuesFromFilter() End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Load Grid Layout: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub Sub Load_Splitter_Layout() @@ -489,7 +487,7 @@ Public Class frmConstructor_Main End Select Next Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Load_Splitter_Layout: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub Sub Save_Splitter_Layout() @@ -511,7 +509,7 @@ Public Class frmConstructor_Main End If layout.Save(settings) Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Save_Splitter_Layout: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub @@ -1031,7 +1029,7 @@ Public Class frmConstructor_Main End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Check Read-Limitations: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) ClassLogger.Add("TempSQL so far: " & tempsql) End Try End If @@ -1076,12 +1074,12 @@ Public Class frmConstructor_Main End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Check Read-Limitations WINDREAM: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Check Read-Limitations WINDREAM: " & ex.StackTrace) ClassLogger.Add("TempSQL so far: " & tempsql) End Try End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Check_Rights: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub #End Region @@ -1235,7 +1233,7 @@ Public Class frmConstructor_Main Try Load_TreeView_Node_Navigation() Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Load TreeView Nodes Navigation: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try Else ' LINQ für Zugriff auf DT_VWPMO_CONSTRUCTOR_FORMS @@ -1312,7 +1310,7 @@ Public Class frmConstructor_Main sw.Done() Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Load TreeView: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub @@ -1428,7 +1426,7 @@ Public Class frmConstructor_Main If LogErrorsOnly = False Then ClassLogger.Add(" >> Load_Datafor_Entity2 took " & Format(elapsed, "0.000000000") & " seconds", False) End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Load Load_Datafor_Entity: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Load_Datafor_Entity: " & ex.StackTrace) End Try End Sub @@ -1483,7 +1481,7 @@ Public Class frmConstructor_Main Next Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Get_RecordCounts_Nodes: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Load_Datafor_Entity: " & ex.StackTrace) End Try End Sub Function ReturnAmountofRecords(EntityID As Integer) @@ -1576,7 +1574,7 @@ Public Class frmConstructor_Main tsslblRecord.Visible = True End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Update_Record_Label: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub @@ -1670,7 +1668,7 @@ Public Class frmConstructor_Main EBENE2_RECID = CURRENT_PARENT_RECORD_ID End Select Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Load_ParentConnections: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End If End If @@ -1689,10 +1687,12 @@ Public Class frmConstructor_Main CURRENT_RECORD_ID = NEW_RECORD_ID RECORD_ID = NEW_RECORD_ID SELECTED_RECORD_ID = NEW_RECORD_ID + ClassProxy.PRPROXY_RECORD_UPD_INS(ENTITY_ID, SELECTED_RECORD_ID) If PARENT_ENTITYID > 0 And PARENT_RECORDID > 0 Then If ClassRecordCommands.ConnectRecord(PARENT_RECORDID, CURRENT_RECORD_ID, "INSERT RECORD") = False Then - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error inConnect Record: ", "Please check the logfile and inform the admin!") - + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "In Connecting Record - Check the log!") + Else + ClassProxy.PRPROXY_RECORD_CONNECT(PARENT_RECORDID, CURRENT_RECORD_ID) End If End If @@ -1716,13 +1716,14 @@ Public Class frmConstructor_Main tsButtonAdd.Enabled = False End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Inserting Record: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) Finally Me.Cursor = Cursors.Default End Try End Sub Private Sub tsButtonSave_Click(sender As Object, e As EventArgs) Handles tsButtonSave.Click + Me.Cursor = Cursors.WaitCursor Save_Record() End Sub @@ -1774,11 +1775,8 @@ Public Class frmConstructor_Main ActivateAllTabs() DisableEditMode() End If - If ClassProxy.MyPROXYConnectionString <> "" Then - Me.Cursor = Cursors.WaitCursor - ClassProxy.Refresh_Object_Change_Data() - Me.Cursor = Cursors.Default - End If + + ClassProxy.PRPROXY_RECORD_UPD_INS(CURRENT_ENTITY_ID, CURRENT_RECORD_ID) End If Dim recid As Integer @@ -1793,7 +1791,7 @@ Public Class frmConstructor_Main RECORD_ID = recid CURRENT_RECORD_ID = RECORD_ID If RECORD_ID = 0 Then - ClassHelper.MSGBOX_Handler("INFO", "Attention", "Missing Input: ", "no current record selected") + ClassHelper.MSGBOX_Handler("ERROR", "Attention:", "No Current row selected") Me.Cursor = Cursors.Default Return False End If @@ -1815,7 +1813,7 @@ Public Class frmConstructor_Main Next If EBENE1_RECID = 0 Then 'Bis jetzt konnte noch keine Parent-ID angelegt werden! - ClassHelper.MSGBOX_Handler("INFO", "Attention", "Missing Input: ", "no parent-link created") + ClassHelper.MSGBOX_Handler("INFO", "Attention", "No parent-link created!") 'Show_Verknuepfungen() End If End Select @@ -1859,16 +1857,16 @@ Public Class frmConstructor_Main If IS_SINGLE_RECORD = False Then If FORM_TYPE <> 5 Then + Load_Entity_Data_Only() + LocateRecordById(RECORD_ID) If EDIT_STATE = EditState.Insert Then 'Die Daten neu laden - Load_Entity_Data_Only() - LocateRecordById(RECORD_ID) + 'Get_Grid_Row_Handle(NEW_RECORD_ID) Else 'Die Daten neu laden - Load_Entity_Data_Only() + 'Get_Grid_Row_Handle(RECORD_ID) - LocateRecordById(RECORD_ID) 'Die Daten auf dem Panel laden 'ClassControlValues.LoadControlValues(RECORD_ID, ENTITY_ID, CtrlBuilder.AllControls) ' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden! @@ -1879,7 +1877,7 @@ Public Class frmConstructor_Main End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Save Data: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) Return False End Try @@ -1924,9 +1922,6 @@ Public Class frmConstructor_Main Update_Status_Label(True, msg, EditState.Update) WD_DELETE_DOCS(DT_DOC_RESULT) - Me.Cursor = Cursors.WaitCursor - ClassProxy.Refresh_Object_Change_Data() - Me.Cursor = Cursors.Default SELECTED_RECORD_ID = 0 RECORD_ID = 0 CURRENT_RECORD_ID = 0 @@ -1975,9 +1970,9 @@ Public Class frmConstructor_Main tslblLocked.Visible = True If USER_LANGUAGE = "de-DE" Then - ClassHelper.MSGBOX_Handler("INFO", "Attention", "Datensatz ist in Bearbeitung: ", String.Format("Dieser Datensatz wird gerade vom Benutzer '{0}' bearbeitet und kann nur lesend abgerufen werden.", EditingUser)) + ClassHelper.MSGBOX_Handler("INFO", "Achtung", "Record is in work: " & vbNewLine & String.Format("Dieser Datensatz wird gerade vom Benutzer '{0}' bearbeitet und kann nur lesend abgerufen werden.", EditingUser)) Else - ClassHelper.MSGBOX_Handler("INFO", "Attention", "Record is in work: ", String.Format("This Record is currently being edited by User '{0}' and only available in Read-Only mode.", EditingUser)) + ClassHelper.MSGBOX_Handler("INFO", "Attention", "Record is in work: " & vbNewLine & String.Format("This Record is currently being edited by User '{0}' and only available in Read-Only mode.", EditingUser)) End If ' Wenn Record bearbeitet wird, EnableEditMode abbrechen! Exit Sub @@ -2084,7 +2079,7 @@ Public Class frmConstructor_Main Dim ctrl As Control = sender ClassFunctionCommandsUI.NewEditAppointment(ctrl.Name, ENTITY_ID, RECORD_ID, pnlDetails.Controls) Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OpenEditAppointment: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub @@ -2100,7 +2095,7 @@ Public Class frmConstructor_Main End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in EditAppointment: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub @@ -2112,7 +2107,7 @@ Public Class frmConstructor_Main Try Dim sel = String.Format("SELECT DISTINCT EDIT_REC,ADD_REC,DELETE_REC,ADD_DOC,VIEW_DOC,DELETE_DOC FROM TBPMO_RIGHT_GROUP WHERE ENTITY_ID = {0} AND GROUP_ID IN (SELECT GROUP_ID FROM TBDD_GROUPS_USER WHERE USER_ID = {1})", ENTITY_ID, USER_GUID) If LogErrorsOnly = False Then ClassLogger.Add(" >> Select Rightsmanagement " & sel, False) - Dim DT As DataTable = ClassDatabase.Return_Datatable(sel) + Dim DT As DataTable = ClassDatabase.Return_Datatable(sel, True) If DT.Rows.Count > 0 Then For Each row As DataRow In DT.Rows 'RIGHT_EDIT_R = True @@ -2180,7 +2175,7 @@ Public Class frmConstructor_Main RecordDeleteToolStripMenuItem.Enabled = False End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in GetSet_Rights: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub Sub Load_Entity_Data(ClickedLevel As Integer) @@ -2246,15 +2241,15 @@ Public Class frmConstructor_Main tsbtnGeodata.Visible = False End If ACTIVATE_DOC_SEARCH_ON_EDIT = result.Item("ACTIVATE_DOC_SEARCH_ON_EDIT") - Dim sql_ResultList = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE) 'TBPMO_WINDREAM_RESULTLIST_CONFIG" - DT_WINDREAM_RESULTLIST = ClassDatabase.Return_Datatable(sql_ResultList, True) - sql_ResultList = String.Format("select T.*, T1.HEADER_CAPTION from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID AND T.CONFIG_ID IN (SELECT GUID FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND TYPE_ID = 4 AND LANGUAGE = '{1}')", ENTITY_ID, USER_LANGUAGE) - DT_DOCRESULT_DROPDOWN_ITEMS = ClassDatabase.Return_Datatable(sql_ResultList, False) + sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE) 'TBPMO_WINDREAM_RESULTLIST_CONFIG" + DT_WINDREAM_RESULTLIST = ClassDatabase.Return_Datatable(sql, True) + sql = String.Format("select T.*, T1.HEADER_CAPTION from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID AND T.CONFIG_ID IN (SELECT GUID FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND TYPE_ID = 4 AND LANGUAGE = '{1}')", ENTITY_ID, USER_LANGUAGE) + DT_DOCRESULT_DROPDOWN_ITEMS = ClassDatabase.Return_Datatable(sql, True) - sql_ResultList = String.Format("select * from TBPMO_DOCSEARCH_VARIABLE_CONTROLS WHERE ENTITY_ID = {0}", ENTITY_ID) 'TBPMO_WINDREAM_RESULTLIST_CONFIG" - DT_RESULTLIST_OPTIONS = ClassDatabase.Return_Datatable(sql_ResultList, False) - sql_ResultList = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%'", ENTITY_ID, USER_LANGUAGE) - DT_RESULTLIST_VARIABLE_VALUE = ClassDatabase.Return_Datatable(sql_ResultList, True) + sql = String.Format("select * from TBPMO_DOCSEARCH_VARIABLE_CONTROLS WHERE ENTITY_ID = {0}", ENTITY_ID) 'TBPMO_WINDREAM_RESULTLIST_CONFIG" + DT_RESULTLIST_OPTIONS = ClassDatabase.Return_Datatable(sql, True) + sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%'", ENTITY_ID, USER_LANGUAGE) + DT_RESULTLIST_VARIABLE_VALUE = ClassDatabase.Return_Datatable(sql, True) Dim ENTITY_ROW = (From form In DT_ENTITY_DATA.AsEnumerable() Select form Where form.Item("GUID") = ENTITY_ID).Single() @@ -2272,7 +2267,8 @@ Public Class frmConstructor_Main If VIEW_ID_RUNTIME <> -1 Then GRID_TYPE_ID = VIEW_ID_RUNTIME Else - Dim VIEW_ID = ClassDatabase.Execute_Scalar(String.Format("SELECT VIEW_ID FROM TBPMO_USER_CONSTR_VIEW_TYPE WHERE CONSTRUCTOR_DETAIL_ID = {0} AND [ENTITY_ID] = {1} AND USER_ID = {2}", CURRENT_CONSTRUCTOR_DETAIL_ID, ENTITY_ID, USER_GUID)) + sql = String.Format("SELECT VIEW_ID FROM TBPMO_USER_CONSTR_VIEW_TYPE WHERE CONSTRUCTOR_DETAIL_ID = {0} AND [ENTITY_ID] = {1} AND USER_ID = {2}", CURRENT_CONSTRUCTOR_DETAIL_ID, ENTITY_ID, USER_GUID) + Dim VIEW_ID = ClassDatabase.Execute_Scalar(sql, True) If IsNothing(VIEW_ID) Then ClassDatabase.Execute_non_Query("INSERT INTO TBPMO_USER_CONSTR_VIEW_TYPE ([USER_ID],CONSTRUCTOR_DETAIL_ID,[ENTITY_ID]) VALUES (" & USER_GUID & "," & CURRENT_CONSTRUCTOR_DETAIL_ID & "," & ENTITY_ID & ")") VIEW_ID = 1 @@ -2497,7 +2493,7 @@ Public Class frmConstructor_Main End While DTEntity = async.dt Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Load_ViewData: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try @@ -2509,7 +2505,7 @@ Public Class frmConstructor_Main labelLoadEntity.Visible = False If IsNothing(DTEntity) Then - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in getting Entity-Data: ", "Check logfile") + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in getting Entity-Data - Check logfile") Else DTEntity.TableName = "VWTEMP_PMO_FORM" & ENTITY_ID Dim SQL_AutoValues = "SELECT GUID AS CONTROL_ID, CONNECTION_ID_1 AS CONNECTION_ID, SQL_COMMAND_1 AS SQL_COMMAND FROM TBPMO_CONTROL WHERE CONNECTION_ID_1 <> '' AND SQL_COMMAND_1 <> '' AND FORM_ID = " & ENTITY_ID @@ -2625,7 +2621,7 @@ Public Class frmConstructor_Main Reload_Entity_while_Control_Load() End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Load_Entity_Data: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) Finally Me.Cursor = Cursors.Default ENTITY_LOADED = True @@ -2659,7 +2655,7 @@ Public Class frmConstructor_Main End Select End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Load_Record_Direct: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub Sub Load_Entity_Data_Only() @@ -2673,7 +2669,7 @@ Public Class frmConstructor_Main LoadGrid_Selection() Load_Grid_Layout() Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Load_Entity_Data_Only: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try ENTITY_LOADED = True End Sub @@ -2770,7 +2766,7 @@ Public Class frmConstructor_Main End Select Next Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in LoadGrid_Selection: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try @@ -2834,17 +2830,14 @@ Public Class frmConstructor_Main Dim ResultMessage = Update_Record_OnChange() Update_Status_Label(True, ResultMessage) Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Save Record Changes: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Save Record Changes: " & ex.Message, ex.StackTrace) End Try Else - If CtrlCommandUI.IsInsert = True Then ' Wenn nicht gespeichert werden soll, den Record wieder löschen ClassHelper.DeleteRecord(SELECTED_RECORD_ID) End If tsButtonAdd.Enabled = True - End If - ClassProxy.Refresh_Control_Data() CtrlCommandUI.IsEdit = False CtrlCommandUI.IsInsert = False RECORD_CHANGED = False @@ -2861,9 +2854,12 @@ Public Class frmConstructor_Main 'Die neue Record-ID setzen RECORD_ID = GRP_SINGLE_REC SELECTED_RECORD_ID = RECORD_ID + ClassProxy.PRPROXY_RECORD_UPD_INS(CURRENT_ENTITY_ID, SELECTED_RECORD_ID) If ClassRecordCommands.ConnectRecord(PARENT_RECORD_ID, RECORD_ID, "PARENT_LINK (Group/Single-Record) for Entity " & ENTITY_ID.ToString) = False Then MsgBox("Unexpected Error in Connecting Record. Check log", MsgBoxStyle.Critical) Return False + Else + ClassProxy.PRPROXY_RECORD_CONNECT(PARENT_RECORDID, RECORD_ID) End If Else Return False @@ -2876,7 +2872,7 @@ Public Class frmConstructor_Main RECORD_ID = CInt(GRP_SINGLE_REC) SELECTED_RECORD_ID = RECORD_ID Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in getting CURRENT_RECORDID FOR PARENT_ID: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in getting CURRENT_RECORDID FOR PARENT_ID: " & ex.Message, ex.StackTrace) Return False End Try End If @@ -2936,7 +2932,7 @@ Public Class frmConstructor_Main End If End Select Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in GET_LINKED_RECORD: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) Return 0 End Try End Function @@ -2988,7 +2984,7 @@ Public Class frmConstructor_Main tslbldisplayRecords.Text = msg & Get_Grid_Row_Count() End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in LoadGrid_Selection: ", ex.Message) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) Return False End Try @@ -4212,9 +4208,6 @@ Public Class frmConstructor_Main End If 'Nur wenn neue Dateien abgelegt wurden muss die Prozedur zur aktualisierung der windream Dateien ausgeführt werden...ansonsten muss nichts passieren If NEW_FILES_ADDED = True Then - If ClassProxy.MyPROXYConnectionString <> "" Then - ClassProxy.Refresh_Doc_Data() - End If Me.Cursor = Cursors.WaitCursor RUN_WDSEARCH_GRID() Else @@ -4257,7 +4250,7 @@ Public Class frmConstructor_Main Next DROPPED_CHECKED = True End If - + Dim sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORMVIEW_ID = " & FORMVIEW_ID Dim count_DT = ClassDatabase.Execute_Scalar(sql, True) If count_DT = 0 And CURRENT_ENTITY_REDUNDANT_ID = 0 Then @@ -4509,7 +4502,7 @@ Public Class frmConstructor_Main text += " - " & _row.Item("DUE_DATE") tsslblWorkflowstate.Text = text 'Direkten Zugriff auf RecordView Workflow erlauben - + Dim Colorstring = _row.Item("COLOR") If IsDBNull(Colorstring) Then Exit Sub @@ -4793,7 +4786,10 @@ Public Class frmConstructor_Main If Not IsNothing(recid) Then 'Die neue Record-ID setzen POS_RECORD_ID = recid - ClassRecordCommands.ConnectRecord(PARENT_RECORDID, POS_RECORD_ID, "POS_LINK for Entity " & POS_ENTITY.ToString) + ClassProxy.PRPROXY_RECORD_UPD_INS(POS_ENTITY, POS_RECORD_ID) + If ClassRecordCommands.ConnectRecord(PARENT_RECORDID, POS_RECORD_ID, "POS_LINK for Entity " & POS_ENTITY.ToString) = True Then + ClassProxy.PRPROXY_RECORD_CONNECT(PARENT_RECORDID, POS_RECORD_ID) + End If Else MsgBox("Unexpected Error in Creating POS", MsgBoxStyle.Exclamation) End If @@ -5113,8 +5109,6 @@ Public Class frmConstructor_Main If ClassFileResult.Delete_ResultFile(row.Item("DOC_ID"), RECORD_ID, 0) = True Then ClassHelper.InsertEssential_Log(row.Item("DOC_ID"), "DOC-ID", "RECORD LINK REMOVED FROM DOC-SEARCH") Cursor = Cursors.WaitCursor - ClassProxy.Refresh_Doc_Data() - Cursor = Cursors.Default RUN_WDSEARCH_GRID() End If Else @@ -5199,8 +5193,6 @@ Public Class frmConstructor_Main msg = "The record '" & SELECTED_RECORD_ID & "' could not be deleted. Check the log" End If MsgBox(msg, MsgBoxStyle.Exclamation) - Else - ClassProxy.Refresh_Control_Data() End If End If tsButtonCancel.Visible = False @@ -5390,7 +5382,9 @@ Public Class frmConstructor_Main Save_Grid_Layout() frmMass_Change.ShowDialog() If SUCCESSFULL = True Then + Cursor = Cursors.WaitCursor Load_Datafor_Entity() + Cursor = Cursors.Default End If Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in MassChange Collector:", ex.Message) @@ -5398,7 +5392,7 @@ Public Class frmConstructor_Main End Sub Private Sub GridViewDoc_Search_ColumnWidthChanged(sender As Object, e As ColumnEventArgs) Handles GridViewDoc_Search.ColumnWidthChanged Try - + Catch ex As Exception ClassLogger.Add(">> Unexpected Error in ColumnWidth-Change DocResult: " & ex.Message, False) End Try @@ -5443,9 +5437,6 @@ Public Class frmConstructor_Main Refresh_Selected_Table() Dim frm As New frmDocLink_to_Record() 'fileName, ClassWindreamDocGrid.RESULT_OBJECTTYPE) frm.Show() - Cursor = Cursors.WaitCursor - ClassProxy.Refresh_Doc_Data() - Cursor = Cursors.Default Catch ex As Exception MsgBox("Unexpected Error in Linking Record: " & ex.Message, MsgBoxStyle.Critical) End Try @@ -5548,13 +5539,12 @@ Public Class frmConstructor_Main Private Sub ContextMenuStripResultFiles_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles ContextMenuStripResultFiles.Opening GridViewDoc_Search.EndSelection() ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) + Refresh_DocID() If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then If ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DOC_ID") = 0 Then e.Cancel = True End If - End If - File_in_Work() Dim Result = ClassWindream.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_PATH) If Not IsNothing(Result) Then @@ -5583,9 +5573,6 @@ Public Class frmConstructor_Main Else e.Cancel = True End If - - - End Sub Sub File_in_Work() docCM_InWork.Enabled = True @@ -5642,7 +5629,6 @@ Public Class frmConstructor_Main Dim msg1 As String If IW_USER.ToUpper = USER_USERNAME.ToUpper Or USER_IS_ADMIN Then If ClassFileResult.Set_InWork(0, "") = True Then - ClassProxy.Refresh_Doc_Data() RUN_WDSEARCH_GRID() End If Else @@ -5656,7 +5642,6 @@ Public Class frmConstructor_Main Else frmFileInWork.ShowDialog() ClassWindreamDocGrid.SELECTED_INWORK = ClassFileResult.InWork - ClassProxy.Refresh_Doc_Data() RUN_WDSEARCH_GRID() End If End Sub @@ -5711,7 +5696,7 @@ Public Class frmConstructor_Main If USER_LANGUAGE <> "de-DE" Then msg = String.Format("file '" & vbNewLine & "{0}'" & vbNewLine & "Please check the logfile!", row.Item("DOC_PATH")) End If - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error Rights module", "Could not read file Parameters: ", msg) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error Rights module", "Error while setting rights: (Scroll down) ", msg) End If 'Create Session um Fehler bei windows Session icht zu erzeugen FAU_AD_USER = "" @@ -5806,10 +5791,15 @@ Public Class frmConstructor_Main msg = String.Format("The file {0} could not be deleted! Check the logfile!", row.Item("DOC_PATH")) End If MsgBox(msg, MsgBoxStyle.Critical, "Attention:") + End If End If End If + If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then + Dim proc = String.Format("EXEC PRPROXY_DOC_CHECK_DELETE {0}", row.Item("DOC_ID")) + ClassDatabase.Execute_non_Query(proc, True) + End If Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in delete file: ", ex.Message) End Try @@ -5819,9 +5809,6 @@ Public Class frmConstructor_Main If CURRENT_SEARCH_TYPE = "ENTITY" Then CURRENT_DT_DOC_ENTITY_SEARCH = Nothing End If - Cursor = Cursors.WaitCursor - ClassProxy.Refresh_Doc_Data() - Cursor = Cursors.Default RUN_WDSEARCH_GRID() End If @@ -5892,7 +5879,6 @@ Public Class frmConstructor_Main If USER_LANGUAGE <> "de-DE" Then msg = String.Format("The record was successfully relinked with entity {0}", ENTITY_STRING.ToString) End If - ClassProxy.Refresh_Object_Change_Data() MsgBox(msg, MsgBoxStyle.Information) Load_Datafor_Entity() End If @@ -6047,8 +6033,8 @@ Public Class frmConstructor_Main frmNewVariant.ShowDialog() If recid <> CURRENT_RECORD_ID Then Me.Cursor = Cursors.WaitCursor - ClassProxy.Refresh_Object_Change_Data() - ClassProxy.PRROXY_SYNC_DETAIL_OBJECT("TBPMO_RECORD_VARIANT") + ClassProxy.PRPROXY_SYNC_DETAIL_OBJECT("TBPMO_RECORD_VARIANT") + ClassProxy.PRPROXY_SYNC_DETAIL_OBJECT("TBPMO_RECORD") Me.Cursor = Cursors.Default Load_Datafor_Entity() LocateRecordById(CURRENT_RECORD_ID) @@ -6180,9 +6166,6 @@ Public Class frmConstructor_Main Private Sub DateiVersionierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiVersionierenToolStripMenuItem.Click Refresh_Selected_Table() frmWD_CreateVersion.ShowDialog() - Cursor = Cursors.WaitCursor - ClassProxy.Refresh_Doc_Data() - Cursor = Cursors.Default RUN_WDSEARCH_GRID() End Sub Sub Refresh_Selected_Table() @@ -6215,9 +6198,6 @@ Public Class frmConstructor_Main CURRENT_FORMVIEW_ID = FORMVIEW_ID Refresh_Selected_Table() frmWD_ChangeDoctype.ShowDialog() - Cursor = Cursors.WaitCursor - ClassProxy.Refresh_Doc_Data() - Cursor = Cursors.Default RUN_WDSEARCH_GRID() End Sub Private Sub NeuToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NeuToolStripMenuItem.Click @@ -6232,16 +6212,22 @@ Public Class frmConstructor_Main If e.KeyCode = Keys.Return Then Try If CMDoc_TextBoxRenameFile.Text <> "" Then - Dim OldName, NewName As String + Dim OldName, NewName, OnlyFilename As String OldName = ClassWindreamDocGrid.SELECTED_DOC_PATH ' Define file names. NewName = CMDoc_TextBoxRenameFile.Text + OnlyFilename = NewName Dim name1 = Path.Combine(Path.GetDirectoryName(ClassWindreamDocGrid.SELECTED_DOC_PATH), NewName) NewName = NewName & Path.GetExtension(ClassWindreamDocGrid.SELECTED_DOC_PATH) + OnlyFilename &= Path.GetExtension(ClassWindreamDocGrid.SELECTED_DOC_PATH) ' Rename file. My.Computer.FileSystem.RenameFile(OldName, NewName) Cursor = Cursors.WaitCursor - ClassProxy.Refresh_Doc_Data() + If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then + Dim upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Filename = '{0}', FULL_FILENAME = '{1}', CHANGED_WHO = '{2}', CHANGED_WHEN = GETDATE() WHERE DocID = {3}", _ + OnlyFilename, NewName, USER_USERNAME, ClassWindreamDocGrid.SELECTED_DOC_ID) + ClassDatabase.Execute_non_Query(upd, True) + End If Cursor = Cursors.Default RUN_WDSEARCH_GRID() ContextMenuStripResultFiles.Close() @@ -6267,8 +6253,6 @@ Public Class frmConstructor_Main If CMDoc_TextBoxRenameDisplay.Text <> "" Then If ClassFileResult.Set_Displayname(CMDoc_TextBoxRenameDisplay.Text) Then Cursor = Cursors.WaitCursor - ClassProxy.Refresh_Doc_Data() - Cursor = Cursors.Default RUN_WDSEARCH_GRID() ContextMenuStripResultFiles.Close() End If @@ -6335,6 +6319,8 @@ Public Class frmConstructor_Main 'Dim NEWRECORD As Integer = ClassControlCommandsUI.GetLastRecord(ENTITY_ID) Dim NEWNODE = New TreeNode(tsmINewText.Text) If Not IsNothing(NEWRECORD) Then + ClassProxy.PRPROXY_RECORD_UPD_INS(ENTITY_ID, NEWRECORD) + If Not IsNothing(CURRENT_NODE_CONFIGURABLE_ID) And CURRENT_NODE_CONFIGURABLE_ID > 0 Then Dim index As Integer = 0 For Each img As String In TREEVIEW_IMAGELIST.Images.Keys @@ -6370,7 +6356,7 @@ Public Class frmConstructor_Main TreeViewMain.SelectedNode.Expand() End If End If - End If + End If Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Unexpected Error in Adding ConfigNode: ", ex.Message) End Try diff --git a/app/DD-Record-Organiser/frmDocLink_to_Record.vb b/app/DD-Record-Organiser/frmDocLink_to_Record.vb index 10710b5..b6ae05e 100644 --- a/app/DD-Record-Organiser/frmDocLink_to_Record.vb +++ b/app/DD-Record-Organiser/frmDocLink_to_Record.vb @@ -398,6 +398,11 @@ Public Class frmDocLink_to_Record Dim ins = String.Format("INSERT INTO TBPMO_DOC_RECORD_LINK (RECORD_ID,DOC_ID,COMMENT,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", RecordId, CURRENT_DOC_ID, "MANUAL RECORD-LINK", USER_USERNAME) If ClassDatabase.Execute_non_Query(ins) = False Then MsgBox("Unexpected Error in Inserting Record-Doc Link. Please check logfile!", MsgBoxStyle.Critical) + Else + If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then + Dim proc = String.Format("EXEC PRPROXY_DOC_CHECK_DOC_REC_LINK {0},{1}", CURRENT_DOC_ID, RecordId) + ClassDatabase.Execute_non_Query(proc, True) + End If End If Dim sql = String.Format("SELECT * FROM TBPMO_WD_OBJECTTYPE WHERE OBJECT_TYPE = '{0}'", _objecttype) Dim DT_OBJTYPE As DataTable = ClassDatabase.Return_Datatable(sql, True) diff --git a/app/DD-Record-Organiser/frmGlobalSearch.vb b/app/DD-Record-Organiser/frmGlobalSearch.vb index fb85d84..dad1937 100644 --- a/app/DD-Record-Organiser/frmGlobalSearch.vb +++ b/app/DD-Record-Organiser/frmGlobalSearch.vb @@ -91,7 +91,7 @@ Public Class frmGlobalSearch End If End Function Private Function Refresh_Files() - Dim DT_Files = ClassDatabase.Return_Datatable(sel_FT) + Dim DT_Files = ClassDatabase.Return_Datatable(sel_FT, True) If Not IsNothing(DT_Files) Then SplitContainerMain.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.None SplitContainerMain.Collapsed = False diff --git a/app/DD-Record-Organiser/frmMain.Designer.vb b/app/DD-Record-Organiser/frmMain.Designer.vb index 71c4c3e..90cdc21 100644 --- a/app/DD-Record-Organiser/frmMain.Designer.vb +++ b/app/DD-Record-Organiser/frmMain.Designer.vb @@ -154,7 +154,6 @@ Partial Class frmMain Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter = Nothing - Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Nothing diff --git a/app/DD-Record-Organiser/frmMain.resx b/app/DD-Record-Organiser/frmMain.resx index 0909b21..a9a6532 100644 --- a/app/DD-Record-Organiser/frmMain.resx +++ b/app/DD-Record-Organiser/frmMain.resx @@ -2397,13 +2397,13 @@ Konfiguration Administration - 1436, 150 + 1444, 150 - 0, 763 + 0, 767 - 1436, 23 + 1444, 23 RibbonStatusBar1 @@ -2457,7 +2457,7 @@ Konfiguration 6, 13 - 1436, 786 + 1444, 790 Segoe UI, 8.25pt diff --git a/app/DD-Record-Organiser/frmMain.vb b/app/DD-Record-Organiser/frmMain.vb index ac9fa86..ecbc759 100644 --- a/app/DD-Record-Organiser/frmMain.vb +++ b/app/DD-Record-Organiser/frmMain.vb @@ -613,7 +613,7 @@ Public Class frmMain Private Sub itemRefreshProxy_ItemClick(sender As Object, e As ItemClickEventArgs) Handles itemRefreshProxy.ItemClick Me.Cursor = Cursors.WaitCursor ClassProxy.Refresh_Object_Data() - ClassProxy.Refresh_Doc_Data() + ClassProxy.PRPROXY_SYNC_DOC_OBJECTS() Dim msg = "Die Proxydaten wurden erfolgreich synchronisiert!" If USER_LANGUAGE <> "de-DE" Then msg = "All proxydata was refreshed successfully!" diff --git a/app/DD-Record-Organiser/frmMass_Change.vb b/app/DD-Record-Organiser/frmMass_Change.vb index c035173..b51c906 100644 --- a/app/DD-Record-Organiser/frmMass_Change.vb +++ b/app/DD-Record-Organiser/frmMass_Change.vb @@ -38,11 +38,11 @@ If result = MsgBoxResult.Yes Then Dim val = txtNewValue.Text Dim SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL WHERE COL_NAME = '{0}' AND FORM_ID = {1}", cmbColumn.Text, CURRENT_ENTITY_ID) - Dim control_Id = ClassDatabase.Execute_Scalar(SQL) + Dim control_Id = ClassDatabase.Execute_Scalar(SQL, True) If Not IsNothing(control_Id) Then If control_Id > 0 Then SQL = String.Format("SELECT CONTROL_TYPE_ID FROM TBPMO_CONTROL WHERE GUID = {0}", control_Id) - Dim control_type_ID = ClassDatabase.Execute_Scalar(SQL) + Dim control_type_ID = ClassDatabase.Execute_Scalar(SQL, True) If control_type_ID = 4 Then Try @@ -66,6 +66,7 @@ For Each Record As String In MASS_RECORD_IDs2CHANGE Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", control_Id, CInt(Record)) ClassDatabase.Execute_non_Query(del, False) + ClassProxy.PRPROXY_CONTROL_DEL(CInt(Record), CURRENT_ENTITY_ID, control_Id) Next End If @@ -74,18 +75,22 @@ Dim err As Boolean = False For Each Record As String In MASS_RECORD_IDs2CHANGE SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", control_Id, CInt(Record)) - Dim ex_GUID = ClassDatabase.Execute_Scalar(SQL) + Dim ex_GUID = ClassDatabase.Execute_Scalar(SQL, True) If Not IsNothing(ex_GUID) Then SQL = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}',CHANGED_WHO = '{1}' WHERE GUID = {2}", val, USER_USERNAME, ex_GUID) If ClassDatabase.Execute_non_Query(SQL, False) = False Then MsgBox("Error in updating the value for Record: " & Record & vbNewLine & "Please check the logfile.", MsgBoxStyle.Exclamation) + Else + ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, control_Id, CInt(Record), val) End If Else SQL = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", control_Id, CInt(Record), val, USER_USERNAME) If ClassDatabase.Execute_non_Query(SQL, False) = False Then MsgBox("Error in inserting the value for Record: " & Record & vbNewLine & "Please check the logfile.", MsgBoxStyle.Exclamation) + Else + ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, control_Id, CInt(Record), val) End If End If Next diff --git a/app/DD-Record-Organiser/frmRight_Management.Designer.vb b/app/DD-Record-Organiser/frmRight_Management.Designer.vb index 3217a70..0ff7907 100644 --- a/app/DD-Record-Organiser/frmRight_Management.Designer.vb +++ b/app/DD-Record-Organiser/frmRight_Management.Designer.vb @@ -443,20 +443,30 @@ Partial Class frmRight_Management ' 'GridControl1 ' + Me.GridControl1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.GridControl1.DataMember = "USER_RIGHTS" Me.GridControl1.DataSource = Me.DD_ECMAdmin - Me.GridControl1.Location = New System.Drawing.Point(8, 43) + Me.GridControl1.Location = New System.Drawing.Point(3, 112) Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(1039, 200) + Me.GridControl1.Size = New System.Drawing.Size(1250, 425) Me.GridControl1.TabIndex = 2 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' 'GridView1 ' + Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.Aqua + Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colFORM_TITLE, Me.colUSERNAME, Me.colNAME, Me.colPRENAME, Me.colEDIT_REC, Me.colADD_REC, Me.colDELETE_REC, Me.colADD_DOC, Me.colREAD_ONLY_DOC, Me.colDELETE_DOC, Me.GridColumn1, Me.colADDED_WHEN, Me.colCHANGED_WHEN}) Me.GridView1.GridControl = Me.GridControl1 Me.GridView1.Name = "GridView1" + Me.GridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[True] + Me.GridView1.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[True] + Me.GridView1.OptionsFind.AlwaysVisible = True + Me.GridView1.OptionsView.ColumnAutoWidth = False + Me.GridView1.OptionsView.EnableAppearanceEvenRow = True ' 'colGUID ' @@ -756,7 +766,6 @@ Partial Class frmRight_Management Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Me.TBDD_USER_GROUPSTableAdapter Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter = Nothing - Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Nothing diff --git a/app/DD-Record-Organiser/frmWD_ChangeDoctype.vb b/app/DD-Record-Organiser/frmWD_ChangeDoctype.vb index 39bdd33..f026087 100644 --- a/app/DD-Record-Organiser/frmWD_ChangeDoctype.vb +++ b/app/DD-Record-Organiser/frmWD_ChangeDoctype.vb @@ -38,6 +38,11 @@ Public Class frmWD_ChangeDoctype For Each row As DataRow In CURRENT_DT_SELECTED_FILES.Rows sql = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Doctype = '{0}' WHERE DocID = {1}", NewDoctype, row.Item("DOC_ID")) If clsDatabase.Execute_non_Query(sql) = True Then + If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then + clsDatabase.Execute_non_Query(sql, True) + sql = String.Format("UPDATE VWPMO_DOC_SEARCH SET Doctype = '{0}', Change_DateTime = GETDATE() WHERE DocID = {1}", NewDoctype, row.Item("DOC_ID")) + clsDatabase.Execute_non_Query(sql, True) + End If If clsWD_SET.IndexFile(row.Item("FILEPATH"), IDXNAME_DOCTYPE, NewDoctype, OBJECTTYPE) = False Then ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error while setting Doctype: ", "Check the logfile") End If diff --git a/app/DD-Record-Organiser/frmWD_CreateVersion.vb b/app/DD-Record-Organiser/frmWD_CreateVersion.vb index a498e36..788d645 100644 --- a/app/DD-Record-Organiser/frmWD_CreateVersion.vb +++ b/app/DD-Record-Organiser/frmWD_CreateVersion.vb @@ -17,6 +17,9 @@ Public Class frmWD_CreateVersion VERSION = VERSION + 1 Dim upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Version = {0} WHERE DocID = {1}", VERSION, row.Item("DOC_ID")) clsDatabase.Execute_non_Query(upd) + If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then + clsDatabase.Execute_non_Query(upd, True) + End If End If Else MsgBox("Could not create a version for file '" & row.Item("FILEPATH") & "'! Check log", MsgBoxStyle.Exclamation) diff --git a/app/DD-Record-Organiser/frmWD_IndexFile.vb b/app/DD-Record-Organiser/frmWD_IndexFile.vb index f400321..03d398e 100644 --- a/app/DD-Record-Organiser/frmWD_IndexFile.vb +++ b/app/DD-Record-Organiser/frmWD_IndexFile.vb @@ -27,7 +27,7 @@ Public Class frmWD_IndexFile '################################################################# If streamresult = True Then Dim sql = "SELECT * FROM TBDD_INDEX_AUTOM WHERE ACTIVE = 1 AND UPPER(INDEXNAME) NOT LIKE UPPER('%ONLY %') AND SQL_ACTIVE = 0 AND DOCTYPE_ID = " & vDokart_ID - Dim DT_AUTO_INDEXE As DataTable = ClassDatabase.Return_Datatable(sql) + Dim DT_AUTO_INDEXE As DataTable = ClassDatabase.Return_Datatable(sql, True) Dim indexierung_erfolgreich As Boolean = False 'Einbauen dass auch Konfigurationen erlaubt sind wo der Doktyp und der Record fest gestzt sind If DT_AUTO_INDEXE Is Nothing = False Then 'CHECK DD @@ -877,7 +877,7 @@ Public Class frmWD_IndexFile OBJECT_TYPETextBox.Text = ClassDatabase.Execute_Scalar(sql, True) DOCTYPE_IDTextBox.Text = CURRENT_DOKARTID sql = "SELECT * FROM TBDD_INDEX_AUTOM WHERE DOCTYPE_ID = " & CURRENT_DOKARTID - Dim dt As DataTable = ClassDatabase.Return_Datatable(sql) + Dim dt As DataTable = ClassDatabase.Return_Datatable(sql, True) Dim Count As Integer = 0 lvwIndices.Items.Clear() If dt.Rows.Count > 0 Then