MS23032016
This commit is contained in:
@@ -113,7 +113,11 @@ Public Class ClassControlBuilder
|
|||||||
|
|
||||||
Select Case control.GetType()
|
Select Case control.GetType()
|
||||||
Case GetType(ComboBox)
|
Case GetType(ComboBox)
|
||||||
value = DirectCast(control, ComboBox).SelectedValue
|
If IsNothing(DirectCast(control, ComboBox).ValueMember) Then
|
||||||
|
value = DirectCast(control, ComboBox).Text
|
||||||
|
Else
|
||||||
|
value = DirectCast(control, ComboBox).SelectedValue
|
||||||
|
End If
|
||||||
Case Else
|
Case Else
|
||||||
Exit Sub
|
Exit Sub
|
||||||
End Select
|
End Select
|
||||||
|
|||||||
@@ -452,13 +452,9 @@
|
|||||||
End Try
|
End Try
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
Public Shared Function DeleteControl()
|
Public Shared Function DeleteControl(ID As Integer)
|
||||||
Try
|
Try
|
||||||
If CURRENT_CONTROL_ID = Nothing Then
|
Dim del = "EXEC [dbo].[PRPMO_DELETE_CONTROL] " & ID.ToString
|
||||||
MsgBox("Kein Element ausgewählt", MsgBoxStyle.Information)
|
|
||||||
End If
|
|
||||||
|
|
||||||
Dim del = "EXEC [dbo].[PRPMO_DELETE_CONTROL] " & CURRENT_CONTROL_ID.ToString
|
|
||||||
If ClassDatabase.Execute_non_Query(del) = True Then
|
If ClassDatabase.Execute_non_Query(del) = True Then
|
||||||
Return True
|
Return True
|
||||||
Else
|
Else
|
||||||
@@ -494,28 +490,28 @@
|
|||||||
End Try
|
End Try
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
Public Shared Function DeleteControl(id As Integer)
|
'Public Shared Function DeleteControl(id As Integer)
|
||||||
Try
|
' Try
|
||||||
If DeleteControlValues(id) = True Then
|
' If DeleteControlValues(id) = True Then
|
||||||
If DeleteControlScreen(id) = True Then
|
' If DeleteControlScreen(id) = True Then
|
||||||
If ClassFunctionCommands.DeleteFunction(id) = True Then
|
' If ClassFunctionCommands.DeleteFunction(id) = True Then
|
||||||
Dim SQL = "DELETE FROM TBPMO_CONTROL WHERE GUID = " & id
|
' Dim SQL = "DELETE FROM TBPMO_CONTROL WHERE GUID = " & id
|
||||||
|
|
||||||
If ClassDatabase.Execute_non_Query(SQL) = True Then
|
' If ClassDatabase.Execute_non_Query(SQL) = True Then
|
||||||
Return True
|
' Return True
|
||||||
Else
|
' Else
|
||||||
Throw New Exception()
|
' Throw New Exception()
|
||||||
End If
|
' End If
|
||||||
End If
|
' End If
|
||||||
End If
|
' End If
|
||||||
End If
|
' End If
|
||||||
|
|
||||||
Catch ex As Exception
|
' Catch ex As Exception
|
||||||
ClassLogger.Add("Unexpected Error in Delete Control1: " & ex.Message, True)
|
' ClassLogger.Add("Unexpected Error in Delete Control1: " & ex.Message, True)
|
||||||
MsgBox("Unexpected Error in Delete Control1:" + vbNewLine + ex.Message, MsgBoxStyle.Critical)
|
' MsgBox("Unexpected Error in Delete Control1:" + vbNewLine + ex.Message, MsgBoxStyle.Critical)
|
||||||
Return False
|
' Return False
|
||||||
End Try
|
' End Try
|
||||||
End Function
|
'End Function
|
||||||
|
|
||||||
|
|
||||||
Public Shared Function DeleteControlScreen(id As Integer)
|
Public Shared Function DeleteControlScreen(id As Integer)
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ Public Class ClassDatabase
|
|||||||
SQLconnect.Close()
|
SQLconnect.Close()
|
||||||
Return True
|
Return True
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
ClassLogger.Add("Fehler bei DatabaseInit: " & ex.Message, True)
|
ClassLogger.Add("Error in DatabaseInit: " & ex.Message, True)
|
||||||
Return False
|
Return False
|
||||||
End Try
|
End Try
|
||||||
End Function
|
End Function
|
||||||
@@ -50,8 +50,8 @@ Public Class ClassDatabase
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
ClassLogger.Add(" - Unvorhergesehener Fehler bei GetConnectionString - Fehler: " & vbNewLine & ex.Message)
|
ClassLogger.Add(" - Error in bei GetConnectionString - Fehler: " & vbNewLine & ex.Message)
|
||||||
MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei GetConnectionString:")
|
MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in GetConnectionString:")
|
||||||
End Try
|
End Try
|
||||||
Return connectionString
|
Return connectionString
|
||||||
End Function
|
End Function
|
||||||
@@ -70,8 +70,8 @@ Public Class ClassDatabase
|
|||||||
SQLconnect.Close()
|
SQLconnect.Close()
|
||||||
Return dt
|
Return dt
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
MsgBox("Fehler bei Return_Datatable: " & ex.Message & vbNewLine & vbNewLine & Select_anweisung & vbNewLine & vbNewLine & "Call-Method: " & CallMethod, MsgBoxStyle.Critical)
|
MsgBox("Error in Return_Datatable: " & ex.Message & vbNewLine & vbNewLine & Select_anweisung & vbNewLine & vbNewLine & "Call-Method: " & CallMethod, MsgBoxStyle.Critical)
|
||||||
ClassLogger.Add("Fehler bei Return_Datatable: " & ex.Message & "Call-Method: " & CallMethod, True)
|
ClassLogger.Add("Error in Return_Datatable: " & ex.Message & "Call-Method: " & CallMethod, True)
|
||||||
If CallMethod <> "" Then ClassLogger.Add(">> Call-Method: " & CallMethod, False)
|
If CallMethod <> "" Then ClassLogger.Add(">> Call-Method: " & CallMethod, False)
|
||||||
ClassLogger.Add(">> SQL: " & Select_anweisung, False)
|
ClassLogger.Add(">> SQL: " & Select_anweisung, False)
|
||||||
Return Nothing
|
Return Nothing
|
||||||
@@ -79,6 +79,13 @@ Public Class ClassDatabase
|
|||||||
End Function
|
End Function
|
||||||
Public Shared Function MSSQL_ReturnDTWithConnection(connectionId As Integer, sql As String)
|
Public Shared Function MSSQL_ReturnDTWithConnection(connectionId As Integer, sql As String)
|
||||||
Try
|
Try
|
||||||
|
Dim regex As New System.Text.RegularExpressions.Regex("(@(\d+)@)")
|
||||||
|
Dim match As System.Text.RegularExpressions.Match = regex.Match(sql)
|
||||||
|
|
||||||
|
If match.Success Then
|
||||||
|
Return Nothing
|
||||||
|
End If
|
||||||
|
|
||||||
Dim connectionString As String
|
Dim connectionString As String
|
||||||
connectionString = ClassDatabase.GetConnectionString(connectionId)
|
connectionString = ClassDatabase.GetConnectionString(connectionId)
|
||||||
If connectionString <> "" Then
|
If connectionString <> "" Then
|
||||||
@@ -96,13 +103,13 @@ Public Class ClassDatabase
|
|||||||
SQLconnect.Close()
|
SQLconnect.Close()
|
||||||
Return dt
|
Return dt
|
||||||
Else
|
Else
|
||||||
MsgBox("No ConnectionID!", MsgBoxStyle.Exclamation)
|
MsgBox("No Connection received for ID: " & connectionId.ToString, MsgBoxStyle.Exclamation)
|
||||||
Return Nothing
|
Return Nothing
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
ClassLogger.Add(" - Unvorhergesehener Fehler bei MSSQL_ReturnDTWithConnection: " & vbNewLine & ex.Message)
|
ClassLogger.Add(" - Unexpected Error in MSSQL_ReturnDTWithConnection: " & vbNewLine & ex.Message)
|
||||||
MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei MSSQL_ReturnDTWithConnection:")
|
MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected Error in MSSQL_ReturnDTWithConnection:")
|
||||||
Return Nothing
|
Return Nothing
|
||||||
End Try
|
End Try
|
||||||
End Function
|
End Function
|
||||||
@@ -124,7 +131,7 @@ Public Class ClassDatabase
|
|||||||
If userInput = True Then
|
If userInput = True Then
|
||||||
MsgBox("Error in Return_Datatable_CS - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
|
MsgBox("Error in Return_Datatable_CS - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
|
||||||
End If
|
End If
|
||||||
ClassLogger.Add("Fehler bei Return_Datatable_CS: " & ex.Message, True)
|
ClassLogger.Add("Error in Return_Datatable_CS: " & ex.Message, True)
|
||||||
ClassLogger.Add("#SQL: " & Select_anweisung, False)
|
ClassLogger.Add("#SQL: " & Select_anweisung, False)
|
||||||
Return Nothing
|
Return Nothing
|
||||||
End Try
|
End Try
|
||||||
@@ -145,10 +152,10 @@ Public Class ClassDatabase
|
|||||||
Return True
|
Return True
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
If Userinput = True Then
|
If Userinput = True Then
|
||||||
MsgBox("Fehler bei Execute_non_Query: " & ex.Message & vbNewLine & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
|
MsgBox("Error in Execute_non_Query: " & ex.Message & vbNewLine & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
|
||||||
|
|
||||||
End If
|
End If
|
||||||
ClassLogger.Add("Fehler bei Execute_non_Query: " & ex.Message, True)
|
ClassLogger.Add("Error in Execute_non_Query: " & ex.Message, True)
|
||||||
ClassLogger.Add("SQL: " & ExecuteCMD, False)
|
ClassLogger.Add("SQL: " & ExecuteCMD, False)
|
||||||
Return False
|
Return False
|
||||||
End Try
|
End Try
|
||||||
@@ -175,7 +182,7 @@ Public Class ClassDatabase
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
ClassLogger.Add("Fehler bei Execute_non_Query_withConn: " & ex.Message, True)
|
ClassLogger.Add("Error in Execute_non_Query_withConn: " & ex.Message, True)
|
||||||
ClassLogger.Add("SQL: " & ExecuteCMD, False)
|
ClassLogger.Add("SQL: " & ExecuteCMD, False)
|
||||||
Return False
|
Return False
|
||||||
End Try
|
End Try
|
||||||
@@ -197,9 +204,9 @@ Public Class ClassDatabase
|
|||||||
SQLcommand.BeginExecuteNonQuery(callback, SQLcommand)
|
SQLcommand.BeginExecuteNonQuery(callback, SQLcommand)
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
If Userinput = True Then
|
If Userinput = True Then
|
||||||
MsgBox("Fehler bei Execute_non_Query_Async: " & ex.Message & vbNewLine & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
|
MsgBox("Error in Execute_non_Query_Async: " & ex.Message & vbNewLine & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
|
||||||
End If
|
End If
|
||||||
ClassLogger.Add("Fehler bei Execute_non_Query_Async: " & ex.Message, True)
|
ClassLogger.Add("Error in Execute_non_Query_Async: " & ex.Message, True)
|
||||||
ClassLogger.Add("SQL: " & ExecuteCMD, False)
|
ClassLogger.Add("SQL: " & ExecuteCMD, False)
|
||||||
Finally
|
Finally
|
||||||
SQLcommand.Dispose()
|
SQLcommand.Dispose()
|
||||||
@@ -230,9 +237,9 @@ Public Class ClassDatabase
|
|||||||
Return result
|
Return result
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
If Userinput = True Then
|
If Userinput = True Then
|
||||||
MsgBox("Fehler bei Execute_Scalar: " & ex.Message & vbNewLine & vbNewLine & cmdscalar, MsgBoxStyle.Critical)
|
MsgBox("Error in Execute_Scalar: " & ex.Message & vbNewLine & vbNewLine & cmdscalar, MsgBoxStyle.Critical)
|
||||||
End If
|
End If
|
||||||
ClassLogger.Add("Fehler bei Execute_Scalar: " & ex.Message, True)
|
ClassLogger.Add("Error in Execute_Scalar: " & ex.Message, True)
|
||||||
ClassLogger.Add("SQL: " & cmdscalar, False)
|
ClassLogger.Add("SQL: " & cmdscalar, False)
|
||||||
Return Nothing
|
Return Nothing
|
||||||
End Try
|
End Try
|
||||||
@@ -261,7 +268,7 @@ Public Class ClassDatabase
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
ClassLogger.Add("Fehler bei Execute_ScalarWithConnection: " & ex.Message, True)
|
ClassLogger.Add("Error in Execute_ScalarWithConnection: " & ex.Message, True)
|
||||||
ClassLogger.Add("SQL: " & cmdscalar, False)
|
ClassLogger.Add("SQL: " & cmdscalar, False)
|
||||||
Return Nothing
|
Return Nothing
|
||||||
End Try
|
End Try
|
||||||
@@ -282,7 +289,7 @@ Public Class ClassDatabase
|
|||||||
SQLconnect.Close()
|
SQLconnect.Close()
|
||||||
Return result
|
Return result
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
ClassLogger.Add("Fehler bei OracleExecute_Scalar: " & ex.Message, True)
|
ClassLogger.Add("Error in OracleExecute_Scalar: " & ex.Message, True)
|
||||||
ClassLogger.Add("#SQL: " & cmdscalar, False)
|
ClassLogger.Add("#SQL: " & cmdscalar, False)
|
||||||
Return Nothing
|
Return Nothing
|
||||||
End Try
|
End Try
|
||||||
@@ -304,7 +311,7 @@ Public Class ClassDatabase
|
|||||||
If userInput = True Then
|
If userInput = True Then
|
||||||
MsgBox("Error in OracleExecute_non_Query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
|
MsgBox("Error in OracleExecute_non_Query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
|
||||||
End If
|
End If
|
||||||
ClassLogger.Add("Fehler bei OracleExecute_non_Query: " & ex.Message, True)
|
ClassLogger.Add("Error in OracleExecute_non_Query: " & ex.Message, True)
|
||||||
ClassLogger.Add("#SQL: " & ExecuteCMD, False)
|
ClassLogger.Add("#SQL: " & ExecuteCMD, False)
|
||||||
|
|
||||||
Return False
|
Return False
|
||||||
@@ -329,7 +336,7 @@ Public Class ClassDatabase
|
|||||||
If userInput = True Then
|
If userInput = True Then
|
||||||
MsgBox("Error in Oracle Return Datatable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
|
MsgBox("Error in Oracle Return Datatable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
|
||||||
End If
|
End If
|
||||||
ClassLogger.Add("Fehler bei Oracle_Return_Datatable: " & ex.Message, True)
|
ClassLogger.Add("Error in Oracle_Return_Datatable: " & ex.Message, True)
|
||||||
ClassLogger.Add("#SQL: " & Select_anweisung, False)
|
ClassLogger.Add("#SQL: " & Select_anweisung, False)
|
||||||
Return Nothing
|
Return Nothing
|
||||||
End Try
|
End Try
|
||||||
|
|||||||
@@ -98,7 +98,7 @@
|
|||||||
For Each row As DataRow In dt.Rows
|
For Each row As DataRow In dt.Rows
|
||||||
Dim controlid As Integer = row.Item(0)
|
Dim controlid As Integer = row.Item(0)
|
||||||
CURRENT_CONTROL_ID = controlid
|
CURRENT_CONTROL_ID = controlid
|
||||||
ClassControlCommands.DeleteControl()
|
ClassControlCommands.DeleteControl(controlid)
|
||||||
|
|
||||||
Next
|
Next
|
||||||
End If
|
End If
|
||||||
|
|||||||
@@ -1219,6 +1219,7 @@ Public Class frmConstructor_Main
|
|||||||
' Nach dem löschen muss die aktuelle Ansicht neugeladen werden
|
' Nach dem löschen muss die aktuelle Ansicht neugeladen werden
|
||||||
Load_Entity_Data(ACT_EBENE)
|
Load_Entity_Data(ACT_EBENE)
|
||||||
DisableEditMode()
|
DisableEditMode()
|
||||||
|
RECORD_CHANGED = False
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
EDIT_STATE = EditState.None
|
EDIT_STATE = EditState.None
|
||||||
|
|||||||
@@ -272,28 +272,16 @@
|
|||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub BindingNavigatorDeleteItem_Click(sender As Object, e As EventArgs) Handles BindingNavigatorDeleteItem.Click
|
Private Sub BindingNavigatorDeleteItem_Click(sender As Object, e As EventArgs) Handles BindingNavigatorDeleteItem.Click
|
||||||
Dim result As MsgBoxResult = MsgBox("Wollen Sie diese Dokumentart wirklich löschen?", MsgBoxStyle.YesNo, "Frage:")
|
Dim msg = "Sind Sie sicher, dass Sie diese Dokumentart löschen wollen?"
|
||||||
|
If USER_LANGUAGE <> "de-DE" Then
|
||||||
|
msg = "Are You sure You want to delete the selected Doctype?"
|
||||||
|
End If
|
||||||
|
Dim result As MsgBoxResult
|
||||||
|
result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
|
||||||
If result = MsgBoxResult.Yes Then
|
If result = MsgBoxResult.Yes Then
|
||||||
Dim del As String = "DELETE FROM TBDD_INDEX_MAN WHERE DOK_ID = " & akt_DokartID
|
Dim del = "EXEC [dbo].[PRPMO_DELETE_DOCTYPE] " & GUIDTextBox.Text
|
||||||
If ClassDatabase.Execute_non_Query(del, True) = True Then
|
If ClassDatabase.Execute_non_Query(del, True) = True Then
|
||||||
del = "DELETE FROM TBDD_INDEX_AUTOM WHERE DOCTYPE_ID = " & akt_DokartID
|
Refresh_Dokart(False)
|
||||||
If ClassDatabase.Execute_non_Query(del, True) = True Then
|
|
||||||
del = "DELETE FROM TBDD_DOKUMENTART_MODULE WHERE DOKART_ID = " & akt_DokartID
|
|
||||||
If ClassDatabase.Execute_non_Query(del, True) = True Then
|
|
||||||
del = "DELETE FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = " & akt_DokartID
|
|
||||||
If ClassDatabase.Execute_non_Query(del, True) = True Then
|
|
||||||
del = "DELETE FROM TBDD_DOKUMENTART WHERE GUID = " & akt_DokartID
|
|
||||||
If ClassDatabase.Execute_non_Query(del, True) = True Then
|
|
||||||
Dim pmoobj As String = "DOCTYPE_TITLE" & akt_DokartID
|
|
||||||
del = "DELETE FROM TBPMO_LANGUAGE_OBJECT WHERE PMO_OBJECT_NAME = '" & pmoobj & "'"
|
|
||||||
If ClassDatabase.Execute_non_Query(del, True) = True Then
|
|
||||||
MsgBox("Die Dokumentart wurde erfolgreich gelöscht!", MsgBoxStyle.Information)
|
|
||||||
Refresh_Dokart(False)
|
|
||||||
End If
|
|
||||||
End If
|
|
||||||
End If
|
|
||||||
End If
|
|
||||||
End If
|
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ Partial Class frmLanguage_Translator
|
|||||||
'cmbObjectgroup
|
'cmbObjectgroup
|
||||||
'
|
'
|
||||||
Me.cmbObjectgroup.FormattingEnabled = True
|
Me.cmbObjectgroup.FormattingEnabled = True
|
||||||
Me.cmbObjectgroup.Items.AddRange(New Object() {resources.GetString("cmbObjectgroup.Items"), resources.GetString("cmbObjectgroup.Items1"), resources.GetString("cmbObjectgroup.Items2")})
|
Me.cmbObjectgroup.Items.AddRange(New Object() {resources.GetString("cmbObjectgroup.Items"), resources.GetString("cmbObjectgroup.Items1"), resources.GetString("cmbObjectgroup.Items2"), resources.GetString("cmbObjectgroup.Items3"), resources.GetString("cmbObjectgroup.Items4")})
|
||||||
resources.ApplyResources(Me.cmbObjectgroup, "cmbObjectgroup")
|
resources.ApplyResources(Me.cmbObjectgroup, "cmbObjectgroup")
|
||||||
Me.cmbObjectgroup.Name = "cmbObjectgroup"
|
Me.cmbObjectgroup.Name = "cmbObjectgroup"
|
||||||
'
|
'
|
||||||
@@ -310,6 +310,7 @@ Partial Class frmLanguage_Translator
|
|||||||
'TableAdapterManager
|
'TableAdapterManager
|
||||||
'
|
'
|
||||||
Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
|
Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
|
||||||
|
Me.TableAdapterManager.TBDD_CLIENTTableAdapter = Nothing
|
||||||
Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing
|
Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing
|
||||||
Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Nothing
|
Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Nothing
|
||||||
Me.TableAdapterManager.TBDD_EINGANGSARTENTableAdapter = Nothing
|
Me.TableAdapterManager.TBDD_EINGANGSARTENTableAdapter = Nothing
|
||||||
@@ -318,6 +319,7 @@ Partial Class frmLanguage_Translator
|
|||||||
Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Nothing
|
Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Nothing
|
||||||
Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing
|
Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing
|
||||||
Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
|
Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
|
||||||
|
Me.TableAdapterManager.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter = Nothing
|
||||||
Me.TableAdapterManager.TBPMO_FILES_USERTableAdapter = Nothing
|
Me.TableAdapterManager.TBPMO_FILES_USERTableAdapter = Nothing
|
||||||
Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing
|
Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing
|
||||||
Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing
|
Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing
|
||||||
|
|||||||
@@ -158,6 +158,12 @@
|
|||||||
<data name="cmbObjectgroup.Items2" xml:space="preserve">
|
<data name="cmbObjectgroup.Items2" xml:space="preserve">
|
||||||
<value>Doctype titles</value>
|
<value>Doctype titles</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="cmbObjectgroup.Items3" xml:space="preserve">
|
||||||
|
<value>Workflow titles</value>
|
||||||
|
</data>
|
||||||
|
<data name="cmbObjectgroup.Items4" xml:space="preserve">
|
||||||
|
<value>Worflow state titles</value>
|
||||||
|
</data>
|
||||||
<data name="cmbObjectgroup.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="cmbObjectgroup.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>120, 34</value>
|
<value>120, 34</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -1198,7 +1204,7 @@
|
|||||||
<value>DD_DMSDataSet</value>
|
<value>DD_DMSDataSet</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>DD_DMSDataSet.Type" xml:space="preserve">
|
<data name=">>DD_DMSDataSet.Type" xml:space="preserve">
|
||||||
<value>DD_Record_Organiser.DD_DMSDataSet, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
<value>DD_Record_Organiser.DD_DMSDataSet, DD_DMSDataSet1.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>grvwGridObjects.Name" xml:space="preserve">
|
<data name=">>grvwGridObjects.Name" xml:space="preserve">
|
||||||
<value>grvwGridObjects</value>
|
<value>grvwGridObjects</value>
|
||||||
@@ -1276,13 +1282,13 @@
|
|||||||
<value>TBPMO_LANGUAGE_OBJECTTableAdapter</value>
|
<value>TBPMO_LANGUAGE_OBJECTTableAdapter</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>TBPMO_LANGUAGE_OBJECTTableAdapter.Type" xml:space="preserve">
|
<data name=">>TBPMO_LANGUAGE_OBJECTTableAdapter.Type" xml:space="preserve">
|
||||||
<value>DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_LANGUAGE_OBJECTTableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
<value>DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_LANGUAGE_OBJECTTableAdapter, DD_DMSDataSet1.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>TableAdapterManager.Name" xml:space="preserve">
|
<data name=">>TableAdapterManager.Name" xml:space="preserve">
|
||||||
<value>TableAdapterManager</value>
|
<value>TableAdapterManager</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>TableAdapterManager.Type" xml:space="preserve">
|
<data name=">>TableAdapterManager.Type" xml:space="preserve">
|
||||||
<value>DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
<value>DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager, DD_DMSDataSet1.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>ts_statelbl.Name" xml:space="preserve">
|
<data name=">>ts_statelbl.Name" xml:space="preserve">
|
||||||
<value>ts_statelbl</value>
|
<value>ts_statelbl</value>
|
||||||
|
|||||||
@@ -21,6 +21,11 @@ Public Class frmLanguage_Translator
|
|||||||
group = "FORMVIEW_TITLE"
|
group = "FORMVIEW_TITLE"
|
||||||
Case "Doctype titles"
|
Case "Doctype titles"
|
||||||
group = "DOCTYPE_TITLE"
|
group = "DOCTYPE_TITLE"
|
||||||
|
Case "Workflow titles"
|
||||||
|
group = "TASK_TITLE"
|
||||||
|
Case "Worflow state titles"
|
||||||
|
group = "WF_STATE_TITLE"
|
||||||
|
|
||||||
End Select
|
End Select
|
||||||
Dim sql = "select * from TBPMO_LANGUAGE_OBJECT where LANGUAGE_TYPE = '@LANGUAGE' AND PMO_OBJECT_NAME like '%@OBJECT%'"
|
Dim sql = "select * from TBPMO_LANGUAGE_OBJECT where LANGUAGE_TYPE = '@LANGUAGE' AND PMO_OBJECT_NAME like '%@OBJECT%'"
|
||||||
If cmbLanguage.SelectedIndex = -1 And cmbObjectgroup.SelectedIndex = -1 Then
|
If cmbLanguage.SelectedIndex = -1 And cmbObjectgroup.SelectedIndex = -1 Then
|
||||||
|
|||||||
@@ -949,7 +949,7 @@
|
|||||||
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If ClassControlCommands.DeleteControl() = True Then
|
If ClassControlCommands.DeleteControl(CURRENT_CONTROL_ID) = True Then
|
||||||
'MsgBox("Element gelöscht, Elemente werden neu geladen.", MsgBoxStyle.Information)
|
'MsgBox("Element gelöscht, Elemente werden neu geladen.", MsgBoxStyle.Information)
|
||||||
CtrlBuilder.ClearControls()
|
CtrlBuilder.ClearControls()
|
||||||
frmLevel_Designer.Instance.LoadControls()
|
frmLevel_Designer.Instance.LoadControls()
|
||||||
|
|||||||
@@ -598,7 +598,7 @@
|
|||||||
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If ClassControlCommands.DeleteControl() = True Then
|
If ClassControlCommands.DeleteControl(CURRENT_CONTROL_ID) = True Then
|
||||||
'MsgBox("Element gelöscht, Elemente werden neu geladen.", MsgBoxStyle.Information)
|
'MsgBox("Element gelöscht, Elemente werden neu geladen.", MsgBoxStyle.Information)
|
||||||
CtrlBuilder.ClearControls()
|
CtrlBuilder.ClearControls()
|
||||||
frmLevel_Designer.Instance.LoadControls()
|
frmLevel_Designer.Instance.LoadControls()
|
||||||
|
|||||||
56
app/DD-Record-Organiser/frmUserKonfig.Designer.vb
generated
56
app/DD-Record-Organiser/frmUserKonfig.Designer.vb
generated
@@ -98,6 +98,8 @@ Partial Class frmUserKonfig
|
|||||||
Me.btnAddUserToGroup = New System.Windows.Forms.Button()
|
Me.btnAddUserToGroup = New System.Windows.Forms.Button()
|
||||||
Me.lbGroups = New System.Windows.Forms.ListBox()
|
Me.lbGroups = New System.Windows.Forms.ListBox()
|
||||||
Me.TabPage2 = New System.Windows.Forms.TabPage()
|
Me.TabPage2 = New System.Windows.Forms.TabPage()
|
||||||
|
Me.txtUserSearch3 = New System.Windows.Forms.TextBox()
|
||||||
|
Me.txtUserSearch2 = New System.Windows.Forms.TextBox()
|
||||||
Me.btndeleteUserfromGroup = New System.Windows.Forms.Button()
|
Me.btndeleteUserfromGroup = New System.Windows.Forms.Button()
|
||||||
Me.lblUserforGroup = New System.Windows.Forms.Label()
|
Me.lblUserforGroup = New System.Windows.Forms.Label()
|
||||||
Me.chklbxUserForGroup = New System.Windows.Forms.CheckedListBox()
|
Me.chklbxUserForGroup = New System.Windows.Forms.CheckedListBox()
|
||||||
@@ -158,6 +160,8 @@ Partial Class frmUserKonfig
|
|||||||
Me.ADDED_WHOTextBox2 = New System.Windows.Forms.TextBox()
|
Me.ADDED_WHOTextBox2 = New System.Windows.Forms.TextBox()
|
||||||
Me.ADDED_WHENTextBox2 = New System.Windows.Forms.TextBox()
|
Me.ADDED_WHENTextBox2 = New System.Windows.Forms.TextBox()
|
||||||
Me.TabPage6 = New System.Windows.Forms.TabPage()
|
Me.TabPage6 = New System.Windows.Forms.TabPage()
|
||||||
|
Me.txtUserSearch5 = New System.Windows.Forms.TextBox()
|
||||||
|
Me.txtUserSearch4 = New System.Windows.Forms.TextBox()
|
||||||
Me.btndeleteUserfromClient = New System.Windows.Forms.Button()
|
Me.btndeleteUserfromClient = New System.Windows.Forms.Button()
|
||||||
Me.lblUser2Client = New System.Windows.Forms.Label()
|
Me.lblUser2Client = New System.Windows.Forms.Label()
|
||||||
Me.chklbxUsersforClient = New System.Windows.Forms.CheckedListBox()
|
Me.chklbxUsersforClient = New System.Windows.Forms.CheckedListBox()
|
||||||
@@ -176,10 +180,6 @@ Partial Class frmUserKonfig
|
|||||||
Me.lstbxUserMandant = New System.Windows.Forms.ListBox()
|
Me.lstbxUserMandant = New System.Windows.Forms.ListBox()
|
||||||
Me.TBDD_CLIENTTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBDD_CLIENTTableAdapter()
|
Me.TBDD_CLIENTTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBDD_CLIENTTableAdapter()
|
||||||
Me.txtUserSearch1 = New System.Windows.Forms.TextBox()
|
Me.txtUserSearch1 = New System.Windows.Forms.TextBox()
|
||||||
Me.txtUserSearch2 = New System.Windows.Forms.TextBox()
|
|
||||||
Me.txtUserSearch3 = New System.Windows.Forms.TextBox()
|
|
||||||
Me.txtUserSearch4 = New System.Windows.Forms.TextBox()
|
|
||||||
Me.txtUserSearch5 = New System.Windows.Forms.TextBox()
|
|
||||||
GUIDLabel = New System.Windows.Forms.Label()
|
GUIDLabel = New System.Windows.Forms.Label()
|
||||||
PRENAMELabel = New System.Windows.Forms.Label()
|
PRENAMELabel = New System.Windows.Forms.Label()
|
||||||
NAMELabel = New System.Windows.Forms.Label()
|
NAMELabel = New System.Windows.Forms.Label()
|
||||||
@@ -725,6 +725,18 @@ Partial Class frmUserKonfig
|
|||||||
Me.TabPage2.Name = "TabPage2"
|
Me.TabPage2.Name = "TabPage2"
|
||||||
Me.TabPage2.UseVisualStyleBackColor = True
|
Me.TabPage2.UseVisualStyleBackColor = True
|
||||||
'
|
'
|
||||||
|
'txtUserSearch3
|
||||||
|
'
|
||||||
|
Me.txtUserSearch3.BackColor = System.Drawing.Color.SandyBrown
|
||||||
|
resources.ApplyResources(Me.txtUserSearch3, "txtUserSearch3")
|
||||||
|
Me.txtUserSearch3.Name = "txtUserSearch3"
|
||||||
|
'
|
||||||
|
'txtUserSearch2
|
||||||
|
'
|
||||||
|
Me.txtUserSearch2.BackColor = System.Drawing.Color.SandyBrown
|
||||||
|
resources.ApplyResources(Me.txtUserSearch2, "txtUserSearch2")
|
||||||
|
Me.txtUserSearch2.Name = "txtUserSearch2"
|
||||||
|
'
|
||||||
'btndeleteUserfromGroup
|
'btndeleteUserfromGroup
|
||||||
'
|
'
|
||||||
Me.btndeleteUserfromGroup.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
|
Me.btndeleteUserfromGroup.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
|
||||||
@@ -1157,6 +1169,18 @@ Partial Class frmUserKonfig
|
|||||||
Me.TabPage6.Name = "TabPage6"
|
Me.TabPage6.Name = "TabPage6"
|
||||||
Me.TabPage6.UseVisualStyleBackColor = True
|
Me.TabPage6.UseVisualStyleBackColor = True
|
||||||
'
|
'
|
||||||
|
'txtUserSearch5
|
||||||
|
'
|
||||||
|
Me.txtUserSearch5.BackColor = System.Drawing.Color.SandyBrown
|
||||||
|
resources.ApplyResources(Me.txtUserSearch5, "txtUserSearch5")
|
||||||
|
Me.txtUserSearch5.Name = "txtUserSearch5"
|
||||||
|
'
|
||||||
|
'txtUserSearch4
|
||||||
|
'
|
||||||
|
Me.txtUserSearch4.BackColor = System.Drawing.Color.SandyBrown
|
||||||
|
resources.ApplyResources(Me.txtUserSearch4, "txtUserSearch4")
|
||||||
|
Me.txtUserSearch4.Name = "txtUserSearch4"
|
||||||
|
'
|
||||||
'btndeleteUserfromClient
|
'btndeleteUserfromClient
|
||||||
'
|
'
|
||||||
Me.btndeleteUserfromClient.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
|
Me.btndeleteUserfromClient.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
|
||||||
@@ -1263,30 +1287,6 @@ Partial Class frmUserKonfig
|
|||||||
resources.ApplyResources(Me.txtUserSearch1, "txtUserSearch1")
|
resources.ApplyResources(Me.txtUserSearch1, "txtUserSearch1")
|
||||||
Me.txtUserSearch1.Name = "txtUserSearch1"
|
Me.txtUserSearch1.Name = "txtUserSearch1"
|
||||||
'
|
'
|
||||||
'txtUserSearch2
|
|
||||||
'
|
|
||||||
Me.txtUserSearch2.BackColor = System.Drawing.Color.SandyBrown
|
|
||||||
resources.ApplyResources(Me.txtUserSearch2, "txtUserSearch2")
|
|
||||||
Me.txtUserSearch2.Name = "txtUserSearch2"
|
|
||||||
'
|
|
||||||
'txtUserSearch3
|
|
||||||
'
|
|
||||||
Me.txtUserSearch3.BackColor = System.Drawing.Color.SandyBrown
|
|
||||||
resources.ApplyResources(Me.txtUserSearch3, "txtUserSearch3")
|
|
||||||
Me.txtUserSearch3.Name = "txtUserSearch3"
|
|
||||||
'
|
|
||||||
'txtUserSearch4
|
|
||||||
'
|
|
||||||
Me.txtUserSearch4.BackColor = System.Drawing.Color.SandyBrown
|
|
||||||
resources.ApplyResources(Me.txtUserSearch4, "txtUserSearch4")
|
|
||||||
Me.txtUserSearch4.Name = "txtUserSearch4"
|
|
||||||
'
|
|
||||||
'txtUserSearch5
|
|
||||||
'
|
|
||||||
Me.txtUserSearch5.BackColor = System.Drawing.Color.SandyBrown
|
|
||||||
resources.ApplyResources(Me.txtUserSearch5, "txtUserSearch5")
|
|
||||||
Me.txtUserSearch5.Name = "txtUserSearch5"
|
|
||||||
'
|
|
||||||
'frmUserKonfig
|
'frmUserKonfig
|
||||||
'
|
'
|
||||||
resources.ApplyResources(Me, "$this")
|
resources.ApplyResources(Me, "$this")
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -487,4 +487,21 @@
|
|||||||
chklbxUsersforClient.SelectedIndex = -1
|
chklbxUsersforClient.SelectedIndex = -1
|
||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
Private Sub BindingNavigatorDeleteItem_Click(sender As Object, e As EventArgs) Handles BindingNavigatorDeleteItem.Click
|
||||||
|
Dim msg = "Sind Sie sicher, dass Sie diesen User löschen wollen?"
|
||||||
|
If USER_LANGUAGE <> "de-DE" Then
|
||||||
|
msg = "Are You sure You want to delete the selected user?"
|
||||||
|
End If
|
||||||
|
Dim result As MsgBoxResult
|
||||||
|
result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
|
||||||
|
If result = MsgBoxResult.Yes Then
|
||||||
|
Dim del = "EXEC [dbo].[PRPMO_DELETE_USER] " & USER_GUIDTextBox.Text
|
||||||
|
If ClassDatabase.Execute_non_Query(del, True) = True Then
|
||||||
|
Load_User()
|
||||||
|
End If
|
||||||
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
End Sub
|
||||||
End Class
|
End Class
|
||||||
Reference in New Issue
Block a user