diff --git a/app/DD-Record-Organiser/ClassAsyncReturnDT.vb b/app/DD-Record-Organiser/ClassAsyncReturnDT.vb
index 92eff7b..df92cfe 100644
--- a/app/DD-Record-Organiser/ClassAsyncReturnDT.vb
+++ b/app/DD-Record-Organiser/ClassAsyncReturnDT.vb
@@ -10,6 +10,6 @@ Public Class ClassAsyncReturnDT
Me.sql = sqlCommand
End Sub
Private Sub bw_DoWork(ByVal sender As Object, ByVal e As DoWorkEventArgs) Handles bw.DoWork
- Me.dt = ClassDatabase.Return_Datatable(Me.sql, comment)
+ Me.dt = ClassDatabase.Return_Datatable(Me.sql)
End Sub
End Class
diff --git a/app/DD-Record-Organiser/ClassAsyncSQL.vb b/app/DD-Record-Organiser/ClassAsyncSQL.vb
index d0b0eae..7fd824f 100644
--- a/app/DD-Record-Organiser/ClassAsyncSQL.vb
+++ b/app/DD-Record-Organiser/ClassAsyncSQL.vb
@@ -13,6 +13,6 @@ Public Class ClassAsyncSQL
End Sub
Private Sub bw_DoWork(ByVal sender As Object, ByVal e As DoWorkEventArgs) Handles bw.DoWork
- Me.dt = ClassDatabase.Return_Datatable(Me.sql, "LoadEntityData - Get DTEntity")
+ Me.dt = ClassDatabase.Return_Datatable(Me.sql, True)
End Sub
End Class
\ No newline at end of file
diff --git a/app/DD-Record-Organiser/ClassControlBuilder.vb b/app/DD-Record-Organiser/ClassControlBuilder.vb
index 269a7fe..4583291 100644
--- a/app/DD-Record-Organiser/ClassControlBuilder.vb
+++ b/app/DD-Record-Organiser/ClassControlBuilder.vb
@@ -355,7 +355,7 @@ Public Class ClassControlBuilder
Dim match As System.Text.RegularExpressions.Match = regex.Match(sqlcommand)
If match.Success Then
Dim sqlguid = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", CONTROL_ID, CURRENT_RECORD_ID)
- Dim ctrlvalID = ClassDatabase.Execute_Scalar(sqlguid)
+ Dim ctrlvalID = ClassDatabase.Execute_Scalar(sqlguid, True)
Select Case row.Item("FORMAT_TYPE")
Case "Currency"
value = Decimal.Parse(value, Globalization.NumberStyles.Currency).ToString
@@ -374,15 +374,24 @@ Public Class ClassControlBuilder
' nicht überschrieben werden. Diese Werte werden bereits mit UpdateMultipleValues gespeichert
If (Not value.Contains(";")) Then
If Not IsNothing(ctrlvalID) Then
- Dim upd1 = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}',CHANGE_STEP = {1},CHANGED_WHO = '{2}' WHERE CONTROL_ID = {3} AND RECORD_ID = {4}", _
- value.ToString, CURRENT_CHANGE_STEP, USER_USERNAME, CONTROL_ID, CURRENT_RECORD_ID)
- If ClassDatabase.Execute_non_Query(upd1, True) = False Then
+ If ClassControlCommandsUI.UpdateControlValue(CONTROL_ID, CURRENT_RECORD_ID, value.ToString) = False Then
+ ClassLogger.Add(" >> Check Update depending control (XX) value as Update was not successful'", False)
+ Else
+ ' & upd & "'")
End If
+ 'Dim upd1 = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}',CHANGE_STEP = {1},CHANGED_WHO = '{2}' WHERE CONTROL_ID = {3} AND RECORD_ID = {4}", _
+ ' value.ToString, CURRENT_CHANGE_STEP, USER_USERNAME, CONTROL_ID, CURRENT_RECORD_ID)
+ 'If ClassDatabase.Execute_non_Query(upd1) = False Then
+
+ 'End If
Else
If CURRENT_RECORD_ID <> 0 Then
- Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", CONTROL_ID, CURRENT_RECORD_ID, value, USER_USERNAME)
- ClassDatabase.Execute_non_Query(ins)
+ 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
' If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue '" & ins & "'")
@@ -400,9 +409,9 @@ Public Class ClassControlBuilder
End Function).SingleOrDefault()
sqlcommand = sqlcommand.Replace(match.Groups(1).Value, value)
- If LogErrorsOnly = False Then ClassLogger.Add(" >> " & String.Format("Executing SQL_COMMAND: '{0}' for controlID '{1}'", sqlcommand, dependingControlId))
+ If LogErrorsOnly = False Then ClassLogger.Add(" >> " & String.Format("Executing SQL_COMMAND: '{0}' for controlID '{1}'", sqlcommand, dependingControlId), False)
- Dim dt As DataTable = ClassDatabase.Return_Datatable(sqlcommand)
+ Dim dt As DataTable = ClassDatabase.Return_Datatable(sqlcommand, True)
Dim type = dependingControl.GetType().Name
Select Case type
@@ -422,27 +431,32 @@ Public Class ClassControlBuilder
ControlLoader.DateTimePicker.LoadValue(dependingControl, dateValue)
Dim sql1 = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", dependingControlId, CURRENT_RECORD_ID)
- Dim id = ClassDatabase.Execute_Scalar(sql1)
+ Dim id = ClassDatabase.Execute_Scalar(sql1, True)
If Not IsNothing(id) Then
- Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", dateValue, USER_USERNAME, id)
- If ClassDatabase.Execute_non_Query(upd, True) = True Then
- If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was not nothing - Updated the ControlValue '" & upd)
+ 'Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", dateValue, USER_USERNAME, id)
+ If ClassControlCommandsUI.UpdateControlValue(dependingControlId, CURRENT_RECORD_ID, dateValue) = True Then
+ If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was not nothing - Updated the ControlValue'", False) '" & upd)
Else
- ClassLogger.Add(" >> Check Update depending control value as it was nothing and Update was not successful - Update-Command '" & upd & "'")
+ ClassLogger.Add(" >> Check Update depending control (DateEdit) value as it was nothing and Update was not successful - Update-Command '", False) ' & upd & "'")
End If
Else
- 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
- If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue '" & ins & "'")
+ If ClassControlCommandsUI.InsertControlValue(dependingControlId, CURRENT_RECORD_ID, dateValue) = True Then
+ If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue (DateEdit)!", False)
Else
- ClassLogger.Add(" >> Check Insert depending control value as it was nothing and Insert was not successful- Insert-Command '" & ins & "'")
+ ClassLogger.Add(" >> Check Insert depending control (DateEdit)value as it was nothing and Insert was not successful", 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
+ ' If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue '" & ins & "'")
+ 'Else
+ ' ClassLogger.Add(" >> Check Insert depending control value as it was nothing and Insert was not successful- Insert-Command '" & ins & "'")
+ 'End If
End If
Catch ex As Exception
- ClassLogger.Add("Unexpectet Error in OnComboBoxValueChanged - TextBox: " & ex.Message, True)
+ ClassLogger.Add("Unexpected Error in OnComboBoxValueChanged - TextBox: " & ex.Message, True)
End Try
Else
ClassLogger.Add(" >> Attention: RowCount for depending control was '" & dt.Rows.Count.ToString & "' and not 1 as expected - Check SQL: '" & sqlcommand & "'")
@@ -461,7 +475,7 @@ Public Class ClassControlBuilder
'ClassControlValues.LoadControlValue(CURRENT_RECORD_ID, CURRENT_PARENT_RECORD_ID, dependingControlId, dependingControl, values, CURRENT_ENTITY_ID)
-
+
ControlLoader.CheckedListBox.LoadValue(checkedlistbox, values)
If IsEdit Or IsInsert Then
CURRENT_RECORD_ENABLED = True
@@ -481,23 +495,33 @@ Public Class ClassControlBuilder
Dim value1 As String = dt.Rows(0).Item(0)
ControlLoader.TextBox.LoadValue(DirectCast(dependingControl, TextBox), 9999, 9999, value1, 999, True)
Dim sqltextbox = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", dependingControlId, CURRENT_RECORD_ID)
- Dim id = ClassDatabase.Execute_Scalar(sqltextbox)
+ Dim id = ClassDatabase.Execute_Scalar(sqltextbox, True)
If Not IsNothing(id) Then
- 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) = True Then
- If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was not nothing - Updated the ControlValue '" & upd)
+ If ClassControlCommandsUI.UpdateControlValue(dependingControlId, CURRENT_RECORD_ID, value1) = True Then
+ If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was not nothing - Updated the ControlValue'", False) '" & upd)
Else
- ClassLogger.Add(" >> Check Update depending control value as it was nothing and Update was not successful - Update-Command '" & upd & "'")
+ ClassLogger.Add(" >> Check Update depending control (TextBox) value as it was nothing and Update was not successful - Update-Command '", False) ' & upd & "'")
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
+ ' If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was not nothing - Updated the ControlValue '" & upd)
+ 'Else
+ ' ClassLogger.Add(" >> Check Update depending control value as it was nothing and Update was not successful - Update-Command '" & upd & "'")
+ 'End If
Else
- 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
- If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue '" & ins & "'")
+ If ClassControlCommandsUI.InsertControlValue(dependingControlId, CURRENT_RECORD_ID, value1) = True Then
+ If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue (TextBox)!", False)
Else
- ClassLogger.Add(" >> Check Insert depending control value as it was nothing and Insert was not successful- Insert-Command '" & ins & "'")
+ ClassLogger.Add(" >> Check Insert depending control (TextBox) value as it was nothing and Insert was not successful", 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
+ ' If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue '" & ins & "'")
+ 'Else
+ ' ClassLogger.Add(" >> Check Insert depending control value as it was nothing and Insert was not successful- Insert-Command '" & ins & "'")
+ 'End If
End If
Catch ex As Exception
@@ -520,6 +544,7 @@ 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
@@ -735,11 +760,11 @@ Public Class ClassControlBuilder
'End If
Dim SQL1 As String = String.Format("SELECT * FROM VWPMO_VALUES WHERE RECORD_ID = {0}", CURRENT_RECORD_ID)
- Dim DT_ControlValues As DataTable = ClassDatabase.Return_Datatable(SQL1, "LoadControlValues")
+ Dim DT_ControlValues As DataTable = ClassDatabase.Return_Datatable(SQL1, True)
CURRENT_CONTROL_VALUES = DT_ControlValues
- Dim datatable As DataTable = ClassDatabase.Return_Datatable(SQL)
- Dim datatable1 As DataTable = ClassDatabase.Return_Datatable(SQLenable)
+ Dim datatable As DataTable = ClassDatabase.Return_Datatable(SQL, True)
+ Dim datatable1 As DataTable = ClassDatabase.Return_Datatable(SQLenable, True)
Depending_Controls(control, datatable, CONTROL_VALUE)
If IsNothing(CONTROL_VALUE) Then
Exit Sub
@@ -790,7 +815,7 @@ Public Class ClassControlBuilder
'End If
Dim SQL1 As String = String.Format("SELECT * FROM VWPMO_VALUES WHERE RECORD_ID = {0}", CURRENT_RECORD_ID)
- Dim DT_ControlValues As DataTable = ClassDatabase.Return_Datatable(SQL1, "LoadControlValues")
+ Dim DT_ControlValues As DataTable = ClassDatabase.Return_Datatable(SQL1, True)
CURRENT_CONTROL_VALUES = DT_ControlValues
Dim datatable As DataTable = ClassDatabase.Return_Datatable(SQL)
diff --git a/app/DD-Record-Organiser/ClassControlCommands.vb b/app/DD-Record-Organiser/ClassControlCommands.vb
index fddcd6f..a7cc3df 100644
--- a/app/DD-Record-Organiser/ClassControlCommands.vb
+++ b/app/DD-Record-Organiser/ClassControlCommands.vb
@@ -51,7 +51,7 @@
Public Shared Function GetParentRecordId(RecordId As Integer) As Integer
Try
- Dim parentId = ClassDatabase.Execute_Scalar("SELECT RECORD1_ID FROM TBPMO_RECORD_CONNECT WHERE RECORD2_ID = " & RecordId)
+ Dim parentId = ClassDatabase.Execute_Scalar("SELECT RECORD1_ID FROM TBPMO_RECORD_CONNECT WHERE RECORD2_ID = " & RecordId, True)
If IsNothing(parentId) Then
Return 0
Else
@@ -64,7 +64,7 @@
Public Shared Function GetFormId(RecordId As Integer) As Integer
Try
- Dim FormId = ClassDatabase.Execute_Scalar("SELECT FORM_ID FROM VWPMO_VALUES WHERE RECORD_ID = " & RecordId)
+ Dim FormId = ClassDatabase.Execute_Scalar("SELECT FORM_ID FROM VWPMO_VALUES WHERE RECORD_ID = " & RecordId, True)
Return FormId
Catch ex As Exception
MsgBox("Error in GetFormId:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -74,7 +74,7 @@
Public Shared Function GetControlGuid(name As String)
Try
Dim sql = "SELECT GUID FROM TBPMO_CONTROL WHERE UPPER(NAME) = UPPER('" & name & "')"
- Return ClassDatabase.Execute_Scalar(sql)
+ Return ClassDatabase.Execute_Scalar(sql, True)
Catch ex As Exception
Return -1
End Try
@@ -148,16 +148,16 @@
SQL = "INSERT TBPMO_CONTROL_SCREEN (CONTROL_ID, SCREEN_ID, CONTROL_TEXT, X_LOC, Y_LOC, HEIGHT, WIDTH) VALUES (" & guid & ", 1, '" & CONTROL_TEXT & "', " & X_LOC & ", " & Y_LOC & ", " & HEIGHT & ", " & WIDTH & ")"
- If ClassDatabase.Execute_non_Query(SQL, True) Then
+ If ClassDatabase.Execute_non_Query(SQL) Then
' Die Guid in die Metadaten des Controls zurückschreiben
Dim metadata = DirectCast(control.Tag, ClassControlMetadata)
metadata.Id = guid
control.Tag = metadata
SQL = "SELECT MAX(GUID) FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = " & guid & " AND SCREEN_ID = " & CURRENT_SCREEN_ID
- Dim ctrl_screen_Id = ClassDatabase.Execute_Scalar(SQL, True)
+ Dim ctrl_screen_Id = ClassDatabase.Execute_Scalar(SQL)
SQL = String.Format("INSERT INTO TBPMO_CONTROL_LANGUAGE (LANGUAGE_TYPE,CONTROL_SCREEN_ID,CAPTION,ADDED_WHO) VALUES ('{0}',{1},'{2}','{3}')", USER_LANGUAGE, ctrl_screen_Id, CONTROL_TEXT, USER_USERNAME)
- ClassDatabase.Execute_non_Query(SQL, True)
+ ClassDatabase.Execute_non_Query(SQL)
Return True
Else
Throw New Exception()
@@ -426,7 +426,7 @@
Dim upd = String.Format("UPDATE TBPMO_CONTROL_LANGUAGE SET CAPTION = '{0}', HINT = '{1}' WHERE LANGUAGE_TYPE = '{2}' AND " & _
"CONTROL_SCREEN_ID = (SELECT GUID FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = " & _
CURRENT_CONTROL_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID & ")", CONTROL_TEXT, HINT, USER_LANGUAGE)
- ClassDatabase.Execute_non_Query(upd, True)
+ ClassDatabase.Execute_non_Query(upd)
If CurrentType.Contains("Button") Then
'If control.Tag = "ADDAPPOINTMENT" Then
If control.Name.Contains("f_addappointment") Then
@@ -516,60 +516,12 @@
Else
Return False
End If
- 'If DeleteControlValues(CURRENT_CONTROL_ID) = True Then
-
- ' If DeleteControlScreen(CURRENT_CONTROL_ID) = True Then
-
- ' If ClassFunctionCommands.DeleteFunction(CURRENT_CONTROL_ID) = True Then
- ' ss()
- ' Dim SQL = "DELETE FROM TBPMO_CONTROL_IMAGE WHERE CONTROL_ID = " & CURRENT_CONTROL_ID
- ' If ClassDatabase.Execute_non_Query(SQL) = True Then
- ' SQL = "DELETE FROM TBPMO_CONTROL WHERE GUID = " & CURRENT_CONTROL_ID
- ' If ClassDatabase.Execute_non_Query(SQL) = True Then
- ' Return True
- ' End If
- ' Else
- ' Return False
- ' End If
- ' End If
- ' Else
- ' Return False
- ' End If
- 'Else
- ' Return False
- 'End If
-
Catch ex As Exception
ClassLogger.Add("Unexpected Error in Delete Control: " & ex.Message, True)
MsgBox("Unexpected Error in Delete Control:" + vbNewLine + ex.Message, MsgBoxStyle.Critical)
Return False
End Try
End Function
-
- 'Public Shared Function DeleteControl(id As Integer)
- ' Try
- ' If DeleteControlValues(id) = True Then
- ' If DeleteControlScreen(id) = True Then
- ' If ClassFunctionCommands.DeleteFunction(id) = True Then
- ' Dim SQL = "DELETE FROM TBPMO_CONTROL WHERE GUID = " & id
-
- ' If ClassDatabase.Execute_non_Query(SQL) = True Then
- ' Return True
- ' Else
- ' Throw New Exception()
- ' End If
- ' End If
- ' End If
- ' End If
-
- ' Catch ex As Exception
- ' ClassLogger.Add("Unexpected Error in Delete Control1: " & ex.Message, True)
- ' MsgBox("Unexpected Error in Delete Control1:" + vbNewLine + ex.Message, MsgBoxStyle.Critical)
- ' Return False
- ' End Try
- 'End Function
-
-
Public Shared Function DeleteControlScreen(id As Integer)
Try
Dim SQL = "DELETE FROM TBPMO_CONTROL_LANGUAGE WHERE CONTROL_SCREEN_ID IN (SELECT GUID FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = " & id & ")"
diff --git a/app/DD-Record-Organiser/ClassControlCommandsUI.vb b/app/DD-Record-Organiser/ClassControlCommandsUI.vb
index 0b29397..12d6953 100644
--- a/app/DD-Record-Organiser/ClassControlCommandsUI.vb
+++ b/app/DD-Record-Organiser/ClassControlCommandsUI.vb
@@ -50,9 +50,9 @@ Public Class ClassControlCommandsUI
Dim sw As New SW("LoadControls")
- Dim SQL As String = String.Format("SELECT T.*, dbo.FNPMO_GET_CONTROL_CAPTION ('{2}', {3},T.CONTROL_ID) AS 'CAPTION' FROM VWPMO_CONTROL_SCREEN T WHERE SCREEN_ID = {0} AND FORM_ID = {1} AND CONTROL_VISIBLE = 1", CURRENT_SCREEN_ID, FormId, USER_LANGUAGE, CURRENT_SCREEN_ID)
+ Dim SQL As String = String.Format("SELECT T.*, dbo.FNPMO_GET_CONTROL_CAPTION ('{2}', {3},T.CONTROL_ID) AS 'CAPTION' FROM VWPMO_CONTROL_SCREEN T WHERE T.SCREEN_ID = {0} AND T.FORM_ID = {1} AND T.CONTROL_VISIBLE = 1", CURRENT_SCREEN_ID, FormId, USER_LANGUAGE, CURRENT_SCREEN_ID)
- Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL)
+ Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL, True)
For Each dr As DataRow In DT.Rows
Dim parent As GroupBox = Nothing
@@ -330,39 +330,9 @@ Public Class ClassControlCommandsUI
Function SaveRecord(RecordID As Integer, FormID As Integer, Optional foreignRecordID As Integer = 0) As String
Try
Dim ADDED_WHO As String = USER_USERNAME
- 'Dim RECORD_ID As Integer
-
- 'If IsInsert Then
- ' If LogErrorsOnly = False Then ClassLogger.Add(" >> (SaveRecord) Insert", False)
-
- ' ' Den Record erstellen
- ' If CreateRecord(FormID) = False Then
- ' IsInsert = False
- ' Return "ERROR - INSERT RECORD NOT SUCCESSFUL"
- ' End If
-
- ' ' Die eben erstellte RecordID holen
- ' RECORD_ID = GetLastRecord()
- ' CURRENT_RECORD_ID = RECORD_ID
- ' ' Wenn gegeben, foreignrecordID mit Record verknüpfen
- ' If foreignRecordID > 0 Then
- ' If LogErrorsOnly = False Then ClassLogger.Add(" >> foreignRecordID: " & foreignRecordID & "; Record-ID: " & RECORD_ID, False)
- ' ConnectRecord(foreignRecordID, RECORD_ID)
- ' End If
-
- ' ' Für angegebene Control Typen den Wert speichern
- ' InsertAllControls(FormID, RECORD_ID, _CtrlBuilder.AllControls)
-
- ' ' Status zurücksetzen
- ' IsInsert = False
-
- ' NEW_RECORD_ID = RECORD_ID
-
- ' Return "Neuer Datensatz eingefügt - " & Now
- 'ElseIf IsInsert = False Then
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
@@ -459,8 +429,8 @@ 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
-
- ClassDatabase.Execute_non_Query(SQL, True)
+ ClassProxy.Refresh_Control_Data()
+ ClassDatabase.Execute_non_Query(SQL)
Catch ex As Exception
MsgBox("Error in LinkImage: " & vbNewLine & ex.Message)
End Try
@@ -517,7 +487,8 @@ Public Class ClassControlCommandsUI
Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE_CHANGE_HISTORY WHERE UPPER(ADDED_WHO) = '{0}'", USER_USERNAME.ToUpper)
ClassDatabase.Execute_non_Query(del)
CURRENT_CHANGE_STEP += 1
- Dim VALUE_EXISTS_DT As DataTable = ClassDatabase.Return_Datatable(String.Format("SELECT RECORD_ID, CONTROL_ID FROM VWPMO_VALUES WHERE RECORD_ID = {0}", RecordID))
+ Dim sel = String.Format("SELECT RECORD_ID, CONTROL_ID FROM VWPMO_VALUES WHERE RECORD_ID = {0}", RecordID)
+ Dim VALUE_EXISTS_DT As DataTable = ClassDatabase.Return_Datatable(sel, True)
For Each ctrl As Control In controls
Console.WriteLine("Updating Control " + ctrl.Name)
@@ -587,8 +558,8 @@ Public Class ClassControlCommandsUI
Public Shared Sub UpdateMultipleValues(ControlId As Integer, RecordId As Integer, value As String)
Try
-
- Dim dt As DataTable = ClassDatabase.Return_Datatable(String.Format("SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", ControlId, RecordId))
+ Dim val = String.Format("SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", ControlId, RecordId)
+ Dim dt As DataTable = ClassDatabase.Return_Datatable(val, True)
If IsNothing(dt) Then
Exit Sub
End If
@@ -609,7 +580,7 @@ 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)
+ 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
@@ -626,7 +597,7 @@ Public Class ClassControlCommandsUI
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))
Next
-
+ ClassProxy.Refresh_Control_Data()
Catch ex As Exception
MsgBox("Error in UpdateMultipleValues:" & vbNewLine & ex.Message)
End Try
@@ -662,7 +633,7 @@ Public Class ClassControlCommandsUI
Case "CheckedListBoxControl"
Dim chklbx As DevExpress.XtraEditors.CheckedListBoxControl
chklbx = DirectCast(ctrl, DevExpress.XtraEditors.CheckedListBoxControl)
- Dim SQL_COMAMND = ClassDatabase.Execute_Scalar("SELECT UPPER(SQL_COMMAND_1) FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID)
+ Dim SQL_COMAMND = ClassDatabase.Execute_Scalar("SELECT UPPER(SQL_COMMAND_1) FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID, True)
'TODO: Wenn keine Datasource vorhanden, angecheckte einträge als string speichern
If IsNothing(chklbx.DataSource) Then
@@ -691,7 +662,7 @@ Public Class ClassControlCommandsUI
If CInt(row(0)) > 0 Then
'Überprüfen ob es den Record gibt
Dim SQL = "SELECT COUNT(*) FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_RECORD_ID & " AND RECORD2_ID = " & CInt(row(0))
- If ClassDatabase.Execute_Scalar(SQL) = 1 Then
+ If ClassDatabase.Execute_Scalar(SQL, True) = 1 Then
SQL = "DELETE FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_RECORD_ID & " AND RECORD2_ID = " & CInt(row(0))
If ClassDatabase.Execute_non_Query(SQL) = True Then
If LogErrorsOnly = False Then ClassLogger.Add(" >> TBPMO_RECORD_CONNECT-Entry after 'deselect CheckedListBox' deleted", False)
@@ -717,11 +688,11 @@ Public Class ClassControlCommandsUI
checked_result.Add(checked_value)
checked_result_string = String.Join(";", checked_result)
Dim SQL = "SELECT COUNT(*) FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_RECORD_ID & " AND RECORD2_ID = " & CInt(row(0))
- If ClassDatabase.Execute_Scalar(SQL) = 0 Then
+ If ClassDatabase.Execute_Scalar(SQL, True) = 0 Then
If CURRENT_RECORD_ID = 0 Then
MsgBox("Attention: no current record Selected!", MsgBoxStyle.Exclamation)
Else
- If ConnectRecord(CURRENT_RECORD_ID, CInt(row(0)), "CheckedListBox;" & ctrl.Name) = True Then
+ If ClassRecordCommands.ConnectRecord(CURRENT_RECORD_ID, CInt(row(0)), "CheckedListBox;" & ctrl.Name) = True Then
If LogErrorsOnly = False Then ClassLogger.Add(" >> Checked ListBox record '" & rid.ToString & "' was linked successfully.", False)
End If
End If
@@ -769,7 +740,7 @@ Public Class ClassControlCommandsUI
Dim chk_grid As DevExpress.XtraGrid.GridControl
chk_grid = DirectCast(ctrl, DevExpress.XtraGrid.GridControl)
Dim gridview As DevExpress.XtraGrid.Views.Grid.GridView = chk_grid.MainView
- Dim SQL_COMAMND = ClassDatabase.Execute_Scalar("SELECT UPPER(SQL_COMMAND_1) FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID)
+ Dim SQL_COMAMND = ClassDatabase.Execute_Scalar("SELECT UPPER(SQL_COMMAND_1) FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID, True)
Dim result As New List(Of String)
Dim result_string As String
@@ -788,131 +759,6 @@ Public Class ClassControlCommandsUI
Return Nothing
End If
- ''TODO: Wenn keine Datasource vorhanden, angecheckte einträge als string speichern
- 'If IsNothing(chk_grid.DataSource) Then
- ' Dim result As New List(Of String)
- ' Dim result_string As String
-
- ' For i As Integer = 0 To gridview.DataRowCount
- ' Dim res = gridview.GetRowCellValue(i, 0)
- ' If CBool(gridview.GetRowCellValue(i, "CHECKED")) = True Then
- ' Dim value = gridview.GetRowCellValue(i, 1).ToString.Trim
- ' result.Add(value)
- ' End If
- ' Next
- ' ' Hier wird ein String zurückgegeben, der als VALUE gespeichert werden soll
- ' ' Überspringt den Rest der funktion
- ' result_string = String.Join(";", result)
- ' If Not IsNothing(result_string) Then
- ' Return result_string
- ' Else
- ' Return Nothing
- ' End If
- 'Else
- ' Dim result As New List(Of String)
- ' Dim result_string As String
- ' Dim DT As DataTable = chk_grid.DataSource
- ' For Each row As DataRow In DT.Rows
- ' If CBool(row.Item(0)) = True Then
- ' Dim value = row.Item(1).ToString.Trim
- ' result.Add(value)
- ' End If
- ' Next
- ' ' Hier wird ein String zurückgegeben, der als VALUE gespeichert werden soll
- ' ' Überspringt den Rest der funktion
- ' result_string = String.Join(";", result)
- ' If Not IsNothing(result_string) Then
- ' Return result_string
- ' Else
- ' Return Nothing
- ' End If
- 'End If
-
- 'If SQL_COMAMND.ToString.StartsWith("SELECT [RECORD_ID]") Or SQL_COMAMND.ToString.StartsWith("SELECT [RECORD-ID]") Then
- ' 'Alle Recorddatensätze durchlaufen und überprüfen ob nicht angehakt
- ' 'Wenn nicht angehakt dann Record löschen
- ' Dim index As Integer = 0
- ' For i As Integer = 0 To gridview.DataRowCount
- ' ' Dim item = chklbx.GetItem(i)
- ' ' Dim row As DataRowView = CType(item, DataRowView)
- ' If CBool(gridview.GetRowCellValue(i, "CHECKED")) = False Then
- ' ' If CInt(row(0)) > 0 Then
- ' ' 'Überprüfen ob es den Record gibt
- ' ' Dim SQL = "SELECT COUNT(*) FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_RECORD_ID & " AND RECORD2_ID = " & CInt(row(0))
- ' ' If ClassDatabase.Execute_Scalar(SQL) = 1 Then
- ' ' SQL = "DELETE FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_RECORD_ID & " AND RECORD2_ID = " & CInt(row(0))
- ' ' If ClassDatabase.Execute_non_Query(SQL) = True Then
- ' ' If LogErrorsOnly = False Then ClassLogger.Add(" >> TBPMO_RECORD_CONNECT-Entry after 'deselect CheckedListBox' deleted", False)
- ' ' End If
- ' ' End If
- ' ' End If
- ' End If
- ' Next
- 'End If
-
-
- ''Für jeden gecheckten Eintrag den Record der Stammentität mit dem selektierten linken
- 'Dim checked_result As New List(Of String)
- 'Dim checked_result_string As String
- 'If SQL_COMAMND.ToString.StartsWith("SELECT [RECORD_ID]") Or SQL_COMAMND.ToString.StartsWith("SELECT [RECORD-ID]") Then
-
- ' For Each item As Object In DirectCast(ctrl, DevExpress.XtraEditors.CheckedListBoxControl).CheckedItems
- ' Dim row As DataRowView = CType(item, DataRowView)
- ' Try
- ' If CInt(row(0)) > 0 Then
- ' Dim rid = CInt(row(0))
- ' Dim checked_value = row(1)
- ' checked_result.Add(checked_value)
- ' checked_result_string = String.Join(";", checked_result)
- ' Dim SQL = "SELECT COUNT(*) FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_RECORD_ID & " AND RECORD2_ID = " & CInt(row(0))
- ' If ClassDatabase.Execute_Scalar(SQL) = 0 Then
- ' If CURRENT_RECORD_ID = 0 Then
- ' MsgBox("Attention: no current record Selected!", MsgBoxStyle.Exclamation)
- ' Else
- ' If ConnectRecord(CURRENT_RECORD_ID, CInt(row(0)), "CheckedListBox;" & ctrl.Name) = True Then
- ' If LogErrorsOnly = False Then ClassLogger.Add(" >> Checked ListBox record '" & rid.ToString & "' was linked successfully.", False)
- ' End If
- ' End If
-
- ' End If
- ' End If
- ' Catch ex As Exception
- ' ClassLogger.Add("Error in CheckedListBoxGetControlValue: " & ex.Message, True)
- ' End Try
-
- ' Next
- 'Else
-
- ' For Each item As Object In DirectCast(ctrl, DevExpress.XtraEditors.CheckedListBoxControl).CheckedItems
- ' Dim row As DataRowView = CType(item, DataRowView)
- ' If row.DataView.Table.Columns.Count = 1 Then
- ' Dim checked_value = row(0)
- ' checked_result.Add(checked_value)
- ' ElseIf row.DataView.Table.Columns.Count = 2 Then
- ' Dim checked_value = row(1)
- ' checked_result.Add(checked_value)
- ' End If
- ' checked_result_string = String.Join(";", checked_result)
- ' Next
-
-
-
-
- 'End If
-
- '' Hier wird ein String zurückgegeben, der als VALUE gespeichert werden soll
- '' Überspringt den Rest der funktion
- 'If Not IsNothing(checked_result_string) Then
- ' 'Dim sql = String.Format("select count(*) from TBPMO_CONTROL_VALUE where CONTROL_ID = {0} and RECORD_ID = {1}", CONTROL_ID, CURRENT_RECORD_ID)
- ' 'If ClassDatabase.Execute_Scalar(sql) = 0 Then
- ' ' InsertControlValue(CONTROL_ID, CURRENT_RECORD_ID, "")
- ' 'End If
- ' Return checked_result_string
- 'Else
- ' 'In jedem Fall Nothing zurückgeben
- ' Return Nothing
- 'End If
-
Case "ListBoxControl"
Dim listbox As DevExpress.XtraEditors.ListBoxControl = DirectCast(ctrl, DevExpress.XtraEditors.ListBoxControl)
@@ -939,7 +785,7 @@ Public Class ClassControlCommandsUI
Public Shared Function InsertControlValue(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)
+ Dim FORMAT_TYPE As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE FROM TBPMO_CONTROL WHERE GUID = " & ControlID, True)
Select Case FORMAT_TYPE
Case "Currency"
@@ -953,24 +799,9 @@ 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)
-
- 'Using conn As New SqlClient.SqlConnection(MyConnectionString)
- ' Dim cmd As New SqlClient.SqlCommand("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES (@CONTROL_ID, @RECORD_ID, @VALUE, @ADDED_WHO)", conn)
- ' cmd.Parameters.Add("@VALUE", SqlDbType.NVarChar).Value = Value
- ' cmd.Parameters.Add("@ADDED_WHO", SqlDbType.VarChar).Value = AddedWho
- ' cmd.Parameters.Add("@CONTROL_ID", SqlDbType.Int).Value = ControlID
- ' cmd.Parameters.Add("@RECORD_ID", SqlDbType.Int).Value = RecordID
-
- ' conn.Open()
- ' cmd.ExecuteNonQuery()
- ' Return True
- 'End Using
-
- 'Dim SQL = "INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES (" & ControlID & ", " & RecordID & ", '" & Value & "', '" & AddedWho & "')"
- 'Return ClassDatabase.Execute_non_Query(SQL, True)
Catch ex As Exception
ClassLogger.Add("Unerwarteter Fehler in InsertControlValue: " & ex.Message, True)
Return False
@@ -980,8 +811,9 @@ Public Class ClassControlCommandsUI
Public Shared Function UpdateControlValue(ControlID As Integer, RecordID As Integer, Value As String)
Try
Dim CHANGED_WHO = USER_USERNAME
- Dim DT_FORMAT_TYPE As DataTable = ClassDatabase.Return_Datatable("SELECT FORMAT_TYPE,CONTROL_TYPE_ID FROM TBPMO_CONTROL WHERE GUID = " & ControlID)
- Dim FORMAT_TYPE As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE,CONTROL_TYPE_ID FROM TBPMO_CONTROL WHERE GUID = " & ControlID)
+ 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
@@ -999,41 +831,12 @@ Public Class ClassControlCommandsUI
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)
- Return ClassDatabase.Execute_non_Query(upd, True)
- 'Using conn As New SqlClient.SqlConnection(MyConnectionString)
- ' Dim cmd As New SqlClient.SqlCommand("UPDATE TBPMO_CONTROL_VALUE SET VALUE = @VALUE, CHANGED_WHO = @CHANGED_WHO, CHANGE_STEP = @CHANGE_STEP WHERE CONTROL_ID = @CONTROL_ID AND RECORD_ID = @RECORD_ID", conn)
- ' cmd.Parameters.Add("@VALUE", SqlDbType.NVarChar).Value = Value
- ' cmd.Parameters.Add("@CHANGED_WHO", SqlDbType.VarChar).Value = CHANGED_WHO
- ' cmd.Parameters.Add("@CONTROL_ID", SqlDbType.Int).Value = ControlID
- ' cmd.Parameters.Add("@RECORD_ID", SqlDbType.Int).Value = RecordID
- ' cmd.Parameters.Add("CHANGE_STEP", SqlDbType.Int).Value = CURRENT_CHANGE_STEP
- ' conn.Open()
- ' cmd.ExecuteNonQuery()
- ' Return True
- 'End Using
+ ClassProxy.Refresh_Control_Data()
+ Return ClassDatabase.Execute_non_Query(upd)
Catch ex As Exception
ClassLogger.Add("Unerwarteter Fehler in UpdateControlValue: " & ex.Message, True)
Return False
End Try
End Function
-
- Public Shared Function CreateRecord(FormID)
- Dim ADDED_WHO As String = USER_USERNAME
- Dim SQL = "INSERT INTO TBPMO_RECORD(ADDED_WHO, FORM_ID,RECORD_ENTITY_ID) VALUES ('" & ADDED_WHO & "', " & FormID & ",4711)"
- Return ClassDatabase.Execute_non_Query(SQL, True)
- End Function
-
- Public Shared Function GetLastRecord()
- Dim ADDED_WHO As String = USER_USERNAME
- Dim SQL = "SELECT (MAX(GUID)) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND ADDED_WHO = '" & ADDED_WHO & "'"
- Return ClassDatabase.Execute_Scalar(SQL, True)
- End Function
-
- Public Shared Function ConnectRecord(PARENT_RECORD As Integer, LINK_RECORD As Integer, Optional Comment As String = "")
- Dim ADDED_WHO As String = USER_USERNAME
- Dim SQL = "INSERT INTO TBPMO_RECORD_CONNECT(RECORD1_ID,RECORD2_ID,COMMENT,ADDED_WHO) VALUES (" & PARENT_RECORD & "," & LINK_RECORD & ",'" & Comment & "','" & ADDED_WHO & "')"
- If LogErrorsOnly = False Then ClassLogger.Add(" >> ConnectRecord SQL: " & SQL, False)
- Return ClassDatabase.Execute_non_Query(SQL, True)
- End Function
End Class
diff --git a/app/DD-Record-Organiser/ClassControlLoader.vb b/app/DD-Record-Organiser/ClassControlLoader.vb
index c658e45..d2b1944 100644
--- a/app/DD-Record-Organiser/ClassControlLoader.vb
+++ b/app/DD-Record-Organiser/ClassControlLoader.vb
@@ -64,7 +64,7 @@
' Der alte SQL Befehl hat nicht wirklich nach der StaticList geschaut o_O
' Dim SQL As String = String.Format("SELECT VALUE FROM VWPMO_VALUES WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", controlId, recordId)
Dim SQL As String = String.Format("SELECT STATIC_LIST FROM TBPMO_CONTROL WHERE GUID = {0}", controlId)
- Dim staticList As String = ClassDatabase.Execute_Scalar(SQL)
+ Dim staticList As String = ClassDatabase.Execute_Scalar(SQL, True)
If IsNothing(staticList) Or String.IsNullOrWhiteSpace(staticList) Then
Return Nothing
@@ -123,7 +123,7 @@
'Jetzt noch den Columnname ändern
Dim gridview = DirectCast(control.MainView, DevExpress.XtraGrid.Views.Grid.GridView)
- Dim caption As String = ClassDatabase.Execute_Scalar(String.Format("SELECT COL_NAME FROM TBPMO_CONTROL WHERE GUID = {0}", DirectCast(control.Tag, ClassControlMetadata).Id))
+ Dim caption As String = ClassDatabase.Execute_Scalar(String.Format("SELECT COL_NAME FROM TBPMO_CONTROL WHERE GUID = {0}", DirectCast(control.Tag, ClassControlMetadata).Id), True)
gridview.Columns(0).Caption = caption
Catch ex As Exception
MsgBox("Error in SetDataSource - GridControl: " & ex.Message, MsgBoxStyle.Critical)
diff --git a/app/DD-Record-Organiser/ClassControlValues.vb b/app/DD-Record-Organiser/ClassControlValues.vb
index 6e7589c..f21f9d8 100644
--- a/app/DD-Record-Organiser/ClassControlValues.vb
+++ b/app/DD-Record-Organiser/ClassControlValues.vb
@@ -149,7 +149,7 @@ Public Class ClassControlValues
'Dim SQL As String = String.Format("SELECT * FROM VWPMO_VALUES WHERE VALUE <> '' AND RECORD_ID = {0}", RecordId)
Dim SQL As String = String.Format("SELECT * FROM VWPMO_VALUES WHERE RECORD_ID = {0}", RecordId)
- Dim DT_ControlValues As DataTable = ClassDatabase.Return_Datatable(SQL, "LoadControlValues")
+ Dim DT_ControlValues As DataTable = ClassDatabase.Return_Datatable(SQL, True)
CURRENT_CONTROL_VALUES = DT_ControlValues
Dim elapsed As Double
elapsed = sw.Elapsed.TotalSeconds
@@ -169,7 +169,7 @@ Public Class ClassControlValues
sw.Start()
' Load all Hints for controls
Dim SQLHint = "SELECT * FROM VWPMO_CONTROL_HINT WHERE FORM_ID = " & FormId
- Dim DT_Hints As DataTable = ClassDatabase.Return_Datatable(SQLHint, "LoadControlHints")
+ Dim DT_Hints As DataTable = ClassDatabase.Return_Datatable(SQLHint, True)
' ' Hint in DT_Hints suchen der zur aktuellen controlId passt
For Each row As DataRow In DT_Hints.Rows
ClassControlValueCache.SaveHint(row.Item(1), row.Item(2))
@@ -210,7 +210,7 @@ Public Class ClassControlValues
Try
'Dim SQL As String = String.Format("SELECT * FROM VWPMO_VALUES WHERE VALUE <> '' AND RECORD_ID = {0}", RecordId)
Dim SQL As String = String.Format("SELECT VALUE FROM VWPMO_VALUES WHERE RECORD_ID = {0} AND CONTROL_ID = {1}", RecordId, CONTROL_ID)
- Dim RESULT = ClassDatabase.Execute_Scalar(SQL)
+ Dim RESULT = ClassDatabase.Execute_Scalar(SQL, True)
If IsNothing(RESULT) Then
Return Nothing
ElseIf RESULT = "" Then
@@ -327,7 +327,7 @@ Public Class ClassControlValues
' Zuerst alle SQL Commands für FormID finden
' CONTROL_SQLCOMMAND_1 wird als SQL gealiast
Dim SQL As String = String.Format("SELECT CONTROL_ID, CONTROL_CONNID_1,CONTROL_SQLCOMMAND_1 AS SQL FROM VWPMO_CONTROL_SCREEN WHERE FORM_ID = {0} AND CONTROL_SQLCOMMAND_1 NOT LIKE '%@%'", FormID)
- Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL)
+ Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL, True)
Dim elapsed As Double
elapsed = swsql.Elapsed.TotalSeconds
swsql.Stop()
@@ -399,7 +399,7 @@ Public Class ClassControlValues
Dim SQL As String = String.Format("SELECT CONTROL_ID, CONTROL_CONNID_1, CONTROL_SQLCOMMAND_1 AS SQL FROM VWPMO_CONTROL_SCREEN WHERE FORM_ID = {0} AND CONTROL_SQLCOMMAND_1 <> '' AND CONTROL_SQLCOMMAND_1 LIKE '%@%'", FormId)
Dim SW As Stopwatch = Stopwatch.StartNew()
Dim commands As New List(Of String)
- Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL)
+ Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL, True)
If dt.Rows.Count = 0 Then
Exit Sub
@@ -681,7 +681,7 @@ Public Class ClassControlValues
' Alle Controls laden, die einen Default Value haben
Dim SQL As String = String.Format("SELECT CONTROL_ID, CONTROL_DEF_VALUE, CONTROL_NAME FROM VWPMO_CONTROL_SCREEN WHERE FORM_ID = {0} AND CONTROL_DEF_VALUE <> '' " & _
"UNION SELECT CONTROL_ID, CONTROL_SQLCOMMAND_1 AS CONTROL_DEF_VALUE, CONTROL_NAME FROM VWPMO_CONTROL_SCREEN where FORM_ID = {0} and CONTROL_SQLCOMMAND_1 <> '' AND CONTROL_SQLCOMMAND_1 NOT LIKE '%@%@%' AND CONTROL_SQLCOMMAND_1 LIKE '%@RECORD_ID%'", FormID)
- Dim DEFAULT_VALUE_DT As DataTable = ClassDatabase.Return_Datatable(SQL)
+ Dim DEFAULT_VALUE_DT As DataTable = ClassDatabase.Return_Datatable(SQL, True)
For Each row As DataRow In DEFAULT_VALUE_DT.Rows
@@ -849,7 +849,7 @@ Public Class ClassControlValues
Try
Dim sql = "SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = " & Control_ID & " AND RECORD_ID = " & Record_ID
CURRENT_LAST_SQL = sql
- Return ClassDatabase.Execute_Scalar(sql, True)
+ Return ClassDatabase.Execute_Scalar(sql)
Catch ex As Exception
ClassLogger.Add("Unexpected Error in GetControlValueForControlID: " & ex.Message, True)
MsgBox("Error in GetControlValueForControlID:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
diff --git a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb
index 5bb0d39..70a7c0a 100644
--- a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb
+++ b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb
@@ -6,7 +6,7 @@ Public Class ClassDOC_SEARCH
Private Shared ENTITY_ID As Integer
Private Shared RECORD_ID As Integer
Private Shared AsyncRunning As Boolean = False
- Private Shared Function GET_DOCSEARCH_DATATABLE(Type As String, Optional fulltext_String As String = "", Optional BG As Boolean = False)
+ Private Shared Function GET_DOCSEARCH_DATATABLE(Optional BG As Boolean = False)
Try
Dim OPTION1
Dim OPTION2
@@ -58,7 +58,7 @@ Public Class ClassDOC_SEARCH
End If
Dim SQL_DOC_SEARCH
- If Type = "ENTITY" Then
+ If CURRENT_SEARCH_TYPE = "ENTITY" Then
SQL_DOC_SEARCH = String.Format("SELECT 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 & _
@@ -96,7 +96,7 @@ Public Class ClassDOC_SEARCH
End If
- ElseIf Type = "RECORD" Then
+ ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then
SQL_DOC_SEARCH = String.Format("SELECT T.* ," & vbNewLine & _
"ISNULL(T1.VALUE,'') AS OPTION1," & vbNewLine & _
"ISNULL(T2.VALUE,'') AS OPTION2," & vbNewLine & _
@@ -118,6 +118,7 @@ Public Class ClassDOC_SEARCH
"VWPMO_DOC_SEARCH T " & vbNewLine & _
"INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine & _
"INNER JOIN TBPMO_RECORD TR ON TRL.RECORD_ID = TR.GUID" & vbNewLine & _
+ "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHTS ON T.DocID = TRIGHTS.dwObjectID" & vbNewLine & _
"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC ON TR.FORM_ID = TRC.ENTITY_ID AND TRC.LANGUAGE = '{7}' AND TRC.GUID = {8}" & vbNewLine & _
"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC1 ON TR.FORM_ID = TRC1.ENTITY_ID AND TRC1.LANGUAGE = '{7}' AND TRC1.GUID = {9}" & vbNewLine & _
"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC2 ON TR.FORM_ID = TRC2.ENTITY_ID AND TRC2.LANGUAGE = '{7}' AND TRC2.GUID = {10}" & vbNewLine & _
@@ -126,36 +127,96 @@ Public Class ClassDOC_SEARCH
"LEFT JOIN TBPMO_CONTROL_VALUE T2 ON TRL.RECORD_ID = T2.RECORD_ID AND T2.CONTROL_ID = {3} " & vbNewLine & _
"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 T.DocID = (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {6} AND dwObjectID = T.DocID)", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE, VALUE_CONF1, VALUE_CONF2, VALUE_CONF3, VALUE_CONF4)
- ElseIf Type = "FULLTEXT" Then
+ "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", fulltext_String)
- SQL_DOC_SEARCH = String.Format("SELECT 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 & _
- "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX2') AS DOCIDX2," & vbNewLine & _
- "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX3') AS DOCIDX3," & vbNewLine & _
- "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX4') AS DOCIDX4," & vbNewLine & _
- "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN1','{1}') AS DROPDOWN1," & vbNewLine & _
- "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN2','{1}') AS DROPDOWN2," & vbNewLine & _
- "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN3','{1}') AS DROPDOWN3," & vbNewLine & _
- "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN4','{1}') AS DROPDOWN4" & vbNewLine & _
+ sqlft = sqlft.Replace("@FULLTEXT", CURRENT_FULLTEXT_PATTERN)
+ 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 & _
+ "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX2') AS DOCIDX2," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX3') AS DOCIDX3," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX4') AS DOCIDX4," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN1','{1}') AS DROPDOWN1," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN2','{1}') AS DROPDOWN2," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN3','{1}') AS DROPDOWN3," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN4','{1}') AS DROPDOWN4" & vbNewLine & _
+ "FROM " & vbNewLine & _
+ "VWPMO_DOC_SEARCH T" & vbNewLine & _
+ "INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine & _
+ "INNER JOIN TBPMO_RECORD TR ON TRL.RECORD_ID = TR.GUID" & vbNewLine & _
+ "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHTS ON T.DocID = TRIGHTS.dwObjectID" & vbNewLine & _
+ "LEFT OUTER JOIN TBPMO_CONTROL_VALUE TCTRL ON TR.GUID = TCTRL.RECORD_ID" & vbNewLine & _
+ "WHERE TR.FORM_ID = {0} AND TRIGHTS.dwUserOrGroupID = {2} AND (" & vbNewLine & _
+ "TCTRL.VALUE LIKE '%{6}%' OR" & vbNewLine & _
+ "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 & _
+ "ISNULL(T1.VALUE,'') AS OPTION1," & vbNewLine & _
+ "ISNULL(T2.VALUE,'') AS OPTION2," & vbNewLine & _
+ "ISNULL(T3.VALUE,'') AS OPTION3," & vbNewLine & _
+ "ISNULL(T4.VALUE,'') AS OPTION4," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX1') AS DOCIDX1," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX2') AS DOCIDX2," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX3') AS DOCIDX3," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX4') AS DOCIDX4," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN1','{7}') AS DROPDOWN1," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN2','{7}') AS DROPDOWN2," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN3','{7}') AS DROPDOWN3," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN4','{7}') AS DROPDOWN4," & vbNewLine & _
+ "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC.GUID) AS VALUE1," & vbNewLine & _
+ "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC1.GUID) AS VALUE2," & vbNewLine & _
+ "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC2.GUID) AS VALUE3," & vbNewLine & _
+ "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC3.GUID) AS VALUE4" & vbNewLine & _
+ "FROM " & vbNewLine & _
+ "VWPMO_DOC_SEARCH T " & vbNewLine & _
+ "INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine & _
+ "INNER JOIN TBPMO_RECORD TR ON TRL.RECORD_ID = TR.GUID" & vbNewLine & _
+ "INNER JOIN TBPMO_STRUCTURE_NODES_USER_TEMP TTEMP ON TR.GUID = TTEMP.RECORD_ID" & vbNewLine & _
+ "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHTS ON T.DocID = TRIGHTS.dwObjectID" & vbNewLine & _
+ "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC ON TR.FORM_ID = TRC.ENTITY_ID AND TRC.LANGUAGE = '{7}' AND TRC.GUID = {8}" & vbNewLine & _
+ "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC1 ON TR.FORM_ID = TRC1.ENTITY_ID AND TRC1.LANGUAGE = '{7}' AND TRC1.GUID = {9}" & vbNewLine & _
+ "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC2 ON TR.FORM_ID = TRC2.ENTITY_ID AND TRC2.LANGUAGE = '{7}' AND TRC2.GUID = {10}" & vbNewLine & _
+ "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC3 ON TR.FORM_ID = TRC3.ENTITY_ID AND TRC3.LANGUAGE = '{7}' AND TRC3.GUID = {11}" & vbNewLine & _
+ "LEFT JOIN TBPMO_CONTROL_VALUE T1 ON TRL.RECORD_ID = T1.RECORD_ID AND T1.CONTROL_ID = {2} " & vbNewLine & _
+ "LEFT JOIN TBPMO_CONTROL_VALUE T2 ON TRL.RECORD_ID = T2.RECORD_ID AND T2.CONTROL_ID = {3} " & vbNewLine & _
+ "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 TR.FORM_ID = {1} AND TTEMP.USER_ID = {0} AND TRIGHTS.dwUserOrGroupID = {6}", USER_GUID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE, VALUE_CONF1, VALUE_CONF2, VALUE_CONF3, VALUE_CONF4)
+ ElseIf CURRENT_SEARCH_TYPE = "FULLTEXT_SUBNODES" Then
+ Dim sqlft = SQL_FULLTEXT
+ sqlft = sqlft.Replace("@FULLTEXT", CURRENT_FULLTEXT_PATTERN)
+ SQL_DOC_SEARCH = String.Format("SELECT DISTINCT T.*," & vbNewLine & _
+ "[dbo].[FNPMO_GET_CONTROL_VALUES_DOC_ENTITY] ({4},T.DocID,{1}) AS OPTION1," & vbNewLine & _
+ "[dbo].[FNPMO_GET_CONTROL_VALUES_DOC_ENTITY] ({5},T.DocID,{1}) AS OPTION2," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX1') AS DOCIDX1," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX2') AS DOCIDX2," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX3') AS DOCIDX3," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX4') AS DOCIDX4," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN1','{0}') AS DROPDOWN1," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN2','{0}') AS DROPDOWN2," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN3','{0}') AS DROPDOWN3," & vbNewLine & _
+ "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN4','{0}') AS DROPDOWN4" & vbNewLine & _
"FROM " & vbNewLine & _
"VWPMO_DOC_SEARCH T" & vbNewLine & _
- "WHERE T.DocID IN (select DISTINCT DOC_ID from TBPMO_DOC_RECORD_LINK T, TBPMO_RECORD T1 WHERE T.RECORD_ID = T1.GUID AND T1.FORM_ID = {0}) " & vbNewLine & _
- "AND T.DocID IN (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {2} AND dwObjectID = T.DocID) AND " & vbNewLine & _
- "T.DocID IN ({5})", ENTITY_ID, USER_LANGUAGE, USERID_FK_INT_ECM, OPTION1, OPTION2, sqlft)
-
+ "INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine & _
+ "INNER JOIN TBPMO_RECORD TR ON TRL.RECORD_ID = TR.GUID" & vbNewLine & _
+ "INNER JOIN TBPMO_STRUCTURE_NODES_USER_TEMP TTEMP ON TR.GUID = TTEMP.RECORD_ID" & vbNewLine & _
+ "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHTS ON T.DocID = TRIGHTS.dwObjectID" & vbNewLine & _
+ "WHERE TR.FORM_ID = {1} AND TTEMP.USER_ID = {2} AND TRIGHTS.dwUserOrGroupID = {3}" & vbNewLine & _
+ "AND T.DocID IN ({6})", USER_LANGUAGE, ENTITY_ID, USER_GUID, USERID_FK_INT_ECM, OPTION1, OPTION2, sqlft)
End If
If LogErrorsOnly = False Then ClassLogger.Add(" >> SQL_DOC_SEARCH: " & SQL_DOC_SEARCH, False)
- If BG = True And Type = "ENTITY" Then
+ If BG = True And CURRENT_SEARCH_TYPE = "ENTITY" Then
If Not IsNothing(CURRENT_DT_DOC_ENTITY_SEARCH) Then
Return CURRENT_DT_DOC_ENTITY_SEARCH
End If
End If
- Return ClassDatabase.Return_Datatable_Connection(SQL_DOC_SEARCH, 1)
+ Return ClassDatabase.Return_Datatable(SQL_DOC_SEARCH, True)
Catch ex As Exception
ClassLogger.Add("Unexpected Error in GET_DOCSEARCH_DATATABLE: " & ex.Message, True)
Return Nothing
@@ -165,9 +226,9 @@ Public Class ClassDOC_SEARCH
ENTITY_ID = ENT_ID
DT_RESULTLIST_OPTIONS = vDT_RESULTLIST_OPTIONS
DT_RESULTLIST_SEL_VALUES = vDT_RESULTLIST_SELVALUES
- Return GET_DOCSEARCH_DATATABLE(vType, ftString, BG)
+ Return GET_DOCSEARCH_DATATABLE(BG)
End Function
- Public Shared Function Get_DOC_RESULTTABLE(vDT_RESULTLIST_OPTIONS As DataTable, vDT_RESULTLIST_SELVALUES As DataTable, DT_WINDREAM_RESULTLIST As DataTable, ENT_ID As Integer, REC_ID As Integer, vType As String, Optional ftString As String = "", Optional BG As Boolean = False, Optional Preload As Boolean = False)
+ Public Shared Function Get_DOC_RESULTTABLE(vDT_RESULTLIST_OPTIONS As DataTable, vDT_RESULTLIST_SELVALUES As DataTable, DT_WINDREAM_RESULTLIST As DataTable, ENT_ID As Integer, REC_ID As Integer, Optional BG As Boolean = False, Optional Preload As Boolean = False)
Dim COL_ARRAY_RESULTLIST As List(Of String)
ENTITY_ID = ENT_ID
DT_RESULTLIST_OPTIONS = vDT_RESULTLIST_OPTIONS
@@ -177,7 +238,7 @@ Public Class ClassDOC_SEARCH
Dim sw As New Stopwatch
sw.Start()
Dim elapsed As Double
- Dim DT_FILE_RESULT As DataTable = GET_DOCSEARCH_DATATABLE(vType, ftString, BG)
+ Dim DT_FILE_RESULT As DataTable = GET_DOCSEARCH_DATATABLE(BG)
CURRENT_DOC_RESULTS = DT_FILE_RESULT
If IsNothing(DT_FILE_RESULT) Then
ClassLogger.Add(">> ATTENTION: GET_DOCSEARCH_DATATABLE IS NOTHING!!", False)
@@ -323,11 +384,11 @@ Public Class ClassDOC_SEARCH
rowvalue = FILE_ROW.Item(Colname)
'If LogErrorsOnly = False Then ClassLogger.Add(" >> rowvalue for Colname '" & Colname & "': '" & rowvalue.ToString & "'", False)
Catch ex As Exception
- If vType = "RECORD" Then ClassLogger.Add("Unexpected Error in GetVariableValue for Column '" & Colname & "'- Error: " & ex.Message)
+ If CURRENT_SEARCH_TYPE = "RECORD" Then ClassLogger.Add("Unexpected Error in GetVariableValue for Column '" & Colname & "'- Error: " & ex.Message)
If Colname.ToString.StartsWith("doct") Or Colname.ToString.StartsWith("Dokum") Then
rowvalue = ""
Else
- If vType <> "RECORD" Then
+ If CURRENT_SEARCH_TYPE <> "RECORD" Then
rowvalue = "Not displayable in Group-Search"
Else
rowvalue = "Error getting rowvalue"
@@ -386,52 +447,6 @@ Public Class ClassDOC_SEARCH
If DD_Rights.clsDatabase.Init(MyConnectionString) = True Then
If DD_Rights.ClassRights.Init(ENTITY_ID, LogErrorsOnly) = True Then
If DD_Rights.ClassRights.Collect_Users(CURRENT_RECORD_ID, ENTITY_ID) = True Then
- 'If DD_Rights.ClassRights.TransferRights2Service(RESULT_DOCID, RESULT_DOC_PATH, False) Then
- ' Dim sql_select = String.Format("SELECT * FROM VWPMO_RIGHTS_2B_WORKED WHERE DOC_ID = {0}", RESULT_DOCID)
- ' Dim DT_RIGHTS2B_CHANGED As DataTable = ClassDatabase.Return_Datatable(sql_select)
- ' If Not IsNothing(DT_RIGHTS2B_CHANGED) Then
- ' If DT_RIGHTS2B_CHANGED.Rows.Count > 0 Then
- ' Try
- ' For Each rightRow As DataRow In DT_RIGHTS2B_CHANGED.Rows
- ' Dim GUID = rightRow.Item("GUID")
- ' Dim USER_ID = rightRow.Item("USER_ID")
- ' Dim USERNAME = rightRow.Item("USERNAME").ToString.ToUpper
- ' Dim TYPE = rightRow.Item("RIGHT_MODIFY")
- ' Dim FILE_RIGHT = rightRow.Item("FILE_RIGHT_ID")
- ' Dim upd
- ' Dim Result As Boolean
- ' Select Case TYPE
- ' Case "ADD RIGHT"
- ' Result = DD_Rights.ClassRights.SetRightExplicit(RESULT_DOCID, RESULT_DOC_PATH, USERNAME, FILE_RIGHT, ClassWindream.oSession)
- ' End Select
- ' 'upd = String.Format("UPDATE TBPMO_RIGHTS_WORK_SERVICE SET WORKING = 0 WHERE GUID = {0}", GUID)
- ' 'If clsDatabase.Execute_non_Query(upd) = True Then
- ' If Result = True Then
- ' upd = String.Format("UPDATE TBPMO_RIGHTS_WORK_SERVICE SET WORKED = 1 WHERE GUID = {0}", GUID)
- ' ClassDatabase.Execute_non_Query(upd)
- ' Dim msg = DD_Rights.ClassRights.MSG_RESULT
- ' ClassLogger.Add(msg, False)
- ' If DD_Rights.ClassRights.DeleteRightExplicit(RESULT_DOCID, RESULT_DOC_PATH, WD_GROUP1, ClassWindream.oSession) = False Then
- ' msg = DD_Rights.ClassRights.MSG_RESULT
- ' ClassLogger.Add(msg, False)
- ' Else
- ' Return True
- ' End If
-
- ' Else
- ' Dim msg = String.Format("ERROR: {0} ", DD_Rights.ClassRights.MSG_RESULT)
- ' ClassLogger.Add(msg, True)
- ' End If
- ' 'End If
-
-
- ' Next
- ' Catch ex As Exception
- ' ClassLogger.Add("Unexpected Error : " & ex.Message, True)
- ' End Try
- ' End If
- ' End If
- 'End If
If DD_Rights.ClassRights.File_DeleteAndSetRight(RESULT_DOCID, RESULT_DOC_PATH, True) Then
If DD_Rights.ClassRights.MSG_RESULT <> "" Then
Dim msg = "Achtung: einige Rechte konnten nicht gesetzt werden: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT
diff --git a/app/DD-Record-Organiser/ClassDatabase.vb b/app/DD-Record-Organiser/ClassDatabase.vb
index 4ca774f..ee1a867 100644
--- a/app/DD-Record-Organiser/ClassDatabase.vb
+++ b/app/DD-Record-Organiser/ClassDatabase.vb
@@ -20,7 +20,7 @@ Public Class ClassDatabase
Dim connectionString As String = ""
Try
'Me.TBCONNECTIONTableAdapter.FillByID(Me.DD_DMSLiteDataSet.TBCONNECTION, id)
- Dim DTConnection As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_CONNECTION WHERE GUID = " & id)
+ Dim DTConnection As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_CONNECTION WHERE GUID = " & id, True)
If DTConnection.Rows.Count = 1 Then
Select Case DTConnection.Rows(0).Item("SQL_PROVIDER")
Case "MS-SQLServer"
@@ -54,13 +54,21 @@ Public Class ClassDatabase
End Try
Return connectionString
End Function
- Public Shared Function Return_Datatable(Select_anweisung As String, Optional CallMethod As String = "")
+ Public Shared Function Return_Datatable(Select_anweisung As String, Optional USE_PROXY As Boolean = False)
Try
Dim sw As New SW("Return_Datatable: " & Select_anweisung)
Dim SQLconnect As New SqlClient.SqlConnection
Dim SQLcommand As SqlClient.SqlCommand
- SQLconnect.ConnectionString = connectionString
+ If USE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
+ SQLconnect.ConnectionString = ClassProxy.MyPROXYConnectionString
+ Else
+ SQLconnect.ConnectionString = connectionString
+ End If
+
+ If USE_PROXY = False Then
+ Console.WriteLine(Select_anweisung)
+ End If
SQLconnect.Open()
SQLcommand = SQLconnect.CreateCommand
SQLcommand.CommandText = Select_anweisung
@@ -74,9 +82,8 @@ Public Class ClassDatabase
Return dt
Catch ex As Exception
- MsgBox("Error in Return_Datatable: " & ex.Message & vbNewLine & vbNewLine & Select_anweisung & vbNewLine & vbNewLine & "Call-Method: " & CallMethod, MsgBoxStyle.Critical)
- ClassLogger.Add("Error in Return_Datatable: " & ex.Message & "Call-Method: " & CallMethod, True)
- If CallMethod <> "" Then ClassLogger.Add(">> Call-Method: " & CallMethod, False)
+ MsgBox("Error in Return_Datatable: " & ex.Message & vbNewLine & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
+ ClassLogger.Add("Error in Return_Datatable: " & ex.Message, True)
ClassLogger.Add(">> SQL: " & Select_anweisung, False)
Return Nothing
End Try
@@ -180,13 +187,17 @@ Public Class ClassDatabase
Return Nothing
End Try
End Function
- Public Shared Function Execute_non_Query(ExecuteCMD As String, Optional Userinput As Boolean = False)
+ Public Shared Function Execute_non_Query(ExecuteCMD As String, Optional USE_PROXY As Boolean = False)
Try
Dim sw As New SW("Execute_non_Query: " & ExecuteCMD)
Dim SQLconnect As New SqlClient.SqlConnection
Dim SQLcommand As SqlClient.SqlCommand
- SQLconnect.ConnectionString = MyConnectionString
+ If USE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
+ SQLconnect.ConnectionString = ClassProxy.MyPROXYConnectionString
+ Else
+ SQLconnect.ConnectionString = connectionString
+ End If
SQLconnect.Open()
SQLcommand = SQLconnect.CreateCommand
'Update Last Created Record in Foo
@@ -200,9 +211,9 @@ Public Class ClassDatabase
Return True
Catch ex As Exception
- If Userinput = True Then
- MsgBox("Error in Execute_non_Query: " & ex.Message & vbNewLine & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
- End If
+ 'If Userinput = True Then
+ ' MsgBox("Error in Execute_non_Query: " & ex.Message & vbNewLine & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
+ 'End If
ClassLogger.Add("Error in Execute_non_Query: " & ex.Message, True)
ClassLogger.Add("SQL: " & ExecuteCMD, False)
Return False
@@ -274,14 +285,21 @@ Public Class ClassDatabase
ClassLogger.Add(String.Format("Finished executing Async database operation: {0}", command.CommandText), False)
End Sub
- Public Shared Function Execute_Scalar(cmdscalar As String, Optional Userinput As Boolean = False)
+ Public Shared Function Execute_Scalar(cmdscalar As String, Optional USE_PROXY As Boolean = False)
Dim result
Try
Dim sw As New SW("Execute_Scalar: " & cmdscalar)
Dim SQLconnect As New SqlClient.SqlConnection
Dim SQLcommand As SqlClient.SqlCommand
- SQLconnect.ConnectionString = connectionString
+ If USE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
+ SQLconnect.ConnectionString = ClassProxy.MyPROXYConnectionString
+ Else
+ SQLconnect.ConnectionString = connectionString
+ End If
+ If USE_PROXY = False Then
+ Console.WriteLine(cmdscalar)
+ End If
SQLconnect.Open()
SQLcommand = SQLconnect.CreateCommand
'Update Last Created Record in Foo
@@ -294,9 +312,9 @@ Public Class ClassDatabase
Return result
Catch ex As Exception
- If Userinput = True Then
- MsgBox("Error in Execute_Scalar: " & ex.Message & vbNewLine & vbNewLine & cmdscalar, MsgBoxStyle.Critical)
- End If
+ 'If Userinput = True Then
+ ' MsgBox("Error in Execute_Scalar: " & ex.Message & vbNewLine & vbNewLine & cmdscalar, MsgBoxStyle.Critical)
+ 'End If
ClassLogger.Add("Error in Execute_Scalar: " & ex.Message, True)
ClassLogger.Add("SQL: " & cmdscalar, False)
Return Nothing
diff --git a/app/DD-Record-Organiser/ClassDragDrop.vb b/app/DD-Record-Organiser/ClassDragDrop.vb
index cbf617a..2fe0532 100644
--- a/app/DD-Record-Organiser/ClassDragDrop.vb
+++ b/app/DD-Record-Organiser/ClassDragDrop.vb
@@ -9,7 +9,7 @@ Public Class ClassDragDrop
files_dropped = Nothing
Dim sql As String = "DELETE FROM TBPMO_FILES_USER WHERE HANDLE_TYPE <> 'SCAN' AND UPPER(USER_WORK) = UPPER('" & USER_USERNAME & "')"
- ClassDatabase.Execute_non_Query(sql)
+ ClassDatabase.Execute_non_Query(sql, True)
If e.Data.GetDataPresent(DataFormats.FileDrop) Then
@@ -129,7 +129,6 @@ Public Class ClassDragDrop
Return True
'Drop eines Outlook Attachments
End If
-
Catch ex As Exception
MsgBox("Unexpected Error in Drop_File: " & ex.Message, MsgBoxStyle.Critical)
End Try
diff --git a/app/DD-Record-Organiser/ClassFileResult.vb b/app/DD-Record-Organiser/ClassFileResult.vb
index f5e82b6..a6b1676 100644
--- a/app/DD-Record-Organiser/ClassFileResult.vb
+++ b/app/DD-Record-Organiser/ClassFileResult.vb
@@ -48,8 +48,12 @@
Dim DT As DataTable = CURRENT_TBPMO_INDEX_MAN
If DT.Rows.Count > 0 Then
For Each row As DataRow In DT.Rows
- Dim insert As String = String.Format("INSERT INTO TBPMO_DOC_INDICES (DocID,INDEX_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", DocID, row.Item("GUID"), row.Item("MAN_VALUE"), USER_USERNAME)
- ClassDatabase.Execute_non_Query(insert)
+ If row.Item("MAN_VALUE") <> String.Empty Then
+ Dim MAN_INDEX_ID = row.Item("GUID")
+ Dim insert As String = String.Format("INSERT INTO TBPMO_DOC_INDICES (DocID,INDEX_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", DocID, MAN_INDEX_ID, row.Item("MAN_VALUE"), USER_USERNAME)
+ ClassDatabase.Execute_non_Query(insert)
+ End If
+
Next
End If
Return True
@@ -58,6 +62,15 @@
Return False
End Try
End Function
+ Public Shared Function Delete_Doc_Indices()
+ Try
+ Dim delete As String = String.Format("DELETE FROM TBPMO_DOC_INDICES WHERE DocID = {0}", DocID)
+ Return ClassDatabase.Execute_non_Query(delete)
+ Catch ex As Exception
+ ClassLogger.Add("Unexpected Error in Update_Doc_Indices: " & ex.Message, True)
+ Return False
+ End Try
+ End Function
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)
@@ -72,5 +85,104 @@
Return False
End Try
End Function
+ Public Shared Function CheckWrite_IndexeMan(grbxControls As GroupBox)
+ '#### Zuerst manuelle Werte indexieren ####
+ Try
+ If LogErrorsOnly = False Then ClassLogger.Add(" >>In CheckWrite_IndexeMan", False)
+ Dim result As Boolean = False
+ For Each ctrl As Control In grbxControls.Controls
+ ' ' MsgBox(ctrl.Name)
+ If ctrl.Name.StartsWith("txt") Then
+ Dim box As TextBox = ctrl
+ If box.Text = "" Then
+ Dim optional_index = ClassMoreMetadata.Return_CURRENT_TBPMO_INDEX_MAN_VALUE(box.Tag, "OPTIONAL") 'ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBPMO_INDEX_MAN WHERE GUID = " & box.Tag, True)
+ If Not IsNothing(optional_index) Then
+ If CBool(optional_index) = False Then
+ MsgBox("Please insert a value!", MsgBoxStyle.Exclamation, "Missing input:")
+ box.Focus()
+ Return False
+ Else
+ SET_CURRENT_TBPMO_INDEX_MAN_VALUE(box.Tag, "")
+ 'Indexwert_Postprocessing(Replace(box.Name, "txt", ""), "")
+ result = True
+ End If
+ Else
+ Return False
+ End If
+ Else
+ 'If Indexwert_checkValueDB(Replace(box.Name, "txt", ""), box.Text) = False Then
+ ' ClassLogger.Add(" - Der eingegebene Wert wurde nicht in der Datenbank gefunden", False)
+ ' MsgBox("Der eingegebene Wert wurde nicht in der Datenbank gefunden!", MsgBoxStyle.Exclamation, "Fehlerhafte Indexierung:")
+ ' box.Focus()
+ ' Return False
+ 'Else
+ ' 'Indexwert_Postprocessing(Replace(box.Name, "txt", ""), box.Text)
+ SET_CURRENT_TBPMO_INDEX_MAN_VALUE(box.Tag, "")
+ result = True
+ 'End If
+ End If
+ End If
+ If ctrl.Name.StartsWith("cmb") Then
+ Dim cmb As ComboBox = ctrl
+ If cmb.Text = "" Then
+ Dim optional_index = ClassMoreMetadata.Return_CURRENT_TBPMO_INDEX_MAN_VALUE(cmb.Tag, "OPTIONAL") 'ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBPMO_INDEX_MAN WHERE GUID = " & box.Tag, True)
+ If Not IsNothing(optional_index) Then
+ If CBool(optional_index) = False Then
+ MsgBox("Please choose a value!", MsgBoxStyle.Exclamation, "Missing input:")
+ cmb.Focus()
+ Return False
+ Else
+ SET_CURRENT_TBPMO_INDEX_MAN_VALUE(cmb.Tag, "")
+ 'Indexwert_Postprocessing(Replace(box.Name, "txt", ""), "")
+ result = True
+ End If
+ End If
+ Else
+ SET_CURRENT_TBPMO_INDEX_MAN_VALUE(cmb.Tag, cmb.Text)
+ ' Indexwert_Postprocessing(Replace(cmb.Name, "cmb", ""), cmb.Text)
+ result = True
+ End If
+ End If
+ If ctrl.Name.StartsWith("dtp") Then
+ Dim dtp As DateTimePicker = ctrl
+ SET_CURRENT_TBPMO_INDEX_MAN_VALUE(dtp.Tag, dtp.Value)
+ 'Indexwert_Postprocessing(Replace(dtp.Name, "dtp", ""), dtp.Text)
+ result = True
+ End If
+ If ctrl.Name.StartsWith("chk") Then
+ Dim chk As CheckBox = ctrl
+ SET_CURRENT_TBPMO_INDEX_MAN_VALUE(chk.Tag, chk.Checked)
+ 'Indexwert_Postprocessing(Replace(chk.Name, "chk", ""), chk.Checked)
+ result = True
+ End If
+ If ctrl.Name.StartsWith("lbl") = False And result = False Then
+ ClassLogger.Add("Die Überprüfung der manuellen Indices ist fehlerhaft. Bitte informieren Sie den Systembetreuer", True)
+ Return False
+ End If
+ Next
+
+
+ Return True
+
+ Catch ex As Exception
+ ClassLogger.Add(" - Unvorhergesehener Fehler in CheckWrite_IndexeMan - Fehler: " & vbNewLine & ex.Message)
+ MsgBox(ex.Message, MsgBoxStyle.Critical, "Unerwarteter Unexpected error in CheckWrite_IndexeMan:")
+ Return False
+ End Try
+ End Function
+
+ Private Shared Function SET_CURRENT_TBPMO_INDEX_MAN_VALUE(CONTROL_GUID As Integer, VALUE As String)
+ Try
+ For Each row As DataRow In CURRENT_TBPMO_INDEX_MAN.Rows
+ If row.Item("GUID") = CONTROL_GUID Then
+ row.Item("MAN_VALUE") = VALUE
+ Return True
+ End If
+ Next
+ Catch ex As Exception
+ ClassLogger.Add(" - Unvorhergesehener Fehler in SET_CURRENT_TBPMO_INDEX_MAN_VALUE - Fehler: " & vbNewLine & ex.Message)
+ Return Nothing
+ End Try
+ End Function
End Class
diff --git a/app/DD-Record-Organiser/ClassFolderWatcher.vb b/app/DD-Record-Organiser/ClassFolderWatcher.vb
index 76daca7..6324834 100644
--- a/app/DD-Record-Organiser/ClassFolderWatcher.vb
+++ b/app/DD-Record-Organiser/ClassFolderWatcher.vb
@@ -84,16 +84,24 @@ Public Class ClassFolderWatcher
'Die Datei übergeben
If LogErrorsOnly = False Then ClassLogger.Add(" >> OnCreated-File:" & e.FullPath, False)
If FileExistsinDropTable(CURRENT_FILENAME) = False Then
- Insert_SCAN_File(e.FullPath, handleType)
+ Insert_USER_File(e.FullPath, handleType)
Else
Console.WriteLine("File existiert bereits")
End If
-
+ Create_USER_FILE_TABLE()
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei folder_watch_Created")
End Try
End Sub
+ Public Shared Sub Create_USER_FILE_TABLE()
+ Try
+ Dim sql = String.Format("SELECT * FROM TBPMO_FILES_USER WHERE (UPPER(USER_WORK) = UPPER('{0}')) AND WORKED = 0", USER_USERNAME)
+ Dim CURRENT_TBPMO_FILES_USER As DataTable = ClassDatabase.Return_Datatable(sql, True)
+ Catch ex As Exception
+ MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error while creating User_File_Table")
+ End Try
+ End Sub
Public Shared Function FileExistsinDropTable(Filename As String)
Dim check As String
Try
@@ -106,7 +114,7 @@ Public Class ClassFolderWatcher
End Try
End Function
- Private Shared Function Insert_SCAN_File(filename As String, handleType As String)
+ Public Shared Function Insert_USER_File(filename As String, handleType As String)
Try
Dim filename_only As String = Path.GetFileName(filename)
@@ -117,5 +125,34 @@ Public Class ClassFolderWatcher
Return False
End Try
End Function
-
+ Public Shared Function DELETE_SCAN_File(filename As String)
+ Try
+ Dim filename_only As String = Path.GetFileName(filename)
+
+ Dim del As String = String.Format("DELETE FROM TBPMO_FILES_USER WHERE UPPER(FILENAME2WORK) = UPPER('{0}')", filename)
+ Return ClassDatabase.Execute_non_Query(del, True)
+ Catch ex As Exception
+ MsgBox("Unexpected Error in DELETE_SCAN_File: " & ex.Message, MsgBoxStyle.Critical)
+ Return False
+ End Try
+ End Function
+ Public Shared Function DELETE_SCAN_File_User()
+ Try
+ Dim del As String = String.Format("DELETE FROM TBPMO_FILES_USER WHERE UPPER(USER_WORK) = UPPER('{0}') AND HANDLE_TYPE = 'SCAN'", USER_USERNAME)
+ Return ClassDatabase.Execute_non_Query(del, True)
+ Catch ex As Exception
+ MsgBox("Unexpected Error in DELETE_SCAN_File_User: " & ex.Message, MsgBoxStyle.Critical)
+ Return False
+ End Try
+ End Function
+
+ Public Shared Function Check_Scan_Files()
+ Try
+ Dim sql1 As String = String.Format("select * from TBPMO_FILES_USER where HANDLE_TYPE = 'SCAN' and WORKED = 0 AND UPPER(USER_WORK) = '{0}'", USER_USERNAME)
+ Return ClassDatabase.Return_Datatable(sql1, True)
+ Catch ex As Exception
+ MsgBox("Unexpected Error in DELETE_SCAN_File_User: " & ex.Message, MsgBoxStyle.Critical)
+ Return Nothing
+ End Try
+ End Function
End Class
diff --git a/app/DD-Record-Organiser/ClassFormCommands.vb b/app/DD-Record-Organiser/ClassFormCommands.vb
index a5e2933..b293b63 100644
--- a/app/DD-Record-Organiser/ClassFormCommands.vb
+++ b/app/DD-Record-Organiser/ClassFormCommands.vb
@@ -3,7 +3,7 @@
Public Shared Function LoadForm(guid) As DataTable
Try
Dim SQL As String = "SELECT NAME, LEVEL FROM TBPMO_FORM WHERE GUID = " & guid
- Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL)
+ Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL, True)
If DT.Rows.Count = 1 Then
Return DT
@@ -19,7 +19,7 @@
Public Shared Function LoadFormView(guid) As DataTable
Try
Dim SQL As String = "SELECT FORM_TITLE FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & guid
- Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL)
+ Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL, True)
If DT.Rows.Count = 1 Then
Return DT
diff --git a/app/DD-Record-Organiser/ClassFunctionCommands.vb b/app/DD-Record-Organiser/ClassFunctionCommands.vb
index 3b736bc..7466ab6 100644
--- a/app/DD-Record-Organiser/ClassFunctionCommands.vb
+++ b/app/DD-Record-Organiser/ClassFunctionCommands.vb
@@ -20,18 +20,6 @@
Return False
End Try
End Function
-
- 'Public Shared Function UpdateFunction(ControlId As Integer, FromDateId As Integer, ToDateId As Integer, SubjectId As Integer)
- ' Try
- ' Dim SQL As String = "UPDATE TBPMO_FUNCTION_ADD_APPOINTMENT SET FROM_DATE = " & FromDateId & ", TO_DATE = " & ToDateId & ", SUBJECT = " & SubjectId & " WHERE CONTROL_ID = " & ControlId
- ' ClassDatabase.Execute_non_Query(SQL)
- ' Return True
- ' Catch ex As Exception
- ' MsgBox("Fehler beim Aktalisieren der KalenderFunktion:" & vbNewLine & ex.Message)
- ' Return False
- ' End Try
- 'End Function
-
Public Shared Function UpdateAddAppointmentFunction(ControlId As Integer, FromDateId As Integer, ToDateId As Integer, SubjectString As String, Subject2String As String, PlaceString As String, DescriptionString As String)
Try
Dim SQL As String = "UPDATE TBPMO_FUNCTION_GENERAL SET INTEGER1 = " & FromDateId & ", INTEGER2 = " & ToDateId & ", STRING1 = '" & SubjectString & "', STRING2 = '" & Subject2String & "', STRING3 = '" & PlaceString & "', STRING4 = '" & DescriptionString & "' WHERE CONTROL_ID = " & ControlId
@@ -106,7 +94,7 @@
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) = True Then
+ If ClassDatabase.Execute_non_Query(SQL) = True Then
Return True
Else : Return False
End If
diff --git a/app/DD-Record-Organiser/ClassFunctionCommandsUI.vb b/app/DD-Record-Organiser/ClassFunctionCommandsUI.vb
index fa39e3a..450c8b9 100644
--- a/app/DD-Record-Organiser/ClassFunctionCommandsUI.vb
+++ b/app/DD-Record-Organiser/ClassFunctionCommandsUI.vb
@@ -9,7 +9,7 @@ Public Class ClassFunctionCommandsUI
reminder.AlertTime = DueDateTime
apt.Reminders.Add(reminder)
- Dim Value = ClassDatabase.Execute_Scalar(SQL)
+ Dim Value = ClassDatabase.Execute_Scalar(SQL, True)
If Value Is Nothing Then
apt.Subject = Subject & " - " & Value.ToString()
Else
@@ -37,7 +37,7 @@ Public Class ClassFunctionCommandsUI
reminder.AlertTime = DueDateTime
apt.Reminders.Add(reminder)
- Dim Value = ClassDatabase.Execute_Scalar(SQL)
+ Dim Value = ClassDatabase.Execute_Scalar(SQL, True)
apt.Subject = Subject & " - " & Value.ToString()
apt.Description = Description
diff --git a/app/DD-Record-Organiser/ClassGridFormatter.vb b/app/DD-Record-Organiser/ClassGridFormatter.vb
new file mode 100644
index 0000000..8b905b4
--- /dev/null
+++ b/app/DD-Record-Organiser/ClassGridFormatter.vb
@@ -0,0 +1,215 @@
+Imports DevExpress.Utils
+
+Imports DevExpress.XtraGrid
+Imports DevExpress.XtraGrid.Columns
+Imports DevExpress.XtraGrid.Views.Grid
+
+Imports DevExpress.XtraEditors
+Imports DevExpress.XtraEditors.Repository
+
+
+Public Class ClassGridFormatter
+
+ Private Shared tDate As Type = GetType(Date)
+ Private Shared tBool As Type = GetType(Boolean)
+
+
+
+ Public Enum DataTableType
+ CONSTRUCTOR_VIEW
+ WINDREAM_RESULT
+ End Enum
+
+ '''
+ ''' Die Formatierungsfunktionen für die ConstruktorView Tabellen
+ '''
+ Public Class ConstructorView
+ Private EntityId As Integer
+ Private DT As DataTable
+
+ Private dateEdit As New RepositoryItemTimeEdit()
+ Private checkboxEdit = New RepositoryItemCheckEdit()
+
+ Public checkboxColumns As New List(Of String)
+ Public dateColumns As New List(Of String)
+
+ Public Sub New(DT As DataTable, EntityId As Integer)
+ Me.EntityId = EntityId
+ Me.DT = DT
+
+ ' dateEdit vor-formatieren
+ dateEdit.DisplayFormat.FormatType = FormatType.DateTime
+ dateEdit.DisplayFormat.FormatString = CURRENT_DATE_FORMAT
+ dateEdit.Mask.MaskType = Mask.MaskType.DateTime
+ dateEdit.Mask.EditMask = CURRENT_DATE_FORMAT
+ dateEdit.Mask.UseMaskAsDisplayFormat = True
+
+ ' checkboxEdit vor-formatieren
+ checkboxEdit.ValueChecked = True
+ checkboxEdit.ValueUnchecked = False
+ End Sub
+
+ Public Function FormatDatatable() As DataTable
+ Try
+ ' Datatable klonen, um Spalten zu formatieren
+ Dim clonedDT As DataTable = Me.DT.Clone()
+
+ ' Checkbox Spalten bestimmen
+ Me.checkboxColumns = GetCheckboxColumns()
+
+ ' Checkbox Spalten formatieren
+ For Each columnName As String In Me.checkboxColumns
+ Dim column As DataColumn = clonedDT.Columns(columnName)
+
+ If Not IsNothing(column) Then
+ column.DataType = tBool
+ End If
+ Next
+
+ ' Datums Spalten bestimmen
+ Me.dateColumns = GetDateColumns()
+
+ ' Datums Spalten Formatieren
+ For Each columnName As String In Me.dateColumns
+ Dim column As DataColumn = clonedDT.Columns(columnName)
+
+ If Not IsNothing(column) Then
+ column.DataType = tDate
+ End If
+ Next
+
+ ' Daten aus DT in formatierte DataTable clonedDT laden
+ clonedDT.Load(DT.CreateDataReader)
+ Return clonedDT
+ Catch ex As Exception
+ ClassLogger.Add("Unexpected Error in FormatDatatable: " & ex.Message, True)
+ Return DT
+ End Try
+ End Function
+
+ Public Sub FormatGridView(gridView As GridView)
+ If IsNothing(gridView.GridControl.DataSource) Then
+ Throw New Exception("Error in FormatGridView: DataSource is Empty!")
+ End If
+
+ ' Editoren zum Grid hinzufügen
+ gridView.GridControl.RepositoryItems.AddRange({checkboxEdit, dateEdit})
+
+ For Each columnName As String In Me.dateColumns
+ Dim column As GridColumn = gridView.Columns(columnName)
+
+ If Not IsNothing(column) Then
+ column.DisplayFormat.FormatType = FormatType.DateTime
+ column.DisplayFormat.FormatString = CURRENT_DATE_FORMAT
+ column.OptionsFilter.FilterPopupMode = FilterPopupMode.Date
+ column.FilterMode = ColumnFilterMode.Value ' was DisplayText
+ column.ColumnEdit = dateEdit
+ End If
+ Next
+
+ For Each columnName As String In Me.checkboxColumns
+ Dim column As GridColumn = gridView.Columns(columnName)
+
+ If Not IsNothing(column) Then
+ column.ColumnEdit = checkboxEdit
+ End If
+ Next
+
+ End Sub
+
+ Private Function GetCheckboxColumns()
+ Try
+ Dim listcheck As New List(Of String)
+ ' Alle Checkboxen für aktuelle Ansicht heraussuchen
+ Dim sqlcheck As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID in (10,11) AND SHOW_COLUMN = 1 AND FORM_ID = " & Me.EntityId
+ Dim dtcheck As DataTable = ClassDatabase.Return_Datatable(sqlcheck, True)
+ 'Liste von allen Spaltentiteln mit Checkbox erstellen
+ If dtcheck.Rows.Count > 0 Then
+ For Each row As DataRow In dtcheck.Rows
+ listcheck.Add(row.Item(0))
+ Next
+ End If
+ listcheck.Add("files?")
+ Return listcheck
+ Catch ex As Exception
+ ClassLogger.Add("Unexpected Error in GetCheckboxColumns: " & ex.Message, True)
+ Return Nothing
+ End Try
+ End Function
+ Private Function GetDateColumns()
+ Try
+ Dim listdate As New List(Of String)
+ ' Alle Checkboxen für aktuelle Ansicht heraussuchen
+ Dim sqlcheck As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID = 4 AND SHOW_COLUMN = 1 AND FORM_ID = " & Me.EntityId
+ Dim dtdate As DataTable = ClassDatabase.Return_Datatable(sqlcheck, True)
+ 'Liste von allen Spaltentiteln mit Checkbox erstellen
+ If dtdate.Rows.Count > 0 Then
+ For Each row As DataRow In dtdate.Rows
+ listdate.Add(row.Item(0))
+ Next
+ End If
+ Return listdate
+ Catch ex As Exception
+ ClassLogger.Add("Unexpected Error in GetCheckboxColumns: " & ex.Message, True)
+ Return Nothing
+ End Try
+ End Function
+ End Class
+
+ '''
+ ''' Die Formatierungsfunktionen für die WindreamResult Tabellen
+ '''
+ Public Class WindreamResult
+
+ End Class
+
+End Class
+
+' FOR REFERENCE IN CASE SOMETHING BREAKS :)
+'Public Shared Function Format_GridColumns(Primary_DT As DataTable, _ENTITYSQL As String, listcheck As List(Of String), listdate As List(Of String))
+' Try
+' Dim tbltemp As DataTable = Primary_DT.Clone()
+' ' Nicht benötigt? Datumsspalten werden im Grid formatiert
+' For Each col As String In listdate
+' Dim colDate As DataColumn = tbltemp.Columns(col)
+' If Not IsNothing(colDate) Then
+' Try
+' colDate.DataType = GetType(Date)
+' Catch ex As Exception
+' MsgBox("Error in Format_GridColumns:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+' End Try
+' End If
+' Next
+' For Each col1 As String In listcheck
+' Dim collist As DataColumn = tbltemp.Columns(col1)
+' If Not IsNothing(collist) Then
+' collist.DataType = GetType(Boolean)
+' End If
+' Next
+' Try
+' Dim collist As DataColumn = tbltemp.Columns("files?")
+' If Not IsNothing(collist) Then
+' collist.DataType = GetType(Boolean)
+' End If
+' Catch ex As Exception
+
+' End Try
+' Try
+' tbltemp.Load(Primary_DT.CreateDataReader)
+' Return tbltemp
+' Catch ex As Exception
+' ClassLogger.Add(">> Attention: Format_GridColumns - Could not load converted datatable: " & ex.Message, False)
+' 'Tabelle wird ohne Datekonvertierung geladen
+' Dim DTEntity As DataTable = ClassDatabase.Return_Datatable(_ENTITYSQL, "Load_Entity_Data_Only")
+' Dim primaryKey(1) As DataColumn
+' primaryKey(0) = DTEntity.Columns("Record-ID")
+' DTEntity.PrimaryKey = primaryKey
+' Return DTEntity
+' End Try
+' Catch ex As Exception
+' MsgBox("Unexpected Error in Format_GridColumns:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+' ClassLogger.Add("Error in Format_GridColumns: " & ex.Message, True)
+' Return Nothing
+' End Try
+
+'End Function
diff --git a/app/DD-Record-Organiser/ClassHelper.vb b/app/DD-Record-Organiser/ClassHelper.vb
index 6241028..4144de7 100644
--- a/app/DD-Record-Organiser/ClassHelper.vb
+++ b/app/DD-Record-Organiser/ClassHelper.vb
@@ -135,6 +135,19 @@ Public Class ClassHelper
ClassLogger.Add("Error in File_open: " & ex.Message & vbNewLine & " - Path: " & RESULT_DOC_PATH & " - DocID: " & DocID, True)
End Try
End Sub
+ Public Shared Sub Open_Folder(RESULT_DOC_PATH As Object, DocID As String)
+ Try
+ If RESULT_DOC_PATH <> Nothing Then
+ Dim _path = Path.GetDirectoryName(RESULT_DOC_PATH)
+ FOLDER_OPEN(_path, DocID)
+ Else
+ If LogErrorsOnly = False Then ClassLogger.Add(" >> RESULT_DOC_PATH IS NOTHING")
+ End If
+ Catch ex As Exception
+ MsgBox("Unexpected Error in Open_Folder:" & vbNewLine & ex.Message & vbNewLine & RESULT_DOC_PATH & vbNewLine & "DocID: " & DocID, MsgBoxStyle.Critical)
+ ClassLogger.Add("Error in Open_Folder: " & ex.Message & vbNewLine & " - Path: " & RESULT_DOC_PATH & " - DocID: " & DocID, True)
+ End Try
+ End Sub
Public Shared Sub OPEN_DOCVIEW(Doc_Path As String, DocID As Integer)
Try
Dim DocView
@@ -158,7 +171,7 @@ Public Class ClassHelper
If System.IO.File.Exists(RESULT_DOC_PATH) = True Then
Process.Start(RESULT_DOC_PATH)
Else
- MsgBox("File Does Not Exist!", MsgBoxStyle.Exclamation)
+ MsgBox("File '" & RESULT_DOC_PATH & "' not existing or accessible!", MsgBoxStyle.Exclamation)
End If
@@ -168,98 +181,32 @@ Public Class ClassHelper
ClassLogger.Add("Error in File_SYSOPEN: " & ex.Message & vbNewLine & " - Path: " & RESULT_DOC_PATH & " - DocID: " & DocID, True)
End Try
+ End Sub
+ Private Shared Sub FOLDER_OPEN(PATH As Object, DocID As String)
+ Try
+ If PATH <> Nothing Then
+
+ If System.IO.Directory.Exists(PATH) = True Then
+ Process.Start(PATH)
+ Else
+ MsgBox("Folder '" & PATH & "' not existing or accessible!", MsgBoxStyle.Exclamation)
+ End If
+
+
+ End If
+ Catch ex As Exception
+ MsgBox("Unexpected Error in FOLDER_OPEN:" & vbNewLine & ex.Message & vbNewLine & PATH & vbNewLine & "DocID: " & DocID, MsgBoxStyle.Critical)
+ ClassLogger.Add("Error in FOLDER_OPEN: " & ex.Message & vbNewLine & " - Path: " & PATH & " - DocID: " & DocID, True)
+ End Try
+
End Sub
Shared Function Convert_Date_2_Form_Format(p1 As Date) As Date
Throw New NotImplementedException
End Function
- Public Shared Function Return_listcheck(ENTITY_ID As Integer)
-
- Try
- Dim listcheck As New List(Of String)
- ' Alle Checkboxen für aktuelle Ansicht heraussuchen
- Dim sqlcheck As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID in (10,11) AND SHOW_COLUMN = 1 AND FORM_ID = " & ENTITY_ID
- Dim dtcheck As DataTable = ClassDatabase.Return_Datatable(sqlcheck)
- 'Liste von allen Spaltentiteln mit Checkbox erstellen
- If dtcheck.Rows.Count > 0 Then
- For Each row As DataRow In dtcheck.Rows
- listcheck.Add(row.Item(0))
- Next
- End If
- Return listcheck
- Catch ex As Exception
- ClassLogger.Add("Unexpected Error in Return_listcheck: " & ex.Message, True)
- Return Nothing
- End Try
- End Function
- Public Shared Function Return_listdate(ENTITY_ID As Integer)
- Try
- Dim listdate As New List(Of String)
- ' Alle Checkboxen für aktuelle Ansicht heraussuchen
- Dim sqlcheck As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID = 4 AND SHOW_COLUMN = 1 AND FORM_ID = " & ENTITY_ID
- Dim dtdate As DataTable = ClassDatabase.Return_Datatable(sqlcheck)
- 'Liste von allen Spaltentiteln mit Checkbox erstellen
- If dtdate.Rows.Count > 0 Then
- For Each row As DataRow In dtdate.Rows
- listdate.Add(row.Item(0))
- Next
- End If
- Return listdate
- Catch ex As Exception
- ClassLogger.Add("Unexpected Error in Return_listdate: " & ex.Message, True)
- Return Nothing
- End Try
- End Function
- Public Shared Function Format_GridColumns(Primary_DT As DataTable, _ENTITYSQL As String, listcheck As List(Of String), listdate As List(Of String))
- Try
- Dim tbltemp As DataTable = Primary_DT.Clone()
- ' Nicht benötigt? Datumsspalten werden im Grid formatiert
- For Each col As String In listdate
- Dim colDate As DataColumn = tbltemp.Columns(col)
- If Not IsNothing(colDate) Then
- Try
- colDate.DataType = GetType(Date)
- Catch ex As Exception
- MsgBox("Error in Format_GridColumns:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
- End Try
- End If
- Next
- For Each col1 As String In listcheck
- Dim collist As DataColumn = tbltemp.Columns(col1)
- If Not IsNothing(collist) Then
- collist.DataType = GetType(Boolean)
- End If
- Next
- Try
- Dim collist As DataColumn = tbltemp.Columns("files?")
- If Not IsNothing(collist) Then
- collist.DataType = GetType(Boolean)
- End If
- Catch ex As Exception
-
- End Try
- Try
- tbltemp.Load(Primary_DT.CreateDataReader)
- Return tbltemp
- Catch ex As Exception
- ClassLogger.Add(">> Attention: Format_GridColumns - Could not load converted datatable: " & ex.Message, False)
- 'Tabelle wird ohne Datekonvertierung geladen
- Dim DTEntity As DataTable = ClassDatabase.Return_Datatable(_ENTITYSQL, "Load_Entity_Data_Only")
- Dim primaryKey(1) As DataColumn
- primaryKey(0) = DTEntity.Columns("Record-ID")
- DTEntity.PrimaryKey = primaryKey
- Return DTEntity
- End Try
- Catch ex As Exception
- MsgBox("Unexpected Error in Format_GridColumns:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
- ClassLogger.Add("Error in Format_GridColumns: " & ex.Message, True)
- Return Nothing
- End Try
-
- End Function
Public Shared Function InsertEssential_Log(REFERENCE_KEY As Integer, REFERENCE_STRING As String, COMMENT As String)
Try
Dim insert = String.Format("INSERT INTO TBPMO_LOG_ESSENTIALS (REFERENCE_KEY,REFERENCE_STRING,COMMENT,ADDED_WHO) VALUES ({0},'{1}','{2}','{3}')", REFERENCE_KEY, REFERENCE_STRING, COMMENT, USER_USERNAME)
- Return ClassDatabase.Execute_non_Query(insert)
+ Return ClassDatabase.Execute_non_Query(insert, False)
Catch ex As Exception
ClassLogger.Add("Unexpected Error in InsertEssential_Log: " & ex.Message, True)
Return False
diff --git a/app/DD-Record-Organiser/ClassImport_Windream.vb b/app/DD-Record-Organiser/ClassImport_Windream.vb
index 198adc1..30a29b6 100644
--- a/app/DD-Record-Organiser/ClassImport_Windream.vb
+++ b/app/DD-Record-Organiser/ClassImport_Windream.vb
@@ -7,7 +7,7 @@ Public Class ClassImport_Windream
Try
Dim err As Boolean = False
CURRENT_FILENAME = QuellDatei_Path
- Dim DT_DOCTYPE As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & DOCTYPE_ID)
+ Dim DT_DOCTYPE As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & DOCTYPE_ID, True)
If Not IsNothing(DT_DOCTYPE) Then
Dim Targetpath As String = DT_DOCTYPE.Rows(0).Item("ZIEL_PFAD")
Dim Dokart As String = DT_DOCTYPE.Rows(0).Item("BEZEICHNUNG")
@@ -56,7 +56,7 @@ Public Class ClassImport_Windream
End If
'den Entity-Key auslesen
sql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE where Upper(object_type) = Upper('" & ClassWindream._WDObjekttyp & "')"
- dt = ClassDatabase.Return_Datatable(sql)
+ dt = ClassDatabase.Return_Datatable(sql, True)
If Not dt Is Nothing Then
If dt.Rows.Count = 1 Then
Dim indexname = dt.Rows(0).Item("IDXNAME_ENTITYID").ToString
@@ -138,7 +138,7 @@ Public Class ClassImport_Windream
Dim err As Boolean = False
Dim Zielordner As String
Dim extension As String = Path.GetExtension(CURRENT_FILENAME)
- Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & DocTypeID)
+ Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & DocTypeID, True)
'sql_history_INSERT_INTO = "INSERT INTO TBGI_HISTORY (FILENAME_ORIGINAL,FILENAME_NEW"
'sql_history_Index_Values = ""
Dim AnzahlIndexe As Integer = 1
@@ -313,7 +313,7 @@ Public Class ClassImport_Windream
value = ""
Else
Dim sql1 = "SELECT * FROM TBPMO_WD_NAMECONVENTION_FORMAT WHERE ID = (SELECT TOP 1 GUID FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = " & DocTypeID & " AND FORMVIEW_ID = " & CURRENT_FORMVIEW_ID & ")"
- Dim DT_FORMAT As DataTable = ClassDatabase.Return_Datatable(sql1)
+ Dim DT_FORMAT As DataTable = ClassDatabase.Return_Datatable(sql1, True)
If Not IsNothing(DT_FORMAT) Then
If DT_FORMAT.Rows.Count > 0 Then
Dim result
@@ -556,7 +556,7 @@ Public Class ClassImport_Windream
Dim INDEX_ID = split(1)
If IsNumeric(INDEX_ID) Then
Dim sql = "SELECT SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE GUID = " & INDEX_ID
- Dim sql_command = ClassDatabase.Execute_Scalar(sql, True)
+ Dim sql_command = ClassDatabase.Execute_Scalar(sql)
If IsNothing(sql_command) Then
ClassLogger.Add(" >> unexpected: SQL_RESULT is nothing!!", False)
ClassLogger.Add(" >> " & sql, False)
@@ -679,7 +679,7 @@ Public Class ClassImport_Windream
ClassLogger.Add(">> SQL-Command: " & CURRENT_LAST_SQL)
Else
Dim sql1 = "SELECT * FROM TBPMO_WD_NAMECONVENTION_FORMAT WHERE ID = (SELECT TOP 1 GUID FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = " & DocTypeID & " AND FORMVIEW_ID = " & CURRENT_FORMVIEW_ID & ")"
- Dim DT_FORMAT As DataTable = ClassDatabase.Return_Datatable(sql1)
+ Dim DT_FORMAT As DataTable = ClassDatabase.Return_Datatable(sql1, True)
If Not IsNothing(DT_FORMAT) Then
If DT_FORMAT.Rows.Count > 0 Then
Dim result
diff --git a/app/DD-Record-Organiser/ClassInit.vb b/app/DD-Record-Organiser/ClassInit.vb
index 847ae53..514539d 100644
--- a/app/DD-Record-Organiser/ClassInit.vb
+++ b/app/DD-Record-Organiser/ClassInit.vb
@@ -19,9 +19,8 @@ Public Class ClassInit
If LoadFileExclusion() = False Then
MsgBox("The Exclude File Structure for files in Folderwatch could not be initialized!", MsgBoxStyle.Information)
End If
-
+ clsDatabase.GUI = True
If MyConnectionString <> String.Empty Then
-
dbResult = clsDatabase.Init(MyConnectionString)
Else
frmConfig_Basic.ShowDialog()
@@ -93,7 +92,7 @@ Public Class ClassInit
Throw New Exception("Find more information in the logfile.")
End If
Dim sql = String.Format("SELECT * FROM TBPMO_KONFIGURATION WHERE GUID = 1")
- Dim KONFIG_DT As DataTable = ClassDatabase.Return_Datatable(sql)
+ Dim KONFIG_DT As DataTable = ClassDatabase.Return_Datatable(sql, False)
If KONFIG_DT.Rows.Count = 1 Then
Try
MY_WIKISTRING = KONFIG_DT.Rows(0).Item("WIKI_STRING")
@@ -120,7 +119,7 @@ Public Class ClassInit
Dim sql = String.Format("SELECT * FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('{0}'))", USER_USERNAME)
ClassLogger.Add(">> Login at: " & Now.ToString, False)
ClassLogger.Add(">> Username: " & USER_USERNAME, False)
- Dim USER_DT As DataTable = ClassDatabase.Return_Datatable(sql)
+ Dim USER_DT As DataTable = ClassDatabase.Return_Datatable(sql, False)
If USER_DT.Rows.Count = 0 Then
ClassLogger.Add(" - User '" & USER_USERNAME & "' not listed in Useradminsitration!", False)
'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
@@ -137,7 +136,7 @@ Public Class ClassInit
USER_DATE_FORMAT = USER_DT.Rows(0).Item("DATE_FORMAT")
USER_GENERAL_VIEWER = USER_DT.Rows(0).Item("GENERAL_VIEWER")
'USER_LANGUAGE = ClassDatabase.Execute_Scalar("SELECT LANGUAGE FROM TBDD_USER WHERE GUID = " & USER_GUID, False)
- DT_CLIENT_USER = ClassDatabase.Return_Datatable("SELECT T.*, T1.LICENSE_PMO, T1.CLIENT_NAME FROM TBDD_CLIENT_USER T,TBDD_CLIENT T1 WHERE T.CLIENT_ID = T1.GUID AND T.USER_ID = " & USER_GUID)
+ DT_CLIENT_USER = ClassDatabase.Return_Datatable("SELECT T.*, T1.LICENSE_PMO, T1.CLIENT_NAME FROM TBDD_CLIENT_USER T,TBDD_CLIENT T1 WHERE T.CLIENT_ID = T1.GUID AND T.USER_ID = " & USER_GUID, False)
If DT_CLIENT_USER.Rows.Count > 1 Then
frmClientLogin.ShowDialog()
ElseIf DT_CLIENT_USER.Rows.Count = 1 Then
@@ -171,7 +170,7 @@ Public Class ClassInit
sql = String.Format("UPDATE TBDD_USER SET LOGGED_IN = 1, LOGGED_WHERE = '{0}' WHERE GUID = {1}", Environment.MachineName, USER_GUID)
ClassDatabase.Execute_non_Query(sql)
sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'RECORD_ORGANIZER'"
- If ClassDatabase.Execute_non_Query(sql, True) = True Then
+ If ClassDatabase.Execute_non_Query(sql) = True Then
End If
@@ -193,7 +192,7 @@ Public Class ClassInit
End If
sql = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('RECORD_ORGANIZER') AND CLIENT_ID = {0}", CLIENT_SELECTED)
- Dim anzahl = ClassDatabase.Execute_Scalar(sql)
+ Dim anzahl = ClassDatabase.Execute_Scalar(sql, False)
USERS_LOGGED_IN = CInt(anzahl)
If LogErrorsOnly = False Then ClassLogger.Add(" >> User# logged in: " & anzahl.ToString, False)
'####
@@ -210,7 +209,7 @@ Public Class ClassInit
If USER_IS_ADMIN = False Then
'Anmeldung wieder herausnehmen
sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'RECORD_ORGANIZER'"
- ClassDatabase.Execute_non_Query(sql, True)
+ ClassDatabase.Execute_non_Query(sql)
ClassLogger.Add(" - logged out the user", False)
Return False
End If
@@ -218,7 +217,7 @@ Public Class ClassInit
Try
'Die FolderWatch starten
Dim sql1 = "SELECT FOLDER_PATH FROM TBPMO_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & USER_GUID
- Dim folderwatch_SCAN = ClassDatabase.Execute_Scalar(sql1, True)
+ Dim folderwatch_SCAN = ClassDatabase.Execute_Scalar(sql1, False)
If Not folderwatch_SCAN Is Nothing Then
CURRENT_SCAN_FOLDERWATCH = folderwatch_SCAN
diff --git a/app/DD-Record-Organiser/ClassJumpRecord.vb b/app/DD-Record-Organiser/ClassJumpRecord.vb
index feb40cd..ddebf08 100644
--- a/app/DD-Record-Organiser/ClassJumpRecord.vb
+++ b/app/DD-Record-Organiser/ClassJumpRecord.vb
@@ -46,7 +46,7 @@ Public Class ClassJumpRecord
Public Shared Sub JumpToRecord(STATE_ID As Integer, recordId As Integer)
Try
'Dim constructorIdExists As Boolean = ClassDatabase.Execute_Scalar(String.Format("SELECT CONSTRUCT_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0}", constructorId))
- Dim recordIdExists As Boolean = ClassDatabase.Execute_Scalar(String.Format("SELECT GUID FROM TBPMO_RECORD WHERE GUID = {0}", recordId))
+ Dim recordIdExists As Boolean = ClassDatabase.Execute_Scalar(String.Format("SELECT GUID FROM TBPMO_RECORD WHERE GUID = {0}", recordId), True)
'If constructorIdExists = False Or recordIdExists = False Then
' MsgBox("Das angegebene Formular konnte nicht geöffnet werden. Grund: Die ConstructorID oder die RecordID wurde nicht gefunden." & vbNewLine & "constructorId: " & constructorId & ", recordId: " & recordId, MsgBoxStyle.Exclamation, "URL Handler")
diff --git a/app/DD-Record-Organiser/ClassLicence.vb b/app/DD-Record-Organiser/ClassLicence.vb
index 5a034d6..0528445 100644
--- a/app/DD-Record-Organiser/ClassLicence.vb
+++ b/app/DD-Record-Organiser/ClassLicence.vb
@@ -7,7 +7,7 @@ Public Class ClassLicence
_lizenzManager = New ClassLicenseManager("#DigitalData35452!#", "")
Dim sql As String = String.Format("SELECT LICENSE_PMO FROM TBDD_CLIENT WHERE GUID = {0}", CLIENT_ID)
- Dim lic As String = ClassDatabase.Execute_Scalar(sql, True)
+ Dim lic As String = ClassDatabase.Execute_Scalar(sql, False)
If lic = "" Then
LICENSE_COUNT = 0
LICENSE_DATE = "1900-01-01"
@@ -45,10 +45,10 @@ Public Class ClassLicence
LICENSE_SAP_Connect = False
End Try
Try
- LICENSE_SITE = CBool(split(4))
+ LICENSE_SITE_PROXY = CBool(split(4))
Catch ex As Exception
- ClassLogger.Add(">> Could not read License for LICENSE_SAP_Connect: " & ex.Message, False)
- LICENSE_SITE = False
+ ClassLogger.Add(">> Could not read License for LICENSE_SITE_Proxy: " & ex.Message, False)
+ LICENSE_SITE_PROXY = False
End Try
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in licensemanager:")
diff --git a/app/DD-Record-Organiser/ClassMoreMetadata.vb b/app/DD-Record-Organiser/ClassMoreMetadata.vb
new file mode 100644
index 0000000..1a45dad
--- /dev/null
+++ b/app/DD-Record-Organiser/ClassMoreMetadata.vb
@@ -0,0 +1,20 @@
+Public Class ClassMoreMetadata
+ Public Shared Function Return_CURRENT_TBPMO_INDEX_MAN_VALUE(CONTROL_GUID As Integer, COL_NAME As String)
+ Try
+ ' Presuming the DataTable has a column named ENTITY_ID and TYPE_NODE.
+ Dim expression As String
+ expression = "GUID = " & CONTROL_GUID
+ Dim foundRowsLevel0() As DataRow
+ ' Use the Select method to find all rows matching the filter.
+ foundRowsLevel0 = CURRENT_TBPMO_INDEX_MAN.Select(expression)
+ Dim i As Integer
+ ' For each row create a Node
+ For i = 0 To foundRowsLevel0.GetUpperBound(0)
+ Return foundRowsLevel0(i)(COL_NAME)
+ Next
+ Catch ex As Exception
+ ClassLogger.Add(" - Unvorhergesehener Fehler in Return_CURRENT_TBPMO_INDEX_MAN_VALUE - Fehler: " & vbNewLine & ex.Message)
+ Return Nothing
+ End Try
+ End Function
+End Class
diff --git a/app/DD-Record-Organiser/ClassNodeNavigation.vb b/app/DD-Record-Organiser/ClassNodeNavigation.vb
index 20f9c05..e582b39 100644
--- a/app/DD-Record-Organiser/ClassNodeNavigation.vb
+++ b/app/DD-Record-Organiser/ClassNodeNavigation.vb
@@ -1,6 +1,195 @@
Public Class ClassNodeNavigation
+ Public Shared NODE_CONFIGURABLE_ID As Integer
+ Public Shared Sub Check_NODE_CONFIG_ID(ENTITY_ID As Integer)
+ Try
+ If CURRENT_DT_NODE_CONFIGURABLE_NODES.Rows.Count > 0 Then
+ 'Prüfen ob es für dieses Level einen konfigurierbaren Knoten gibt
+ Dim result = (From form In CURRENT_DT_NODE_CONFIGURABLE_NODES.AsEnumerable()
+ Select form
+ Where form.Item("ENTITY_ID") = ENTITY_ID).Single()
+
+ Dim ID = result.Item("GUID")
+ If Not IsNothing(ID) Then
+ ClassNodeNavigation.NODE_CONFIGURABLE_ID = ID
+ CURRENT_NODE_CONFIGURABLE_ID = ID
+ End If
+ End If
+ Catch ex As Exception
+ ClassNodeNavigation.NODE_CONFIGURABLE_ID = 0
+ CURRENT_NODE_CONFIGURABLE_ID = 0
+ End Try
+
+ End Sub
+ Public Shared Function CreateNODE_TAG(Entity As Integer, IDNode As String, Record As Object, NODE_CONFIG_ID As Integer)
+ Dim vType, TagString As String
+ Try
+ If NODE_CONFIGURABLE_ID = NODE_CONFIG_ID Then
+ vType = "CONFIG_NODE-" & NODE_CONFIG_ID.ToString
+ Else
+ vType = "NODE-TYPE-" & NODE_CONFIG_ID.ToString
+ End If
+ If Not IsDBNull(Record) Then
+ TagString = vType & "#" & Entity & "#NODE_ID-" & IDNode & "#RECORD-ID" & Record.ToString
+ Else
+ TagString = vType & "#" & Entity & "#NODE_ID-" & IDNode
+ End If
+ Return TagString
+ Catch ex As Exception
+ ClassLogger.Add(">> Unexpected Error in CreateNODE_TAG (NodeNavigation): " & ex.Message, True)
+ MsgBox("Error in CreateNODE_TAG (NodeNavigation):" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+ TagString = "ERROR NODETAG_CREATION"
+ Return TagString
+ End Try
+ End Function
+ Public Shared Function CreateTreeViewNodesNew1(DT_TREEVIEW_NODES As DataTable, TREEVIEW_IMAGELIST As ImageList)
+ Try
+ Dim mytrv As New TreeView
+ Dim ENTITY_ID As Integer
+ Dim expression As String
+ expression = "PARENT_GUID = 0"
+ Dim MAIN_NODES() As DataRow
+ ' Use the Select method to find all rows matching the filter.
+ MAIN_NODES = DT_TREEVIEW_NODES.Select(expression, "NODE_CAPTION")
+ ' For each row create a Node
+ For i = 0 To MAIN_NODES.GetUpperBound(0)
+ If ENTITY_ID <> MAIN_NODES(i)("ENTITY_ID") Then
+ ENTITY_ID = MAIN_NODES(i)("ENTITY_ID")
+ ClassNodeNavigation.Check_NODE_CONFIG_ID(MAIN_NODES(i)("ENTITY_ID"))
+ End If
+ Dim NODE_Tag = CreateNODE_TAG(MAIN_NODES(i)("ENTITY_ID"), MAIN_NODES(i)("GUID"), MAIN_NODES(i)("RECORD_ID"), MAIN_NODES(i)("NODE_CONFIG_ID"))
+ Dim MAIN_NODE = New TreeNode(MAIN_NODES(i)("NODE_CAPTION"))
+ MAIN_NODE.Tag = NODE_Tag
+ Dim index As Integer = 0
+ For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
+ If img = MAIN_NODES(i)("NODE_CONFIG_ID") & "#" & MAIN_NODES(i)("ENTITY_ID") Then
+ Exit For
+ End If
+ index += 1
+ Next
+ MAIN_NODE.ImageIndex = index
+ MAIN_NODE.SelectedImageIndex = index
+ CheckSubNodes(DT_TREEVIEW_NODES, MAIN_NODES(i)("GUID"), TREEVIEW_IMAGELIST, MAIN_NODE)
+ 'Add the node
+ mytrv.Nodes.Add(MAIN_NODE)
+
+ Next
+
+ Return mytrv
+ Catch ex As System.Exception
+ ClassLogger.Add(">> Unexpected Error in CreateTreeViewNodesNew (NodeNavigation): " & ex.Message, True)
+ MsgBox("Error in CreateTreeViewNodesNew (NodeNavigation):" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+ Return Nothing
+ End Try
+ End Function
+ Private Shared Function CheckSubNodes(DT_TREEVIEW_NODES As DataTable, PARENT_GUID As Integer, TREEVIEW_IMAGELIST As ImageList, MY_NODE As TreeNode)
+ Dim ENTITY_ID As Integer
+ Dim expression As String
+ expression = "PARENT_GUID = " & PARENT_GUID.ToString
+ Dim SUB_NODE_ROW() As DataRow
+ ' Use the Select method to find all rows matching the filter.
+ SUB_NODE_ROW = DT_TREEVIEW_NODES.Select(expression, "NODE_CAPTION")
+ ' For each row create a Node
+ For i = 0 To SUB_NODE_ROW.GetUpperBound(0)
+ If ENTITY_ID <> SUB_NODE_ROW(i)("ENTITY_ID") Then
+ ENTITY_ID = SUB_NODE_ROW(i)("ENTITY_ID")
+ ClassNodeNavigation.Check_NODE_CONFIG_ID(SUB_NODE_ROW(i)("ENTITY_ID"))
+ End If
+ Dim NODE_Tag = CreateNODE_TAG(SUB_NODE_ROW(i)("ENTITY_ID"), SUB_NODE_ROW(i)("GUID"), SUB_NODE_ROW(i)("RECORD_ID"), SUB_NODE_ROW(i)("NODE_CONFIG_ID"))
+ Dim SUB_NODE = New TreeNode(SUB_NODE_ROW(i)("NODE_CAPTION"))
+ SUB_NODE.Tag = NODE_Tag
+ Dim index As Integer = 0
+ For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
+ If img = SUB_NODE_ROW(i)("NODE_CONFIG_ID") & "#" & SUB_NODE_ROW(i)("ENTITY_ID") Then
+ Exit For
+ End If
+ index += 1
+ Next
+ SUB_NODE.ImageIndex = index
+ SUB_NODE.SelectedImageIndex = index
+ CheckSubNodes(DT_TREEVIEW_NODES, SUB_NODE_ROW(i)("GUID"), TREEVIEW_IMAGELIST, SUB_NODE)
+ 'Add the node
+ MY_NODE.Nodes.Add(SUB_NODE)
+ Next
+ Return MY_NODE
+ End Function
+ Public Shared Function CreateTreeViewNodesNew(DT_TREEVIEW_PER_CONTROLS As DataTable, TREEVIEW_IMAGELIST As ImageList)
+ Try
+ Dim mytrv As New TreeView
+ Dim node As TreeNode
+ Dim subNode As TreeNode
+ Dim ENTITY_ID As Integer
+ For Each row As DataRow In DT_TREEVIEW_PER_CONTROLS.Rows
+ If ENTITY_ID <> row.Item("ENTITY_ID") Then
+ ENTITY_ID = row.Item("ENTITY_ID")
+ ClassNodeNavigation.Check_NODE_CONFIG_ID(row.Item("ENTITY_ID"))
+ End If
+ Dim NODE_Tag = CreateNODE_TAG(row.Item("ENTITY_ID"), row.Item("GUID"), row.Item("RECORD_ID"), row.Item("NODE_CONFIG_ID"))
+ 'search in the treeview if any country is already present
+ node = FindNode(mytrv.Nodes, row.Item("PARENT_GUID"))
+ If node IsNot Nothing Then
+ 'ParentNode Foun
+ subNode = New TreeNode(row.Item("NODE_CAPTION"))
+ subNode.Tag = NODE_Tag
+ Dim index As Integer = 0
+ For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
+ If img = row.Item("NODE_CONFIG_ID") & "#" & row.Item("ENTITY_ID") Then
+ Exit For
+ End If
+ index += 1
+ Next
+ subNode.ImageIndex = index
+ subNode.SelectedImageIndex = index
+ 'Add new Node to parentNode
+ node.Nodes.Add(subNode)
+ Else
+ Dim NEW_NODE = New TreeNode(row.Item("NODE_CAPTION"))
+ NEW_NODE.Tag = NODE_Tag
+ Dim index As Integer = 0
+ For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
+ If img = row.Item("NODE_CONFIG_ID") & "#" & row.Item("ENTITY_ID") Then
+ Exit For
+ End If
+ index += 1
+ Next
+ NEW_NODE.ImageIndex = index
+ NEW_NODE.SelectedImageIndex = index
+
+ 'Add the node
+ 'node.Nodes.Add(NEW_NODE)
+ mytrv.Nodes.Add(NEW_NODE)
+ End If
+ Next
+ Return mytrv
+ Catch ex As System.Exception
+ ClassLogger.Add(">> Unexpected Error in CreateTreeViewNodesNew (NodeNavigation): " & ex.Message, True)
+ MsgBox("Error in CreateTreeViewNodesNew (NodeNavigation):" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+ Return Nothing
+ End Try
+ End Function
+ Private Shared Function FindNode(tncoll As TreeNodeCollection, PARENT_GUID As Integer) As TreeNode
+ Try
+ Dim tnFound As TreeNode
+ For Each tnCurr As TreeNode In tncoll
+ If tnCurr.Tag.ToString.Contains("#NODE_ID-" & PARENT_GUID) Then
+ Return tnCurr
+ End If
+ tnFound = FindNode(tnCurr.Nodes, PARENT_GUID)
+ If tnFound IsNot Nothing Then
+ Return tnFound
+ End If
+ Next
+ Return Nothing
+ Catch ex As Exception
+ ClassLogger.Add(">> Unexpected Error in FindNode (NodeNavigation): " & ex.Message, True)
+ MsgBox("Error in FindNode (NodeNavigation):" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+ Return Nothing
+ End Try
+
+ End Function
+
Public Shared Function CreateTreeViewNodes(DT_TREEVIEW_PER_CONTROLS As DataTable, TREEVIEW_IMAGELIST As ImageList)
Try
+ Dim mytrv As New TreeView
' Rootnode erstellen und taggen
If DT_TREEVIEW_PER_CONTROLS.Rows.Count > 1 Then
' Presuming the DataTable has a column named ENTITY_ID and TYPE_NODE.
@@ -17,18 +206,14 @@
For i = 0 To foundRowsLevel0.GetUpperBound(0)
Dim ID = foundRowsLevel0(i)("GUID")
Dim LevelEntity = foundRowsLevel0(i)("ENTITY_ID")
+ ClassNodeNavigation.Check_NODE_CONFIG_ID(LevelEntity)
Dim controlID = foundRowsLevel0(i)("CONTROL_ID")
Dim nodetext = foundRowsLevel0(i)("NODE_CAPTION")
Dim Type_node = foundRowsLevel0(i)("TYPE_NODE")
Dim RECORD_ID = foundRowsLevel0(i)("RECORD_ID")
NODE_CONFIG_ID = foundRowsLevel0(i)("NODE_CONFIG_ID")
-
LEVEL0_NODE = New TreeNode(nodetext)
- If Not IsDBNull(RECORD_ID) Then
- LEVEL0_NODE.Tag = LevelEntity & " - CONTROL-ID" & controlID.ToString & "#" & ID & "#RECORD-ID" & RECORD_ID.ToString
- Else
- LEVEL0_NODE.Tag = LevelEntity & " - CONTROL-ID" & controlID.ToString & "#" & ID
- End If
+ LEVEL0_NODE.Tag = CreateNODE_TAG(LevelEntity, ID, RECORD_ID, NODE_CONFIG_ID)
Dim index As Integer = 0
For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
@@ -49,6 +234,7 @@
For j = 0 To foundRowsLevel1.GetUpperBound(0)
Dim ID1 = foundRowsLevel1(j)("GUID")
Dim LevelEntity1 = foundRowsLevel1(j)("ENTITY_ID")
+ ClassNodeNavigation.Check_NODE_CONFIG_ID(LevelEntity1)
Dim controlID1 = foundRowsLevel1(j)("CONTROL_ID")
Dim nodetext1 = foundRowsLevel1(j)("NODE_CAPTION")
Dim Type_node1 = foundRowsLevel1(j)("TYPE_NODE")
@@ -57,11 +243,8 @@
' Node erstellen..
Dim LEVEL1_NODE As TreeNode
LEVEL1_NODE = New TreeNode(nodetext1)
- If Not IsDBNull(RECORD_ID) Then
- LEVEL1_NODE.Tag = LevelEntity1 & "-CONTROL-ID" & controlID1.ToString & "#" & ID1 & "#RECORD-ID" & RECORD_ID.ToString
- Else
- LEVEL1_NODE.Tag = LevelEntity1 & "-CONTROL-ID" & controlID1.ToString & "#" & ID1
- End If
+
+ LEVEL1_NODE.Tag = CreateNODE_TAG(LevelEntity, ID, RECORD_ID, NODE_CONFIG_ID)
index = 0
For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
@@ -83,6 +266,7 @@
For k = 0 To foundRowsLevel2.GetUpperBound(0)
Dim ID2 = foundRowsLevel2(k)("GUID")
Dim LevelEntity2 = foundRowsLevel2(k)("ENTITY_ID")
+ ClassNodeNavigation.Check_NODE_CONFIG_ID(LevelEntity2)
Dim controlID2 = foundRowsLevel2(k)("CONTROL_ID")
Dim nodetext2 = foundRowsLevel2(k)("NODE_CAPTION")
RECORD_ID = foundRowsLevel2(k)("RECORD_ID")
@@ -90,11 +274,7 @@
' Node erstellen..
Dim LEVEL2_NODE As TreeNode
LEVEL2_NODE = New TreeNode(nodetext2)
- If Not IsDBNull(RECORD_ID) Then
- LEVEL2_NODE.Tag = LevelEntity2 & "-CONTROL-ID" & controlID2.ToString & "#" & ID2 & "#RECORD-ID" & RECORD_ID.ToString
- Else
- LEVEL2_NODE.Tag = LevelEntity2 & "-CONTROL-ID" & controlID2.ToString & "#" & ID2
- End If
+ LEVEL2_NODE.Tag = CreateNODE_TAG(LevelEntity, ID, RECORD_ID, NODE_CONFIG_ID)
index = 0
For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
@@ -116,6 +296,7 @@
For l = 0 To foundRowsLevel3.GetUpperBound(0)
Dim ID3 = foundRowsLevel3(l)("GUID")
Dim LevelEntity3 = foundRowsLevel3(l)("ENTITY_ID")
+ ClassNodeNavigation.Check_NODE_CONFIG_ID(LevelEntity3)
Dim controlID3 = foundRowsLevel3(l)("CONTROL_ID")
Dim nodetext3 = foundRowsLevel3(l)("NODE_CAPTION")
RECORD_ID = foundRowsLevel3(l)("RECORD_ID")
@@ -123,11 +304,7 @@
' Node erstellen..
Dim LEVEL3_NODE As TreeNode
LEVEL3_NODE = New TreeNode(nodetext3)
- If Not IsDBNull(RECORD_ID) Then
- LEVEL3_NODE.Tag = LevelEntity3 & "-CONTROL-ID" & controlID3.ToString & "#" & ID3 & "#RECORD-ID" & RECORD_ID.ToString
- Else
- LEVEL3_NODE.Tag = LevelEntity3 & "-CONTROL-ID" & controlID3.ToString & "#" & ID3
- End If
+ LEVEL3_NODE.Tag = CreateNODE_TAG(LevelEntity, ID, RECORD_ID, NODE_CONFIG_ID)
index = 0
For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
@@ -149,6 +326,7 @@
For m = 0 To foundRowsLevel4.GetUpperBound(0)
Dim ID5 = foundRowsLevel4(m)("GUID")
Dim LevelEntity5 = foundRowsLevel4(m)("ENTITY_ID")
+ ClassNodeNavigation.Check_NODE_CONFIG_ID(LevelEntity5)
Dim controlID5 = foundRowsLevel4(m)("CONTROL_ID")
Dim nodetext5 = foundRowsLevel4(m)("NODE_CAPTION")
RECORD_ID = foundRowsLevel4(m)("RECORD_ID")
@@ -156,11 +334,7 @@
' Node erstellen..
Dim LEVEL4_NODE As TreeNode
LEVEL4_NODE = New TreeNode(nodetext5)
- If Not IsDBNull(RECORD_ID) Then
- LEVEL4_NODE.Tag = LevelEntity5 & "-CONTROL-ID" & controlID5.ToString & "#" & ID5 & "#RECORD-ID" & RECORD_ID.ToString
- Else
- LEVEL4_NODE.Tag = LevelEntity5 & "-CONTROL-ID" & controlID5.ToString & "#" & ID5
- End If
+ LEVEL4_NODE.Tag = CreateNODE_TAG(LevelEntity, ID, RECORD_ID, NODE_CONFIG_ID)
index = 0
For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
@@ -186,6 +360,7 @@
For n = 0 To foundRowsLevel5.GetUpperBound(0)
Dim ID6 = foundRowsLevel5(n)("GUID")
Dim LevelEntity6 = foundRowsLevel5(n)("ENTITY_ID")
+ ClassNodeNavigation.Check_NODE_CONFIG_ID(LevelEntity6)
Dim controlID6 = foundRowsLevel5(n)("CONTROL_ID")
Dim nodetext6 = foundRowsLevel5(n)("NODE_CAPTION")
RECORD_ID = foundRowsLevel5(n)("RECORD_ID")
@@ -193,11 +368,7 @@
' Node erstellen..
Dim LEVEL5_NODE As TreeNode
LEVEL5_NODE = New TreeNode(nodetext6)
- If Not IsDBNull(RECORD_ID) Then
- LEVEL5_NODE.Tag = LevelEntity6 & "-CONTROL-ID" & controlID6.ToString & "#" & ID6 & "#RECORD-ID" & RECORD_ID.ToString
- Else
- LEVEL5_NODE.Tag = LevelEntity6 & "-CONTROL-ID" & controlID6.ToString & "#" & ID6
- End If
+ LEVEL5_NODE.Tag = CreateNODE_TAG(LevelEntity, ID, RECORD_ID, NODE_CONFIG_ID)
index = 0
For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
@@ -222,6 +393,7 @@
For o = 0 To foundRowsLevel6.GetUpperBound(0)
Dim ID7 = foundRowsLevel6(o)("GUID")
Dim LevelEntity7 = foundRowsLevel6(o)("ENTITY_ID")
+ ClassNodeNavigation.Check_NODE_CONFIG_ID(LevelEntity7)
Dim controlID7 = foundRowsLevel6(o)("CONTROL_ID")
Dim nodetext7 = foundRowsLevel6(o)("NODE_CAPTION")
RECORD_ID = foundRowsLevel6(o)("RECORD_ID")
@@ -229,11 +401,8 @@
' Node erstellen..
Dim LEVEL6_NODE As TreeNode
LEVEL6_NODE = New TreeNode(nodetext7)
- If Not IsDBNull(RECORD_ID) Then
- LEVEL6_NODE.Tag = LevelEntity7 & "-CONTROL-ID" & controlID7.ToString & "#" & ID7 & "#RECORD-ID" & RECORD_ID.ToString
- Else
- LEVEL6_NODE.Tag = LevelEntity7 & "-CONTROL-ID" & controlID7.ToString & "#" & ID7
- End If
+
+ LEVEL6_NODE.Tag = CreateNODE_TAG(LevelEntity, ID, RECORD_ID, NODE_CONFIG_ID)
index = 0
For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
@@ -255,6 +424,7 @@
For p = 0 To foundRowsLevel7.GetUpperBound(0)
Dim ID8 = foundRowsLevel7(p)("GUID")
Dim LevelEntity8 = foundRowsLevel7(p)("ENTITY_ID")
+ ClassNodeNavigation.Check_NODE_CONFIG_ID(LevelEntity8)
Dim controlID8 = foundRowsLevel7(p)("CONTROL_ID")
Dim nodetext8 = foundRowsLevel7(p)("NODE_CAPTION")
RECORD_ID = foundRowsLevel7(p)("RECORD_ID")
@@ -262,11 +432,7 @@
' Node erstellen..
Dim LEVEL7_NODE As TreeNode
LEVEL7_NODE = New TreeNode(nodetext8)
- If Not IsDBNull(RECORD_ID) Then
- LEVEL7_NODE.Tag = LevelEntity8 & "-CONTROL-ID" & controlID8.ToString & "#" & ID8 & "#RECORD-ID" & RECORD_ID.ToString
- Else
- LEVEL7_NODE.Tag = LevelEntity8 & "-CONTROL-ID" & controlID8.ToString & "#" & ID8
- End If
+ LEVEL7_NODE.Tag = CreateNODE_TAG(LevelEntity, ID, RECORD_ID, NODE_CONFIG_ID)
index = 0
For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
@@ -288,6 +454,7 @@
For q = 0 To foundRowsLevel8.GetUpperBound(0)
Dim ID9 = foundRowsLevel8(q)("GUID")
Dim LevelEntity9 = foundRowsLevel8(q)("ENTITY_ID")
+ ClassNodeNavigation.Check_NODE_CONFIG_ID(LevelEntity9)
Dim controlID9 = foundRowsLevel8(q)("CONTROL_ID")
Dim nodetext9 = foundRowsLevel8(q)("NODE_CAPTION")
RECORD_ID = foundRowsLevel8(q)("RECORD_ID")
@@ -295,12 +462,7 @@
' Node erstellen..
Dim LEVEL8_NODE As TreeNode
LEVEL8_NODE = New TreeNode(nodetext9)
- If Not IsDBNull(RECORD_ID) Then
- LEVEL8_NODE.Tag = LevelEntity9 & "-CONTROL-ID" & controlID9.ToString & "#" & ID9 & "#RECORD-ID" & RECORD_ID.ToString
- Else
- LEVEL8_NODE.Tag = LevelEntity9 & "-CONTROL-ID" & controlID9.ToString & "#" & ID9
- End If
-
+ LEVEL8_NODE.Tag = CreateNODE_TAG(LevelEntity, ID, RECORD_ID, NODE_CONFIG_ID)
index = 0
For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
If img = NODE_CONFIG_ID & "#" & LevelEntity9 Then
@@ -322,15 +484,76 @@
Next ' Level 2 Ende
Next 'Level 1 Ende
Next
- Return LEVEL0_NODE
+ mytrv.Nodes.Add(LEVEL0_NODE)
Else
- MsgBox("Check the Control Navigation Option or inform Digital Data!", MsgBoxStyle.Critical)
+ MsgBox("No Nodes for Navigation. Check the Control Navigation Option or inform Digital Data!", MsgBoxStyle.Critical)
Return Nothing
End If
+ Return mytrv
Catch ex As Exception
ClassLogger.Add(">> Unexpected Error in CreateTreeViewNodes (NodeNavigation): " & ex.Message, True)
MsgBox("Error in CreateTreeViewNodes (NodeNavigation):" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
Return Nothing
End Try
End Function
+ Public Shared Function Return_ENTITY_FOR_TAG(NodeString As String)
+
+ If IsNumeric(NodeString) Then
+ Return NodeString
+ Else
+ Try
+ Dim staticListItems = NodeString.Split("#")
+ Return staticListItems(1)
+ Catch ex As Exception
+ ClassLogger.Add("Unexpected Error in Return_ENTITY_FOR_TAG ('" & NodeString & "'): " & ex.Message, True)
+ Return 0
+ End Try
+ End If
+ End Function
+ Public Shared Function Return_RECORD_forTag(NodeString As String)
+ If IsNumeric(NodeString) Then
+ Return NodeString
+ Else
+ Dim staticListItems = NodeString.Split("#")
+ If staticListItems(3).Contains("RECORD-ID") Then
+ Try
+ Dim _RECORD = staticListItems(3).ToString.Replace("RECORD-ID", "")
+ If IsNumeric(_RECORD) Then
+ Return _RECORD
+ Else
+ Return 0
+ End If
+ Catch ex As Exception
+ ClassLogger.Add("Unexpected Error in Return_RECORD_forTag ('" & NodeString & "'): " & ex.Message, True)
+ Return 0
+ End Try
+ Else
+ Return 0
+ End If
+
+ End If
+ End Function
+ Public Shared Function Return_NODEID_forTag(NodeString As String)
+ 'If NODE_CONFIGURABLE_ID = NODE_CONFIG_ID Then
+ ' vType = "CONFIG_NODE-" & NODE_CONFIG_ID.ToString
+ 'Else
+ ' vType = "NODE-TYPE-" & NODE_CONFIG_ID.ToString
+ 'End If
+ 'If Not IsDBNull(Record) Then
+ ' TagString = vType & "#" & Entity & "#" & "NODE_ID-" & IDNode & "#RECORD-ID" & Record.ToString
+ 'Else
+ ' TagString = vType & "#" & Entity & "#" & "NODE_ID-" & IDNode
+ 'End If
+ If IsNumeric(NodeString) Then
+ Return NodeString
+ Else
+ Dim staticListItems = NodeString.Split("#")
+ If staticListItems(2).Contains("NODE_ID") Then
+ Return staticListItems(2).ToString.Replace("NODE_ID-", "")
+ Else
+ Return 0
+ End If
+
+ End If
+ End Function
End Class
diff --git a/app/DD-Record-Organiser/ClassNodes.vb b/app/DD-Record-Organiser/ClassNodes.vb
index bcdc40c..e3c9eda 100644
--- a/app/DD-Record-Organiser/ClassNodes.vb
+++ b/app/DD-Record-Organiser/ClassNodes.vb
@@ -15,14 +15,12 @@ Public Class ClassNodes
Dim controlID9 = foundRows(q)("CONTROL_ID")
Dim nodetext9 = foundRows(q)("NODE_CAPTION")
Dim RECORD_ID = foundRows(q)("RECORD_ID")
+ Dim NODE_CONFIG_ID = foundRows(q)("NODE_CONFIG_ID")
' Node erstellen..
Dim NEW_NODE As TreeNode
NEW_NODE = New TreeNode(nodetext9)
- If Not IsDBNull(RECORD_ID) Then
- NEW_NODE.Tag = LevelEntity9 & "-CONTROL-ID" & controlID9.ToString & "#" & ID9 & "#RECORD-ID" & RECORD_ID.ToString
- Else
- NEW_NODE.Tag = LevelEntity9 & "-CONTROL-ID" & controlID9.ToString & "#" & ID9
- End If
+ ClassNodeNavigation.Check_NODE_CONFIG_ID(LevelEntity9)
+ NEW_NODE.Tag = ClassNodeNavigation.CreateNODE_TAG(LevelEntity9, ID9, RECORD_ID, NODE_CONFIG_ID)
Dim index = 0
For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
diff --git a/app/DD-Record-Organiser/ClassProxy.vb b/app/DD-Record-Organiser/ClassProxy.vb
new file mode 100644
index 0000000..ae03a05
--- /dev/null
+++ b/app/DD-Record-Organiser/ClassProxy.vb
@@ -0,0 +1,112 @@
+Public Class ClassProxy
+ Public Shared MyPROXYConnectionString As String = ""
+ Public Shared MyLinkedServer As String
+ Public Shared Function Refresh_Object_Data()
+ 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]" & vbNewLine & _
+ "SELECT 'Return Value' = @return_value"
+ 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 Refresh_Object_Change_Data()
+ 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 & _
+ "SELECT 'Return Value' = @return_value"
+ 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 Refresh_Doc_Data()
+ 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 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 Refresh_Control_Data()
+ 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 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 Refresh_Workflow_Data()
+ 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_WORKFLOWS]" & vbNewLine & _
+ "SELECT 'Return Value' = @return_value"
+ 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 PRROXY_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 & _
+ "SELECT 'Return Value' = @return_value"
+ 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/ClassRecordCommands.vb b/app/DD-Record-Organiser/ClassRecordCommands.vb
new file mode 100644
index 0000000..53cba2e
--- /dev/null
+++ b/app/DD-Record-Organiser/ClassRecordCommands.vb
@@ -0,0 +1,16 @@
+Public Class ClassRecordCommands
+ Public Shared Function CreateRecord(EntityID)
+ Dim SQL = "INSERT INTO TBPMO_RECORD(ADDED_WHO, FORM_ID,RECORD_ENTITY_ID) VALUES ('" & USER_USERNAME & "', " & EntityID & ",4711)"
+ Return ClassDatabase.Execute_non_Query(SQL) = True
+ End Function
+ Public Shared Function GetLastRecord()
+ Dim SQL = "SELECT (MAX(GUID)) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND ADDED_WHO = '" & USER_USERNAME & "'"
+ Return ClassDatabase.Execute_Scalar(SQL)
+ End Function
+
+ Public Shared Function ConnectRecord(PARENT_RECORD As Integer, LINK_RECORD As Integer, Optional Comment As String = "")
+ Dim SQL = "INSERT INTO TBPMO_RECORD_CONNECT(RECORD1_ID,RECORD2_ID,COMMENT,ADDED_WHO) VALUES (" & PARENT_RECORD & "," & LINK_RECORD & ",'" & Comment & "','" & USER_USERNAME & "')"
+ If LogErrorsOnly = False Then ClassLogger.Add(" >> ConnectRecord SQL: " & SQL, False)
+ Return ClassDatabase.Execute_non_Query(SQL)
+ End Function
+End Class
diff --git a/app/DD-Record-Organiser/ClassRecordState.vb b/app/DD-Record-Organiser/ClassRecordState.vb
index 6d533e0..316386e 100644
--- a/app/DD-Record-Organiser/ClassRecordState.vb
+++ b/app/DD-Record-Organiser/ClassRecordState.vb
@@ -2,22 +2,34 @@
Public Shared Sub LockRecord(RecordId As Integer)
Try
+ If RecordId = 0 Then
+ Exit Sub
+ End If
Dim Username As String = USER_USERNAME
Dim SQL As String = String.Format("UPDATE TBPMO_RECORD SET IN_WORK = 1, IN_WORK_WHO = '{0}' WHERE GUID = {1}", Username, RecordId)
-
+ If ClassProxy.MyPROXYConnectionString <> String.Empty Then
+ ClassDatabase.Execute_non_Query(SQL, True)
+ End If
ClassDatabase.Execute_non_Query(SQL)
- Console.WriteLine("Record " & RecordId & " locked")
Catch ex As Exception
- MsgBox("Error in LockRecord: " & vbNewLine & ex.Message,MsgBoxStyle.Critical)
+ MsgBox("Error in LockRecord: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try
End Sub
Public Shared Sub UnlockRecord(RecordId As Integer)
Try
+ If RecordId = 0 Then
+ Exit Sub
+ End If
+ Dim RECLOCKED = IsRecordLocked(RecordId)
+ If IsNothing(RECLOCKED) Then
+ Exit Sub
+ End If
Dim SQL As String = String.Format("UPDATE TBPMO_RECORD SET IN_WORK = 0, IN_WORK_WHO = NULL WHERE GUID = {0}", RecordId)
-
+ If ClassProxy.MyPROXYConnectionString <> String.Empty Then
+ ClassDatabase.Execute_non_Query(SQL, True)
+ End If
ClassDatabase.Execute_non_Query(SQL)
- Console.WriteLine("Record " & RecordId & " UNlocked")
Catch ex As Exception
MsgBox("Error in UnlockRecord: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try
@@ -26,7 +38,7 @@
Public Shared Function IsRecordLocked(RecordId As Integer) As String
Try
Dim SQL As String = String.Format("SELECT IN_WORK, IN_WORK_WHO FROM TBPMO_RECORD WHERE GUID = {0}", RecordId)
- Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL)
+ Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL, True)
If dt.Rows.Count = 1 Then
@@ -42,7 +54,7 @@
End If
ElseIf dt.Rows.Count = 0 Then
- Throw New Exception("Record " & RecordId & " does not exist")
+ Return Nothing
Else
Throw New Exception("Record" & RecordId & " is not unique")
End If
diff --git a/app/DD-Record-Organiser/ClassRecordView.vb b/app/DD-Record-Organiser/ClassRecordView.vb
index cc4a62a..688f183 100644
--- a/app/DD-Record-Organiser/ClassRecordView.vb
+++ b/app/DD-Record-Organiser/ClassRecordView.vb
@@ -42,7 +42,7 @@ Public Class ClassRecordView
Private Function GetEntityId() As Integer
Dim SQL = String.Format("SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}", RecordId)
- Me.Entity_ID = ClassDatabase.Execute_Scalar(SQL)
+ Me.Entity_ID = ClassDatabase.Execute_Scalar(SQL, True)
Return Me.Entity_ID
End Function
@@ -151,7 +151,7 @@ Public Class ClassRecordView
Dim match As String = ControlIdRegex.Match(sqlcommand).Value 'Get Full Match to replace later
Dim controlId As Integer = Integer.Parse(match.Replace("@", "")) 'Get Value after removing @-chars
Dim controlSQL = String.Format("SELECT VALUE FROM VWPMO_VALUES WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", controlId, Me.RecordId)
- Dim controlValue = ClassDatabase.Execute_Scalar(controlSQL) 'Get the actual value
+ Dim controlValue = ClassDatabase.Execute_Scalar(controlSQL, True) 'Get the actual value
sqlcommand = sqlcommand.Replace(match, controlValue.ToString()) 'Replace the actual value with the placeholder string/match
End If
@@ -190,7 +190,7 @@ Public Class ClassRecordView
Private Sub LoadControls()
Try
Dim controls As New List(Of Control)
- DTControls = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM VWPMO_CONTROL_SCREEN WHERE FORM_ID = {0}", GetEntityId()))
+ DTControls = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM VWPMO_CONTROL_SCREEN WHERE FORM_ID = {0}", GetEntityId()), True)
For Each row As DataRow In DTControls.Rows
Dim props As ControlProps = MapRowToProps(row)
@@ -255,7 +255,7 @@ Public Class ClassRecordView
Private Sub LoadValues(controlCollection As Control.ControlCollection)
Try
Dim controls As New List(Of Control)
- DTValues = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM VWPMO_VALUES WHERE RECORD_ID = {0}", Me.RecordId))
+ DTValues = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM VWPMO_VALUES WHERE RECORD_ID = {0}", Me.RecordId), True)
' ControlCollection in eine List konvertieren
controls = controlCollection.Cast(Of Control)().ToList()
diff --git a/app/DD-Record-Organiser/ClassWindream.vb b/app/DD-Record-Organiser/ClassWindream.vb
index 56dd0b8..e088459 100644
--- a/app/DD-Record-Organiser/ClassWindream.vb
+++ b/app/DD-Record-Organiser/ClassWindream.vb
@@ -218,6 +218,8 @@ Public Class ClassWindream
oConnect = CreateObject("Windream.WMConnect")
'MsgBox("windrem init 'ed")
Catch ex As Exception
+ Dim msg = "Error in CreateObject(Windream.WMSession) - Err.Number: " & Err.Number & vbNewLine & Err.Description
+ ClassLogger.Add(msg, True)
Return False
End Try
@@ -270,6 +272,8 @@ Public Class ClassWindream
' Ordnertypen ausgelesen werden
oDokumentTypen = oSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
Catch ex As Exception
+ Dim msg = "Error in oSession.SwitchEvents - Err.Number: " & Err.Number & vbNewLine & Err.Description
+ ClassLogger.Add(msg, True)
Return False
End Try
@@ -334,7 +338,7 @@ Public Class ClassWindream
End Function
Public Function GetTypeOfIndex(ByVal indexname As String) As Integer
Try
- Dim oAttribute = Me.oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, indexname)
+ Dim oAttribute = oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, indexname)
Dim vType = oAttribute.getVariableValue("dwAttrType")
Return vType
Catch ex As Exception
@@ -397,7 +401,7 @@ Public Class ClassWindream
Public Function GetObjecttypeByName(ByVal objekttypName As String) As WMObject
Try
' alle Objekttypen auslesen
- Dim oObjectTypes As WMObjects = Me.oSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
+ Dim oObjectTypes As WMObjects = oSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
' alle Objekttypen durchlaufen und nach dem mit dem angegebenen Namen suchen
For Each oObjectType As WMObject In oObjectTypes
@@ -2175,7 +2179,8 @@ Public Class ClassWindream
End If
Dim oWMObject As WINDREAMLib.WMObject
- oWMObject = oSession.GetWMObjectByPath(WMEntityDocumentAndMap, filepath.Substring(2))
+ Dim file = filepath.Substring(2)
+ oWMObject = oSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, filepath.Substring(2))
If Not IsNothing(oWMObject) Then
Dim AccessRightsObject
AccessRightsObject = oWMObject.GetWMObjectRelationByName(REL_Document_AccessRight)
diff --git a/app/DD-Record-Organiser/ClassWindreamDocGrid.vb b/app/DD-Record-Organiser/ClassWindreamDocGrid.vb
index 4b4c46c..43c4636 100644
--- a/app/DD-Record-Organiser/ClassWindreamDocGrid.vb
+++ b/app/DD-Record-Organiser/ClassWindreamDocGrid.vb
@@ -42,6 +42,7 @@ Public Class ClassWindreamDocGrid
End Function
Public Shared Sub GetDocItems(gridView As GridView)
If Init_Table() = True Then
+ Console.WriteLine("gridView.SelectedRowsCount: " & gridView.SelectedRowsCount.ToString)
If gridView.SelectedRowsCount > 1 Then
DT_RESULTFILES.Clear()
For Each row In gridView.GetSelectedRows
@@ -156,7 +157,7 @@ Public Class ClassWindreamDocGrid
Dim DT_DETAILS_SQL = String.Format("SELECT T.[GUID],T.[DocID],T.[CONFIG_ID],T1.HEADER_CAPTION,T.[VALUE],T1.[LANGUAGE], T1.COLUMN_VIEW,T1.EDITABLE,T1.TYPE_ID,T1.VISIBLE,T.CHANGED_WHEN,T.CHANGED_WHO " &
"FROM TBPMO_DOC_VALUES T INNER JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 ON T.CONFIG_ID = T1.GUID WHERE T1.ENTITY_ID = {0} AND LANGUAGE = '{1}'", CURRENT_ENTITY_ID, USER_LANGUAGE)
- Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(DT_DETAILS_SQL)
+ Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(DT_DETAILS_SQL, True)
' Tabellen zum DataSet hinzufügen
ds.Tables.Add(DT_RESULT)
ds.Tables.Add(DT_DETAILS)
diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj
index b79722e..8b6ab5a 100644
--- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj
+++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj
@@ -262,11 +262,15 @@
+
+
+
+
@@ -382,10 +386,10 @@
Form
-
- frmWDChangeDoctype.vb
+
+ frmWD_ChangeDoctype.vb
-
+
Form
@@ -394,6 +398,12 @@
Form
+
+ frmWD_FulltextChoice.vb
+
+
+ Form
+
frmWD_Import_Doc_Record.vb
@@ -729,15 +739,9 @@
frmClientLogin.vb
-
- frmConstructorDesigner.vb
-
frmConstructorDesigner.vb
-
- frmConstructor_Main.vb
-
frmDiagrams.vb
@@ -807,12 +811,24 @@
frmViewsUser.vb
-
- frmWDChangeDoctype.vb
+
+ frmWD_ChangeDoctype.vb
+
+
+ frmWD_ChangeDoctype.vb
+
+
+ frmWD_CreateVersion.vb
frmWD_CreateVersion.vb
+
+ frmWD_FulltextChoice.vb
+
+
+ frmWD_FulltextChoice.vb
+
frmWD_Import_Doc_Record.vb
@@ -904,6 +920,7 @@
frmLanguage_Translator.vb
+ Designer
frmLevel_Designer.vb
@@ -1048,6 +1065,7 @@
frmWD_IndexFile.vb
+ Designer
frmTask_Editor.vb
@@ -1078,7 +1096,6 @@
MSDataSetGenerator
Designer
- DD_DMSDataSet.Designer.vb
DD_DMSDataSet.xsd
diff --git a/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb b/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb
index 2424cae..f7ce268 100644
--- a/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb
+++ b/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
'
' Dieser Code wurde von einem Tool generiert.
-' Laufzeitversion:4.0.30319.34209
+' Laufzeitversion:4.0.30319.36366
'
' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
' der Code erneut generiert wird.
@@ -73,8 +73,6 @@ Partial Public Class DD_DMSDataSet
Private tableTBPMO_WD_OBJECTTYPE As TBPMO_WD_OBJECTTYPEDataTable
- Private tableTBPMO_FILES_USER As TBPMO_FILES_USERDataTable
-
Private tableTBPMO_FOLLOW_UP_EMAIL As TBPMO_FOLLOW_UP_EMAILDataTable
Private tableTBPMO_FOLLUPEMAIL_USER As TBPMO_FOLLUPEMAIL_USERDataTable
@@ -270,9 +268,6 @@ Partial Public Class DD_DMSDataSet
If (Not (ds.Tables("TBPMO_WD_OBJECTTYPE")) Is Nothing) Then
MyBase.Tables.Add(New TBPMO_WD_OBJECTTYPEDataTable(ds.Tables("TBPMO_WD_OBJECTTYPE")))
End If
- If (Not (ds.Tables("TBPMO_FILES_USER")) Is Nothing) Then
- MyBase.Tables.Add(New TBPMO_FILES_USERDataTable(ds.Tables("TBPMO_FILES_USER")))
- End If
If (Not (ds.Tables("TBPMO_FOLLOW_UP_EMAIL")) Is Nothing) Then
MyBase.Tables.Add(New TBPMO_FOLLOW_UP_EMAILDataTable(ds.Tables("TBPMO_FOLLOW_UP_EMAIL")))
End If
@@ -608,16 +603,6 @@ Partial Public Class DD_DMSDataSet
End Get
End Property
- _
- Public ReadOnly Property TBPMO_FILES_USER() As TBPMO_FILES_USERDataTable
- Get
- Return Me.tableTBPMO_FILES_USER
- End Get
- End Property
-
_
- Private Function ShouldSerializeTBPMO_FILES_USER() As Boolean
- Return false
- End Function
-
_
Private Function ShouldSerializeTBPMO_FOLLOW_UP_EMAIL() As Boolean
@@ -2049,9 +2017,6 @@ Partial Public Class DD_DMSDataSet
_
Public Delegate Sub TBPMO_WD_OBJECTTYPERowChangeEventHandler(ByVal sender As Object, ByVal e As TBPMO_WD_OBJECTTYPERowChangeEvent)
- _
- Public Delegate Sub TBPMO_FILES_USERRowChangeEventHandler(ByVal sender As Object, ByVal e As TBPMO_FILES_USERRowChangeEvent)
-
_
Public Delegate Sub TBPMO_FOLLOW_UP_EMAILRowChangeEventHandler(ByVal sender As Object, ByVal e As TBPMO_FOLLOW_UP_EMAILRowChangeEvent)
@@ -11936,344 +11901,6 @@ Partial Public Class DD_DMSDataSet
End Function
End Class
- '''
- '''Represents the strongly named DataTable class.
- '''
- _
- Partial Public Class TBPMO_FILES_USERDataTable
- Inherits Global.System.Data.TypedTableBase(Of TBPMO_FILES_USERRow)
-
- Private columnGUID As Global.System.Data.DataColumn
-
- Private columnFILENAME2WORK As Global.System.Data.DataColumn
-
- Private columnUSER_WORK As Global.System.Data.DataColumn
-
- Private columnHANDLE_TYPE As Global.System.Data.DataColumn
-
- Private columnWORKED As Global.System.Data.DataColumn
-
- Private columnADDED_WHEN As Global.System.Data.DataColumn
-
- _
- Public Sub New()
- MyBase.New
- Me.TableName = "TBPMO_FILES_USER"
- Me.BeginInit
- Me.InitClass
- Me.EndInit
- End Sub
-
- _
- Friend Sub New(ByVal table As Global.System.Data.DataTable)
- MyBase.New
- Me.TableName = table.TableName
- If (table.CaseSensitive <> table.DataSet.CaseSensitive) Then
- Me.CaseSensitive = table.CaseSensitive
- End If
- If (table.Locale.ToString <> table.DataSet.Locale.ToString) Then
- Me.Locale = table.Locale
- End If
- If (table.Namespace <> table.DataSet.Namespace) Then
- Me.Namespace = table.Namespace
- End If
- Me.Prefix = table.Prefix
- Me.MinimumCapacity = table.MinimumCapacity
- End Sub
-
- _
- Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext)
- MyBase.New(info, context)
- Me.InitVars
- End Sub
-
- _
- Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn
- Get
- Return Me.columnGUID
- End Get
- End Property
-
- _
- Public ReadOnly Property FILENAME2WORKColumn() As Global.System.Data.DataColumn
- Get
- Return Me.columnFILENAME2WORK
- End Get
- End Property
-
- _
- Public ReadOnly Property USER_WORKColumn() As Global.System.Data.DataColumn
- Get
- Return Me.columnUSER_WORK
- End Get
- End Property
-
- _
- Public ReadOnly Property HANDLE_TYPEColumn() As Global.System.Data.DataColumn
- Get
- Return Me.columnHANDLE_TYPE
- End Get
- End Property
-
- _
- Public ReadOnly Property WORKEDColumn() As Global.System.Data.DataColumn
- Get
- Return Me.columnWORKED
- End Get
- End Property
-
- _
- Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn
- Get
- Return Me.columnADDED_WHEN
- End Get
- End Property
-
- _
- Public ReadOnly Property Count() As Integer
- Get
- Return Me.Rows.Count
- End Get
- End Property
-
- _
- Public Default ReadOnly Property Item(ByVal index As Integer) As TBPMO_FILES_USERRow
- Get
- Return CType(Me.Rows(index),TBPMO_FILES_USERRow)
- End Get
- End Property
-
- _
- Public Event TBPMO_FILES_USERRowChanging As TBPMO_FILES_USERRowChangeEventHandler
-
- _
- Public Event TBPMO_FILES_USERRowChanged As TBPMO_FILES_USERRowChangeEventHandler
-
- _
- Public Event TBPMO_FILES_USERRowDeleting As TBPMO_FILES_USERRowChangeEventHandler
-
- _
- Public Event TBPMO_FILES_USERRowDeleted As TBPMO_FILES_USERRowChangeEventHandler
-
- _
- Public Overloads Sub AddTBPMO_FILES_USERRow(ByVal row As TBPMO_FILES_USERRow)
- Me.Rows.Add(row)
- End Sub
-
- _
- Public Overloads Function AddTBPMO_FILES_USERRow(ByVal FILENAME2WORK As String, ByVal USER_WORK As String, ByVal HANDLE_TYPE As String, ByVal WORKED As Boolean, ByVal ADDED_WHEN As Date) As TBPMO_FILES_USERRow
- Dim rowTBPMO_FILES_USERRow As TBPMO_FILES_USERRow = CType(Me.NewRow,TBPMO_FILES_USERRow)
- Dim columnValuesArray() As Object = New Object() {Nothing, FILENAME2WORK, USER_WORK, HANDLE_TYPE, WORKED, ADDED_WHEN}
- rowTBPMO_FILES_USERRow.ItemArray = columnValuesArray
- Me.Rows.Add(rowTBPMO_FILES_USERRow)
- Return rowTBPMO_FILES_USERRow
- End Function
-
- _
- Public Function FindByGUID(ByVal GUID As Integer) As TBPMO_FILES_USERRow
- Return CType(Me.Rows.Find(New Object() {GUID}),TBPMO_FILES_USERRow)
- End Function
-
- _
- Public Overrides Function Clone() As Global.System.Data.DataTable
- Dim cln As TBPMO_FILES_USERDataTable = CType(MyBase.Clone,TBPMO_FILES_USERDataTable)
- cln.InitVars
- Return cln
- End Function
-
- _
- Protected Overrides Function CreateInstance() As Global.System.Data.DataTable
- Return New TBPMO_FILES_USERDataTable()
- End Function
-
- _
- Friend Sub InitVars()
- Me.columnGUID = MyBase.Columns("GUID")
- Me.columnFILENAME2WORK = MyBase.Columns("FILENAME2WORK")
- Me.columnUSER_WORK = MyBase.Columns("USER_WORK")
- Me.columnHANDLE_TYPE = MyBase.Columns("HANDLE_TYPE")
- Me.columnWORKED = MyBase.Columns("WORKED")
- Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN")
- End Sub
-
- _
- Private Sub InitClass()
- Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element)
- MyBase.Columns.Add(Me.columnGUID)
- Me.columnFILENAME2WORK = New Global.System.Data.DataColumn("FILENAME2WORK", GetType(String), Nothing, Global.System.Data.MappingType.Element)
- MyBase.Columns.Add(Me.columnFILENAME2WORK)
- Me.columnUSER_WORK = New Global.System.Data.DataColumn("USER_WORK", GetType(String), Nothing, Global.System.Data.MappingType.Element)
- MyBase.Columns.Add(Me.columnUSER_WORK)
- Me.columnHANDLE_TYPE = New Global.System.Data.DataColumn("HANDLE_TYPE", GetType(String), Nothing, Global.System.Data.MappingType.Element)
- MyBase.Columns.Add(Me.columnHANDLE_TYPE)
- Me.columnWORKED = New Global.System.Data.DataColumn("WORKED", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element)
- MyBase.Columns.Add(Me.columnWORKED)
- Me.columnADDED_WHEN = New Global.System.Data.DataColumn("ADDED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element)
- MyBase.Columns.Add(Me.columnADDED_WHEN)
- Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true))
- Me.columnGUID.AutoIncrement = true
- Me.columnGUID.AutoIncrementSeed = -1
- Me.columnGUID.AutoIncrementStep = -1
- Me.columnGUID.AllowDBNull = false
- Me.columnGUID.ReadOnly = true
- Me.columnGUID.Unique = true
- Me.columnFILENAME2WORK.AllowDBNull = false
- Me.columnFILENAME2WORK.MaxLength = 500
- Me.columnUSER_WORK.AllowDBNull = false
- Me.columnUSER_WORK.MaxLength = 50
- Me.columnHANDLE_TYPE.AllowDBNull = false
- Me.columnHANDLE_TYPE.MaxLength = 50
- Me.columnWORKED.AllowDBNull = false
- Me.columnADDED_WHEN.AllowDBNull = false
- End Sub
-
- _
- Public Function NewTBPMO_FILES_USERRow() As TBPMO_FILES_USERRow
- Return CType(Me.NewRow,TBPMO_FILES_USERRow)
- End Function
-
- _
- Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow
- Return New TBPMO_FILES_USERRow(builder)
- End Function
-
- _
- Protected Overrides Function GetRowType() As Global.System.Type
- Return GetType(TBPMO_FILES_USERRow)
- End Function
-
- _
- Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs)
- MyBase.OnRowChanged(e)
- If (Not (Me.TBPMO_FILES_USERRowChangedEvent) Is Nothing) Then
- RaiseEvent TBPMO_FILES_USERRowChanged(Me, New TBPMO_FILES_USERRowChangeEvent(CType(e.Row,TBPMO_FILES_USERRow), e.Action))
- End If
- End Sub
-
- _
- Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs)
- MyBase.OnRowChanging(e)
- If (Not (Me.TBPMO_FILES_USERRowChangingEvent) Is Nothing) Then
- RaiseEvent TBPMO_FILES_USERRowChanging(Me, New TBPMO_FILES_USERRowChangeEvent(CType(e.Row,TBPMO_FILES_USERRow), e.Action))
- End If
- End Sub
-
- _
- Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs)
- MyBase.OnRowDeleted(e)
- If (Not (Me.TBPMO_FILES_USERRowDeletedEvent) Is Nothing) Then
- RaiseEvent TBPMO_FILES_USERRowDeleted(Me, New TBPMO_FILES_USERRowChangeEvent(CType(e.Row,TBPMO_FILES_USERRow), e.Action))
- End If
- End Sub
-
- _
- Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs)
- MyBase.OnRowDeleting(e)
- If (Not (Me.TBPMO_FILES_USERRowDeletingEvent) Is Nothing) Then
- RaiseEvent TBPMO_FILES_USERRowDeleting(Me, New TBPMO_FILES_USERRowChangeEvent(CType(e.Row,TBPMO_FILES_USERRow), e.Action))
- End If
- End Sub
-
- _
- Public Sub RemoveTBPMO_FILES_USERRow(ByVal row As TBPMO_FILES_USERRow)
- Me.Rows.Remove(row)
- End Sub
-
- _
- Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType
- Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType()
- Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence()
- Dim ds As DD_DMSDataSet = New DD_DMSDataSet()
- Dim any1 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny()
- any1.Namespace = "http://www.w3.org/2001/XMLSchema"
- any1.MinOccurs = New Decimal(0)
- any1.MaxOccurs = Decimal.MaxValue
- any1.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax
- sequence.Items.Add(any1)
- Dim any2 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny()
- any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"
- any2.MinOccurs = New Decimal(1)
- any2.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax
- sequence.Items.Add(any2)
- Dim attribute1 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute()
- attribute1.Name = "namespace"
- attribute1.FixedValue = ds.Namespace
- type.Attributes.Add(attribute1)
- Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute()
- attribute2.Name = "tableTypeName"
- attribute2.FixedValue = "TBPMO_FILES_USERDataTable"
- type.Attributes.Add(attribute2)
- type.Particle = sequence
- Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable
- If xs.Contains(dsSchema.TargetNamespace) Then
- Dim s1 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream()
- Dim s2 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream()
- Try
- Dim schema As Global.System.Xml.Schema.XmlSchema = Nothing
- dsSchema.Write(s1)
- Dim schemas As Global.System.Collections.IEnumerator = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator
- Do While schemas.MoveNext
- schema = CType(schemas.Current,Global.System.Xml.Schema.XmlSchema)
- s2.SetLength(0)
- schema.Write(s2)
- If (s1.Length = s2.Length) Then
- s1.Position = 0
- s2.Position = 0
-
- Do While ((s1.Position <> s1.Length) _
- AndAlso (s1.ReadByte = s2.ReadByte))
-
-
- Loop
- If (s1.Position = s1.Length) Then
- Return type
- End If
- End If
-
- Loop
- Finally
- If (Not (s1) Is Nothing) Then
- s1.Close
- End If
- If (Not (s2) Is Nothing) Then
- s2.Close
- End If
- End Try
- End If
- xs.Add(dsSchema)
- Return type
- End Function
- End Class
-
'''
'''Represents the strongly named DataTable class.
'''
@@ -28435,88 +28062,6 @@ Partial Public Class DD_DMSDataSet
End Sub
End Class
- '''
- '''Represents strongly named DataRow class.
- '''
- Partial Public Class TBPMO_FILES_USERRow
- Inherits Global.System.Data.DataRow
-
- Private tableTBPMO_FILES_USER As TBPMO_FILES_USERDataTable
-
- _
- Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder)
- MyBase.New(rb)
- Me.tableTBPMO_FILES_USER = CType(Me.Table,TBPMO_FILES_USERDataTable)
- End Sub
-
- _
- Public Property GUID() As Integer
- Get
- Return CType(Me(Me.tableTBPMO_FILES_USER.GUIDColumn),Integer)
- End Get
- Set
- Me(Me.tableTBPMO_FILES_USER.GUIDColumn) = value
- End Set
- End Property
-
- _
- Public Property FILENAME2WORK() As String
- Get
- Return CType(Me(Me.tableTBPMO_FILES_USER.FILENAME2WORKColumn),String)
- End Get
- Set
- Me(Me.tableTBPMO_FILES_USER.FILENAME2WORKColumn) = value
- End Set
- End Property
-
- _
- Public Property USER_WORK() As String
- Get
- Return CType(Me(Me.tableTBPMO_FILES_USER.USER_WORKColumn),String)
- End Get
- Set
- Me(Me.tableTBPMO_FILES_USER.USER_WORKColumn) = value
- End Set
- End Property
-
- _
- Public Property HANDLE_TYPE() As String
- Get
- Return CType(Me(Me.tableTBPMO_FILES_USER.HANDLE_TYPEColumn),String)
- End Get
- Set
- Me(Me.tableTBPMO_FILES_USER.HANDLE_TYPEColumn) = value
- End Set
- End Property
-
- _
- Public Property WORKED() As Boolean
- Get
- Return CType(Me(Me.tableTBPMO_FILES_USER.WORKEDColumn),Boolean)
- End Get
- Set
- Me(Me.tableTBPMO_FILES_USER.WORKEDColumn) = value
- End Set
- End Property
-
- _
- Public Property ADDED_WHEN() As Date
- Get
- Return CType(Me(Me.tableTBPMO_FILES_USER.ADDED_WHENColumn),Date)
- End Get
- Set
- Me(Me.tableTBPMO_FILES_USER.ADDED_WHENColumn) = value
- End Set
- End Property
- End Class
-
'''
'''Represents strongly named DataRow class.
'''
@@ -35236,42 +34781,6 @@ Partial Public Class DD_DMSDataSet
End Property
End Class
- '''
- '''Row event argument class
- '''
- _
- Public Class TBPMO_FILES_USERRowChangeEvent
- Inherits Global.System.EventArgs
-
- Private eventRow As TBPMO_FILES_USERRow
-
- Private eventAction As Global.System.Data.DataRowAction
-
- _
- Public Sub New(ByVal row As TBPMO_FILES_USERRow, ByVal action As Global.System.Data.DataRowAction)
- MyBase.New
- Me.eventRow = row
- Me.eventAction = action
- End Sub
-
- _
- Public ReadOnly Property Row() As TBPMO_FILES_USERRow
- Get
- Return Me.eventRow
- End Get
- End Property
-
- _
- Public ReadOnly Property Action() As Global.System.Data.DataRowAction
- Get
- Return Me.eventAction
- End Get
- End Property
- End Class
-
'''
'''Row event argument class
'''
@@ -44485,540 +43994,6 @@ Namespace DD_DMSDataSetTableAdapters
End Function
End Class
- '''
- '''Represents the connection and commands used to retrieve and save data.
- '''
- _
- Partial Public Class TBPMO_FILES_USERTableAdapter
- Inherits Global.System.ComponentModel.Component
-
- Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter
-
- Private _connection As Global.System.Data.SqlClient.SqlConnection
-
- Private _transaction As Global.System.Data.SqlClient.SqlTransaction
-
- Private _commandCollection() As Global.System.Data.SqlClient.SqlCommand
-
- Private _clearBeforeFill As Boolean
-
- _
- Public Sub New()
- MyBase.New
- Me.ClearBeforeFill = true
- End Sub
-
- _
- Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter
- Get
- If (Me._adapter Is Nothing) Then
- Me.InitAdapter
- End If
- Return Me._adapter
- End Get
- End Property
-
- _
- Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection
- Get
- If (Me._connection Is Nothing) Then
- Me.InitConnection
- End If
- Return Me._connection
- End Get
- Set
- Me._connection = value
- If (Not (Me.Adapter.InsertCommand) Is Nothing) Then
- Me.Adapter.InsertCommand.Connection = value
- End If
- If (Not (Me.Adapter.DeleteCommand) Is Nothing) Then
- Me.Adapter.DeleteCommand.Connection = value
- End If
- If (Not (Me.Adapter.UpdateCommand) Is Nothing) Then
- Me.Adapter.UpdateCommand.Connection = value
- End If
- Dim i As Integer = 0
- Do While (i < Me.CommandCollection.Length)
- If (Not (Me.CommandCollection(i)) Is Nothing) Then
- CType(Me.CommandCollection(i),Global.System.Data.SqlClient.SqlCommand).Connection = value
- End If
- i = (i + 1)
- Loop
- End Set
- End Property
-
- _
- Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction
- Get
- Return Me._transaction
- End Get
- Set
- Me._transaction = value
- Dim i As Integer = 0
- Do While (i < Me.CommandCollection.Length)
- Me.CommandCollection(i).Transaction = Me._transaction
- i = (i + 1)
- Loop
- If ((Not (Me.Adapter) Is Nothing) _
- AndAlso (Not (Me.Adapter.DeleteCommand) Is Nothing)) Then
- Me.Adapter.DeleteCommand.Transaction = Me._transaction
- End If
- If ((Not (Me.Adapter) Is Nothing) _
- AndAlso (Not (Me.Adapter.InsertCommand) Is Nothing)) Then
- Me.Adapter.InsertCommand.Transaction = Me._transaction
- End If
- If ((Not (Me.Adapter) Is Nothing) _
- AndAlso (Not (Me.Adapter.UpdateCommand) Is Nothing)) Then
- Me.Adapter.UpdateCommand.Transaction = Me._transaction
- End If
- End Set
- End Property
-
- _
- Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand()
- Get
- If (Me._commandCollection Is Nothing) Then
- Me.InitCommandCollection
- End If
- Return Me._commandCollection
- End Get
- End Property
-
- _
- Public Property ClearBeforeFill() As Boolean
- Get
- Return Me._clearBeforeFill
- End Get
- Set
- Me._clearBeforeFill = value
- End Set
- End Property
-
- _
- Private Sub InitAdapter()
- Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter()
- Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping()
- tableMapping.SourceTable = "Table"
- tableMapping.DataSetTable = "TBPMO_FILES_USER"
- tableMapping.ColumnMappings.Add("GUID", "GUID")
- tableMapping.ColumnMappings.Add("FILENAME2WORK", "FILENAME2WORK")
- tableMapping.ColumnMappings.Add("USER_WORK", "USER_WORK")
- tableMapping.ColumnMappings.Add("HANDLE_TYPE", "HANDLE_TYPE")
- tableMapping.ColumnMappings.Add("WORKED", "WORKED")
- tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN")
- Me._adapter.TableMappings.Add(tableMapping)
- Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand()
- Me._adapter.DeleteCommand.Connection = Me.Connection
- Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBPMO_FILES_USER] WHERE (([GUID] = @Original_GUID) AND ([FILENAME2WO"& _
- "RK] = @Original_FILENAME2WORK) AND ([USER_WORK] = @Original_USER_WORK) AND ([HAN"& _
- "DLE_TYPE] = @Original_HANDLE_TYPE) AND ([WORKED] = @Original_WORKED) AND ([ADDED"& _
- "_WHEN] = @Original_ADDED_WHEN))"
- Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text
- Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FILENAME2WORK", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FILENAME2WORK", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_USER_WORK", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USER_WORK", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_HANDLE_TYPE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "HANDLE_TYPE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_WORKED", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "WORKED", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand()
- Me._adapter.InsertCommand.Connection = Me.Connection
- Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBPMO_FILES_USER] ([FILENAME2WORK], [USER_WORK], [HANDLE_TYPE], [WOR"& _
- "KED], [ADDED_WHEN]) VALUES (@FILENAME2WORK, @USER_WORK, @HANDLE_TYPE, @WORKED, @"& _
- "ADDED_WHEN);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, FILENAME2WORK, USER_WORK, HANDLE_TYPE, WORKED, ADDED_"& _
- "WHEN FROM TBPMO_FILES_USER WHERE (GUID = SCOPE_IDENTITY())"
- Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
- Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FILENAME2WORK", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FILENAME2WORK", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
- Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USER_WORK", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USER_WORK", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
- Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@HANDLE_TYPE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "HANDLE_TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
- Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WORKED", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "WORKED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
- Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
- Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
- Me._adapter.UpdateCommand.Connection = Me.Connection
- Me._adapter.UpdateCommand.CommandText = "UPDATE [TBPMO_FILES_USER] SET [FILENAME2WORK] = @FILENAME2WORK, [USER_WORK] = @US"& _
- "ER_WORK, [HANDLE_TYPE] = @HANDLE_TYPE, [WORKED] = @WORKED, [ADDED_WHEN] = @ADDED"& _
- "_WHEN WHERE (([GUID] = @Original_GUID) AND ([FILENAME2WORK] = @Original_FILENAME"& _
- "2WORK) AND ([USER_WORK] = @Original_USER_WORK) AND ([HANDLE_TYPE] = @Original_HA"& _
- "NDLE_TYPE) AND ([WORKED] = @Original_WORKED) AND ([ADDED_WHEN] = @Original_ADDED"& _
- "_WHEN));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, FILENAME2WORK, USER_WORK, HANDLE_TYPE, WORKED, ADDED_WHEN"& _
- " FROM TBPMO_FILES_USER WHERE (GUID = @GUID)"
- Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
- Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FILENAME2WORK", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FILENAME2WORK", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
- Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USER_WORK", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USER_WORK", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
- Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@HANDLE_TYPE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "HANDLE_TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
- Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WORKED", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "WORKED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
- Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
- Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FILENAME2WORK", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FILENAME2WORK", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_USER_WORK", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USER_WORK", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_HANDLE_TYPE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "HANDLE_TYPE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_WORKED", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "WORKED", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
- End Sub
-
- _
- Private Sub InitConnection()
- Me._connection = New Global.System.Data.SqlClient.SqlConnection()
- Me._connection.ConnectionString = Global.DD_Record_Organiser.My.MySettings.Default.DD_DMSConnectionString
- End Sub
-
- _
- Private Sub InitCommandCollection()
- Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(3) {}
- Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
- Me._commandCollection(0).Connection = Me.Connection
- Me._commandCollection(0).CommandText = "select * from TBPMO_FILES_USER where UPPER(USER_WORK) = UPPER(@USER)"
- Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
- Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USER", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
- Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand()
- Me._commandCollection(1).Connection = Me.Connection
- Me._commandCollection(1).CommandText = "DELETE FROM [TBPMO_FILES_USER] WHERE (([GUID] = @Original_GUID) "
- Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text
- Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FILENAME2WORK", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FILENAME2WORK", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_USER_WORK", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USER_WORK", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_HANDLE_TYPE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "HANDLE_TYPE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_WORKED", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "WORKED", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._commandCollection(2) = New Global.System.Data.SqlClient.SqlCommand()
- Me._commandCollection(2).Connection = Me.Connection
- Me._commandCollection(2).CommandText = "INSERT INTO TBPMO_FILES_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (FILENAME2WORK, USER_WORK,"& _
- " HANDLE_TYPE)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@FILENAME2WORK,@USER_WORK,@HANDLE_TYPE); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT "& _
- "GUID, FILENAME2WORK, USER_WORK, HANDLE_TYPE, WORKED, ADDED_WHEN FROM TBPMO_FILES"& _
- "_USER WHERE (GUID = SCOPE_IDENTITY())"
- Me._commandCollection(2).CommandType = Global.System.Data.CommandType.Text
- Me._commandCollection(2).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FILENAME2WORK", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "FILENAME2WORK", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
- Me._commandCollection(2).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USER_WORK", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "USER_WORK", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
- Me._commandCollection(2).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@HANDLE_TYPE", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "HANDLE_TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
- Me._commandCollection(3) = New Global.System.Data.SqlClient.SqlCommand()
- Me._commandCollection(3).Connection = Me.Connection
- Me._commandCollection(3).CommandText = "UPDATE TBPMO_FILES_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET WORKED = @WORKED"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE "& _
- "(GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, FILENAME2WORK, USER_WORK, HANDLE_TYPE, W"& _
- "ORKED, ADDED_WHEN FROM TBPMO_FILES_USER WHERE (GUID = @GUID)"
- Me._commandCollection(3).CommandType = Global.System.Data.CommandType.Text
- Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WORKED", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "WORKED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
- Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
- End Sub
-
- _
- Public Overloads Overridable Function Fill(ByVal dataTable As DD_DMSDataSet.TBPMO_FILES_USERDataTable, ByVal USER As String) As Integer
- Me.Adapter.SelectCommand = Me.CommandCollection(0)
- If (USER Is Nothing) Then
- Throw New Global.System.ArgumentNullException("USER")
- Else
- Me.Adapter.SelectCommand.Parameters(0).Value = CType(USER,String)
- End If
- If (Me.ClearBeforeFill = true) Then
- dataTable.Clear
- End If
- Dim returnValue As Integer = Me.Adapter.Fill(dataTable)
- Return returnValue
- End Function
-
- _
- Public Overloads Overridable Function GetData(ByVal USER As String) As DD_DMSDataSet.TBPMO_FILES_USERDataTable
- Me.Adapter.SelectCommand = Me.CommandCollection(0)
- If (USER Is Nothing) Then
- Throw New Global.System.ArgumentNullException("USER")
- Else
- Me.Adapter.SelectCommand.Parameters(0).Value = CType(USER,String)
- End If
- Dim dataTable As DD_DMSDataSet.TBPMO_FILES_USERDataTable = New DD_DMSDataSet.TBPMO_FILES_USERDataTable()
- Me.Adapter.Fill(dataTable)
- Return dataTable
- End Function
-
- _
- Public Overloads Overridable Function Update(ByVal dataTable As DD_DMSDataSet.TBPMO_FILES_USERDataTable) As Integer
- Return Me.Adapter.Update(dataTable)
- End Function
-
- _
- Public Overloads Overridable Function Update(ByVal dataSet As DD_DMSDataSet) As Integer
- Return Me.Adapter.Update(dataSet, "TBPMO_FILES_USER")
- End Function
-
- _
- Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer
- Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow})
- End Function
-
- _
- Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer
- Return Me.Adapter.Update(dataRows)
- End Function
-
- _
- Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_FILENAME2WORK As String, ByVal Original_USER_WORK As String, ByVal Original_HANDLE_TYPE As String, ByVal Original_WORKED As Boolean, ByVal Original_ADDED_WHEN As Date) As Integer
- Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer)
- If (Original_FILENAME2WORK Is Nothing) Then
- Throw New Global.System.ArgumentNullException("Original_FILENAME2WORK")
- Else
- Me.Adapter.DeleteCommand.Parameters(1).Value = CType(Original_FILENAME2WORK,String)
- End If
- If (Original_USER_WORK Is Nothing) Then
- Throw New Global.System.ArgumentNullException("Original_USER_WORK")
- Else
- Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_USER_WORK,String)
- End If
- If (Original_HANDLE_TYPE Is Nothing) Then
- Throw New Global.System.ArgumentNullException("Original_HANDLE_TYPE")
- Else
- Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_HANDLE_TYPE,String)
- End If
- Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_WORKED,Boolean)
- Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_ADDED_WHEN,Date)
- Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State
- If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _
- <> Global.System.Data.ConnectionState.Open) Then
- Me.Adapter.DeleteCommand.Connection.Open
- End If
- Try
- Dim returnValue As Integer = Me.Adapter.DeleteCommand.ExecuteNonQuery
- Return returnValue
- Finally
- If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
- Me.Adapter.DeleteCommand.Connection.Close
- End If
- End Try
- End Function
-
- _
- Public Overloads Overridable Function Insert(ByVal FILENAME2WORK As String, ByVal USER_WORK As String, ByVal HANDLE_TYPE As String, ByVal WORKED As Boolean, ByVal ADDED_WHEN As Date) As Integer
- If (FILENAME2WORK Is Nothing) Then
- Throw New Global.System.ArgumentNullException("FILENAME2WORK")
- Else
- Me.Adapter.InsertCommand.Parameters(0).Value = CType(FILENAME2WORK,String)
- End If
- If (USER_WORK Is Nothing) Then
- Throw New Global.System.ArgumentNullException("USER_WORK")
- Else
- Me.Adapter.InsertCommand.Parameters(1).Value = CType(USER_WORK,String)
- End If
- If (HANDLE_TYPE Is Nothing) Then
- Throw New Global.System.ArgumentNullException("HANDLE_TYPE")
- Else
- Me.Adapter.InsertCommand.Parameters(2).Value = CType(HANDLE_TYPE,String)
- End If
- Me.Adapter.InsertCommand.Parameters(3).Value = CType(WORKED,Boolean)
- Me.Adapter.InsertCommand.Parameters(4).Value = CType(ADDED_WHEN,Date)
- Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State
- If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _
- <> Global.System.Data.ConnectionState.Open) Then
- Me.Adapter.InsertCommand.Connection.Open
- End If
- Try
- Dim returnValue As Integer = Me.Adapter.InsertCommand.ExecuteNonQuery
- Return returnValue
- Finally
- If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
- Me.Adapter.InsertCommand.Connection.Close
- End If
- End Try
- End Function
-
- _
- Public Overloads Overridable Function Update(ByVal FILENAME2WORK As String, ByVal USER_WORK As String, ByVal HANDLE_TYPE As String, ByVal WORKED As Boolean, ByVal ADDED_WHEN As Date, ByVal Original_GUID As Integer, ByVal Original_FILENAME2WORK As String, ByVal Original_USER_WORK As String, ByVal Original_HANDLE_TYPE As String, ByVal Original_WORKED As Boolean, ByVal Original_ADDED_WHEN As Date, ByVal GUID As Integer) As Integer
- If (FILENAME2WORK Is Nothing) Then
- Throw New Global.System.ArgumentNullException("FILENAME2WORK")
- Else
- Me.Adapter.UpdateCommand.Parameters(0).Value = CType(FILENAME2WORK,String)
- End If
- If (USER_WORK Is Nothing) Then
- Throw New Global.System.ArgumentNullException("USER_WORK")
- Else
- Me.Adapter.UpdateCommand.Parameters(1).Value = CType(USER_WORK,String)
- End If
- If (HANDLE_TYPE Is Nothing) Then
- Throw New Global.System.ArgumentNullException("HANDLE_TYPE")
- Else
- Me.Adapter.UpdateCommand.Parameters(2).Value = CType(HANDLE_TYPE,String)
- End If
- Me.Adapter.UpdateCommand.Parameters(3).Value = CType(WORKED,Boolean)
- Me.Adapter.UpdateCommand.Parameters(4).Value = CType(ADDED_WHEN,Date)
- Me.Adapter.UpdateCommand.Parameters(5).Value = CType(Original_GUID,Integer)
- If (Original_FILENAME2WORK Is Nothing) Then
- Throw New Global.System.ArgumentNullException("Original_FILENAME2WORK")
- Else
- Me.Adapter.UpdateCommand.Parameters(6).Value = CType(Original_FILENAME2WORK,String)
- End If
- If (Original_USER_WORK Is Nothing) Then
- Throw New Global.System.ArgumentNullException("Original_USER_WORK")
- Else
- Me.Adapter.UpdateCommand.Parameters(7).Value = CType(Original_USER_WORK,String)
- End If
- If (Original_HANDLE_TYPE Is Nothing) Then
- Throw New Global.System.ArgumentNullException("Original_HANDLE_TYPE")
- Else
- Me.Adapter.UpdateCommand.Parameters(8).Value = CType(Original_HANDLE_TYPE,String)
- End If
- Me.Adapter.UpdateCommand.Parameters(9).Value = CType(Original_WORKED,Boolean)
- Me.Adapter.UpdateCommand.Parameters(10).Value = CType(Original_ADDED_WHEN,Date)
- Me.Adapter.UpdateCommand.Parameters(11).Value = CType(GUID,Integer)
- Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
- If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _
- <> Global.System.Data.ConnectionState.Open) Then
- Me.Adapter.UpdateCommand.Connection.Open
- End If
- Try
- Dim returnValue As Integer = Me.Adapter.UpdateCommand.ExecuteNonQuery
- Return returnValue
- Finally
- If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
- Me.Adapter.UpdateCommand.Connection.Close
- End If
- End Try
- End Function
-
- _
- Public Overloads Overridable Function Update(ByVal FILENAME2WORK As String, ByVal USER_WORK As String, ByVal HANDLE_TYPE As String, ByVal WORKED As Boolean, ByVal ADDED_WHEN As Date, ByVal Original_GUID As Integer, ByVal Original_FILENAME2WORK As String, ByVal Original_USER_WORK As String, ByVal Original_HANDLE_TYPE As String, ByVal Original_WORKED As Boolean, ByVal Original_ADDED_WHEN As Date) As Integer
- Return Me.Update(FILENAME2WORK, USER_WORK, HANDLE_TYPE, WORKED, ADDED_WHEN, Original_GUID, Original_FILENAME2WORK, Original_USER_WORK, Original_HANDLE_TYPE, Original_WORKED, Original_ADDED_WHEN, Original_GUID)
- End Function
-
- _
- Public Overloads Overridable Function cmdDelete(ByVal Original_GUID As Integer, ByVal Original_FILENAME2WORK As String, ByVal Original_USER_WORK As String, ByVal Original_HANDLE_TYPE As String, ByVal Original_WORKED As Boolean, ByVal Original_ADDED_WHEN As Date) As Integer
- Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(1)
- command.Parameters(0).Value = CType(Original_GUID,Integer)
- If (Original_FILENAME2WORK Is Nothing) Then
- Throw New Global.System.ArgumentNullException("Original_FILENAME2WORK")
- Else
- command.Parameters(1).Value = CType(Original_FILENAME2WORK,String)
- End If
- If (Original_USER_WORK Is Nothing) Then
- Throw New Global.System.ArgumentNullException("Original_USER_WORK")
- Else
- command.Parameters(2).Value = CType(Original_USER_WORK,String)
- End If
- If (Original_HANDLE_TYPE Is Nothing) Then
- Throw New Global.System.ArgumentNullException("Original_HANDLE_TYPE")
- Else
- command.Parameters(3).Value = CType(Original_HANDLE_TYPE,String)
- End If
- command.Parameters(4).Value = CType(Original_WORKED,Boolean)
- command.Parameters(5).Value = CType(Original_ADDED_WHEN,Date)
- Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State
- If ((command.Connection.State And Global.System.Data.ConnectionState.Open) _
- <> Global.System.Data.ConnectionState.Open) Then
- command.Connection.Open
- End If
- Dim returnValue As Integer
- Try
- returnValue = command.ExecuteNonQuery
- Finally
- If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
- command.Connection.Close
- End If
- End Try
- Return returnValue
- End Function
-
- _
- Public Overloads Overridable Function cmdInsert(ByVal FILENAME2WORK As String, ByVal USER_WORK As String, ByVal HANDLE_TYPE As String) As Integer
- Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(2)
- If (FILENAME2WORK Is Nothing) Then
- Throw New Global.System.ArgumentNullException("FILENAME2WORK")
- Else
- command.Parameters(0).Value = CType(FILENAME2WORK,String)
- End If
- If (USER_WORK Is Nothing) Then
- Throw New Global.System.ArgumentNullException("USER_WORK")
- Else
- command.Parameters(1).Value = CType(USER_WORK,String)
- End If
- If (HANDLE_TYPE Is Nothing) Then
- Throw New Global.System.ArgumentNullException("HANDLE_TYPE")
- Else
- command.Parameters(2).Value = CType(HANDLE_TYPE,String)
- End If
- Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State
- If ((command.Connection.State And Global.System.Data.ConnectionState.Open) _
- <> Global.System.Data.ConnectionState.Open) Then
- command.Connection.Open
- End If
- Dim returnValue As Integer
- Try
- returnValue = command.ExecuteNonQuery
- Finally
- If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
- command.Connection.Close
- End If
- End Try
- Return returnValue
- End Function
-
- _
- Public Overloads Overridable Function cmdsetworked(ByVal WORKED As Boolean, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer
- Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(3)
- command.Parameters(0).Value = CType(WORKED,Boolean)
- command.Parameters(1).Value = CType(Original_GUID,Integer)
- command.Parameters(2).Value = CType(GUID,Integer)
- Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State
- If ((command.Connection.State And Global.System.Data.ConnectionState.Open) _
- <> Global.System.Data.ConnectionState.Open) Then
- command.Connection.Open
- End If
- Dim returnValue As Integer
- Try
- returnValue = command.ExecuteNonQuery
- Finally
- If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
- command.Connection.Close
- End If
- End Try
- Return returnValue
- End Function
- End Class
-
'''
'''Represents the connection and commands used to retrieve and save data.
'''
@@ -53982,43 +52957,43 @@ Namespace DD_DMSDataSetTableAdapters
Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {}
Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
Me._commandCollection(0).Connection = Me.Connection
- Me._commandCollection(0).CommandText = "SELECT GUID, RECORD_ID, REASON_CODE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANG" & _
- "ED_WHO, CHANGED_WHEN" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "FROM TBPMO_RECORD_VARIANT" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE (RECORD" & _
- "_ID IN" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " (SELECT GUID" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " " & _
- " FROM TBPMO_RECORD" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " WHERE " & _
- " (RECORD_ENTITY_ID =" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " " & _
- " (SELECT RECORD_ENTITY_ID" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " " & _
- " FROM TBPMO_RECORD AS TBPMO_RECORD_1" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " " & _
- " WHERE (GUID = @RECORD" & _
+ Me._commandCollection(0).CommandText = "SELECT GUID, RECORD_ID, REASON_CODE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANG"& _
+ "ED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPMO_RECORD_VARIANT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (RECORD"& _
+ "_ID IN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (SELECT GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _
+ " FROM TBPMO_RECORD"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" WHERE "& _
+ " (RECORD_ENTITY_ID ="&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _
+ " (SELECT RECORD_ENTITY_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _
+ " FROM TBPMO_RECORD AS TBPMO_RECORD_1"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _
+ " WHERE (GUID = @RECORD"& _
"_ID))) AND (FORM_ID = @ENTITY_ID) AND (GUID <> @RECORD_ID)))"
Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
- Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
- Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@RECORD_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+ Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+ Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@RECORD_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
End Sub
-
- _
- Public Overridable Overloads Function Fill(ByVal dataTable As DD_DMSDataSet.TBPMO_RECORD_VARIANTDataTable, ByVal ENTITY_ID As Integer, ByVal RECORD_ID As Integer) As Integer
+
+ _
+ Public Overloads Overridable Function Fill(ByVal dataTable As DD_DMSDataSet.TBPMO_RECORD_VARIANTDataTable, ByVal ENTITY_ID As Integer, ByVal RECORD_ID As Integer) As Integer
Me.Adapter.SelectCommand = Me.CommandCollection(0)
- Me.Adapter.SelectCommand.Parameters(0).Value = CType(ENTITY_ID, Integer)
- Me.Adapter.SelectCommand.Parameters(1).Value = CType(RECORD_ID, Integer)
- If (Me.ClearBeforeFill = True) Then
- dataTable.Clear()
+ Me.Adapter.SelectCommand.Parameters(0).Value = CType(ENTITY_ID,Integer)
+ Me.Adapter.SelectCommand.Parameters(1).Value = CType(RECORD_ID,Integer)
+ If (Me.ClearBeforeFill = true) Then
+ dataTable.Clear
End If
Dim returnValue As Integer = Me.Adapter.Fill(dataTable)
Return returnValue
End Function
-
- _
- Public Overridable Overloads Function GetData(ByVal ENTITY_ID As Integer, ByVal RECORD_ID As Integer) As DD_DMSDataSet.TBPMO_RECORD_VARIANTDataTable
+
+ _
+ Public Overloads Overridable Function GetData(ByVal ENTITY_ID As Integer, ByVal RECORD_ID As Integer) As DD_DMSDataSet.TBPMO_RECORD_VARIANTDataTable
Me.Adapter.SelectCommand = Me.CommandCollection(0)
- Me.Adapter.SelectCommand.Parameters(0).Value = CType(ENTITY_ID, Integer)
- Me.Adapter.SelectCommand.Parameters(1).Value = CType(RECORD_ID, Integer)
+ Me.Adapter.SelectCommand.Parameters(0).Value = CType(ENTITY_ID,Integer)
+ Me.Adapter.SelectCommand.Parameters(1).Value = CType(RECORD_ID,Integer)
Dim dataTable As DD_DMSDataSet.TBPMO_RECORD_VARIANTDataTable = New DD_DMSDataSet.TBPMO_RECORD_VARIANTDataTable()
Me.Adapter.Fill(dataTable)
Return dataTable
@@ -54070,8 +53045,6 @@ Namespace DD_DMSDataSetTableAdapters
Private _tBPMO_WD_OBJECTTYPETableAdapter As TBPMO_WD_OBJECTTYPETableAdapter
- Private _tBPMO_FILES_USERTableAdapter As TBPMO_FILES_USERTableAdapter
-
Private _tBPMO_FOLLOW_UP_EMAILTableAdapter As TBPMO_FOLLOW_UP_EMAILTableAdapter
Private _tBPMO_FOLLUPEMAIL_USERTableAdapter As TBPMO_FOLLUPEMAIL_USERTableAdapter
@@ -54349,20 +53322,6 @@ Namespace DD_DMSDataSetTableAdapters
End Set
End Property
- _
- Public Property TBPMO_FILES_USERTableAdapter() As TBPMO_FILES_USERTableAdapter
- Get
- Return Me._tBPMO_FILES_USERTableAdapter
- End Get
- Set
- Me._tBPMO_FILES_USERTableAdapter = value
- End Set
- End Property
-
-
-
-
-
-
- DELETE FROM [TBPMO_FILES_USER] WHERE (([GUID] = @Original_GUID) AND ([FILENAME2WORK] = @Original_FILENAME2WORK) AND ([USER_WORK] = @Original_USER_WORK) AND ([HANDLE_TYPE] = @Original_HANDLE_TYPE) AND ([WORKED] = @Original_WORKED) AND ([ADDED_WHEN] = @Original_ADDED_WHEN))
-
-
-
-
-
-
-
-
-
-
-
-
- INSERT INTO [TBPMO_FILES_USER] ([FILENAME2WORK], [USER_WORK], [HANDLE_TYPE], [WORKED], [ADDED_WHEN]) VALUES (@FILENAME2WORK, @USER_WORK, @HANDLE_TYPE, @WORKED, @ADDED_WHEN);
-SELECT GUID, FILENAME2WORK, USER_WORK, HANDLE_TYPE, WORKED, ADDED_WHEN FROM TBPMO_FILES_USER WHERE (GUID = SCOPE_IDENTITY())
-
-
-
-
-
-
-
-
-
-
-
- select * from TBPMO_FILES_USER where UPPER(USER_WORK) = UPPER(@USER)
-
-
-
-
-
-
-
- UPDATE [TBPMO_FILES_USER] SET [FILENAME2WORK] = @FILENAME2WORK, [USER_WORK] = @USER_WORK, [HANDLE_TYPE] = @HANDLE_TYPE, [WORKED] = @WORKED, [ADDED_WHEN] = @ADDED_WHEN WHERE (([GUID] = @Original_GUID) AND ([FILENAME2WORK] = @Original_FILENAME2WORK) AND ([USER_WORK] = @Original_USER_WORK) AND ([HANDLE_TYPE] = @Original_HANDLE_TYPE) AND ([WORKED] = @Original_WORKED) AND ([ADDED_WHEN] = @Original_ADDED_WHEN));
-SELECT GUID, FILENAME2WORK, USER_WORK, HANDLE_TYPE, WORKED, ADDED_WHEN FROM TBPMO_FILES_USER WHERE (GUID = @GUID)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DELETE FROM [TBPMO_FILES_USER] WHERE (([GUID] = @Original_GUID)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- INSERT INTO TBPMO_FILES_USER
- (FILENAME2WORK, USER_WORK, HANDLE_TYPE)
-VALUES (@FILENAME2WORK,@USER_WORK,@HANDLE_TYPE);
-SELECT GUID, FILENAME2WORK, USER_WORK, HANDLE_TYPE, WORKED, ADDED_WHEN FROM TBPMO_FILES_USER WHERE (GUID = SCOPE_IDENTITY())
-
-
-
-
-
-
-
-
-
-
-
- UPDATE TBPMO_FILES_USER
-SET WORKED = @WORKED
-WHERE (GUID = @Original_GUID);
-SELECT GUID, FILENAME2WORK, USER_WORK, HANDLE_TYPE, WORKED, ADDED_WHEN FROM TBPMO_FILES_USER WHERE (GUID = @GUID)
-
-
-
-
-
-
-
-
-
-
@@ -3597,7 +3482,7 @@ WHERE (RECORD_ID IN
-
+
@@ -3638,7 +3523,7 @@ WHERE (RECORD_ID IN
-
+
@@ -3716,7 +3601,7 @@ WHERE (RECORD_ID IN
-
+
@@ -3811,7 +3696,7 @@ WHERE (RECORD_ID IN
-
+
@@ -3834,7 +3719,7 @@ WHERE (RECORD_ID IN
-
+
@@ -3879,7 +3764,7 @@ WHERE (RECORD_ID IN
-
+
@@ -3917,7 +3802,7 @@ WHERE (RECORD_ID IN
-
+
@@ -3952,7 +3837,7 @@ WHERE (RECORD_ID IN
-
+
@@ -3996,7 +3881,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4017,7 +3902,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4054,7 +3939,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4099,7 +3984,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4166,7 +4051,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4203,7 +4088,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4259,7 +4144,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4298,7 +4183,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4422,7 +4307,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4520,7 +4405,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4550,7 +4435,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4587,7 +4472,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4624,7 +4509,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4656,7 +4541,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4676,7 +4561,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4722,7 +4607,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4780,37 +4665,7 @@ WHERE (RECORD_ID IN
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -4967,7 +4822,7 @@ WHERE (RECORD_ID IN
-
+
@@ -4992,7 +4847,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5027,7 +4882,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5056,7 +4911,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5116,7 +4971,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5189,7 +5044,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5296,7 +5151,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5390,7 +5245,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5429,7 +5284,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5447,7 +5302,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5493,7 +5348,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5507,7 +5362,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5559,7 +5414,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5603,7 +5458,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5635,7 +5490,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5717,7 +5572,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5769,7 +5624,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5860,7 +5715,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5891,7 +5746,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5929,7 +5784,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5971,7 +5826,7 @@ WHERE (RECORD_ID IN
-
+
@@ -5985,7 +5840,7 @@ WHERE (RECORD_ID IN
-
+
@@ -6014,7 +5869,7 @@ WHERE (RECORD_ID IN
-
+
@@ -6052,7 +5907,7 @@ WHERE (RECORD_ID IN
-
+
@@ -6070,7 +5925,7 @@ WHERE (RECORD_ID IN
-
+
@@ -6186,10 +6041,6 @@ WHERE (RECORD_ID IN
-
-
-
-
@@ -6289,27 +6140,27 @@ 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 0571353..81eb0e6 100644
--- a/app/DD-Record-Organiser/DD_DMSDataSet.xss
+++ b/app/DD-Record-Organiser/DD_DMSDataSet.xss
@@ -4,62 +4,61 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
437
@@ -75,7 +74,7 @@
-
+
1701
@@ -87,7 +86,7 @@
-
+
1627
@@ -99,7 +98,7 @@
-
+
710
@@ -115,7 +114,7 @@
-
+
1374
@@ -131,7 +130,7 @@
-
+
842
@@ -143,7 +142,7 @@
-
+
107
@@ -163,7 +162,7 @@
-
+
1632
@@ -175,7 +174,7 @@
-
+
1358
@@ -187,7 +186,7 @@
-
+
601
@@ -203,7 +202,7 @@
-
+
618
@@ -215,7 +214,7 @@
-
+
2461
@@ -231,7 +230,7 @@
-
+
2358
@@ -243,7 +242,7 @@
-
+
2134
@@ -259,7 +258,7 @@
-
+
2142
@@ -275,7 +274,7 @@
-
+
141
@@ -291,7 +290,7 @@
-
+
22
@@ -311,7 +310,7 @@
-
+
14
@@ -331,7 +330,7 @@
-
+
389
@@ -347,7 +346,7 @@
-
+
158
@@ -367,7 +366,7 @@
-
+
961
diff --git a/app/DD-Record-Organiser/ModuleHelperMethods.vb b/app/DD-Record-Organiser/ModuleHelperMethods.vb
index 6ceba4e..908a5c6 100644
--- a/app/DD-Record-Organiser/ModuleHelperMethods.vb
+++ b/app/DD-Record-Organiser/ModuleHelperMethods.vb
@@ -150,7 +150,7 @@ Module ModuleHelperMethods
Public Function GetControlID_for_RecordID(name As String, recID As Integer) As Integer
Try
Dim SQL = "SELECT CONTROL_ID FROM VWPMO_VALUES WHERE RECORD_ID = " & recID & " and CONTROL_NAME = '" & name & "'"
- Dim ID As Integer = ClassDatabase.Execute_Scalar(SQL)
+ Dim ID As Integer = ClassDatabase.Execute_Scalar(SQL, True)
If ID > 0 Then
Return ID
Else
diff --git a/app/DD-Record-Organiser/ModuleMySettings.vb b/app/DD-Record-Organiser/ModuleMySettings.vb
index ce1c6d8..e934372 100644
--- a/app/DD-Record-Organiser/ModuleMySettings.vb
+++ b/app/DD-Record-Organiser/ModuleMySettings.vb
@@ -6,6 +6,7 @@ Module ModuleMySettings
Dim ConfigPath As String = Path.Combine(Application.UserAppDataPath(), "UserConfig.xml")
Public MyConnectionString As String = ""
+
Public LogErrorsOnly As Boolean = True
Public Sett_TaskOverviewKeepInFront As Boolean = True
Public Sett_LoadWD_Docs As Boolean = True
@@ -148,7 +149,37 @@ Module ModuleMySettings
Else
MyConnectionString = ""
End If
+ Case "MyProxyConnectionString"
+ Dim connstring As String
+ 'Den ConnectonString mit verschlüsseltem PW laden
+ Dim csb As New SqlClient.SqlConnectionStringBuilder
+ csb.ConnectionString = Row.Item("Value")
+ If Not csb.ConnectionString = "" Then
+ If csb.ConnectionString.Contains("Password=") Then
+ 'sa-
+ 'Jetzt das Passwort entschlüsseln
+ Dim PWplainText As String
+ Dim wrapper As New ClassEncryption("!35452didalog=")
+ ' DecryptData throws if the wrong password is used.
+ Try
+ PWplainText = wrapper.DecryptData(csb.Password)
+ connstring = Row.Item("Value").ToString.Replace(csb.Password, PWplainText)
+ Catch ex As Exception
+ ClassLogger.Add("- the Password '" & csb.Password & "' could not be decrypted", False)
+ connstring = ""
+ End Try
+ Else
+ 'Windows-Auth
+ connstring = Row.Item("Value").ToString
+ End If
+
+ ClassProxy.MyPROXYConnectionString = connstring
+ Else
+ ClassProxy.MyPROXYConnectionString = ""
+ End If
+ Case "MyLinkedServer"
+ ClassProxy.MyLinkedServer = Row.Item("Value")
Case "LogErrorsOnly"
LogErrorsOnly = CBool(Row.Item("Value"))
Case "Sett_TaskOverviewKeepInFront"
@@ -223,6 +254,22 @@ Module ModuleMySettings
DT.Rows.Add(newRow)
DT.WriteXml(ConfigPath)
End If
+ If rowresult.Contains("MyProxyConnectionString") = False Then
+ Dim newRow As DataRow = DT.NewRow()
+ newRow("ConfigName") = "MyProxyConnectionString"
+ newRow("Value") = ""
+ DT.Rows.Add(newRow)
+ DT.WriteXml(ConfigPath)
+ End If
+ If rowresult.Contains("MyLinkedServer") = False Then
+ Dim newRow As DataRow = DT.NewRow()
+ newRow("ConfigName") = "MyLinkedServer"
+ newRow("Value") = ""
+ DT.Rows.Add(newRow)
+ DT.WriteXml(ConfigPath)
+ End If
+
+
Catch ex As Exception
MsgBox("Error in LoadMyConfig" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
ClassLogger.Add("Error in LoadMyConfig: " & ex.Message, True)
@@ -318,7 +365,14 @@ Module ModuleMySettings
Dim newRow13 As DataRow = table.NewRow()
newRow13("ConfigName") = "PATH_ADDON"
newRow13("Value") = ""
- table.Rows.Add(newRow13)
+ Dim newRow14 As DataRow = table.NewRow()
+ newRow14("ConfigName") = "MyProxyConnectionString"
+ newRow14("Value") = ""
+ table.Rows.Add(newRow14)
+ Dim newRow15 As DataRow = table.NewRow()
+ newRow15("ConfigName") = "MyLinkedServer"
+ newRow15("Value") = ""
+ table.Rows.Add(newRow15)
table.AcceptChanges()
ClassLogger.Add(">> CreateConfigTable su...", False)
@@ -360,7 +414,7 @@ Module ModuleMySettings
Public Function Settings_LoadBasicConfig()
Try
Dim sql As String = "select * from tbdd_Modules where UPPER(NAME) = UPPER('Record-Organizer')"
- Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
+ Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, False)
If DT.Rows.Count = 1 Then
vWLaufwerk = DT.Rows(0).Item("STRING1")
vVERSION_DELIMITER = DT.Rows(0).Item("VERSION_DELIMITER")
diff --git a/app/DD-Record-Organiser/ModuleRuntimeVariables.vb b/app/DD-Record-Organiser/ModuleRuntimeVariables.vb
index a14560a..973fb4a 100644
--- a/app/DD-Record-Organiser/ModuleRuntimeVariables.vb
+++ b/app/DD-Record-Organiser/ModuleRuntimeVariables.vb
@@ -4,10 +4,7 @@
Public MAIN_FORM As frmMain = Nothing
Public ERROR_INIT = "NONE"
-
' Diese Werte müssen später zur Laufzeit geladen werden
-
-
Public CURRENT_PARENT_ENTITY_ID As Integer
Public CURRENT_PARENT_RECORD_ID As Integer
Public CURRENT_ACT_LEVEL As Integer
@@ -46,12 +43,16 @@
Public CURRENT_FILEIN_WD As String
Public CURRENT_DOC_ID
+ Public CURRENT_NAVIGATION_TYPE As String = "DEFAULT"
+ Public CURRENT_SELECTED_NODE As TreeNode
+
Public NEW_RECORD_ID As Integer
Public LOGPATH As String
Public INTEGER1 As Integer
Public STRING1 As String
+ Public BOOLEAN1 As Boolean = False
Public JUMP_STATE As Integer
Public JUMP_RECORD_ID As Integer
@@ -62,7 +63,7 @@
Public LICENSE_COUNT As Integer = 0
Public LICENSE_DOSSIER_COUNT As Integer = 0
Public LICENSE_SAP_Connect As Boolean = False
- Public LICENSE_SITE As Boolean = False
+ Public LICENSE_SITE_PROXY As Boolean = False
Public LICENSE_DATE As Date
Public CONNECTION_CHANGED As Boolean = False
@@ -79,20 +80,24 @@
Public ENTITY_RELOAD_AFT_CONTROL_LOAD As Boolean = False
Public CURRENT_COL_COUNT As Integer = 0
- Public CURRENT_ENTITY_DATATABLE As DataTable
- Public CURRENT_ENTITY_VALUES_DT As DataTable
Public CURRENT_CONTROL_VALUES As DataTable
Public CURRENT_SQL_AUTO_VALUES_DT As DataTable
Public CURRENT_ENTITYSQL_WHERE As String
Public CURRENT_TBPMO_INDEX_MAN As DataTable
Public CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS As DataTable
Public CURRENT_DT_DOC_ENTITY_SEARCH As DataTable
-
+ Public CURRENT_DT_NODE_CONFIGURABLE_NODES As DataTable
Public CURRENT_DOC_RESULTS As DataTable
Public CURRENT_DOC_DROPDOWN As DataTable
-
Public CURRENT_PARENT_DT As DataTable
+ Public CURRENT_TBPMO_FILES_USER As DataTable
+
+ Public CURRENT_SEARCH_TYPE As String = "RECORD"
+ Public CURRENT_FULLTEXT_PATTERN As String
+
+ Public CURRENT_DT_SELECTED_FILES As DataTable
+
Public MASS_RECORD_IDs2CHANGE As ArrayList
Public MASS_COLUMN_LIST As ArrayList
@@ -106,10 +111,13 @@
Public CURRENT_DOCVIEW_PATH As String
Public CURRENT_DOCVIEW
+ Public CURRENT_NODE_CONFIGURABLE_ID As Integer
+
Public CURRENT_CHECK_SUBFOLDER As Boolean = False
Public CURRENT_SUBFOLDER As String = ""
Public RECORD_CHANGED As Boolean = False
+
Public CURRENT_COMBOBOX_SELECTED_INDEX As Integer = 0
Public CURRENT_COMBOBOX_SELECTED_TEXT As String = ""
Public CURRENT_TEXTBOX_SELECTED_TEXT As String = ""
diff --git a/app/DD-Record-Organiser/My Project/AssemblyInfo.vb b/app/DD-Record-Organiser/My Project/AssemblyInfo.vb
index 25d1875..b93a8f5 100644
--- a/app/DD-Record-Organiser/My Project/AssemblyInfo.vb
+++ b/app/DD-Record-Organiser/My Project/AssemblyInfo.vb
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
'
-
+
\ No newline at end of file
diff --git a/app/DD-Record-Organiser/My Project/Resources.resx b/app/DD-Record-Organiser/My Project/Resources.resx
index fd8faa4..e81694a 100644
--- a/app/DD-Record-Organiser/My Project/Resources.resx
+++ b/app/DD-Record-Organiser/My Project/Resources.resx
@@ -652,6 +652,9 @@
..\Resources\page_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\Checkbox.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -715,7 +718,4 @@
..\Resources\NetworkPipes_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
\ No newline at end of file
diff --git a/app/DD-Record-Organiser/My Project/licenses.licx b/app/DD-Record-Organiser/My Project/licenses.licx
index ef3405b..25a3c7b 100644
--- a/app/DD-Record-Organiser/My Project/licenses.licx
+++ b/app/DD-Record-Organiser/My Project/licenses.licx
@@ -1,10 +1,11 @@
-DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraScheduler.SchedulerControl, DevExpress.XtraScheduler.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/app/DD-Record-Organiser/frmConfig_Basic.Designer.vb b/app/DD-Record-Organiser/frmConfig_Basic.Designer.vb
index 12e4b9e..4db9fc3 100644
--- a/app/DD-Record-Organiser/frmConfig_Basic.Designer.vb
+++ b/app/DD-Record-Organiser/frmConfig_Basic.Designer.vb
@@ -23,9 +23,14 @@ Partial Class frmConfig_Basic
_
Private Sub InitializeComponent()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfig_Basic))
- Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.TabControl1 = New System.Windows.Forms.TabControl()
Me.TabPage1 = New System.Windows.Forms.TabPage()
+ Me.lblLinkedServer = New System.Windows.Forms.Label()
+ Me.txtLinkedServer = New System.Windows.Forms.TextBox()
+ Me.btndeleteProxy = New System.Windows.Forms.Button()
+ Me.rbConn_Proxy = New System.Windows.Forms.RadioButton()
+ Me.rbConnDefault = New System.Windows.Forms.RadioButton()
Me.chkbxUserAut = New System.Windows.Forms.CheckBox()
Me.Label5 = New System.Windows.Forms.Label()
Me.cmbDatenbank = New System.Windows.Forms.ComboBox()
@@ -85,15 +90,21 @@ Partial Class frmConfig_Basic
'
'TabControl1
'
+ resources.ApplyResources(Me.TabControl1, "TabControl1")
Me.TabControl1.Controls.Add(Me.TabPage1)
Me.TabControl1.Controls.Add(Me.TabPage2)
Me.TabControl1.Controls.Add(Me.TabPage3)
- resources.ApplyResources(Me.TabControl1, "TabControl1")
Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 0
'
'TabPage1
'
+ resources.ApplyResources(Me.TabPage1, "TabPage1")
+ Me.TabPage1.Controls.Add(Me.lblLinkedServer)
+ Me.TabPage1.Controls.Add(Me.txtLinkedServer)
+ Me.TabPage1.Controls.Add(Me.btndeleteProxy)
+ Me.TabPage1.Controls.Add(Me.rbConn_Proxy)
+ Me.TabPage1.Controls.Add(Me.rbConnDefault)
Me.TabPage1.Controls.Add(Me.chkbxUserAut)
Me.TabPage1.Controls.Add(Me.Label5)
Me.TabPage1.Controls.Add(Me.cmbDatenbank)
@@ -106,10 +117,39 @@ Partial Class frmConfig_Basic
Me.TabPage1.Controls.Add(Me.txtUser)
Me.TabPage1.Controls.Add(Me.txtPasswort)
Me.TabPage1.Controls.Add(Me.BtnConnect)
- resources.ApplyResources(Me.TabPage1, "TabPage1")
Me.TabPage1.Name = "TabPage1"
Me.TabPage1.UseVisualStyleBackColor = True
'
+ 'lblLinkedServer
+ '
+ resources.ApplyResources(Me.lblLinkedServer, "lblLinkedServer")
+ Me.lblLinkedServer.Name = "lblLinkedServer"
+ '
+ 'txtLinkedServer
+ '
+ resources.ApplyResources(Me.txtLinkedServer, "txtLinkedServer")
+ Me.txtLinkedServer.Name = "txtLinkedServer"
+ '
+ 'btndeleteProxy
+ '
+ resources.ApplyResources(Me.btndeleteProxy, "btndeleteProxy")
+ Me.btndeleteProxy.Name = "btndeleteProxy"
+ Me.btndeleteProxy.UseVisualStyleBackColor = True
+ '
+ 'rbConn_Proxy
+ '
+ resources.ApplyResources(Me.rbConn_Proxy, "rbConn_Proxy")
+ Me.rbConn_Proxy.Name = "rbConn_Proxy"
+ Me.rbConn_Proxy.UseVisualStyleBackColor = True
+ '
+ 'rbConnDefault
+ '
+ resources.ApplyResources(Me.rbConnDefault, "rbConnDefault")
+ Me.rbConnDefault.Checked = True
+ Me.rbConnDefault.Name = "rbConnDefault"
+ Me.rbConnDefault.TabStop = True
+ Me.rbConnDefault.UseVisualStyleBackColor = True
+ '
'chkbxUserAut
'
resources.ApplyResources(Me.chkbxUserAut, "chkbxUserAut")
@@ -123,8 +163,8 @@ Partial Class frmConfig_Basic
'
'cmbDatenbank
'
- Me.cmbDatenbank.FormattingEnabled = True
resources.ApplyResources(Me.cmbDatenbank, "cmbDatenbank")
+ Me.cmbDatenbank.FormattingEnabled = True
Me.cmbDatenbank.Name = "cmbDatenbank"
'
'Label4
@@ -156,32 +196,33 @@ Partial Class frmConfig_Basic
'
'txtServer
'
- Me.txtServer.ForeColor = System.Drawing.SystemColors.WindowText
resources.ApplyResources(Me.txtServer, "txtServer")
+ Me.txtServer.ForeColor = System.Drawing.SystemColors.WindowText
Me.txtServer.Name = "txtServer"
'
'txtUser
'
- Me.txtUser.ForeColor = System.Drawing.SystemColors.WindowText
resources.ApplyResources(Me.txtUser, "txtUser")
+ Me.txtUser.ForeColor = System.Drawing.SystemColors.WindowText
Me.txtUser.Name = "txtUser"
'
'txtPasswort
'
- Me.txtPasswort.ForeColor = System.Drawing.SystemColors.WindowText
resources.ApplyResources(Me.txtPasswort, "txtPasswort")
+ Me.txtPasswort.ForeColor = System.Drawing.SystemColors.WindowText
Me.txtPasswort.Name = "txtPasswort"
Me.txtPasswort.UseSystemPasswordChar = True
'
'BtnConnect
'
- Me.BtnConnect.Image = Global.DD_Record_Organiser.My.Resources.Resources.database_go1
resources.ApplyResources(Me.BtnConnect, "BtnConnect")
+ Me.BtnConnect.Image = Global.DD_Record_Organiser.My.Resources.Resources.database_go1
Me.BtnConnect.Name = "BtnConnect"
Me.BtnConnect.UseVisualStyleBackColor = True
'
'TabPage2
'
+ resources.ApplyResources(Me.TabPage2, "TabPage2")
Me.TabPage2.Controls.Add(Me.Button4)
Me.TabPage2.Controls.Add(Me.GroupBox5)
Me.TabPage2.Controls.Add(Me.GroupBox4)
@@ -192,23 +233,22 @@ Partial Class frmConfig_Basic
Me.TabPage2.Controls.Add(Me.Button1)
Me.TabPage2.Controls.Add(Me.btnApplicationFolder)
Me.TabPage2.Controls.Add(Me.LinkLabel1)
- resources.ApplyResources(Me.TabPage2, "TabPage2")
Me.TabPage2.Name = "TabPage2"
Me.TabPage2.UseVisualStyleBackColor = True
'
'Button4
'
- Me.Button4.Image = Global.DD_Record_Organiser.My.Resources.Resources.email_go
resources.ApplyResources(Me.Button4, "Button4")
+ Me.Button4.Image = Global.DD_Record_Organiser.My.Resources.Resources.email_go
Me.Button4.Name = "Button4"
Me.Button4.UseVisualStyleBackColor = True
'
'GroupBox5
'
+ resources.ApplyResources(Me.GroupBox5, "GroupBox5")
Me.GroupBox5.Controls.Add(Me.Label11)
Me.GroupBox5.Controls.Add(Me.Label10)
Me.GroupBox5.Controls.Add(Me.txtTask_Popup)
- resources.ApplyResources(Me.GroupBox5, "GroupBox5")
Me.GroupBox5.Name = "GroupBox5"
Me.GroupBox5.TabStop = False
'
@@ -229,9 +269,9 @@ Partial Class frmConfig_Basic
'
'GroupBox4
'
+ resources.ApplyResources(Me.GroupBox4, "GroupBox4")
Me.GroupBox4.Controls.Add(Me.Button3)
Me.GroupBox4.Controls.Add(Me.cmbLanguage)
- resources.ApplyResources(Me.GroupBox4, "GroupBox4")
Me.GroupBox4.Name = "GroupBox4"
Me.GroupBox4.TabStop = False
'
@@ -243,17 +283,17 @@ Partial Class frmConfig_Basic
'
'cmbLanguage
'
+ resources.ApplyResources(Me.cmbLanguage, "cmbLanguage")
Me.cmbLanguage.FormattingEnabled = True
Me.cmbLanguage.Items.AddRange(New Object() {resources.GetString("cmbLanguage.Items"), resources.GetString("cmbLanguage.Items1")})
- resources.ApplyResources(Me.cmbLanguage, "cmbLanguage")
Me.cmbLanguage.Name = "cmbLanguage"
'
'GroupBox3
'
+ resources.ApplyResources(Me.GroupBox3, "GroupBox3")
Me.GroupBox3.Controls.Add(Me.Label7)
Me.GroupBox3.Controls.Add(Me.cmbConstructor)
Me.GroupBox3.Controls.Add(Me.CheckBox1)
- resources.ApplyResources(Me.GroupBox3, "GroupBox3")
Me.GroupBox3.Name = "GroupBox3"
Me.GroupBox3.TabStop = False
'
@@ -264,8 +304,8 @@ Partial Class frmConfig_Basic
'
'cmbConstructor
'
- Me.cmbConstructor.FormattingEnabled = True
resources.ApplyResources(Me.cmbConstructor, "cmbConstructor")
+ Me.cmbConstructor.FormattingEnabled = True
Me.cmbConstructor.Name = "cmbConstructor"
'
'CheckBox1
@@ -279,11 +319,11 @@ Partial Class frmConfig_Basic
'
'GroupBox2
'
+ resources.ApplyResources(Me.GroupBox2, "GroupBox2")
Me.GroupBox2.Controls.Add(Me.CheckBoxWD_ShowEnitityDocs)
Me.GroupBox2.Controls.Add(Me.chkbxloadWDDocs)
Me.GroupBox2.Controls.Add(Me.Label6)
Me.GroupBox2.Controls.Add(Me.txtwdSearch_Count)
- resources.ApplyResources(Me.GroupBox2, "GroupBox2")
Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.TabStop = False
'
@@ -311,8 +351,8 @@ Partial Class frmConfig_Basic
'
'GroupBox1
'
- Me.GroupBox1.Controls.Add(Me.chkboxQuickMenue)
resources.ApplyResources(Me.GroupBox1, "GroupBox1")
+ Me.GroupBox1.Controls.Add(Me.chkboxQuickMenue)
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.TabStop = False
'
@@ -330,15 +370,15 @@ Partial Class frmConfig_Basic
'
'Button1
'
- Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.folder_go
resources.ApplyResources(Me.Button1, "Button1")
+ Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.folder_go
Me.Button1.Name = "Button1"
Me.Button1.UseVisualStyleBackColor = True
'
'btnApplicationFolder
'
- Me.btnApplicationFolder.Image = Global.DD_Record_Organiser.My.Resources.Resources.folder_go
resources.ApplyResources(Me.btnApplicationFolder, "btnApplicationFolder")
+ Me.btnApplicationFolder.Image = Global.DD_Record_Organiser.My.Resources.Resources.folder_go
Me.btnApplicationFolder.Name = "btnApplicationFolder"
Me.btnApplicationFolder.UseVisualStyleBackColor = True
'
@@ -350,6 +390,7 @@ Partial Class frmConfig_Basic
'
'TabPage3
'
+ resources.ApplyResources(Me.TabPage3, "TabPage3")
Me.TabPage3.Controls.Add(Me.chkSubfolder)
Me.TabPage3.Controls.Add(Me.Label9)
Me.TabPage3.Controls.Add(Me.DataGridView1)
@@ -358,7 +399,6 @@ Partial Class frmConfig_Basic
Me.TabPage3.Controls.Add(Me.txtScanFolderWatch)
Me.TabPage3.Controls.Add(Me.Label8)
Me.TabPage3.Controls.Add(Me.btnstartstop2)
- resources.ApplyResources(Me.TabPage3, "TabPage3")
Me.TabPage3.Name = "TabPage3"
Me.TabPage3.UseVisualStyleBackColor = True
'
@@ -375,9 +415,9 @@ Partial Class frmConfig_Basic
'
'DataGridView1
'
- DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua
- Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
resources.ApplyResources(Me.DataGridView1, "DataGridView1")
+ DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua
+ Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.DataGridView1.Name = "DataGridView1"
'
@@ -395,8 +435,8 @@ Partial Class frmConfig_Basic
'
'txtScanFolderWatch
'
- Me.txtScanFolderWatch.BackColor = System.Drawing.Color.LemonChiffon
resources.ApplyResources(Me.txtScanFolderWatch, "txtScanFolderWatch")
+ Me.txtScanFolderWatch.BackColor = System.Drawing.Color.LemonChiffon
Me.txtScanFolderWatch.Name = "txtScanFolderWatch"
'
'Label8
@@ -406,8 +446,8 @@ Partial Class frmConfig_Basic
'
'btnstartstop2
'
- Me.btnstartstop2.Image = Global.DD_Record_Organiser.My.Resources.Resources.bell_go
resources.ApplyResources(Me.btnstartstop2, "btnstartstop2")
+ Me.btnstartstop2.Image = Global.DD_Record_Organiser.My.Resources.Resources.bell_go
Me.btnstartstop2.Name = "btnstartstop2"
Me.btnstartstop2.UseVisualStyleBackColor = True
'
@@ -486,4 +526,9 @@ Partial Class frmConfig_Basic
Friend WithEvents txtTask_Popup As System.Windows.Forms.TextBox
Friend WithEvents Button4 As System.Windows.Forms.Button
Friend WithEvents chkSubfolder As System.Windows.Forms.CheckBox
+ Friend WithEvents rbConn_Proxy As System.Windows.Forms.RadioButton
+ Friend WithEvents rbConnDefault As System.Windows.Forms.RadioButton
+ Friend WithEvents btndeleteProxy As System.Windows.Forms.Button
+ Friend WithEvents lblLinkedServer As System.Windows.Forms.Label
+ Friend WithEvents txtLinkedServer As System.Windows.Forms.TextBox
End Class
diff --git a/app/DD-Record-Organiser/frmConfig_Basic.en-US.resx b/app/DD-Record-Organiser/frmConfig_Basic.en-US.resx
index 6fc6aad..722cdd0 100644
--- a/app/DD-Record-Organiser/frmConfig_Basic.en-US.resx
+++ b/app/DD-Record-Organiser/frmConfig_Basic.en-US.resx
@@ -117,19 +117,49 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- NoControl
+
+ Database Connection
+
+
+ Configurations
+
+ 6, 188
+
+
+ 11, 204
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+ JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsTAAALEwEAmpwYAAACLUlE
+ QVQ4T52TvY/ScBjHuVIRKHA9JAgnL+VoC7TX0kLLS6EvFBTa0uj5J7gYF+PsfpOTMrg4ORgHY+LCYJwc
+ TYyJiYuDLu7GxHgxd/Hnr5fA8TZcrsmnzfN9nufTNPnVBwDw2ZYljGzr3ciyTNu2EC87L75eb+DvD67f
+ hU9g9vt/HNs5cMaOf9Owohro7YNbe8PhjfuzzBOgkDuabk6bbRXoxuBkNLIeus6yhKyIwY5umo5tHxmG
+ +Wwu8G5QkIa0jN5gqnR1oOkGuOk6b1x3jHl9uaWGhpb1UtXNY1luPmJ4KbIkmAElAcgD3egfa5oJxq77
+ oq3ovKJoE7XbBbwoTWhG2F7cWRJ4dFR1S9fNCvykT41mB9TqjSOxXvtJM9zrYokLrc4vFYtUBcngq9Lf
+ tqICvlr7RhQr8U1za4FHXZIIurT/mePFf1AEJLkFGJb7uml2LRBrcp4us1+g4KRcYV8lkmkplyenglgH
+ VIm9tzq/VJRZLpUlih9yBQrAt79Pp3bjkVgM244nsPwe/VQQ6r8pRsgu7pwtC61grkA/T10r/NrnxB8s
+ V2VmvQiOB0MhLMZVxY/pDPEkU6DnZ2Qu2M0STjJFAIpmAUmXD0NY9PQMzEBRPwJzkiSp71F8J1/ipNMj
+ f9rE8XggkUgexq9cBXmi+DYYjtCRGL72T+D4jr/RaE+waFgu8c0zgUcmT9UuBS4/9m0hmh9Fo7N8FXih
+ CIKE5/Vi8yJsDM8P8P0HLGwR4Wl3ICYAAAAASUVORK5CYII=
+
+
+
+ 564, 161
+
+
+ 513, 64
+
156, 17
Windows-Authentication
-
- NoControl
+
+ 8, 143
143, 13
@@ -137,8 +167,11 @@
Current ConnectionString:
-
- NoControl
+
+ 11, 110
+
+
+ 8, 90
58, 13
@@ -146,11 +179,11 @@
Database:
-
- NoControl
+
+ 8, 42
-
- NoControl
+
+ 302, 42
61, 13
@@ -158,8 +191,8 @@
Username:
-
- NoControl
+
+ 426, 42
59, 13
@@ -167,14 +200,26 @@
Password:
-
- NoControl
+
+ 11, 163
+
+
+ 11, 62
+
+
+ 305, 62
+
+
+ 429, 62
+
+
+ 305, 110
Establish Database Connection
-
- Database Connection
+
+ task configs
189, 25
@@ -194,26 +239,20 @@
160, 22
-
- task configs
+
+ current language:
Change language
-
- current language:
-
-
- NoControl
+
+ formulars open:
- 179, 13
+ 214, 13
- run formular on application start:
-
-
- NoControl
+ run following sight on application start:
133, 17
@@ -221,11 +260,8 @@
run calendar as child
-
- formulars open:
-
-
- NoControl
+
+ Windream-Configuration:
236, 17
@@ -233,29 +269,20 @@
run windream search on entity-changing
-
- NoControl
-
192, 17
start windream search ultimately
-
- NoControl
-
163, 13
max. result# windream-search:
-
- Windream-Configuration:
-
-
- NoControl
+
+ menue configs
128, 17
@@ -263,30 +290,12 @@
show quick menues
-
- menue configs
-
-
- NoControl
-
-
- NoControl
-
-
- NoControl
-
-
- NoControl
-
192, 17
Link Support-Portal Digital Data
-
- Configurations
-
397, 13
diff --git a/app/DD-Record-Organiser/frmConfig_Basic.resx b/app/DD-Record-Organiser/frmConfig_Basic.resx
index a815d03..0440b87 100644
--- a/app/DD-Record-Organiser/frmConfig_Basic.resx
+++ b/app/DD-Record-Organiser/frmConfig_Basic.resx
@@ -117,1317 +117,798 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- True
-
-
+
NoControl
-
- 510, 36
+
+ 602, 22
-
- 170, 17
-
-
- 47
-
-
- Windows-Authentifizierung
-
-
- chkbxUserAut
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage1
-
-
- 0
-
-
- True
-
-
- NoControl
-
-
- 5, 115
-
-
- 150, 13
-
-
- 46
-
-
- Aktueller ConnectionString:
-
-
- Label5
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage1
-
-
+
1
-
- 8, 82
+
+ en-US
-
- 252, 21
+
+ CenterScreen
-
- 39
+
+ rbConnDefault
-
- cmbDatenbank
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage1
-
-
+
2
-
- True
+
+ MiddleRight
-
- NoControl
+
+ System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 5, 62
+
+ 216, 13
-
- 67, 13
+
+ CheckBoxWD_ShowEnitityDocs
-
- 44
-
-
- Datenbank:
-
-
- Label4
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage1
-
-
- 3
-
-
- True
-
-
- NoControl
-
-
- 5, 14
-
-
- 74, 13
-
-
- 41
-
-
- Server-Name:
-
-
- Label1
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ include Subfolders
TabPage1
-
- 4
+
+ 547, 22
-
- True
+
+ 481, 44
-
- NoControl
+
+ System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 299, 14
+
+ System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 84, 13
+
+ 1
-
- 42
+
+ 184, 17
-
- Benutzername:
-
-
- Label2
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage1
-
-
- 5
-
-
- True
-
-
- NoControl
-
-
- 423, 14
-
-
- 56, 13
-
-
- 43
-
-
- Passwort:
-
-
- Label3
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage1
-
-
- 6
+
+ 209, 102
Top, Left, Right
-
- 8, 135
-
-
- 547, 22
-
-
- 45
-
-
- txtActualConnection
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage1
-
-
- 7
-
-
- 8, 34
-
-
- 288, 22
-
-
- 36
-
-
- txtServer
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage1
-
+ 13
+
+
8
-
- 302, 34
-
-
- 118, 22
-
-
- 37
-
-
- txtUser
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage1
-
-
- 9
-
-
- 426, 34
-
-
- 64, 22
-
-
- 38
-
-
- txtPasswort
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage1
-
-
- 10
-
-
- MiddleLeft
-
-
- NoControl
-
-
- 302, 82
-
-
- 253, 25
-
-
- 40
-
-
- Verbindung zur Datenbank herstellen
-
-
- MiddleRight
-
-
- BtnConnect
+
+ 4
System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- TabPage1
+
+ 8, 12
-
- 11
+
+ 10, 21
-
- 4, 22
+
+ 6, 143
-
- 3, 3, 3, 3
-
-
- 687, 333
-
-
- 0
-
-
- Datenbank-Verbindung
-
-
- TabPage1
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabControl1
-
-
- 0
-
-
- MiddleLeft
-
-
+
NoControl
-
- 481, 97
+
+ 6
-
- 198, 23
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 14
+
+ 11, 56
-
- Create Log-Email
+
+ max. Ergebnissanzahl windream-Suche:
-
- MiddleRight
-
-
- Button4
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage2
-
-
- 0
-
-
- True
-
-
- NoControl
-
-
- 64, 25
-
-
- 157, 13
-
-
- 8
-
-
- Minuten ein Popup anzeigen
-
-
- Label11
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GroupBox5
-
-
- 0
-
-
+
+
True
NoControl
-
- 6, 25
+
+ 2
-
- 25, 13
-
-
- 7
-
-
- alle
-
-
- Label10
-
-
+
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- GroupBox5
+
+ MiddleLeft
-
- 1
-
-
- 33, 22
-
-
- 25, 22
-
-
- 6
-
-
- txtTask_Popup
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GroupBox5
-
-
- 2
-
-
- 297, 129
-
-
- 382, 53
-
-
- 13
-
-
- Tasks-Einstellungen
-
-
- GroupBox5
-
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage2
-
-
- 1
-
-
- NoControl
-
-
- 9, 48
-
-
- 134, 23
-
-
- 47
-
-
- Sprache jetzt wechseln
-
-
- Button3
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GroupBox4
-
-
+
0
-
- de-DE
-
-
- en-US
-
-
- 9, 21
-
-
- 134, 21
-
-
- 46
-
-
- cmbLanguage
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GroupBox4
-
-
- 1
-
-
- 297, 44
-
-
- 157, 77
-
-
- 12
-
-
- Aktuelle Sprache:
-
-
- GroupBox4
-
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage2
-
-
- 2
-
-
- True
-
-
- NoControl
-
-
- 284, 14
-
-
- 185, 13
-
-
- 4
-
-
- Formular bei Programmstart laden:
-
-
- Label7
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GroupBox3
-
-
- 0
-
-
- 287, 30
-
-
- 248, 21
-
-
- 1
-
-
- cmbConstructor
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GroupBox3
-
-
- 1
-
-
- True
-
-
- NoControl
-
-
- 10, 21
-
-
- 184, 30
-
-
- 0
-
-
- Kalender als Child aufrufen
-(Eingebettet in Hauptformular)
-
-
- CheckBox1
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GroupBox3
-
-
- 2
-
-
- 14, 188
-
-
- 665, 61
+
+ 288, 22
11
-
- Formularaufrufe:
+
+ 288, 21
-
- GroupBox3
-
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage2
-
-
- 3
-
-
- True
-
-
- NoControl
-
-
- 10, 86
-
-
- 265, 17
-
-
- 6
-
-
- Windream-Suche bei Entitätswechsel auslösen
-
-
- CheckBoxWD_ShowEnitityDocs
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GroupBox2
-
-
- 0
-
-
- True
-
-
- NoControl
-
-
- 10, 21
-
-
- 184, 17
-
-
- 0
-
-
- windream-Suche direkt starten
-
-
- chkbxloadWDDocs
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GroupBox2
-
-
- 1
-
-
- True
-
-
- NoControl
-
-
- 7, 41
-
-
- 209, 13
-
-
- 3
-
-
- max. Ergebnissanzahl windream-Suche:
-
-
- Label6
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GroupBox2
-
-
- 2
-
-
- 10, 57
-
-
- 61, 22
-
-
- 5
-
-
- txtwdSearch_Count
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GroupBox2
-
-
- 3
-
-
- 14, 6
-
-
- 277, 115
-
-
- 10
-
-
- Windream-Einstellungen
-
-
- GroupBox2
-
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage2
-
-
- 4
-
-
- True
-
-
- NoControl
-
-
- 10, 21
-
-
- 189, 17
-
-
- 8
-
-
- Quick-Menü (Buttons) anzeigen
-
-
- chkboxQuickMenue
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GroupBox1
+
+ TabPage1
0
-
- 14, 129
+
+ txtActualConnection
-
- 277, 53
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 9
+
+ Hot Folder - Scan
-
- Menü-Einstellungen
+
+ 41
-
- GroupBox1
+
+ 10
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
+
TabPage2
-
- 5
-
-
+
True
-
+
+ GroupBox2
+
+
+ Windream-Suche bei Entitätswechsel auslösen
+
+
NoControl
-
- 306, 17
+
+ chkbxUserAut
-
- 105, 17
-
-
- 7
-
-
- Log Errors Only
-
-
- chkLogErrorsOnly
-
-
+
System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- TabPage2
+
+ 284, 14
+
+
+ NoControl
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ True
+
+
+ 14
6
-
- MiddleLeft
+
+ 0
-
+
+ GroupBox2
+
+
+ txtPasswort
+
+
+ TabPage1
+
+
+ 15
+
+
+ GroupBox4
+
+
+ 611, 13
+
+
+ True
+
+
+ 6, 168
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TabPage1
+
+
+ 11, 102
+
+
+ TabPage2
+
+
+ 45
+
+
+ Datenbank-Verbindung
+
+
+ User-Grundeinstellungen
+
+
+ 18
+
+
+ Delete Proxy
+
+
+ 1
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ MiddleRight
+
+
+ 0
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ True
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ lblLinkedServer
+
+
+ 33, 22
+
+
+ 4
+
+
NoControl
-
- 481, 70
+
+ MiddleRight
-
- 198, 23
+
+ True
+
+
+ 9, 48
+
+
+ 6, 74
+
+
+ btndeleteProxy
+
+
+ 687, 333
+
+
+ 50
+
+
+ Definieren Sie hier Inhalte von Dateinamen welche von der Folderwatch-Überwachung ausgenommen werden sollen:
+
+
+ 559, 141
+
+
+ alle
+
+
+ 265, 17
+
+
+ 9, 94
+
+
+ 3, 3, 3, 3
+
+
+ 40
+
+
+ MiddleRight
6
-
- Open Log-Folder
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- MiddleRight
+
+ 7
+
+
+ 0
+
+
+ 3, 3, 3, 3
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Top, Bottom, Left
+
+
+ GroupBox3
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Quick-Menü (Buttons) anzeigen
+
+
+ Label4
+
+
+ 134, 21
+
+
+ 6, 13
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 38
+
+
+ 48
+
+
+ TabPage1
+
+
+ Überwachung starten
+
+
+ 2
+
+
+ 189, 17
+
+
+ 248, 21
+
+
+ True
+
+
+ 7
+
+
+ Verbindung zur Datenbank herstellen
+
+
+ Passwort:
+
+
+ 3
+
+
+ 4, 22
+
+
+ TabPage2
+
+
+ TabPage2
Button1
-
+
+ 52
+
+
+ 9
+
+
+ 695, 359
+
+
+ TabPage3
+
+
+ 47
+
+
System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 6, 25
+
+
+ txtScanFolderWatch
+
+
+ 8
+
+
+ Button4
+
+
+ 303, 90
+
+
+ TabPage2
+
+
+ TabPage2
+
+
+ TabPage3
+
+
+ 297, 129
+
+
+ Button2
+
+
+ 44
+
+
+ GroupBox4
+
+
+ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TabPage2
+
+
+ 10
+
+
+ 10, 21
+
+
+ windream-Suche direkt starten
+
+
+ True
+
+
+ MiddleLeft
+
+
+ NoControl
+
+
+ 11
+
+
+ TabPage1
+
+
+ TabPage2
+
+
+ Button3
+
+
+ 64, 22
+
+
+ TabPage3
+
+
+ 9, 184
+
+
+ Label6
+
+
+ 49
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 3
+
+
+ TabPage1
+
+
+ 0
+
+
+ 37
+
+
+ 10, 57
+
+
+ NoControl
+
+
+ MiddleLeft
+
+
+ GroupBox2
+
+
+ NoControl
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 4
+
+
+ Link zu Support-Tool Digital Data
+
+
+ 424, 26
+
+
+ Sprache jetzt wechseln
+
+
+ TabPage3
+
+
+ 25, 22
+
+
+ 198, 23
+
+
+ True
+
+
+ 6
+
+
+ 478, 15
+
+
+ TabPage1
+
+
+ 3, 3, 3, 3
+
+
+ True
+
+
+ 2
+
+
+ 115, 17
+
+
+ Formularaufrufe:
+
+
+ 15
+
+
+ 7, 41
+
+
TabPage2
7
-
- MiddleLeft
-
-
- NoControl
-
-
- 481, 44
-
-
- 198, 23
-
-
- 2
+
+ 3
Open AppFolder User
-
- MiddleRight
+
+ TabPage1
-
- btnApplicationFolder
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage2
-
-
- 8
-
-
- True
-
-
- Segoe UI, 9.75pt
-
-
- NoControl
-
-
- 478, 15
-
-
- 201, 17
-
-
- 1
-
-
- Link zu Support-Tool Digital Data
-
-
- LinkLabel1
-
-
- System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage2
-
-
- 9
-
-
- 4, 22
-
-
- 3, 3, 3, 3
-
-
- 687, 333
-
-
- 1
-
-
- Weitere Einstellungen
-
-
- TabPage2
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabControl1
-
-
- 1
-
-
- True
-
-
- 11, 56
-
-
- 123, 17
-
-
- 18
-
-
- include Subfolders
-
-
- chkSubfolder
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage3
-
-
- 0
-
-
- True
-
-
- NoControl
-
-
- 8, 86
-
-
- 611, 13
-
-
- 17
-
-
- Definieren Sie hier Inhalte von Dateinamen welche von der Folderwatch-Überwachung ausgenommen werden sollen:
-
-
- Label9
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage3
-
-
- 1
-
-
- Top, Bottom, Left
-
-
- 11, 102
-
-
- 192, 153
-
-
- 15
-
-
- DataGridView1
-
-
- System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage3
-
-
- 2
-
-
- MiddleLeft
-
-
- NoControl
-
-
- 209, 102
-
-
- 94, 29
-
-
- 16
-
-
- Speichern
-
-
- MiddleRight
-
-
- btnSaveExclusionFiles
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage3
-
-
- 3
-
-
- NoControl
-
-
- 616, 28
-
-
- 49, 22
-
-
- 14
-
-
- ...
-
-
- Button2
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage3
-
-
- 4
-
-
- 11, 28
-
-
- 602, 22
-
-
- 12
-
-
- txtScanFolderWatch
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPage3
-
-
- 5
-
-
- True
-
-
- NoControl
-
-
- 8, 12
-
-
- 392, 13
-
-
- 11
-
-
- Definieren Sie hier den Ordner der für Scan2Folder verwendet werden soll:
+
+ GroupBox4
Label8
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+