This commit is contained in:
2021-09-07 16:35:17 +02:00
parent d5aeb55704
commit 1f392ca41b
51 changed files with 6881 additions and 1404 deletions

View File

@@ -27,20 +27,20 @@ Public Class frmAdministration
formloaded = False
UNSAVED_CHANGES_PROFILE = False
Try
TBPM_KONFIGURATIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING
TBPM_PROFILETableAdapter.Connection.ConnectionString = CONNECTION_STRING
TBPM_KONFIGURATIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM
TBPM_PROFILETableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM
PROF_ORIGIN = DD_DMSLiteDataSet.TBPM_PROFILE
TBPM_TYPETableAdapter.Connection.ConnectionString = CONNECTION_STRING
TBDD_USERTableAdapter.Connection.ConnectionString = CONNECTION_STRING
FNPM_GET_FREE_USER_FOR_PROFILETableAdapter.Connection.ConnectionString = CONNECTION_STRING
TBDD_GROUPSTableAdapter.Connection.ConnectionString = CONNECTION_STRING
TBPROFILE_USERTableAdapter.Connection.ConnectionString = CONNECTION_STRING
TBPROFILE_GROUPTableAdapter.Connection.ConnectionString = CONNECTION_STRING
TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Connection.ConnectionString = CONNECTION_STRING
TBPM_TYPETableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM
TBDD_USERTableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM
FNPM_GET_FREE_USER_FOR_PROFILETableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM
TBDD_GROUPSTableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM
TBPROFILE_USERTableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM
TBPROFILE_GROUPTableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM
TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM
TBPM_PROFILE_CONTROLSTableAdapter.Connection.ConnectionString = CONNECTION_STRING
TBPM_PROFILE_FILESTableAdapter.Connection.ConnectionString = CONNECTION_STRING
TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING
TBPM_PROFILE_CONTROLSTableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM
TBPM_PROFILE_FILESTableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM
TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM
TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION)
Refresh_Profildaten()
@@ -212,7 +212,7 @@ Public Class frmAdministration
End Try
Else
Dim oSQL = "SELECT GUID, TITLE FROM TBIDB_BUSINESS_ENTITY"
Dim oDT As DataTable = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB)
Dim oDT As DataTable = Database_IDB.GetDatatable(oSQL)
For Each oROW As DataRow In oDT.Rows
Me.cmbObjekttypen.Items.Add(oROW.Item(1))
Next
@@ -484,7 +484,7 @@ Public Class frmAdministration
Series4Sequence.Value = 1
Dim oSQLChart As String = "SELECT * FROM TBPM_CHART ORDER BY GROUP_ID"
DT_CHART_CONFIG = ClassDatabase.Return_Datatable(oSQLChart, "Adm_Chart")
DT_CHART_CONFIG = Database_ECM.GetDatatable(oSQLChart) ', "Adm_Chart")
For Each oROW As DataRow In DT_CHART_CONFIG.Rows
If oROW.Item("GROUP_ID") = 1 Then
Series1GUID.Text = oROW.Item("GUID")
@@ -685,7 +685,7 @@ Public Class frmAdministration
End Sub
Private Function Execute_SQL(SQL As String)
Try
Dim SQLconnection As New SqlClient.SqlConnection(CONNECTION_STRING)
Dim SQLconnection As New SqlClient.SqlConnection(CONNECTION_STRING_ECM)
Dim SQLcommand As New SqlCommand(SQL, SQLconnection)
SQLconnection.Open()
SQLcommand.ExecuteNonQuery()
@@ -1082,7 +1082,7 @@ Public Class frmAdministration
If result = MsgBoxResult.Yes Then
Try
Dim oEXECSQL As String = $"EXEC PRPM_COPY_PROFILE {PROFILGUIDTextBox.Text},'{USER_USERNAME}'"
If ClassDatabase.Execute_non_Query(oEXECSQL) = True Then
If Database_ECM.ExecuteNonQuery(oEXECSQL) = True Then
MsgBox("Das Profil " & NAMETextBox.Text & " wurde erfolgreich kopiert!", MsgBoxStyle.Information, "Erfolgsmeldung")
Refresh_Profildaten()
Else
@@ -1106,7 +1106,7 @@ Public Class frmAdministration
Try
Dim profileID = PROFILGUIDTextBox.Text
Dim del As String = $"EXEC PRPM_DELETE_PROFILE {profileID}"
If ClassDatabase.Execute_non_Query(del) = True Then
If Database_ECM.ExecuteNonQuery(del) = True Then
MsgBox("Das Profil " & NAMETextBox.Text & " wurde erfolgreich gelöscht!", MsgBoxStyle.Information, "Erfolgsmeldung")
Refresh_Profildaten()
End If
@@ -1123,7 +1123,7 @@ Public Class frmAdministration
Dim result As MsgBoxResult = MsgBox("Wollen Sie die Dateien für dieses Profil wirklich entfernen?" & vbNewLine & "Wenn ja müssen Sie auf die Aktualisierung des Jobs warten bis wieder Dateien zur Bearbeitung frei sind.", MsgBoxStyle.YesNo, "Bestätigung erforderlich:")
'wenn Speichern ja
If result = MsgBoxResult.Yes Then
If ClassDatabase.Execute_non_Query("DELETE FROM TBPM_PROFILE_FILES WHERE PROFIL_ID = " & PROFILGUIDTextBox.Text) = True Then
If Database_ECM.ExecuteNonQuery("DELETE FROM TBPM_PROFILE_FILES WHERE PROFIL_ID = " & PROFILGUIDTextBox.Text) = True Then
MsgBox("Die Dateien zum Profil wurden erfolgreich gelöscht!", MsgBoxStyle.Information)
End If
End If
@@ -1180,7 +1180,7 @@ Public Class frmAdministration
Dim result As MsgBoxResult = MsgBox("Do You really want to delete all workflow-Jobs?" & vbNewLine & "If yes You have to wait for the next Sync-Job for the jobs.", MsgBoxStyle.YesNo, "Bestätigung erforderlich:")
'wenn Speichern ja
If result = MsgBoxResult.Yes Then
If ClassDatabase.Execute_non_Query("DELETE FROM TBPM_PROFILE_FILES") = True Then
If Database_ECM.ExecuteNonQuery("DELETE FROM TBPM_PROFILE_FILES") = True Then
MsgBox("All workflow-jobs have been erased!", MsgBoxStyle.Information)
End If
End If
@@ -1201,7 +1201,7 @@ Public Class frmAdministration
Dim oResult = oForm.ShowDialog()
If oResult = DialogResult.OK Then
ClassDatabase.Execute_non_Query(String.Format("UPDATE TBPM_KONFIGURATION SET SQL_PROFILE_MAIN_VIEW = '{0}' WHERE GUID = 1", oForm.SQLCommand.Replace("'", "''")))
Database_ECM.ExecuteNonQuery(String.Format("UPDATE TBPM_KONFIGURATION SET SQL_PROFILE_MAIN_VIEW = '{0}' WHERE GUID = 1", oForm.SQLCommand.Replace("'", "''")))
BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") = oForm.SQLCommand
End If
Catch ex As Exception
@@ -1295,7 +1295,7 @@ Public Class frmAdministration
Dim sql As String = $"INSERT INTO TBPM_PROFILE_FINAL_INDEXING (PROFIL_ID, CONNECTION_ID, SQL_COMMAND, INDEXNAME, VALUE, ACTIVE, PREVENT_DUPLICATES, ALLOW_NEW_VALUES, ADDED_WHO,IF_VEKTOR_BEHAVIOUR,DESCRIPTION,SEQUENCE,CONTINUE_INDETERMINED)
VALUES ({oProfileId}, {connectionId}, '{sqlCommand}', '{indexName}', '{value}', {active}, {preventDuplicates}, {AllowAddNewValues}, '{addedWho}','{IF_VEKTOR_BEHAVIOUR}','{oDescription}',{pSequence},{oContinueOIdS})"
If ClassDatabase.Execute_non_Query(sql, True) Then
If Database_ECM.ExecuteNonQuery(sql) Then
tsbStaticInfo.Caption = $"Final index added - {Now.ToLongTimeString}"
INSERT_ACTIVE = False
End If
@@ -1305,7 +1305,7 @@ Public Class frmAdministration
VALUE = '{value}', ACTIVE = {active}, ALLOW_NEW_VALUES = {AllowAddNewValues}, PREVENT_DUPLICATES = {preventDuplicates},IF_VEKTOR_BEHAVIOUR = '{IF_VEKTOR_BEHAVIOUR}', [SEQUENCE] = {oSequence}, CONTINUE_INDETERMINED = {oContinueOIdS}
WHERE GUID = {guid}"
If ClassDatabase.Execute_non_Query(sql, True) Then
If Database_ECM.ExecuteNonQuery(sql) Then
tsbStaticInfo.Caption = $"Final index saved - {Now.ToLongTimeString} - RESTART NECESSARY"
End If
End If
@@ -1344,7 +1344,7 @@ Public Class frmAdministration
Dim oResult = oForm.ShowDialog()
If oResult = DialogResult.OK Then
ClassDatabase.Execute_non_Query(String.Format("UPDATE TBPM_KONFIGURATION SET SQL_PROFILE_MAIN_VIEW = '{0}' WHERE GUID = 1", oForm.SQLCommand.Replace("'", "''")))
Database_ECM.ExecuteNonQuery(String.Format("UPDATE TBPM_KONFIGURATION SET SQL_PROFILE_MAIN_VIEW = '{0}' WHERE GUID = 1", oForm.SQLCommand.Replace("'", "''")))
BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") = oForm.SQLCommand
End If
Catch ex As Exception
@@ -1359,14 +1359,14 @@ Public Class frmAdministration
CURRENT_ProfilGUID = PROFILGUIDTextBox.Text
CURRENT_DESIGN_TYPE = "SQL_PROFILE"
Dim oSQL = $"SELECT [SQL_VIEW] FROM TBPM_PROFILE WHERE GUID = {CURRENT_ProfilGUID}"
Dim oldSQL = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING)
Dim oldSQL = Database_ECM.GetScalarValue(oSQL)
Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oldSQL}
Dim oResult = oForm.ShowDialog()
If oResult = DialogResult.OK Then
If oldSQL <> oForm.SQLCommand Then
Dim oUpdate As String = $"Update TBPM_PROFILE SET CHANGED_WHO = '{USER_USERNAME}', SQL_VIEW = '{oForm.SQLCommand.Replace("'", "''")}' WHERE GUID = {CURRENT_ProfilGUID}"
If ClassDatabase.Execute_non_Query(oUpdate) = True Then
If Database_ECM.ExecuteNonQuery(oUpdate) = True Then
tsbStaticInfo.Caption = $"Profile SQL saved - {Now.ToLongTimeString}"
CHANGES_FORM_DESIGN = True
End If
@@ -1384,14 +1384,14 @@ Public Class frmAdministration
CURRENT_ProfilGUID = PROFILGUIDTextBox.Text
CURRENT_DESIGN_TYPE = "SQL_BTNFINISH"
Dim oSQL = $"SELECT SQL_BTN_FINISH FROM TBPM_PROFILE WHERE GUID = {CURRENT_ProfilGUID}"
Dim oldSQL = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, "bbtnItemFinishSQL_ItemClick-get SQL_BTN_FINISH")
Dim oldSQL = Database_ECM.GetScalarValue(oSQL) ', CONNECTION_STRING_ECM, "bbtnItemFinishSQL_ItemClick-get SQL_BTN_FINISH")
Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oldSQL}
Dim oResult = oForm.ShowDialog()
If oResult = DialogResult.OK Then
If oldSQL <> oForm.SQLCommand Then
Dim oUpdate As String = $"Update TBPM_PROFILE SET CHANGED_WHO = '{USER_USERNAME}', SQL_BTN_FINISH = '{oForm.SQLCommand.Replace("'", "''")}' WHERE GUID = {CURRENT_ProfilGUID}"
If ClassDatabase.Execute_non_Query(oUpdate) = True Then
If Database_ECM.ExecuteNonQuery(oUpdate) = True Then
tsbStaticInfo.Caption = $"Profile SQLFinish saved - {Now.ToLongTimeString}"
CHANGES_FORM_DESIGN = True
End If
@@ -1528,7 +1528,7 @@ Public Class frmAdministration
,[CHANGED_WHO] = '{USER_USERNAME}'
,[GROUP_ID] = '{pSequence}'
WHERE GUID = {pGUID}"
Return ClassDatabase.Execute_non_Query(oUpdate)
Return Database_ECM.ExecuteNonQuery(oUpdate)
End Function
Private Function Insert_ChartRow(pTitle As String, pArgument As String, pColumn As String, pType As String, pSQL As String, pSequence As String)
pSQL = pSQL.Replace("'", "''")
@@ -1548,7 +1548,7 @@ Public Class frmAdministration
,'{pTitle}'
,'{USER_USERNAME}'
,'{pSequence}')"
Return ClassDatabase.Execute_non_Query(oInsert)
Return Database_ECM.ExecuteNonQuery(oInsert)
End Function
Private Sub BarButtonItem22_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem22.ItemClick
@@ -1667,7 +1667,7 @@ Public Class frmAdministration
End Sub
Private Function DELETE_ChartRow(pGUID As String)
Dim oDelete = $"DELETE FROM [dbo].[TBPM_CHART] WHERE GUID = {pGUID}"
Return ClassDatabase.Execute_non_Query(oDelete)
Return Database_ECM.ExecuteNonQuery(oDelete)
End Function
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click