diff --git a/app/DD-Record-Organizer/ClassAsyncNodeBuild.vb b/app/DD-Record-Organizer/ClassAsyncNodeBuild.vb new file mode 100644 index 0000000..51b5a5d --- /dev/null +++ b/app/DD-Record-Organizer/ClassAsyncNodeBuild.vb @@ -0,0 +1,19 @@ +Imports System.ComponentModel +Public Class ClassAsyncNodeBuild + Private DTNODES As DataTable + Private ImgList As ImageList + Public WithEvents bw As BackgroundWorker + Public newTreeview As TreeView + + Public Sub New(DT_TREEVIEW_NODES As DataTable, TREEVIEW_IMAGELIST As ImageList) + Me.bw = New BackgroundWorker() + bw.WorkerReportsProgress = False + bw.WorkerSupportsCancellation = False + Me.DTNODES = DT_TREEVIEW_NODES + Me.ImgList = TREEVIEW_IMAGELIST + End Sub + + Private Sub bw_DoWork(ByVal sender As Object, ByVal e As DoWorkEventArgs) Handles bw.DoWork + Me.newTreeview = ClassNodeNavigation.CreateTreeViewNodes(DTNODES, ImgList) + End Sub +End Class diff --git a/app/DD-Record-Organizer/ClassConstructors.vb b/app/DD-Record-Organizer/ClassConstructors.vb new file mode 100644 index 0000000..b8a3b8b --- /dev/null +++ b/app/DD-Record-Organizer/ClassConstructors.vb @@ -0,0 +1,67 @@ +Public Class ClassConstructors + Public Shared ConstructorsTuple_TreeView As Object + Public Shared Function Init_Tuple() + + Dim ConstructTreeViewTuple = New Dictionary(Of Tuple(Of TreeView), Integer)() + Dim sql = String.Format("Select DISTINCT T.GUID, T2.ENTITY_ID FROM TBPMO_FORM_CONSTRUCTOR T, TBPMO_FORM_CONSTRUCTOR_DETAIL T1, " & + "TBPMO_STRUCTURE_NODES_CONFIGURATION T2 WHERE T.GUID = T1.CONSTRUCT_ID And T1.FORM_ID = T2.ENTITY_ID " & + "And T.GUID In (Select CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE USER_ID = {0})", USER_GUID) + Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True) + For Each rowconstruct As DataRow In DT.Rows + Try + Dim sqlnodes = String.Format("select * from VWPMO_STRUCTURE_NODES where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", rowconstruct.Item(0)) + Dim DTNODES As DataTable = ClassDatabase.Return_Datatable(sqlnodes, True) + + Dim sqlimage = String.Format("select * from TBPMO_STRUCTURE_NODES_CONFIGURATION where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", rowconstruct.Item(0)) + Dim DT_TREEVIEW_CONFIGURATION = ClassDatabase.Return_Datatable(sql) + Dim TREEVIEW_IMAGELIST = New ImageList + + For Each row As DataRow In DT_TREEVIEW_CONFIGURATION.Rows + Try + Dim bimage = row.Item("NODE_IMAGE") + If Not IsDBNull(bimage) Then + Dim Node_image = ByteArrayToBitmap(bimage) + TREEVIEW_IMAGELIST.Images.Add(row.Item("GUID").ToString, Node_image) 'row.Item("GUID").ToString & "#" & row.Item("ENTITY_ID") + End If + Catch ex As Exception + + End Try + + Next + + 'Dim async As New ClassAsyncNodeBuild(DTNODES, TREEVIEW_IMAGELIST) + 'async.bw.RunWorkerAsync() + 'While async.bw.IsBusy + ' Application.DoEvents() + 'End While + Dim MyTreeview As TreeView = ClassNodeNavigation.CreateTreeViewNodes(DTNODES, TREEVIEW_IMAGELIST) + ConstructTreeViewTuple.Add(Tuple.Create(MyTreeview), rowconstruct.Item(0)) + Catch ex As Exception + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Adding TreeView to Dictionary: ") + End Try + + + + Next + + ConstructorsTuple_TreeView = ConstructTreeViewTuple + + End Function + + + + Public Shared Function Check_TreeViewLoaded(CONSTRUCTID As Integer) + Try + For Each constrid As Integer In ConstructorsTuple_TreeView.keys + If constrid = CONSTRUCTID Then + Return True + End If + Next + Return False + Catch ex As Exception + ClassLogger.Add("Error in Check_TreeViewLoaded: " & ex.Message, True) + Return False + End Try + End Function + +End Class diff --git a/app/DD-Record-Organizer/ClassControlLoader.vb b/app/DD-Record-Organizer/ClassControlLoader.vb index 35294e3..f55a004 100644 --- a/app/DD-Record-Organizer/ClassControlLoader.vb +++ b/app/DD-Record-Organizer/ClassControlLoader.vb @@ -227,9 +227,15 @@ Dim drarray() As DataRow = CURRENT_SQL_AUTO_VALUES_DT.Select("GUID = " & ControlId) If drarray.Length > 0 Then - Dim ID = drarray(0)("CONNECTION_ID").ToString + Dim ID + Try + ID = drarray(0)("CONNECTION_ID_1").ToString + Catch ex As Exception + ID = drarray(0)("CONNECTION_ID").ToString + End Try + If Not IsNothing(ID) Then - Sql = drarray(0)("SQL_COMMAND").ToString + Sql = drarray(0)("SQL_COMMAND_1").ToString Sql = ClassControlValues.ReplaceSqlCommandPlaceholders(Sql, recordId, parentRecordId, entity_ID) autoValue = ClassDatabase.Execute_ScalarWithConnection(ID, Sql) Else @@ -258,8 +264,8 @@ End If Catch ex As Exception MsgBox("Unexpected Error in LoadValueMain:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - ClassLogger.Add("Unexpected Error in LoadValueMain: " & ex.Message, True) - ClassLogger.Add(String.Format("ControlID: {0}" & vbNewLine & "recordid: {1}" & vbNewLine & "parentRecordId: {2}" & vbNewLine & "value: {3}" & vbNewLine & "entity_ID: {4}" & vbNewLine & "VARIABLE_VALUE: {5}", ControlId, recordId, parentRecordId, value, entity_ID, VARIABLE_VALUE), False) + ClassLogger.Add("Unexpected Error in LoadValueMain: " & ex.Message, True) + ClassLogger.Add(String.Format("ControlID: {0}" & vbNewLine & "recordid: {1}" & vbNewLine & "parentRecordId: {2}" & vbNewLine & "value: {3}" & vbNewLine & "entity_ID: {4}" & vbNewLine & "VARIABLE_VALUE: {5}", ControlId, recordId, parentRecordId, value, entity_ID, VARIABLE_VALUE), False) End Try End Sub @@ -323,7 +329,14 @@ Dim drarray() As DataRow = CURRENT_SQL_AUTO_VALUES_DT.Select("CONTROL_ID = " & ControlId) If drarray.Length > 0 Then Dim autoValue - Dim ID = drarray(0)("CONNECTION_ID").ToString + Dim ID + Try + ID = drarray(0)("CONNECTION_ID_1").ToString + Catch ex As Exception + ID = drarray(0)("CONNECTION_ID").ToString + End Try + + Dim Sql = drarray(0)("SQL_COMMAND").ToString If Not IsNothing(ID) Then autoValue = ClassDatabase.Execute_ScalarWithConnection(ID, Sql) diff --git a/app/DD-Record-Organizer/ClassControlValues.vb b/app/DD-Record-Organizer/ClassControlValues.vb index 94aa66f..ee0656b 100644 --- a/app/DD-Record-Organizer/ClassControlValues.vb +++ b/app/DD-Record-Organizer/ClassControlValues.vb @@ -188,8 +188,8 @@ Public Class ClassControlValues Dim ControlId As Integer = DirectCast(control.Tag, ClassControlMetadata).Id ' Wert per LINQ aus DT_ControlValues suchen der zur aktuellen controlId passt Dim values As List(Of Object) = (From row In DT_ControlValues.AsEnumerable() - Where row.Item("CONTROL_ID") = ControlId - Select row.Item("VALUE")).ToList() + Where row.Item("CONTROL_ID") = ControlId + Select row.Item("VALUE")).ToList() If TypeOf control Is GroupBox Then Dim groupbox As GroupBox = DirectCast(control, GroupBox) LoadControlValues(RecordId, ParentRecordId, FormId, groupbox.Controls, Entity_ID, True) @@ -244,9 +244,9 @@ Public Class ClassControlValues End Sub Public Shared Sub LoadControlValue(recordId As Integer, parentRecordId As Integer, controlId As Integer, control As Control, values As List(Of Object), entity_ID As Integer) - Try - ' Für die meisten Controls wird nur das erste Element der Liste benötigt - Dim value As String = Nothing + ' Try + ' Für die meisten Controls wird nur das erste Element der Liste benötigt + Dim value As String = Nothing If values.Count > 0 Then value = values.Item(0) @@ -306,10 +306,10 @@ Public Class ClassControlValues End If End Select - Catch ex As Exception - ClassLogger.Add("Unexpected Error in LoadControlValue: " & ex.Message, True) - MsgBox("Error in LoadControlValue:" & vbNewLine & ex.Message) - End Try + 'Catch ex As Exception + ' ClassLogger.Add("Unexpected Error in LoadControlValue: " & ex.Message, True) + ' MsgBox("Error in LoadControlValue:" & vbNewLine & ex.Message) + 'End Try End Sub diff --git a/app/DD-Record-Organizer/ClassDOC_SEARCH.vb b/app/DD-Record-Organizer/ClassDOC_SEARCH.vb index ca56cac..bfc4318 100644 --- a/app/DD-Record-Organizer/ClassDOC_SEARCH.vb +++ b/app/DD-Record-Organizer/ClassDOC_SEARCH.vb @@ -234,13 +234,13 @@ Public Class ClassDOC_SEARCH Return Nothing End Try End Function - Public Shared Function Get_DOCRESULTS(vDT_RESULTLIST_OPTIONS As DataTable, vDT_RESULTLIST_SELVALUES As DataTable, DT_WINDREAM_RESULTLIST As DataTable, ENT_ID As Integer, vType As String, Optional ftString As String = "", Optional BG As Boolean = False) - ENTITY_ID = ENT_ID - DT_RESULTLIST_OPTIONS = vDT_RESULTLIST_OPTIONS - DT_RESULTLIST_SEL_VALUES = vDT_RESULTLIST_SELVALUES - 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, Optional BG As Boolean = False, Optional Preload As Boolean = False) + 'Public Shared Function Get_DOCRESULTS(vDT_RESULTLIST_OPTIONS As DataTable, vDT_RESULTLIST_SELVALUES As DataTable, DT_WINDREAM_RESULTLIST As DataTable, ENT_ID As Integer, vType As String, Optional ftString As String = "", Optional BG As Boolean = False) + ' ENTITY_ID = ENT_ID + ' DT_RESULTLIST_OPTIONS = vDT_RESULTLIST_OPTIONS + ' DT_RESULTLIST_SEL_VALUES = vDT_RESULTLIST_SELVALUES + ' Return GET_DOCSEARCH_DATATABLE(BG) + 'End Function + Public Shared Function Get_DOC_RESULTTABLE(vDT_RESULTLIST_OPTIONS As DataTable, vDT_RESULTLIST_SELVALUES As DataTable, DT_TBPMO_DOCSEARCH_RESULTLIST_CONFIG As DataTable, ENT_ID As Integer, REC_ID As Integer, Optional BG As Boolean = False, Optional Preload As Boolean = False) Dim _step As String Dim COL_ARRAY_RESULTLIST As List(Of String) ENTITY_ID = ENT_ID @@ -265,7 +265,7 @@ Public Class ClassDOC_SEARCH Dim DTGrid As New DataTable Dim ColArrayDEFINITION As New List(Of String) Dim listcheck As New List(Of String) - For Each row As DataRow In DT_WINDREAM_RESULTLIST.Rows + For Each row As DataRow In DT_TBPMO_DOCSEARCH_RESULTLIST_CONFIG.Rows Dim type = row.Item("TYPE_ID") Dim COLNAME = row.Item("HEADER_CAPTION") If type = 2 Then @@ -307,14 +307,18 @@ Public Class ClassDOC_SEARCH DTGrid.Columns.Add(colDocID) _step = "7" - If Not DT_WINDREAM_RESULTLIST Is Nothing And DT_WINDREAM_RESULTLIST.Rows.Count >= 1 Then + If Not DT_TBPMO_DOCSEARCH_RESULTLIST_CONFIG Is Nothing And DT_TBPMO_DOCSEARCH_RESULTLIST_CONFIG.Rows.Count >= 1 Then Dim ColCount As Integer = 1 - For Each rw As DataRow In DT_WINDREAM_RESULTLIST.Rows + For Each rw As DataRow In DT_TBPMO_DOCSEARCH_RESULTLIST_CONFIG.Rows Dim ColumnName = rw.Item("HEADER_CAPTION") Dim Width = rw.Item("WIDTH") If IsNothing(Width) Or IsDBNull(Width) Then Width = 200 End If + 'Jetzt das Array zusammenbauen um die Spaltenwerte zu erhalten + Dim colname = rw.Item("COLUMN_VIEW") + ColArrayDEFINITION.Add(rw.Item("COLUMN_VIEW")) + _step = "7.2" 'Die Spalte definieren Try DTGrid.Columns.Add(ColumnName) @@ -324,12 +328,6 @@ Public Class ClassDOC_SEARCH End Try Next _step = "7.1" - 'Jetzt das Array zusammenbauen um die Spaltenwerte zu erhalten - For Each rw As DataRow In DT_WINDREAM_RESULTLIST.Rows - Dim colname = rw.Item("COLUMN_VIEW") - ColArrayDEFINITION.Add(rw.Item("COLUMN_VIEW")) - Next - _step = "7.2" End If Catch ex As Exception ClassLogger.Add("Unexpected Error in Construct Datatable: " & ex.Message) @@ -403,7 +401,7 @@ Public Class ClassDOC_SEARCH Dim rowvalue Try rowvalue = FILE_ROW.Item(Colname) - 'If LogErrorsOnly = False Then ClassLogger.Add(" >> rowvalue for Colname '" & Colname & "': '" & rowvalue.ToString & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> rowvalue for Colname '" & Colname & "': '" & rowvalue.ToString & "'", False) Catch ex As Exception 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 diff --git a/app/DD-Record-Organizer/ClassDragDrop.vb b/app/DD-Record-Organizer/ClassDragDrop.vb index 32adffd..6796c82 100644 --- a/app/DD-Record-Organizer/ClassDragDrop.vb +++ b/app/DD-Record-Organizer/ClassDragDrop.vb @@ -84,6 +84,14 @@ Public Class ClassDragDrop Else ClassLogger.Add(">> Attachment File from Outlook could not be created", False) End If + Else + ClassLogger.Add(">> No simple drag and drop.", True, False) + For Each fmt As String In e.Data.GetFormats() + ' Output format name and type + ClassLogger.Add(">> e.Data is: " & fmt + " (" + + e.Data.GetData(fmt).ToString() + ")", True, False) + Next + End If End If If e.Data.GetDataPresent("FileGroupDescriptor") Then diff --git a/app/DD-Record-Organizer/ClassFileResult.vb b/app/DD-Record-Organizer/ClassFileResult.vb index 75b4ace..9e623b3 100644 --- a/app/DD-Record-Organizer/ClassFileResult.vb +++ b/app/DD-Record-Organizer/ClassFileResult.vb @@ -131,12 +131,39 @@ ' Return False 'Else ' 'Indexwert_Postprocessing(Replace(box.Name, "txt", ""), box.Text) - SET_CURRENT_TBPMO_INDEX_MAN_VALUE(box.Tag, "") + SET_CURRENT_TBPMO_INDEX_MAN_VALUE(box.Tag, box.Text) result = True 'End If End If End If + If ctrl.Name.StartsWith("btn") Then + Dim btn As Button = ctrl + Dim optional_index = ClassMoreMetadata.Return_CURRENT_TBPMO_INDEX_MAN_VALUE(btn.Tag, "OPTIONAL") + If Not IsNothing(optional_index) Then + If CBool(optional_index) = False Then + For Each row As DataRow In CURRENT_TBPMO_INDEX_MAN.Rows + If row.Item("GUID") = btn.Tag Then + If Not IsDBNull(row.Item("MAN_VALUE")) Then + If LogErrorsOnly = False Then ClassLogger.Add(" >> we got a value for folder...", False) + result = True + Else + If LogErrorsOnly = False Then ClassLogger.Add(" >> value for folder is missing...", False) + MsgBox("Please choose a folder!", MsgBoxStyle.Exclamation, "Missing input:") + Return False + End If + + End If + + Next + Else + If LogErrorsOnly = False Then ClassLogger.Add(" >> value for folder is OPTIONAL...", False) + SET_CURRENT_TBPMO_INDEX_MAN_VALUE(btn.Tag, "") + result = True + End If + End If + + End If If ctrl.Name.StartsWith("cmb") Then Dim cmb As ComboBox = ctrl If cmb.Text = "" Then @@ -186,7 +213,7 @@ End Try End Function - Private Shared Function SET_CURRENT_TBPMO_INDEX_MAN_VALUE(CONTROL_GUID As Integer, VALUE As String) + Public 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 diff --git a/app/DD-Record-Organizer/ClassHelper.vb b/app/DD-Record-Organizer/ClassHelper.vb index 9f2142a..1e09678 100644 --- a/app/DD-Record-Organizer/ClassHelper.vb +++ b/app/DD-Record-Organizer/ClassHelper.vb @@ -305,6 +305,7 @@ Public Class ClassHelper Public Shared Function Check_File_Read_only(RECORD_ID As Integer, ENTITY_ID As Integer) Dim sql = "" Try + sql = SQL_DOC_READ_ONLY sql = sql.Replace("@RECORDID", RECORD_ID) sql = sql.Replace("@RECORD_ID", RECORD_ID) diff --git a/app/DD-Record-Organizer/ClassImport_Windream.vb b/app/DD-Record-Organizer/ClassImport_Windream.vb index fbc21b2..7b4719c 100644 --- a/app/DD-Record-Organizer/ClassImport_Windream.vb +++ b/app/DD-Record-Organizer/ClassImport_Windream.vb @@ -124,12 +124,17 @@ Public Class ClassImport_Windream ' Den Zielordner erstellen Zielordner = DT.Rows(0).Item("ZIEL_PFAD") - sql = "SELECT FOLDER_FOR_INDEX FROM TBDD_DOKUMENTART WHERE GUID = " & DocTypeID - Dim Folder_for_index = ClassDatabase.Execute_Scalar(sql) - If Not IsDBNull(Folder_for_index) Then - If Folder_for_index <> String.Empty Then - If CREATE_FOLDER_INDEX(Folder_for_index, DocTypeID) = True And CURRENT_VARIABLE_FOLDER <> "" Then - Zielordner = Zielordner & "\" & CURRENT_VARIABLE_FOLDER + sql = $"SELECT DYNAMIC_FOLDER FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE FORMVIEW_ID = {CURRENT_FORMVIEW_ID} AND DOCTYPE_ID = {DocTypeID}" + Dim DYNAMIC_FOLDER = ClassDatabase.Execute_Scalar(sql) + If Not IsDBNull(DYNAMIC_FOLDER) Then + If DYNAMIC_FOLDER <> String.Empty Then + If CREATE_FOLDER_INDEX(DYNAMIC_FOLDER, DocTypeID) = True And CURRENT_VARIABLE_FOLDER <> "" Then + If CURRENT_VARIABLE_FOLDER_OVERRIDE = True Then + Zielordner = CURRENT_VARIABLE_FOLDER + Else + Zielordner = Zielordner & "\" & CURRENT_VARIABLE_FOLDER + End If + Else MsgBox("Unexpected Error in Creating Variable Folder - Check logfile!", MsgBoxStyle.Critical) Return False @@ -151,7 +156,7 @@ Public Class ClassImport_Windream Try Select Case clsWD_GET.WD_PATH_EXISTS(Zielordner.Substring(2)) Case False - ClassLogger.Add(String.Format(">> Targetpath ({0}) is not existing or result of WD_PATH_EXISTS was false.", Zielordner.Substring(2))) + ClassLogger.Add(String.Format(">> Targetpath ({0}) is not existing or result of WD_PATH_EXISTS was false.", Zielordner.Substring(2)), False) Dim split() As String = Zielordner.Split("\") Dim Path_Combined As String = "" For Each s As String In split @@ -159,13 +164,18 @@ Public Class ClassImport_Windream If Path_Combined <> "W:\" Then Dim temppath = Path_Combined.Substring(2) + Try temppath = Path_Combined.Substring(2).Substring(0, temppath.Length) Select Case clsWD_GET.WD_PATH_EXISTS(temppath) Case False + If LogErrorsOnly = False Then + ClassLogger.Add(" >> Trying to create folder-part: " & temppath, False) + End If clsWindream.MY_WDSESSION.GetNewWMObjectFS(2, temppath, 0) 'WMEntityFolder,WMObjectEditModeNoEdit) Case -10 + ClassLogger.Add(">> WD_PATH_EXISTS returned -10 for: " & temppath, False) Return False End Select Catch ex As Exception @@ -451,6 +461,7 @@ Public Class ClassImport_Windream End Function Private Shared Function CREATE_FOLDER_INDEX(FolderConvention As String, DocTypeID As Integer) Try + CURRENT_VARIABLE_FOLDER_OVERRIDE = False 'Dim RootFolder As String = Path.GetDirectoryName(CURRENT_NEWFILENAME) CURRENT_VARIABLE_FOLDER = "" '###### @@ -507,23 +518,53 @@ Public Class ClassImport_Windream End If Case "M" + If LogErrorsOnly = False Then ClassLogger.Add(" >> Working on manual value......'", False) Dim split() As String = element.Value.Substring(3, element.Value.Length - 4).Split("#") If split.Length = 2 Then 'Die GUID des AutoIndex auslesen Dim INDEX_ID = split(1) If IsNumeric(INDEX_ID) Then - For Each row As DataRow In CURRENT_TBPMO_INDEX_MAN.Rows - If row.Item("GUID") = INDEX_ID Then - Dim manvalue = row.Item("MAN_VALUE") - FolderConvention = FolderConvention.Replace(element.ToString, manvalue) - End If - Next + If element.Value.ToUpper.Contains("FOLDERSELECT") Then + If LogErrorsOnly = False Then ClassLogger.Add(" >> FOLDERSELECT......'", False) + For Each row As DataRow In CURRENT_TBPMO_INDEX_MAN.Rows + If row.Item("GUID") = INDEX_ID Then + Dim manvalue = row.Item("MAN_VALUE") + If manvalue <> String.Empty Then + If LogErrorsOnly = False Then ClassLogger.Add(" >> folder value is: '" & manvalue & "'", False) + CURRENT_VARIABLE_FOLDER_OVERRIDE = True + CURRENT_VARIABLE_FOLDER = manvalue + Return True + + Else + ClassLogger.Add(">> Attention: manvalue (from Input indexing is empty!!", False) + End If + End If + Next + Else + + + For Each row As DataRow In CURRENT_TBPMO_INDEX_MAN.Rows + If row.Item("GUID") = INDEX_ID Then + Dim manvalue = row.Item("MAN_VALUE") + If manvalue <> String.Empty Then + If LogErrorsOnly = False Then ClassLogger.Add(" >> manvalue is: '" & manvalue & "'", False) + FolderConvention = FolderConvention.Replace(element.ToString, manvalue) + FolderConvention = FolderConvention.Replace("\\", "") + Else + ClassLogger.Add(">> Attention: manvalue (from Input indexing is empty!!", False) + End If + End If + Next + + End If Else ClassLogger.Add(">> INDEX_ID is not numeric: " & INDEX_ID.ToString & "- APattern: " & element.Value, False) End If Else ClassLogger.Add(">> split.Length <> 2 - APattern: " & element.Value, False) End If + + Case "V" Dim elmt = element.Value.Substring(3, element.Value.Length - 4).Split("#") Dim split() As String = elmt @@ -626,7 +667,7 @@ Public Class ClassImport_Windream End If End If Case "V" - + Case Else ClassLogger.Add(" -Undefined pattern found in folderconvention" & vbNewLine & "Elementname: " & element.Value.ToUpper) diff --git a/app/DD-Record-Organizer/ClassInit.vb b/app/DD-Record-Organizer/ClassInit.vb index 51517fb..9af1002 100644 --- a/app/DD-Record-Organizer/ClassInit.vb +++ b/app/DD-Record-Organizer/ClassInit.vb @@ -115,7 +115,7 @@ Public Class ClassInit sql = "SELECT * FROM TBPMO_CONTROL" CURRENT_TBPMO_CONTROL = ClassDatabase.Return_Datatable(sql, True) - sql = String.Format("SELECT * FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG") + sql = String.Format("SELECT * FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1") CURRENT_RESULTLIST_CONFIG = ClassDatabase.Return_Datatable(sql, True) sql = String.Format("SELECT * FROM TBPMO_DOCSEARCH_VARIABLE_CONTROLS") CURRENT_VARIABLE_CONTROLS = ClassDatabase.Return_Datatable(sql, True) diff --git a/app/DD-Record-Organizer/ClassNodeNavigation.vb b/app/DD-Record-Organizer/ClassNodeNavigation.vb index 042ed72..6d0576e 100644 --- a/app/DD-Record-Organizer/ClassNodeNavigation.vb +++ b/app/DD-Record-Organizer/ClassNodeNavigation.vb @@ -1,8 +1,61 @@ -Public Class ClassNodeNavigation +Imports System.Data.SqlClient +Imports DevExpress.Utils +Public Class ClassNodeNavigation Public Shared NODE_CONFIGURABLE_ID As Integer Public Shared MyTreeView As TreeView Public Shared Datatable_Nodes As DataTable Public Shared TREEVIEW_IMAGELIST As ImageList + Public Shared IMAGE_COLLECTION As ImageCollection + Public Shared Function CreateNodeProcedure(RECORD_ID As Integer, NODE_CONFIG_ID As Integer, NODE_CAPTION As String, NODE_ID1 As String, NODE_PARENT_ID As String, ADDED_WHO As String) + Try + Dim connection As New SqlConnection + connection.ConnectionString = MyConnectionString + + Using cmd As New SqlCommand("PRPMO_CREATE_NODE", connection) + cmd.CommandType = CommandType.StoredProcedure + '@pNODE_PARENT_ID INT, @pADDED_WHO + cmd.Parameters.AddWithValue("@pRECORD_ID", RECORD_ID) + cmd.Parameters.AddWithValue("@pNODE_CONFIG_ID", NODE_CONFIG_ID) + cmd.Parameters.AddWithValue("@pNODE_CAPTION", NODE_CAPTION) + cmd.Parameters.AddWithValue("@pNODE_ID1", NODE_ID1) + cmd.Parameters.AddWithValue("@pNODE_PARENT_ID", NODE_PARENT_ID) + cmd.Parameters.AddWithValue("@pADDED_WHO", ADDED_WHO) + cmd.Parameters.Add("@pRESULT", SqlDbType.Int) + cmd.Parameters("@pRESULT").Direction = ParameterDirection.Output + + connection.Open() + cmd.ExecuteNonQuery() + connection.Close() + + Dim GUID As Integer = cmd.Parameters("@pRESULT").Value + Return GUID + End Using + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in CreateNodeProcedure: ") + ClassLogger.Add("Error in CreateNodeProcedure: " & ex.Message, True) + Return 0 + End Try + End Function + + + Public Shared Function CREATE_IMAGE_COLL(DT_IMAGELIST As DataTable) + IMAGE_COLLECTION = New ImageCollection + For Each row As DataRow In DT_IMAGELIST.Rows + Try + Dim bimage = row.Item("NODE_IMAGE") + If Not IsDBNull(bimage) Then + Dim Node_image = ByteArrayToBitmap(bimage) + IMAGE_COLLECTION.AddImage(Node_image, row.Item("GUID")) 'row.Item("GUID").ToString & "#" & row.Item("ENTITY_ID") + + End If + Catch ex As Exception + + End Try + + Next + End Function + + Public Shared Function Return_Node(PARENT_ID As Integer, ParentNode As TreeNode) Dim expression As String expression = "PARENT_GUID = " & PARENT_ID 'Einschränkung auf Type und Parent_Guid @@ -43,8 +96,8 @@ Dim NODE_ID Dim staticListItems = myTreeNode.Tag.Split("#") If staticListItems(0).Contains("NODE-TYPE") Then - NODE_ID = staticListItems(0).ToString.Replace("NODE-TYPE-", "") - + ' NODE_ID = staticListItems(0).ToString.Replace("NODE-TYPE-", "") + NODE_ID = Return_NODEID_forTag(myTreeNode.Tag) End If If CURRENT_DT_NODE_CONFIGURABLE_NODES.Rows.Count > 0 And IsNumeric(NODE_ID) Then @@ -135,9 +188,9 @@ MAIN_NODE.ImageIndex = index MAIN_NODE.SelectedImageIndex = index 'New Font(fontfamily, fontsize, CType(fontstyle, FontStyle)) - Dim fontfamily As String + Dim fontfamily, backcolor As String Dim fontstyle, fontcolor, fontsize As Integer - Dim backcolor + fontfamily = MAIN_NODES(i)("FONT_FAMILY").ToString fontsize = CInt(MAIN_NODES(i)("FONT_SIZE")) fontstyle = MAIN_NODES(i)("FONT_STYLE") @@ -147,14 +200,10 @@ MAIN_NODE.ForeColor = IntToColor(fontcolor) Try - If IsNumeric(backcolor) Then - If backcolor = 16711680 Then - Console.WriteLine("16711680") - End If - MAIN_NODE.BackColor = IntToColor(backcolor) - Else - If backcolor <> String.Empty Then MAIN_NODE.BackColor = Color.FromName(backcolor) + If backcolor <> String.Empty Then + MAIN_NODE.BackColor = Color.FromName(backcolor) End If + Catch ex As Exception ClassLogger.Add(">> Unexpected Error in Formatting NodeColor (CreateTreViewNodes): " & ex.Message, True) End Try @@ -208,8 +257,8 @@ Next SUB_NODE.ImageIndex = index SUB_NODE.SelectedImageIndex = index - Dim fontfamily As String - Dim fontstyle, fontcolor, fontsize, backcolor As Integer + Dim fontfamily, backcolor As String + Dim fontstyle, fontcolor, fontsize As Integer fontfamily = SUB_NODE_ROW(i)("FONT_FAMILY").ToString fontsize = CInt(SUB_NODE_ROW(i)("FONT_SIZE")) @@ -219,15 +268,12 @@ SUB_NODE.NodeFont = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle)) SUB_NODE.ForeColor = IntToColor(fontcolor) Try - If IsNumeric(backcolor) Then - If backcolor = 255 Then - Console.WriteLine("255") - End If - Dim col = IntToColor(backcolor) - SUB_NODE.BackColor = IntToColor(backcolor) - Else - If backcolor <> String.Empty Then SUB_NODE.BackColor = Color.FromName(backcolor) + If backcolor <> String.Empty Then + SUB_NODE.BackColor = Color.FromName(backcolor) + Dim icolor = SUB_NODE.BackColor End If + + Catch ex As Exception ClassLogger.Add(">> Unexpected Error in Formatting NodeColor (Subnodes): " & ex.Message, True) End Try diff --git a/app/DD-Record-Organizer/DD-Record-Organizer.vbproj b/app/DD-Record-Organizer/DD-Record-Organizer.vbproj index d93dff4..082e3e0 100644 --- a/app/DD-Record-Organizer/DD-Record-Organizer.vbproj +++ b/app/DD-Record-Organizer/DD-Record-Organizer.vbproj @@ -240,8 +240,10 @@ + + @@ -280,6 +282,12 @@ DD_ECMAdmin.xsd + + frmCalendarEntity.vb + + + Form + frmChooseParentRecord.vb @@ -747,6 +755,9 @@ + + frmCalendarEntity.vb + frmChooseParentRecord.vb @@ -764,6 +775,7 @@ frmConstructor_Main.vb + Designer frmDiagrams.vb diff --git a/app/DD-Record-Organizer/ModuleMySettings.vb b/app/DD-Record-Organizer/ModuleMySettings.vb index 56e9e6b..cf33e87 100644 --- a/app/DD-Record-Organizer/ModuleMySettings.vb +++ b/app/DD-Record-Organizer/ModuleMySettings.vb @@ -52,6 +52,7 @@ Module ModuleMySettings Public FWSCAN_started As Boolean = False + Dim rowresult As String = "" Public Function LoadFileExclusion() Dim rowresult As String = "" diff --git a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb index 7f66eaa..8aa62ec 100644 --- a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb +++ b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb @@ -141,6 +141,7 @@ Public NEW_FILES_ADDED As Boolean = False Public CURRENT_VARIABLE_FOLDER As String + Public CURRENT_VARIABLE_FOLDER_OVERRIDE As Boolean = False Public CURRENT_DOCVIEW_PATH As String Public CURRENT_DOCVIEW diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index 4497c97..55cd830 100644 --- a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organizer/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-Organizer/My Project/licenses.licx b/app/DD-Record-Organizer/My Project/licenses.licx index 7222df5..590bd15 100644 --- a/app/DD-Record-Organizer/My Project/licenses.licx +++ b/app/DD-Record-Organizer/My Project/licenses.licx @@ -1,4 +1,6 @@ -DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraScheduler.SchedulerControl, DevExpress.XtraScheduler.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD-Record-Organizer/frmCalendar.Designer.vb b/app/DD-Record-Organizer/frmCalendar.Designer.vb index 9af77d0..992750a 100644 --- a/app/DD-Record-Organizer/frmCalendar.Designer.vb +++ b/app/DD-Record-Organizer/frmCalendar.Designer.vb @@ -94,12 +94,14 @@ Partial Class frmCalendar ' 'SchedulerControl1 ' + Me.SchedulerControl1.ActiveViewType = DevExpress.XtraScheduler.SchedulerViewType.Week Me.SchedulerControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.SchedulerControl1.Location = New System.Drawing.Point(0, 141) Me.SchedulerControl1.MenuManager = Me.ribbonCalendar Me.SchedulerControl1.Name = "SchedulerControl1" + Me.SchedulerControl1.OptionsView.FirstDayOfWeek = DevExpress.XtraScheduler.FirstDayOfWeek.Monday Me.SchedulerControl1.Size = New System.Drawing.Size(926, 456) - Me.SchedulerControl1.Start = New Date(2014, 12, 23, 0, 0, 0, 0) + Me.SchedulerControl1.Start = New Date(2014, 12, 22, 0, 0, 0, 0) Me.SchedulerControl1.Storage = Me.SchedulerStorage1 Me.SchedulerControl1.TabIndex = 0 Me.SchedulerControl1.Text = "SchedulerControl1" diff --git a/app/DD-Record-Organizer/frmCalendar.vb b/app/DD-Record-Organizer/frmCalendar.vb index 4c3d526..83c2825 100644 --- a/app/DD-Record-Organizer/frmCalendar.vb +++ b/app/DD-Record-Organizer/frmCalendar.vb @@ -76,4 +76,8 @@ form.Dispose() End Try End Sub + + Private Sub SchedulerControl1_Click(sender As Object, e As EventArgs) Handles SchedulerControl1.Click + + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmCalendarEntity.Designer.vb b/app/DD-Record-Organizer/frmCalendarEntity.Designer.vb new file mode 100644 index 0000000..f50c1d5 --- /dev/null +++ b/app/DD-Record-Organizer/frmCalendarEntity.Designer.vb @@ -0,0 +1,421 @@ + _ +Partial Class frmCalendarEntity + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Dim TimeRuler4 As DevExpress.XtraScheduler.TimeRuler = New DevExpress.XtraScheduler.TimeRuler() + Dim TimeRuler5 As DevExpress.XtraScheduler.TimeRuler = New DevExpress.XtraScheduler.TimeRuler() + Dim TimeRuler6 As DevExpress.XtraScheduler.TimeRuler = New DevExpress.XtraScheduler.TimeRuler() + Me.ribbonCalendar = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.SwitchToDayViewItem1 = New DevExpress.XtraScheduler.UI.SwitchToDayViewItem() + Me.SwitchToWorkWeekViewItem1 = New DevExpress.XtraScheduler.UI.SwitchToWorkWeekViewItem() + Me.SwitchToWeekViewItem1 = New DevExpress.XtraScheduler.UI.SwitchToWeekViewItem() + Me.SwitchToFullWeekViewItem1 = New DevExpress.XtraScheduler.UI.SwitchToFullWeekViewItem() + Me.SwitchToMonthViewItem1 = New DevExpress.XtraScheduler.UI.SwitchToMonthViewItem() + Me.SwitchToTimelineViewItem1 = New DevExpress.XtraScheduler.UI.SwitchToTimelineViewItem() + Me.SwitchToGanttViewItem1 = New DevExpress.XtraScheduler.UI.SwitchToGanttViewItem() + Me.SwitchTimeScalesItem1 = New DevExpress.XtraScheduler.UI.SwitchTimeScalesItem() + Me.ChangeScaleWidthItem1 = New DevExpress.XtraScheduler.UI.ChangeScaleWidthItem() + Me.SwitchTimeScalesCaptionItem1 = New DevExpress.XtraScheduler.UI.SwitchTimeScalesCaptionItem() + Me.SwitchCompressWeekendItem1 = New DevExpress.XtraScheduler.UI.SwitchCompressWeekendItem() + Me.SwitchShowWorkTimeOnlyItem1 = New DevExpress.XtraScheduler.UI.SwitchShowWorkTimeOnlyItem() + Me.SwitchCellsAutoHeightItem1 = New DevExpress.XtraScheduler.UI.SwitchCellsAutoHeightItem() + Me.ChangeSnapToCellsUIItem1 = New DevExpress.XtraScheduler.UI.ChangeSnapToCellsUIItem() + Me.EditAppointmentQueryItem1 = New DevExpress.XtraScheduler.UI.EditAppointmentQueryItem() + Me.EditOccurrenceUICommandItem1 = New DevExpress.XtraScheduler.UI.EditOccurrenceUICommandItem() + Me.EditSeriesUICommandItem1 = New DevExpress.XtraScheduler.UI.EditSeriesUICommandItem() + Me.DeleteAppointmentsItem1 = New DevExpress.XtraScheduler.UI.DeleteAppointmentsItem() + Me.DeleteOccurrenceItem1 = New DevExpress.XtraScheduler.UI.DeleteOccurrenceItem() + Me.DeleteSeriesItem1 = New DevExpress.XtraScheduler.UI.DeleteSeriesItem() + Me.SplitAppointmentItem1 = New DevExpress.XtraScheduler.UI.SplitAppointmentItem() + Me.ChangeAppointmentStatusItem1 = New DevExpress.XtraScheduler.UI.ChangeAppointmentStatusItem() + Me.ChangeAppointmentLabelItem1 = New DevExpress.XtraScheduler.UI.ChangeAppointmentLabelItem() + Me.ToggleRecurrenceItem1 = New DevExpress.XtraScheduler.UI.ToggleRecurrenceItem() + Me.ChangeAppointmentReminderItem1 = New DevExpress.XtraScheduler.UI.ChangeAppointmentReminderItem() + Me.NewAppointmentItem1 = New DevExpress.XtraScheduler.UI.NewAppointmentItem() + Me.NewRecurringAppointmentItem1 = New DevExpress.XtraScheduler.UI.NewRecurringAppointmentItem() + Me.NavigateViewBackwardItem1 = New DevExpress.XtraScheduler.UI.NavigateViewBackwardItem() + Me.NavigateViewForwardItem1 = New DevExpress.XtraScheduler.UI.NavigateViewForwardItem() + Me.GotoTodayItem1 = New DevExpress.XtraScheduler.UI.GotoTodayItem() + Me.ViewZoomInItem1 = New DevExpress.XtraScheduler.UI.ViewZoomInItem() + Me.ViewZoomOutItem1 = New DevExpress.XtraScheduler.UI.ViewZoomOutItem() + Me.GroupByNoneItem1 = New DevExpress.XtraScheduler.UI.GroupByNoneItem() + Me.GroupByDateItem1 = New DevExpress.XtraScheduler.UI.GroupByDateItem() + Me.GroupByResourceItem1 = New DevExpress.XtraScheduler.UI.GroupByResourceItem() + Me.pageCalendar = New DevExpress.XtraScheduler.UI.HomeRibbonPage() + Me.AppointmentRibbonPageGroup1 = New DevExpress.XtraScheduler.UI.AppointmentRibbonPageGroup() + Me.NavigatorRibbonPageGroup1 = New DevExpress.XtraScheduler.UI.NavigatorRibbonPageGroup() + Me.ArrangeRibbonPageGroup1 = New DevExpress.XtraScheduler.UI.ArrangeRibbonPageGroup() + Me.GroupByRibbonPageGroup1 = New DevExpress.XtraScheduler.UI.GroupByRibbonPageGroup() + Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() + Me.SchedulerControl1 = New DevExpress.XtraScheduler.SchedulerControl() + Me.SchedulerStorage1 = New DevExpress.XtraScheduler.SchedulerStorage(Me.components) + CType(Me.ribbonCalendar, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SchedulerControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SchedulerStorage1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'ribbonCalendar + ' + Me.ribbonCalendar.ExpandCollapseItem.Id = 0 + Me.ribbonCalendar.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonCalendar.ExpandCollapseItem, Me.SwitchToDayViewItem1, Me.SwitchToWorkWeekViewItem1, Me.SwitchToWeekViewItem1, Me.SwitchToFullWeekViewItem1, Me.SwitchToMonthViewItem1, Me.SwitchToTimelineViewItem1, Me.SwitchToGanttViewItem1, Me.SwitchTimeScalesItem1, Me.ChangeScaleWidthItem1, Me.SwitchTimeScalesCaptionItem1, Me.SwitchCompressWeekendItem1, Me.SwitchShowWorkTimeOnlyItem1, Me.SwitchCellsAutoHeightItem1, Me.ChangeSnapToCellsUIItem1, Me.EditAppointmentQueryItem1, Me.EditOccurrenceUICommandItem1, Me.EditSeriesUICommandItem1, Me.DeleteAppointmentsItem1, Me.DeleteOccurrenceItem1, Me.DeleteSeriesItem1, Me.SplitAppointmentItem1, Me.ChangeAppointmentStatusItem1, Me.ChangeAppointmentLabelItem1, Me.ToggleRecurrenceItem1, Me.ChangeAppointmentReminderItem1, Me.NewAppointmentItem1, Me.NewRecurringAppointmentItem1, Me.NavigateViewBackwardItem1, Me.NavigateViewForwardItem1, Me.GotoTodayItem1, Me.ViewZoomInItem1, Me.ViewZoomOutItem1, Me.GroupByNoneItem1, Me.GroupByDateItem1, Me.GroupByResourceItem1}) + Me.ribbonCalendar.Location = New System.Drawing.Point(0, 0) + Me.ribbonCalendar.MaxItemId = 1 + Me.ribbonCalendar.Name = "ribbonCalendar" + Me.ribbonCalendar.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.pageCalendar}) + Me.ribbonCalendar.Size = New System.Drawing.Size(1047, 141) + ' + 'SwitchToDayViewItem1 + ' + Me.SwitchToDayViewItem1.Id = 1 + Me.SwitchToDayViewItem1.Name = "SwitchToDayViewItem1" + ' + 'SwitchToWorkWeekViewItem1 + ' + Me.SwitchToWorkWeekViewItem1.Id = 2 + Me.SwitchToWorkWeekViewItem1.Name = "SwitchToWorkWeekViewItem1" + ' + 'SwitchToWeekViewItem1 + ' + Me.SwitchToWeekViewItem1.Caption = "&Wochenansicht (Arbeitswoche)" + Me.SwitchToWeekViewItem1.Id = 3 + Me.SwitchToWeekViewItem1.Name = "SwitchToWeekViewItem1" + ' + 'SwitchToFullWeekViewItem1 + ' + Me.SwitchToFullWeekViewItem1.Caption = "&Ganze Woche anzeigen" + Me.SwitchToFullWeekViewItem1.Id = 4 + Me.SwitchToFullWeekViewItem1.Name = "SwitchToFullWeekViewItem1" + ' + 'SwitchToMonthViewItem1 + ' + Me.SwitchToMonthViewItem1.Id = 5 + Me.SwitchToMonthViewItem1.Name = "SwitchToMonthViewItem1" + ' + 'SwitchToTimelineViewItem1 + ' + Me.SwitchToTimelineViewItem1.Id = 6 + Me.SwitchToTimelineViewItem1.Name = "SwitchToTimelineViewItem1" + ' + 'SwitchToGanttViewItem1 + ' + Me.SwitchToGanttViewItem1.Id = 7 + Me.SwitchToGanttViewItem1.Name = "SwitchToGanttViewItem1" + ' + 'SwitchTimeScalesItem1 + ' + Me.SwitchTimeScalesItem1.Id = 8 + Me.SwitchTimeScalesItem1.Name = "SwitchTimeScalesItem1" + ' + 'ChangeScaleWidthItem1 + ' + Me.ChangeScaleWidthItem1.Edit = Nothing + Me.ChangeScaleWidthItem1.Id = 9 + Me.ChangeScaleWidthItem1.Name = "ChangeScaleWidthItem1" + Me.ChangeScaleWidthItem1.UseCommandCaption = True + ' + 'SwitchTimeScalesCaptionItem1 + ' + Me.SwitchTimeScalesCaptionItem1.Id = 10 + Me.SwitchTimeScalesCaptionItem1.Name = "SwitchTimeScalesCaptionItem1" + ' + 'SwitchCompressWeekendItem1 + ' + Me.SwitchCompressWeekendItem1.Id = 11 + Me.SwitchCompressWeekendItem1.Name = "SwitchCompressWeekendItem1" + ' + 'SwitchShowWorkTimeOnlyItem1 + ' + Me.SwitchShowWorkTimeOnlyItem1.Id = 12 + Me.SwitchShowWorkTimeOnlyItem1.Name = "SwitchShowWorkTimeOnlyItem1" + ' + 'SwitchCellsAutoHeightItem1 + ' + Me.SwitchCellsAutoHeightItem1.Id = 13 + Me.SwitchCellsAutoHeightItem1.Name = "SwitchCellsAutoHeightItem1" + ' + 'ChangeSnapToCellsUIItem1 + ' + Me.ChangeSnapToCellsUIItem1.Id = 14 + Me.ChangeSnapToCellsUIItem1.Name = "ChangeSnapToCellsUIItem1" + ' + 'EditAppointmentQueryItem1 + ' + Me.EditAppointmentQueryItem1.Id = 15 + Me.EditAppointmentQueryItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.EditOccurrenceUICommandItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.EditSeriesUICommandItem1)}) + Me.EditAppointmentQueryItem1.Name = "EditAppointmentQueryItem1" + Me.EditAppointmentQueryItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph + ' + 'EditOccurrenceUICommandItem1 + ' + Me.EditOccurrenceUICommandItem1.Id = 16 + Me.EditOccurrenceUICommandItem1.Name = "EditOccurrenceUICommandItem1" + ' + 'EditSeriesUICommandItem1 + ' + Me.EditSeriesUICommandItem1.Id = 17 + Me.EditSeriesUICommandItem1.Name = "EditSeriesUICommandItem1" + ' + 'DeleteAppointmentsItem1 + ' + Me.DeleteAppointmentsItem1.Id = 18 + Me.DeleteAppointmentsItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.DeleteOccurrenceItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.DeleteSeriesItem1)}) + Me.DeleteAppointmentsItem1.Name = "DeleteAppointmentsItem1" + Me.DeleteAppointmentsItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph + ' + 'DeleteOccurrenceItem1 + ' + Me.DeleteOccurrenceItem1.Id = 19 + Me.DeleteOccurrenceItem1.Name = "DeleteOccurrenceItem1" + ' + 'DeleteSeriesItem1 + ' + Me.DeleteSeriesItem1.Id = 20 + Me.DeleteSeriesItem1.Name = "DeleteSeriesItem1" + ' + 'SplitAppointmentItem1 + ' + Me.SplitAppointmentItem1.Id = 21 + Me.SplitAppointmentItem1.Name = "SplitAppointmentItem1" + ' + 'ChangeAppointmentStatusItem1 + ' + Me.ChangeAppointmentStatusItem1.Id = 22 + Me.ChangeAppointmentStatusItem1.Name = "ChangeAppointmentStatusItem1" + ' + 'ChangeAppointmentLabelItem1 + ' + Me.ChangeAppointmentLabelItem1.Id = 23 + Me.ChangeAppointmentLabelItem1.Name = "ChangeAppointmentLabelItem1" + ' + 'ToggleRecurrenceItem1 + ' + Me.ToggleRecurrenceItem1.Id = 24 + Me.ToggleRecurrenceItem1.Name = "ToggleRecurrenceItem1" + ' + 'ChangeAppointmentReminderItem1 + ' + Me.ChangeAppointmentReminderItem1.Edit = Nothing + Me.ChangeAppointmentReminderItem1.Id = 25 + Me.ChangeAppointmentReminderItem1.Name = "ChangeAppointmentReminderItem1" + ' + 'NewAppointmentItem1 + ' + Me.NewAppointmentItem1.Id = 26 + Me.NewAppointmentItem1.Name = "NewAppointmentItem1" + ' + 'NewRecurringAppointmentItem1 + ' + Me.NewRecurringAppointmentItem1.Id = 27 + Me.NewRecurringAppointmentItem1.Name = "NewRecurringAppointmentItem1" + ' + 'NavigateViewBackwardItem1 + ' + Me.NavigateViewBackwardItem1.Id = 28 + Me.NavigateViewBackwardItem1.Name = "NavigateViewBackwardItem1" + ' + 'NavigateViewForwardItem1 + ' + Me.NavigateViewForwardItem1.Id = 29 + Me.NavigateViewForwardItem1.Name = "NavigateViewForwardItem1" + ' + 'GotoTodayItem1 + ' + Me.GotoTodayItem1.Id = 30 + Me.GotoTodayItem1.Name = "GotoTodayItem1" + ' + 'ViewZoomInItem1 + ' + Me.ViewZoomInItem1.Id = 31 + Me.ViewZoomInItem1.Name = "ViewZoomInItem1" + ' + 'ViewZoomOutItem1 + ' + Me.ViewZoomOutItem1.Id = 32 + Me.ViewZoomOutItem1.Name = "ViewZoomOutItem1" + ' + 'GroupByNoneItem1 + ' + Me.GroupByNoneItem1.Id = 33 + Me.GroupByNoneItem1.Name = "GroupByNoneItem1" + ' + 'GroupByDateItem1 + ' + Me.GroupByDateItem1.Id = 34 + Me.GroupByDateItem1.Name = "GroupByDateItem1" + ' + 'GroupByResourceItem1 + ' + Me.GroupByResourceItem1.Id = 35 + Me.GroupByResourceItem1.Name = "GroupByResourceItem1" + ' + 'pageCalendar + ' + Me.pageCalendar.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.AppointmentRibbonPageGroup1, Me.NavigatorRibbonPageGroup1, Me.ArrangeRibbonPageGroup1, Me.GroupByRibbonPageGroup1}) + Me.pageCalendar.Name = "pageCalendar" + Me.pageCalendar.Text = "Kalender" + ' + 'AppointmentRibbonPageGroup1 + ' + Me.AppointmentRibbonPageGroup1.ItemLinks.Add(Me.NewAppointmentItem1) + Me.AppointmentRibbonPageGroup1.ItemLinks.Add(Me.NewRecurringAppointmentItem1) + Me.AppointmentRibbonPageGroup1.Name = "AppointmentRibbonPageGroup1" + ' + 'NavigatorRibbonPageGroup1 + ' + Me.NavigatorRibbonPageGroup1.ItemLinks.Add(Me.NavigateViewBackwardItem1) + Me.NavigatorRibbonPageGroup1.ItemLinks.Add(Me.NavigateViewForwardItem1) + Me.NavigatorRibbonPageGroup1.ItemLinks.Add(Me.GotoTodayItem1) + Me.NavigatorRibbonPageGroup1.ItemLinks.Add(Me.ViewZoomInItem1) + Me.NavigatorRibbonPageGroup1.ItemLinks.Add(Me.ViewZoomOutItem1) + Me.NavigatorRibbonPageGroup1.Name = "NavigatorRibbonPageGroup1" + ' + 'ArrangeRibbonPageGroup1 + ' + Me.ArrangeRibbonPageGroup1.ItemLinks.Add(Me.SwitchToDayViewItem1) + Me.ArrangeRibbonPageGroup1.ItemLinks.Add(Me.SwitchToWorkWeekViewItem1) + Me.ArrangeRibbonPageGroup1.ItemLinks.Add(Me.SwitchToWeekViewItem1) + Me.ArrangeRibbonPageGroup1.ItemLinks.Add(Me.SwitchToFullWeekViewItem1) + Me.ArrangeRibbonPageGroup1.ItemLinks.Add(Me.SwitchToMonthViewItem1) + Me.ArrangeRibbonPageGroup1.ItemLinks.Add(Me.SwitchToTimelineViewItem1) + Me.ArrangeRibbonPageGroup1.ItemLinks.Add(Me.SwitchToGanttViewItem1) + Me.ArrangeRibbonPageGroup1.Name = "ArrangeRibbonPageGroup1" + ' + 'GroupByRibbonPageGroup1 + ' + Me.GroupByRibbonPageGroup1.ItemLinks.Add(Me.GroupByNoneItem1) + Me.GroupByRibbonPageGroup1.ItemLinks.Add(Me.GroupByDateItem1) + Me.GroupByRibbonPageGroup1.ItemLinks.Add(Me.GroupByResourceItem1) + Me.GroupByRibbonPageGroup1.Name = "GroupByRibbonPageGroup1" + ' + 'StatusStrip1 + ' + Me.StatusStrip1.Location = New System.Drawing.Point(0, 527) + Me.StatusStrip1.Name = "StatusStrip1" + Me.StatusStrip1.Size = New System.Drawing.Size(1047, 22) + Me.StatusStrip1.TabIndex = 2 + Me.StatusStrip1.Text = "StatusStrip1" + ' + 'SchedulerControl1 + ' + Me.SchedulerControl1.ActiveViewType = DevExpress.XtraScheduler.SchedulerViewType.Week + Me.SchedulerControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.SchedulerControl1.Location = New System.Drawing.Point(0, 141) + Me.SchedulerControl1.MenuManager = Me.ribbonCalendar + Me.SchedulerControl1.Name = "SchedulerControl1" + Me.SchedulerControl1.OptionsView.FirstDayOfWeek = DevExpress.XtraScheduler.FirstDayOfWeek.Monday + Me.SchedulerControl1.Size = New System.Drawing.Size(1047, 386) + Me.SchedulerControl1.Start = New Date(2014, 12, 22, 0, 0, 0, 0) + Me.SchedulerControl1.Storage = Me.SchedulerStorage1 + Me.SchedulerControl1.TabIndex = 3 + Me.SchedulerControl1.Text = "SchedulerControl1" + Me.SchedulerControl1.Views.DayView.TimeRulers.Add(TimeRuler4) + Me.SchedulerControl1.Views.FullWeekView.Enabled = True + Me.SchedulerControl1.Views.FullWeekView.TimeRulers.Add(TimeRuler5) + Me.SchedulerControl1.Views.WorkWeekView.TimeRulers.Add(TimeRuler6) + ' + 'SchedulerStorage1 + ' + Me.SchedulerStorage1.Appointments.CustomFieldMappings.Add(New DevExpress.XtraScheduler.AppointmentCustomFieldMapping("RecordID", "CustomField1")) + Me.SchedulerStorage1.Appointments.CustomFieldMappings.Add(New DevExpress.XtraScheduler.AppointmentCustomFieldMapping("ControlID", "CustomField2")) + Me.SchedulerStorage1.Appointments.Mappings.AllDay = "AllDay" + Me.SchedulerStorage1.Appointments.Mappings.Description = "Description" + Me.SchedulerStorage1.Appointments.Mappings.End = "EndDate" + Me.SchedulerStorage1.Appointments.Mappings.Label = "Label" + Me.SchedulerStorage1.Appointments.Mappings.Location = "Location" + Me.SchedulerStorage1.Appointments.Mappings.RecurrenceInfo = "RecurrenceInfo" + Me.SchedulerStorage1.Appointments.Mappings.ReminderInfo = "ReminderInfo" + Me.SchedulerStorage1.Appointments.Mappings.ResourceId = "ResourceID" + Me.SchedulerStorage1.Appointments.Mappings.Start = "StartDate" + Me.SchedulerStorage1.Appointments.Mappings.Status = "Status" + Me.SchedulerStorage1.Appointments.Mappings.Subject = "Subject" + Me.SchedulerStorage1.Appointments.Mappings.Type = "Type" + Me.SchedulerStorage1.Resources.Mappings.Caption = "ResourceName" + Me.SchedulerStorage1.Resources.Mappings.Color = "Color" + Me.SchedulerStorage1.Resources.Mappings.Id = "ResourceID" + Me.SchedulerStorage1.Resources.Mappings.Image = "Image" + Me.SchedulerStorage1.Resources.Mappings.ParentId = "UniqueID" + ' + 'frmCalendarEntity + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(1047, 549) + Me.Controls.Add(Me.SchedulerControl1) + Me.Controls.Add(Me.StatusStrip1) + Me.Controls.Add(Me.ribbonCalendar) + Me.Name = "frmCalendarEntity" + Me.Text = "frmCalendarEntity" + CType(Me.ribbonCalendar, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SchedulerControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SchedulerStorage1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ribbonCalendar As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents SwitchToDayViewItem1 As DevExpress.XtraScheduler.UI.SwitchToDayViewItem + Friend WithEvents SwitchToWorkWeekViewItem1 As DevExpress.XtraScheduler.UI.SwitchToWorkWeekViewItem + Friend WithEvents SwitchToWeekViewItem1 As DevExpress.XtraScheduler.UI.SwitchToWeekViewItem + Friend WithEvents SwitchToFullWeekViewItem1 As DevExpress.XtraScheduler.UI.SwitchToFullWeekViewItem + Friend WithEvents SwitchToMonthViewItem1 As DevExpress.XtraScheduler.UI.SwitchToMonthViewItem + Friend WithEvents SwitchToTimelineViewItem1 As DevExpress.XtraScheduler.UI.SwitchToTimelineViewItem + Friend WithEvents SwitchToGanttViewItem1 As DevExpress.XtraScheduler.UI.SwitchToGanttViewItem + Friend WithEvents SwitchTimeScalesItem1 As DevExpress.XtraScheduler.UI.SwitchTimeScalesItem + Friend WithEvents ChangeScaleWidthItem1 As DevExpress.XtraScheduler.UI.ChangeScaleWidthItem + Friend WithEvents SwitchTimeScalesCaptionItem1 As DevExpress.XtraScheduler.UI.SwitchTimeScalesCaptionItem + Friend WithEvents SwitchCompressWeekendItem1 As DevExpress.XtraScheduler.UI.SwitchCompressWeekendItem + Friend WithEvents SwitchShowWorkTimeOnlyItem1 As DevExpress.XtraScheduler.UI.SwitchShowWorkTimeOnlyItem + Friend WithEvents SwitchCellsAutoHeightItem1 As DevExpress.XtraScheduler.UI.SwitchCellsAutoHeightItem + Friend WithEvents ChangeSnapToCellsUIItem1 As DevExpress.XtraScheduler.UI.ChangeSnapToCellsUIItem + Friend WithEvents EditAppointmentQueryItem1 As DevExpress.XtraScheduler.UI.EditAppointmentQueryItem + Friend WithEvents EditOccurrenceUICommandItem1 As DevExpress.XtraScheduler.UI.EditOccurrenceUICommandItem + Friend WithEvents EditSeriesUICommandItem1 As DevExpress.XtraScheduler.UI.EditSeriesUICommandItem + Friend WithEvents DeleteAppointmentsItem1 As DevExpress.XtraScheduler.UI.DeleteAppointmentsItem + Friend WithEvents DeleteOccurrenceItem1 As DevExpress.XtraScheduler.UI.DeleteOccurrenceItem + Friend WithEvents DeleteSeriesItem1 As DevExpress.XtraScheduler.UI.DeleteSeriesItem + Friend WithEvents SplitAppointmentItem1 As DevExpress.XtraScheduler.UI.SplitAppointmentItem + Friend WithEvents ChangeAppointmentStatusItem1 As DevExpress.XtraScheduler.UI.ChangeAppointmentStatusItem + Friend WithEvents ChangeAppointmentLabelItem1 As DevExpress.XtraScheduler.UI.ChangeAppointmentLabelItem + Friend WithEvents ToggleRecurrenceItem1 As DevExpress.XtraScheduler.UI.ToggleRecurrenceItem + Friend WithEvents ChangeAppointmentReminderItem1 As DevExpress.XtraScheduler.UI.ChangeAppointmentReminderItem + Friend WithEvents NewAppointmentItem1 As DevExpress.XtraScheduler.UI.NewAppointmentItem + Friend WithEvents NewRecurringAppointmentItem1 As DevExpress.XtraScheduler.UI.NewRecurringAppointmentItem + Friend WithEvents NavigateViewBackwardItem1 As DevExpress.XtraScheduler.UI.NavigateViewBackwardItem + Friend WithEvents NavigateViewForwardItem1 As DevExpress.XtraScheduler.UI.NavigateViewForwardItem + Friend WithEvents GotoTodayItem1 As DevExpress.XtraScheduler.UI.GotoTodayItem + Friend WithEvents ViewZoomInItem1 As DevExpress.XtraScheduler.UI.ViewZoomInItem + Friend WithEvents ViewZoomOutItem1 As DevExpress.XtraScheduler.UI.ViewZoomOutItem + Friend WithEvents GroupByNoneItem1 As DevExpress.XtraScheduler.UI.GroupByNoneItem + Friend WithEvents GroupByDateItem1 As DevExpress.XtraScheduler.UI.GroupByDateItem + Friend WithEvents GroupByResourceItem1 As DevExpress.XtraScheduler.UI.GroupByResourceItem + Friend WithEvents pageCalendar As DevExpress.XtraScheduler.UI.HomeRibbonPage + Friend WithEvents AppointmentRibbonPageGroup1 As DevExpress.XtraScheduler.UI.AppointmentRibbonPageGroup + Friend WithEvents NavigatorRibbonPageGroup1 As DevExpress.XtraScheduler.UI.NavigatorRibbonPageGroup + Friend WithEvents ArrangeRibbonPageGroup1 As DevExpress.XtraScheduler.UI.ArrangeRibbonPageGroup + Friend WithEvents GroupByRibbonPageGroup1 As DevExpress.XtraScheduler.UI.GroupByRibbonPageGroup + Friend WithEvents StatusStrip1 As StatusStrip + Friend WithEvents SchedulerControl1 As DevExpress.XtraScheduler.SchedulerControl + Friend WithEvents SchedulerStorage1 As DevExpress.XtraScheduler.SchedulerStorage +End Class diff --git a/app/DD-Record-Organizer/frmCalendarEntity.resx b/app/DD-Record-Organizer/frmCalendarEntity.resx new file mode 100644 index 0000000..f337e83 --- /dev/null +++ b/app/DD-Record-Organizer/frmCalendarEntity.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 171, 17 + + \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmCalendarEntity.vb b/app/DD-Record-Organizer/frmCalendarEntity.vb new file mode 100644 index 0000000..0e8cbdc --- /dev/null +++ b/app/DD-Record-Organizer/frmCalendarEntity.vb @@ -0,0 +1,3 @@ +Public Class frmCalendarEntity + +End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb index b1555a2..87334eb 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb @@ -42,7 +42,9 @@ Partial Class frmConstructor_Main Me.tsmiFulltext = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator12 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripSeparator24 = New System.Windows.Forms.ToolStripSeparator() - Me.tsmi_NewNode = New System.Windows.Forms.ToolStripMenuItem() + Me.tsmiNodeRename = New System.Windows.Forms.ToolStripMenuItem() + Me.tstxtRenameNode = New System.Windows.Forms.ToolStripTextBox() + Me.tsmiNodeNew = New System.Windows.Forms.ToolStripMenuItem() Me.SdsdToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.tsmINewText = New System.Windows.Forms.ToolStripTextBox() Me.ToolStripSeparator15 = New System.Windows.Forms.ToolStripSeparator() @@ -173,6 +175,9 @@ Partial Class frmConstructor_Main Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() Me.ToolStripSeparator23 = New System.Windows.Forms.ToolStripSeparator() Me.tsbtnVariantDetailView = New System.Windows.Forms.ToolStripButton() + Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() + Me.TreeList1 = New DevExpress.XtraTreeList.TreeList() + Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components) Me.SplitContainerFORM = New DevExpress.XtraEditors.SplitContainerControl() Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.docCM_Open = New System.Windows.Forms.ToolStripMenuItem() @@ -188,6 +193,8 @@ Partial Class frmConstructor_Main Me.CMDoc_TextBoxRenameDisplay = New System.Windows.Forms.ToolStripTextBox() Me.docCM_InWork = New System.Windows.Forms.ToolStripMenuItem() Me.docCM_linkRecord = New System.Windows.Forms.ToolStripMenuItem() + Me.AusDieserEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AusAndererEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.WindreamToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateiVersionierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DokumentartÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -211,7 +218,6 @@ Partial Class frmConstructor_Main Me.tsslblWorkflowstate = New System.Windows.Forms.ToolStripStatusLabel() Me.labelLoadEntity = New System.Windows.Forms.ToolStripStatusLabel() Me.DD_ECMAdmin = New DD_Record_Organizer.DD_ECMAdmin() - Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components) Me.ttToolTip = New System.Windows.Forms.ToolTip(Me.components) Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.cmsrpContainer = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -259,12 +265,14 @@ Partial Class frmConstructor_Main CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewVariants, System.ComponentModel.ISupportInitialize).BeginInit() Me.tsVariants.SuspendLayout() + Me.XtraTabPage1.SuspendLayout() + CType(Me.TreeList1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerFORM, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerFORM.SuspendLayout() Me.ContextMenuStripResultFiles.SuspendLayout() Me.StatusStrip_Main.SuspendLayout() CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() Me.cmsrpContainer.SuspendLayout() CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -308,7 +316,7 @@ Partial Class frmConstructor_Main 'cmsTreeView ' Me.cmsTreeView.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.cmsTreeView.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ResetEbenenAuswahlToolStripMenuItem, Me.ToolStripSeparator14, Me.FormDesignerToolStripMenuItem, Me.ToolStripSeparator13, Me.AuswertungAnzeigenToolStripMenuItem, Me.tsmiFilesearch, Me.ToolStripSeparator12, Me.ToolStripSeparator24, Me.tsmi_NewNode, Me.tsmiNodeDelete, Me.tstxtboxSearchNode}) + Me.cmsTreeView.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ResetEbenenAuswahlToolStripMenuItem, Me.ToolStripSeparator14, Me.FormDesignerToolStripMenuItem, Me.ToolStripSeparator13, Me.AuswertungAnzeigenToolStripMenuItem, Me.tsmiFilesearch, Me.ToolStripSeparator12, Me.ToolStripSeparator24, Me.tsmiNodeRename, Me.tsmiNodeNew, Me.tsmiNodeDelete, Me.tstxtboxSearchNode}) Me.cmsTreeView.Name = "ContextMenuStrip2" resources.ApplyResources(Me.cmsTreeView, "cmsTreeView") ' @@ -371,11 +379,24 @@ Partial Class frmConstructor_Main Me.ToolStripSeparator24.Name = "ToolStripSeparator24" resources.ApplyResources(Me.ToolStripSeparator24, "ToolStripSeparator24") ' - 'tsmi_NewNode + 'tsmiNodeRename ' - Me.tsmi_NewNode.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SdsdToolStripMenuItem, Me.tsmINewText, Me.ToolStripSeparator15, Me.OberhalbToolStripMenuItem, Me.UnterhalbToolStripMenuItem}) - resources.ApplyResources(Me.tsmi_NewNode, "tsmi_NewNode") - Me.tsmi_NewNode.Name = "tsmi_NewNode" + Me.tsmiNodeRename.BackColor = System.Drawing.SystemColors.Control + Me.tsmiNodeRename.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tstxtRenameNode}) + resources.ApplyResources(Me.tsmiNodeRename, "tsmiNodeRename") + Me.tsmiNodeRename.Name = "tsmiNodeRename" + ' + 'tstxtRenameNode + ' + Me.tstxtRenameNode.BackColor = System.Drawing.SystemColors.ActiveCaption + Me.tstxtRenameNode.Name = "tstxtRenameNode" + resources.ApplyResources(Me.tstxtRenameNode, "tstxtRenameNode") + ' + 'tsmiNodeNew + ' + Me.tsmiNodeNew.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SdsdToolStripMenuItem, Me.tsmINewText, Me.ToolStripSeparator15, Me.OberhalbToolStripMenuItem, Me.UnterhalbToolStripMenuItem}) + resources.ApplyResources(Me.tsmiNodeNew, "tsmiNodeNew") + Me.tsmiNodeNew.Name = "tsmiNodeNew" ' 'SdsdToolStripMenuItem ' @@ -419,7 +440,6 @@ Partial Class frmConstructor_Main Me.GridControlMain.AllowDrop = True Me.GridControlMain.ContextMenuStrip = Me.ContextMenuGrid resources.ApplyResources(Me.GridControlMain, "GridControlMain") - Me.GridControlMain.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlMain.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) GridLevelNode1.LevelTemplate = Me.grvwGrid GridLevelNode1.RelationName = "Level1" GridLevelNode2.LevelTemplate = Me.grvwCarousel @@ -548,6 +568,7 @@ Partial Class frmConstructor_Main Me.grvwGrid.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] Me.grvwGrid.OptionsBehavior.Editable = False Me.grvwGrid.OptionsBehavior.ReadOnly = True + Me.grvwGrid.OptionsClipboard.AllowCopy = DevExpress.Utils.DefaultBoolean.[False] Me.grvwGrid.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] Me.grvwGrid.OptionsSelection.EnableAppearanceFocusedCell = False Me.grvwGrid.OptionsSelection.EnableAppearanceFocusedRow = False @@ -674,15 +695,15 @@ Partial Class frmConstructor_Main Me.TCDetails.LookAndFeel.UseDefaultLookAndFeel = False Me.TCDetails.Name = "TCDetails" Me.TCDetails.SelectedTabPage = Me.TabDetails - Me.TCDetails.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabDetails, Me.TabPos, Me.TabWindream, Me.TabFollowUp, Me.TabPageVariant}) + Me.TCDetails.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabDetails, Me.TabPos, Me.TabWindream, Me.TabFollowUp, Me.TabPageVariant, Me.XtraTabPage1}) Me.TCDetails.TabStop = False ' 'TabDetails ' Me.TabDetails.Controls.Add(Me.SplitContainerDetails) Me.TabDetails.Controls.Add(Me.ToolStripEdit) - resources.ApplyResources(Me.TabDetails, "TabDetails") Me.TabDetails.Name = "TabDetails" + resources.ApplyResources(Me.TabDetails, "TabDetails") ' 'SplitContainerDetails ' @@ -818,14 +839,13 @@ Partial Class frmConstructor_Main Me.TabPos.Controls.Add(Me.GridControlPos) Me.TabPos.Controls.Add(Me.BindingNavigatorPOS) Me.TabPos.Image = CType(resources.GetObject("TabPos.Image"), System.Drawing.Image) - resources.ApplyResources(Me.TabPos, "TabPos") Me.TabPos.Name = "TabPos" Me.TabPos.PageVisible = False + resources.ApplyResources(Me.TabPos, "TabPos") ' 'GridControlPos ' resources.ApplyResources(Me.GridControlPos, "GridControlPos") - Me.GridControlPos.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlPos.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.GridControlPos.MainView = Me.grvwGridPos Me.GridControlPos.Name = "GridControlPos" Me.GridControlPos.TabStop = False @@ -938,15 +958,14 @@ Partial Class frmConstructor_Main Me.TabWindream.AllowDrop = True Me.TabWindream.Controls.Add(Me.GridControlDocSearch) Me.TabWindream.Controls.Add(Me.ToolStripDokumente) - resources.ApplyResources(Me.TabWindream, "TabWindream") Me.TabWindream.Name = "TabWindream" + resources.ApplyResources(Me.TabWindream, "TabWindream") ' 'GridControlDocSearch ' Me.GridControlDocSearch.AllowDrop = True Me.GridControlDocSearch.ContextMenuStrip = Me.cmsResultFilesBasic resources.ApplyResources(Me.GridControlDocSearch, "GridControlDocSearch") - Me.GridControlDocSearch.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search Me.GridControlDocSearch.Name = "GridControlDocSearch" Me.GridControlDocSearch.TabStop = False @@ -1036,8 +1055,8 @@ Partial Class frmConstructor_Main Me.TabFollowUp.Controls.Add(Me.ListViewFollowUps) Me.TabFollowUp.Controls.Add(Me.grpbxFU_Profile) Me.TabFollowUp.Controls.Add(Me.Label5) - resources.ApplyResources(Me.TabFollowUp, "TabFollowUp") Me.TabFollowUp.Name = "TabFollowUp" + resources.ApplyResources(Me.TabFollowUp, "TabFollowUp") ' 'ListViewFollowUps ' @@ -1152,15 +1171,14 @@ Partial Class frmConstructor_Main Me.TabPageVariant.Appearance.Header.Options.UseForeColor = True Me.TabPageVariant.Controls.Add(Me.GridControl1) Me.TabPageVariant.Controls.Add(Me.tsVariants) - resources.ApplyResources(Me.TabPageVariant, "TabPageVariant") Me.TabPageVariant.Name = "TabPageVariant" Me.TabPageVariant.PageVisible = False + resources.ApplyResources(Me.TabPageVariant, "TabPageVariant") ' 'GridControl1 ' Me.GridControl1.DataSource = Me.TBPMO_RECORD_VARIANTBindingSource resources.ApplyResources(Me.GridControl1, "GridControl1") - Me.GridControl1.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControl1.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.GridControl1.MainView = Me.GridViewVariants Me.GridControl1.Name = "GridControl1" Me.GridControl1.ShowOnlyPredefinedDetails = True @@ -1259,6 +1277,36 @@ Partial Class frmConstructor_Main resources.ApplyResources(Me.tsbtnVariantDetailView, "tsbtnVariantDetailView") Me.tsbtnVariantDetailView.Name = "tsbtnVariantDetailView" ' + 'XtraTabPage1 + ' + Me.XtraTabPage1.Controls.Add(Me.TreeList1) + Me.XtraTabPage1.Name = "XtraTabPage1" + resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1") + ' + 'TreeList1 + ' + Me.TreeList1.AllowDrop = True + Me.TreeList1.Appearance.FocusedRow.BackColor = CType(resources.GetObject("TreeList1.Appearance.FocusedRow.BackColor"), System.Drawing.Color) + Me.TreeList1.Appearance.FocusedRow.Options.UseBackColor = True + resources.ApplyResources(Me.TreeList1, "TreeList1") + Me.TreeList1.Name = "TreeList1" + Me.TreeList1.OptionsBehavior.EnableFiltering = True + Me.TreeList1.OptionsBehavior.ExpandNodesOnFiltering = True + Me.TreeList1.OptionsFilter.FilterMode = DevExpress.XtraTreeList.FilterMode.Extended + Me.TreeList1.OptionsFind.AllowFindPanel = True + Me.TreeList1.OptionsFind.AlwaysVisible = True + Me.TreeList1.OptionsFind.FindDelay = 300 + Me.TreeList1.OptionsFind.FindMode = DevExpress.XtraTreeList.FindMode.Always + Me.TreeList1.OptionsFind.ShowCloseButton = False + Me.TreeList1.OptionsFind.ShowFindButton = False + Me.TreeList1.OptionsSelection.EnableAppearanceFocusedCell = False + Me.TreeList1.OptionsView.ShowColumns = False + Me.TreeList1.StateImageList = Me.ImageCollection1 + ' + 'ImageCollection1 + ' + Me.ImageCollection1.ImageStream = CType(resources.GetObject("ImageCollection1.ImageStream"), DevExpress.Utils.ImageCollectionStreamer) + ' 'SplitContainerFORM ' Me.SplitContainerFORM.Collapsed = True @@ -1347,10 +1395,21 @@ Partial Class frmConstructor_Main ' 'docCM_linkRecord ' + Me.docCM_linkRecord.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AusDieserEntitätToolStripMenuItem, Me.AusAndererEntitätToolStripMenuItem}) Me.docCM_linkRecord.Image = Global.DD_Record_Organizer.My.Resources.Resources.Link Me.docCM_linkRecord.Name = "docCM_linkRecord" resources.ApplyResources(Me.docCM_linkRecord, "docCM_linkRecord") ' + 'AusDieserEntitätToolStripMenuItem + ' + Me.AusDieserEntitätToolStripMenuItem.Name = "AusDieserEntitätToolStripMenuItem" + resources.ApplyResources(Me.AusDieserEntitätToolStripMenuItem, "AusDieserEntitätToolStripMenuItem") + ' + 'AusAndererEntitätToolStripMenuItem + ' + Me.AusAndererEntitätToolStripMenuItem.Name = "AusAndererEntitätToolStripMenuItem" + resources.ApplyResources(Me.AusAndererEntitätToolStripMenuItem, "AusAndererEntitätToolStripMenuItem") + ' 'WindreamToolStripMenuItem ' Me.WindreamToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiVersionierenToolStripMenuItem, Me.DokumentartÄndernToolStripMenuItem}) @@ -1487,10 +1546,6 @@ Partial Class frmConstructor_Main Me.DD_ECMAdmin.DataSetName = "DD_ECMAdmin" Me.DD_ECMAdmin.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' - 'ImageCollection1 - ' - Me.ImageCollection1.ImageStream = CType(resources.GetObject("ImageCollection1.ImageStream"), DevExpress.Utils.ImageCollectionStreamer) - ' 'ContextMenuDetails ' Me.ContextMenuDetails.ImageScalingSize = New System.Drawing.Size(20, 20) @@ -1623,13 +1678,15 @@ Partial Class frmConstructor_Main CType(Me.GridViewVariants, System.ComponentModel.ISupportInitialize).EndInit() Me.tsVariants.ResumeLayout(False) Me.tsVariants.PerformLayout() + Me.XtraTabPage1.ResumeLayout(False) + CType(Me.TreeList1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerFORM, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerFORM.ResumeLayout(False) Me.ContextMenuStripResultFiles.ResumeLayout(False) Me.StatusStrip_Main.ResumeLayout(False) Me.StatusStrip_Main.PerformLayout() CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() Me.cmsrpContainer.ResumeLayout(False) CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) @@ -1803,7 +1860,7 @@ Partial Class frmConstructor_Main Friend WithEvents CMDoc_TextBoxRenameFile As System.Windows.Forms.ToolStripTextBox Friend WithEvents DisplaynameUmbenennenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents CMDoc_TextBoxRenameDisplay As System.Windows.Forms.ToolStripTextBox - Friend WithEvents tsmi_NewNode As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents tsmiNodeNew As System.Windows.Forms.ToolStripMenuItem Friend WithEvents OberhalbToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents UnterhalbToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents SdsdToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem @@ -1831,4 +1888,10 @@ Partial Class frmConstructor_Main Friend WithEvents ContextMenuStripClipboard As ContextMenuStrip Friend WithEvents tslblDocIDMain As ToolStripStatusLabel Friend WithEvents BW_LoadTreeView As System.ComponentModel.BackgroundWorker + Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage + Friend WithEvents TreeList1 As DevExpress.XtraTreeList.TreeList + Friend WithEvents AusDieserEntitätToolStripMenuItem As ToolStripMenuItem + Friend WithEvents AusAndererEntitätToolStripMenuItem As ToolStripMenuItem + Friend WithEvents tsmiNodeRename As ToolStripMenuItem + Friend WithEvents tstxtRenameNode As ToolStripTextBox End Class diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx index 3a0670a..af02422 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.resx +++ b/app/DD-Record-Organizer/frmConstructor_Main.resx @@ -125,29 +125,23 @@ 0, 0 - - 4, 4, 4, 4 - Fill 0, 0 - - 4, 4, 4, 4 - - 758, 56 + 468, 56 - 232, 26 + 224, 26 Reset Ebenen-Auswahl - 229, 6 + 221, 6 @@ -159,22 +153,22 @@ - 232, 26 + 224, 26 Form-Designer - 229, 6 + 221, 6 - 232, 26 + 224, 26 Auswertung anzeigen - 284, 26 + 233, 22 Diesem Knoten untergeordnet @@ -184,7 +178,7 @@ False - 284, 26 + 233, 22 Enitätssuche - "alle Dateien" @@ -253,7 +247,7 @@ - 284, 26 + 233, 22 Volltextsuche @@ -274,28 +268,44 @@ - 232, 26 + 224, 26 Dateisuchen - 229, 6 + 221, 6 - 229, 6 + 221, 6 + + + 200, 23 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAFBJREFUOE9joBh8+/btPz4MVYYbgBQ5OTmBMUwTMh+qDDegigHYNBKL4S6A0chs + YmjauYAQhqkbTi5A1ojMJ0QTNIAQRvECNgxNb4MWMDAAAPsOTf9dAGOQAAAAAElFTkSuQmCC + + + + 224, 26 + + + Knoten umbenennen - 218, 26 + 216, 26 Knotentext: - 152, 27 + 152, 23 - 215, 6 + 213, 6 @@ -306,7 +316,7 @@ - 218, 26 + 216, 26 Auf dieser Ebene @@ -321,12 +331,12 @@ - 218, 26 + 216, 26 Unterhalb - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn @@ -334,10 +344,10 @@ TkSuQmCC - - 232, 26 + + 224, 26 - + Neuer Knoten @@ -357,7 +367,7 @@ - 232, 26 + 224, 26 Knoten löschen @@ -369,13 +379,13 @@ Segoe UI, 9pt, style=Italic - 160, 27 + 160, 23 Suche Knoten - 233, 213 + 225, 257 cmsTreeView @@ -392,9 +402,6 @@ 0, 0 - - 4, 4, 4, 4 - 283, 237 @@ -423,103 +430,103 @@ Segoe UI, 9pt, style=Bold - 336, 26 + 280, 26 Funktionen DataGrid - 333, 6 + 277, 6 - 218, 26 + 182, 22 Quick View Carousel - 218, 26 + 182, 22 Quick View Tiles - 218, 26 + 182, 22 Detail View - 336, 26 + 280, 26 Ansicht umschalten - 336, 26 + 280, 26 Ansicht als Standard festlegen - 336, 26 + 280, 26 Ansicht zurücksetzen - 333, 6 + 277, 6 - 336, 26 + 280, 26 Suche anzeigen (CTRL+F) - 336, 26 + 280, 26 Alle Filter entfernen - 336, 26 + 280, 26 Export nach Excel - 336, 26 + 280, 26 Daten neu laden - 333, 6 + 277, 6 - 336, 26 + 280, 26 Datensatz löschen - 336, 26 + 280, 26 Massenänderung sichtbare Datensätze - 333, 6 + 277, 6 - 336, 26 + 280, 26 Detail-Ansicht Datensatz - 337, 314 + 281, 314 ContextMenuGrid @@ -530,9 +537,6 @@ Fill - - 4, 4, 4, 4 - Tahoma, 9pt @@ -545,11 +549,8 @@ 0, 27 - - 4, 4, 4, 4 - - 1412, 210 + 988, 210 2 @@ -567,13 +568,13 @@ 0 - 17, 95 + 969, 56 Segoe UI Semibold, 9pt, style=Bold, Italic - 139, 24 + 109, 24 tslbldisplayRecords @@ -590,7 +591,7 @@ - 275, 26 + 228, 22 Record kopieren @@ -599,7 +600,7 @@ False - 275, 26 + 228, 22 Neue Variante @@ -608,13 +609,13 @@ Erzeugt eine neue Variante und speichert den bisherigen Record. - 272, 6 + 225, 6 False - 275, 26 + 228, 22 Ändere Parent-Verknüpfung @@ -623,7 +624,7 @@ False - 275, 26 + 228, 22 Erstelle Workflowtasks @@ -632,7 +633,7 @@ False - 275, 26 + 228, 22 Zeige Record-Logs @@ -641,16 +642,16 @@ False - 275, 26 + 228, 22 Office-Vorlagen - 272, 6 + 225, 6 - 275, 26 + 228, 22 Anwendungscache freigeben @@ -659,7 +660,7 @@ Magenta - 148, 24 + 122, 24 Record-Funktionen @@ -671,7 +672,7 @@ Magenta - 101, 24 + 85, 24 Neu laden @@ -683,7 +684,7 @@ Magenta - 98, 24 + 82, 24 Geodaten @@ -692,7 +693,7 @@ 0, 0 - 1412, 27 + 988, 27 1 @@ -716,7 +717,7 @@ Panel2 - 1701, 237 + 1276, 237 0 @@ -754,9 +755,6 @@ 0, 0 - - 4, 4, 4, 4 - ControlLight @@ -769,9 +767,6 @@ 0, 27 - - 4, 4, 4, 4 - True @@ -781,11 +776,8 @@ 0, 0 - - 4, 4, 4, 4 - - 699, 695 + 699, 381 4 @@ -812,13 +804,10 @@ Fill - 0, 38 - - - 4, 4, 4, 4 + 0, 26 - 985, 628 + 562, 330 5 @@ -836,10 +825,10 @@ 0 - 161, 95 + 1113, 56 - 58, 24 + 46, 20 DocID: @@ -859,19 +848,16 @@ - 389, 24 + 316, 20 Ansicht eingeschränkt - Klick Bearbeiten für Entsperren - 0, 666 - - - 1, 0, 19, 0 + 0, 356 - 985, 29 + 562, 25 0 @@ -897,11 +883,8 @@ 0, 0 - - 4, 4, 4, 4 - - 985, 38 + 562, 26 0 @@ -922,7 +905,7 @@ Panel2 - 1694, 699 + 1270, 385 1 @@ -952,7 +935,7 @@ Magenta - 109, 24 + 93, 24 Hinzufügen @@ -963,7 +946,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABWSURBVDhPY6AK+Pbt238S8PsvX74YQLVCAEjCyckJjj+8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABWSURBVDhPY6AK+Pbt238S8PsvX74YQLVCAEjCyckJjj+8 /wjHyGIguq2tDdMQUgwAYZghUO2kGwDCID1Q7fgNQMbIamhrADF41IBBaQA5GKqdEsDAAADtDPd9n5qK lQAAAABJRU5ErkJggg== @@ -972,7 +955,7 @@ Magenta - 98, 24 + 83, 24 Speichern @@ -987,7 +970,7 @@ Magenta - 86, 24 + 75, 24 Löschen @@ -999,7 +982,7 @@ Magenta - 105, 24 + 87, 24 Bearbeiten @@ -1011,7 +994,7 @@ Magenta - 129, 24 + 107, 24 Taskübersicht @@ -1020,7 +1003,7 @@ Magenta - 176, 24 + 143, 24 Rückgängig Änderungen @@ -1032,7 +1015,7 @@ Magenta - 105, 24 + 89, 24 Abbrechen @@ -1047,7 +1030,7 @@ Magenta - 205, 24 + 167, 24 Detailbereich 'einklappen' @@ -1056,7 +1039,7 @@ Segoe UI, 9pt - 165, 24 + 136, 24 Nur lesenden Zugriff @@ -1065,7 +1048,7 @@ False - 141, 24 + 114, 24 Kein Dateizugriff @@ -1077,7 +1060,7 @@ 0, 0 - 1694, 27 + 1270, 27 0 @@ -1097,11 +1080,8 @@ 1 - - 4, 4, 4, 4 - - 1694, 726 + 1270, 412 Detailansicht @@ -1119,7 +1099,7 @@ 0 - 1701, 761 + 1276, 443 3 @@ -1127,9 +1107,6 @@ Fill - - 4, 4, 4, 4 - 0, 27 @@ -1139,11 +1116,8 @@ 255, 128, 0 - - 4, 4, 4, 4 - - 1694, 699 + 1270, 385 0 @@ -1161,7 +1135,7 @@ 0 - 1089, 56 + 799, 56 False @@ -1178,13 +1152,13 @@ True - 109, 24 + 93, 24 Hinzufügen - 119, 24 + 95, 24 von {0} positions @@ -1240,7 +1214,7 @@ False - 65, 27 + 50, 23 0 @@ -1296,7 +1270,7 @@ Magenta - 82, 24 + 70, 24 Refresh @@ -1320,7 +1294,7 @@ True - 86, 24 + 75, 24 Löschen @@ -1328,7 +1302,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD5SURBVDhPlZK9EYMwDIUZITPRMwBdCgZITZWKNTJCCnpm + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD5SURBVDhPlZK9EYMwDIUZITPRMwBdCgZITZWKNTJCCnpm oadwBZSOP2MRW8Z3ybt7pz9LlmRX67o+t22zQuzqH5DUNI2t69pL7BD6DSSQLIwLGGNu2DHxhfABfQCG ULXv+32aprM4Or4QPkBCqQOnv4dhOGPo+EL4QKmAtC/7gbKjZIxSAd2+MBujVMDJs/2+7z3RszGuCuj2 x3H0RM/GwNDU7S/L4il2MoZLMF3X+QAS2zHZvmYyBpXmebZt21qk+8oPuoi3r5mN4ZJeOJC6ffwxxZ+9 @@ -1339,7 +1313,7 @@ Magenta - 177, 24 + 146, 24 Positionen bearbeiten @@ -1359,7 +1333,7 @@ - 165, 24 + 136, 24 Nur lesenden Zugriff @@ -1368,7 +1342,7 @@ 0, 0 - 1694, 27 + 1270, 27 1 @@ -1396,11 +1370,8 @@ wwXEYqyCpGCsgqRgMEGxF6CaQYEzGogjMRD/MwAARTWKOO3Nn7MAAAAASUVORK5CYII= - - 4, 4, 4, 4 - - 1694, 726 + 1270, 412 Positionen @@ -1418,10 +1389,10 @@ 1 - 17, 134 + 858, 95 - 174, 26 + 152, 26 Datei öffnen @@ -1435,13 +1406,13 @@ - 174, 26 + 152, 26 Eigenschaften - 175, 56 + 153, 56 cmsResultFilesBasic @@ -1452,9 +1423,6 @@ Fill - - 4, 4, 4, 4 - 0, 27 @@ -1464,11 +1432,8 @@ Aqua - - 4, 4, 4, 4 - - 1694, 699 + 1270, 385 7 @@ -1495,7 +1460,7 @@ Segoe UI, 8.25pt, style=Bold, Italic - 158, 24 + 126, 24 Windream-Dokumente @@ -1510,7 +1475,7 @@ Magenta - 139, 24 + 123, 24 Suche neu laden @@ -1521,7 +1486,7 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAKrSURBVFhH7ZO/b9pAFMdR/4AqQ5dOkRIRUiDgQMABY0P4 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKrSURBVFhH7ZO/b9pAFMdR/4AqQ5dOkRIRUiDgQMABY0P4 EZsfNmBjHGxsDESdo+5VsnTrjpQpU9UxY8ZMmTP0D+APyMDE+vrudLFSJZHSLYM/0pPv3r3z9713d5GQ kJCQkHfLbDa7mU6nTTYNOD2d38/nM5jNpuC67srzvCXavec51xPb5lgYxTTNLNpyYBhArNPprFRVTbTb 7V8s5HXm8/kabcmmAZPJZMOf+uD7E/BdVyc+17VNxxnBcDgM4odDXdINnYp2u90e8eF3Q1GU66YiAw16 @@ -1540,7 +1505,7 @@ Magenta - 117, 24 + 105, 24 Volltextsuche @@ -1549,7 +1514,7 @@ 0, 0 - 1694, 27 + 1270, 27 2 @@ -1569,11 +1534,8 @@ 1 - - 4, 4, 4, 4 - - 1694, 726 + 1270, 412 Dateien @@ -1606,13 +1568,10 @@ 200 - 19, 53 - - - 4, 4, 4, 4 + 14, 36 - 349, 385 + 263, 246 5 @@ -1659,13 +1618,10 @@ MiddleLeft - 331, 181 - - - 4, 4, 4, 4 + 248, 124 - 453, 34 + 340, 23 5 @@ -1692,13 +1648,10 @@ MiddleLeft - 331, 139 - - - 4, 4, 4, 4 + 248, 95 - 453, 34 + 340, 23 4 @@ -1722,13 +1675,10 @@ Segoe UI, 8.25pt - 331, 99 - - - 4, 4, 4, 4 + 248, 68 - 452, 27 + 340, 21 3 @@ -1752,13 +1702,10 @@ Segoe UI, 8.25pt - 327, 73 - - - 4, 0, 4, 0 + 245, 50 - 78, 19 + 64, 13 2 @@ -1784,17 +1731,11 @@ Segoe UI, 8.25pt - - 19 - - 12, 73 - - - 4, 4, 4, 4 + 9, 50 - 305, 232 + 230, 134 1 @@ -1818,13 +1759,10 @@ Segoe UI, 8.25pt, style=Italic - 8, 25 - - - 4, 0, 4, 0 + 6, 17 - 464, 19 + 349, 13 0 @@ -1848,16 +1786,10 @@ Segoe UI, 8.25pt, style=Bold - 236, 29 - - - 4, 4, 4, 4 - - - 4, 4, 4, 4 + 177, 20 - 792, 361 + 594, 228 4 @@ -1884,13 +1816,10 @@ Segoe UI, 9pt, style=Italic - 8, 132 - - - 4, 0, 4, 0 + 6, 90 - 177, 20 + 146, 15 3 @@ -1914,13 +1843,10 @@ True - 12, 102 - - - 4, 4, 4, 4 + 9, 70 - 129, 21 + 101, 17 2 @@ -1944,13 +1870,10 @@ False - 12, 48 - - - 4, 4, 4, 4 + 9, 33 - 135, 23 + 102, 21 1 @@ -1971,13 +1894,10 @@ True - 8, 25 - - - 4, 0, 4, 0 + 6, 17 - 162, 17 + 129, 13 0 @@ -1998,16 +1918,10 @@ 4 - 377, 41 - - - 4, 4, 4, 4 - - - 4, 4, 4, 4 + 283, 28 - 1032, 399 + 774, 254 4 @@ -2028,13 +1942,10 @@ True - 15, 18 - - - 4, 0, 4, 0 + 11, 12 - 173, 17 + 139, 13 3 @@ -2054,11 +1965,8 @@ 2 - - 4, 4, 4, 4 - - 1694, 726 + 1270, 412 Wiedervorlage @@ -2085,17 +1993,14 @@ Black - 536, 95 + 169, 95 - 17, 56 + 1140, 17 Fill - - 4, 4, 4, 4 - 0, 27 @@ -2171,11 +2076,8 @@ 5 - - 4, 4, 4, 4 - - 1694, 699 + 1270, 385 90 @@ -2193,7 +2095,7 @@ 0 - 279, 95 + 1231, 56 Segoe UI Semibold, 9pt, style=Bold, Italic @@ -2205,7 +2107,7 @@ Magenta - 101, 24 + 85, 24 Neu laden @@ -2217,7 +2119,7 @@ Magenta - 109, 24 + 89, 24 Detail View @@ -2226,7 +2128,7 @@ 0, 0 - 1694, 27 + 1270, 27 1 @@ -2246,11 +2148,8 @@ 1 - - 4, 4, 4, 4 - - 1694, 726 + 1270, 412 Vorgängervarianten @@ -2267,6 +2166,65 @@ 4 + + Aqua + + + Instandhaltung View + + + Fill + + + 0, 0 + + + 1270, 412 + + + 444, 17 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFtEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu + MTYuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iODhkMTc1NGQ3MDBlNDlhBQEAAAAo + RGV2RXhwcmVzcy5VdGlscy5JbWFnZUNvbGxlY3Rpb25TdHJlYW1lcgAAAAACAAAACw== + + + + 0 + + + TreeList1 + + + DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabPage1 + + + 0 + + + 1270, 412 + + + NodeNavigation(beta) + + + XtraTabPage1 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TCDetails + + + 5 + TCDetails @@ -2283,7 +2241,7 @@ Panel2 - 1701, 1004 + 1276, 685 2 @@ -2309,9 +2267,6 @@ 0, 0 - - 4, 4, 4, 4 - Panel1 @@ -2319,7 +2274,7 @@ Panel2 - 1701, 1004 + 1276, 685 4 @@ -2340,28 +2295,28 @@ 7 - 881, 56 + 591, 56 - 307, 26 + 255, 26 Datei Öffnen - 307, 26 + 255, 26 Ordner öffnen - 307, 26 + 255, 26 Datei in Zwischenablage kopieren - 304, 6 + 252, 6 @@ -2379,52 +2334,64 @@ - 307, 26 + 255, 26 Enitätssuche - "alle Dateien" - 304, 6 + 252, 6 - 152, 27 + 152, 23 Filename - 260, 26 + 216, 22 Dateinamen umbenennen - 152, 27 + 152, 23 Diplayname - 260, 26 + 216, 22 Displayname umbenennen - 307, 26 + 255, 26 Umbenennen - 307, 26 + 255, 26 Datei in Bearbeitung nehmen + + 174, 22 + + + Aus dieser Entität + + + 174, 22 + + + Aus anderer Entität + - 307, 26 + 255, 26 Datei mit Datensatz verknüpfen @@ -2437,28 +2404,28 @@ - 221, 26 + 184, 22 Datei versionieren - 221, 26 + 184, 22 Dokumentart ändern - 307, 26 + 255, 26 windream - 304, 6 + 252, 6 - 307, 26 + 255, 26 Rechte prüfen und setzen @@ -2486,28 +2453,28 @@ - 307, 26 + 255, 26 Dateirechte für User anzeigen - 304, 6 + 252, 6 - 307, 26 + 255, 26 Datei löschen - 307, 26 + 255, 26 Entferne Datei Link - 304, 6 + 252, 6 @@ -2529,28 +2496,28 @@ - 307, 26 + 255, 26 Detail-Suche anzeigen - 304, 6 + 252, 6 - 307, 26 + 255, 26 Eigenschaften - 307, 26 + 255, 26 Ansicht zurücksetzen - 308, 430 + 256, 430 ContextMenuStripResultFiles @@ -2562,7 +2529,7 @@ 17, 17 - 339, 134 + 1180, 95 61, 4 @@ -2574,28 +2541,28 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 70, 27 + 57, 19 tssStatus - 77, 27 + 62, 19 tssRecord - 58, 27 + 46, 19 DocID: - 133, 26 + 100, 18 - 153, 27 + 120, 19 ToolStripStatusLabel1 @@ -2604,19 +2571,16 @@ False - 156, 27 + 123, 19 Loading Record Data.. - 0, 1004 - - - 1, 0, 19, 0 + 0, 685 - 1701, 32 + 1276, 24 1 @@ -2639,17 +2603,6 @@ 160, 17 - - 444, 17 - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFtEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu - MTYuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iODhkMTc1NGQ3MDBlNDlhBQEAAAAo - RGV2RXhwcmVzcy5VdGlscy5JbWFnZUNvbGxlY3Rpb25TdHJlYW1lcgAAAAACAAAACw== - - 712, 17 @@ -2666,16 +2619,16 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 1087, 95 + 720, 95 - 201, 24 + 172, 22 Change Hidepanel - 202, 28 + 173, 26 cmsrpContainer @@ -2684,22 +2637,22 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 307, 56 + 17, 56 - 585, 56 + 295, 56 - 160, 56 + 1283, 17 - 814, 95 + 447, 95 - 174, 134 + 1015, 95 - 384, 95 + 17, 95 True @@ -2708,10 +2661,10 @@ 191 - 8, 19 + 6, 13 - 1701, 1036 + 1276, 709 Segoe UI, 8.25pt @@ -3165,9 +3118,6 @@ AAAADwAA/gAAAAAPAAD//4AAAB8AAP///8AP/wAA////////AAD///////8AAP///////wAA - - 4, 4, 4, 4 - frmForm_Constructor_Main @@ -3237,10 +3187,22 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmi_NewNode + + tsmiNodeRename - + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tstxtRenameNode + + + System.Windows.Forms.ToolStripTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsmiNodeNew + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -3807,6 +3769,12 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ImageCollection1 + + + DevExpress.Utils.ImageCollection, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + docCM_Open @@ -3885,6 +3853,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + AusDieserEntitätToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + AusAndererEntitätToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + WindreamToolStripMenuItem @@ -4011,12 +3991,6 @@ DD_Record_Organizer.DD_ECMAdmin, DD_ECMAdmin.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - ImageCollection1 - - - DevExpress.Utils.ImageCollection, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ttToolTip diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index 6e368a3..0eeca47 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -15,6 +15,11 @@ Imports DD_Rights Imports DD_LIB_Standards Imports DevExpress.LookAndFeel Imports System.ComponentModel +Imports System.Threading +Imports DevExpress.XtraTreeList +Imports DevExpress.XtraTreeList.Columns +Imports DevExpress.XtraTreeList.Nodes.Operations +Imports DevExpress.XtraTreeList.Nodes Public Class frmConstructor_Main @@ -54,7 +59,9 @@ Public Class frmConstructor_Main Private DT_CONSTRUCT_VIEW As DataTable Private DT_VWPMO_CONSTRUCTOR_FORMS As DataTable Private DT_ENTITY_DATA As DataTable - Private DT_TREEVIEW_NODES As DataTable + Private DT_TREEVIEW_NODES_ALL As DataTable + Private DT_TREEVIEW_NODES_FIRST As DataTable + Private DT_TREEVIEW_NODES_DEVEXPRESS As DataTable Private DT_TREEVIEW_CONFIGURATION As DataTable Private DT_CONTROLS_ENTITY As DataTable @@ -286,9 +293,6 @@ Public Class frmConstructor_Main FormDesignerToolStripMenuItem.Visible = False End If - 'Try - - If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then SQL = "SELECT * FROM TBPROXY_SYNC_ENTITY" DT_PROXY_ENTITY = ClassDatabase.Return_Datatable(SQL, True) @@ -349,7 +353,37 @@ Public Class frmConstructor_Main Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL, True) If DT.Rows.Count > 1 Then TreeView_perControl = True - DT_TREEVIEW_NODES = DT + DT_TREEVIEW_NODES_ALL = DT + DT_TREEVIEW_NODES_DEVEXPRESS = DT_TREEVIEW_NODES_ALL.Copy() + Try + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("ID1") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("ID2") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("ID3") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("BOOL1") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("BOOL2") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("ADDED_WHO") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("ADDED_WHEN") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("CHANGED_WHO") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("CHANGED_WHEN") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("CONTROL_ID") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("CREATE_RECORD") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("ENTITY_ID") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("SEQUENCE") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("EXPAND_NODE") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("NAME") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("TYPE_NODE") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("FONT_FAMILY") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("FONT_COLOR") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("FONT_SIZE") + DT_TREEVIEW_NODES_DEVEXPRESS.Columns.Remove("FONT_STYLE") + DT_TREEVIEW_NODES_DEVEXPRESS.AcceptChanges() + Catch ex As Exception + + End Try + + + + DT_TREEVIEW_NODES_FIRST = ClassHelper.FILTER_DATATABLE(DT, "EXPAND_NODE = 1", "") SQL = String.Format("select * from TBPMO_STRUCTURE_NODES_CONFIGURATION where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID) DT_TREEVIEW_CONFIGURATION = ClassDatabase.Return_Datatable(SQL) @@ -382,9 +416,12 @@ Public Class frmConstructor_Main SplitContainerMain.Collapsed = True NODE_NAVIGATION = True tsmiNodedownSearch.Visible = True - tsmi_NewNode.Visible = True + tsmiNodeNew.Visible = True + tsmiNodeRename.Visible = True Else - tsmi_NewNode.Visible = False + tsmiNodeNew.Visible = False + tsmiNodeRename.Visible = False + If DT_VWPMO_CONSTRUCTOR_FORMS.Rows.Count = 1 Then SplitContainerTop.PanelVisibility = SplitPanelVisibility.Both SplitContainerTop.CollapsePanel = SplitCollapsePanel.Panel1 @@ -1061,6 +1098,8 @@ Public Class frmConstructor_Main If RIGHT_RECORD_AND_FILE_READ_ONLY = False And CtrlCommandUI.IsInsert = False Then If DT_CONTROLS_ENTITY.Rows.Count = COUNT_RO_CONTROLS Then tsButtonEdit.Enabled = False + tsButtonSave.Enabled = False + tsButtonDelete.Enabled = False Else ' tsButtonEdit.Enabled = True End If @@ -1110,9 +1149,10 @@ Public Class frmConstructor_Main If SQL_RECORD_AND_FILE_READ_ONLY <> "" Or SQL_DOC_READ_ONLY <> "" Then If RIGHT_RECORD_AND_FILE_READ_ONLY = True Then + + tsButtonEdit.Enabled = False tsButtonSave.Enabled = False tsButtonDelete.Enabled = False - tsButtonEdit.Enabled = False tslblLocked.Visible = True TabFollowUp.PageEnabled = False tsmiMassChanges.Enabled = False @@ -1134,6 +1174,8 @@ Public Class frmConstructor_Main If RIGHT_EDIT_R = False Then tslblLocked.Visible = True tsButtonEdit.Enabled = False + tsButtonSave.Enabled = False + tsButtonDelete.Enabled = False tsmiMassChanges.Enabled = False If RIGHT_ADD_R = False Then tsButtonSave.Enabled = False @@ -1215,6 +1257,7 @@ Public Class frmConstructor_Main If Not IsNothing(TreeViewMain.SelectedNode) Then TreeViewMain.SelectedNode.NodeFont = New Font(TreeViewMain.Font.FontFamily, TreeViewMain.Font.Size, FontStyle.Regular) End If + End If End Sub Private Sub TreeViewMain_AfterSelect(sender As Object, e As TreeViewEventArgs) Handles TreeViewMain.AfterSelect @@ -1310,40 +1353,102 @@ Public Class frmConstructor_Main End Sub Sub Load_TreeView_Node_Navigation() - MyTreeview = Nothing - Dim newTreeview As TreeView - 'If DT_TREEVIEW_NODES.Rows.Count > 500 Then - ' newTreeview = ClassNodeNavigation.CreateTreeViewNodes(DT_TREEVIEW_NODES, TREEVIEW_IMAGELIST) - 'Else - newTreeview = ClassNodeNavigation.CreateTreeViewNodes(DT_TREEVIEW_NODES, TREEVIEW_IMAGELIST) - 'End If + Try + MyTreeview = Nothing + + 'If DT_TREEVIEW_NODES.Rows.Count > 500 Then + ' newTreeview = ClassNodeNavigation.CreateTreeViewNodes(DT_TREEVIEW_NODES, TREEVIEW_IMAGELIST) + 'Else + Try + Dim async As New ClassAsyncNodeBuild(DT_TREEVIEW_NODES_ALL, TREEVIEW_IMAGELIST) + async.bw.RunWorkerAsync() + While async.bw.IsBusy + Application.DoEvents() + progressLoadEntity.Visible = True + labelLoadEntity.Visible = True + labelLoadEntity.Text = "Loading TreeView..." + End While + progressLoadEntity.Visible = False + labelLoadEntity.Visible = False + MyTreeview = async.newTreeview + Catch ex As Exception + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Async NodeBuild", ex.Message & vbNewLine & "ADDI will try an alternative method!", ex.StackTrace) + MyTreeview = ClassNodeNavigation.CreateTreeViewNodes(DT_TREEVIEW_NODES_ALL, TREEVIEW_IMAGELIST) + End Try + + + 'End If + Dim sw As New SW("ADD TV to Form") + If Not IsNothing(MyTreeview) Then + MyTreeview.BeginUpdate() + + For Each node As TreeNode In MyTreeview.Nodes + TreeViewMain.Nodes.Add(node.Clone) + Next + MyTreeview.EndUpdate() + End If + + ' Start the asynchronous operation. + 'backgroundWorkerTreeView.RunWorkerAsync() + + + sw.Done() + Catch ex As Exception + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Load_TreeView_Node_Navigation", ex.Message, ex.StackTrace) + End Try - If Not IsNothing(newTreeview) Then - For Each node As TreeNode In newTreeview.Nodes - TreeViewMain.Nodes.Add(node.Clone) - Next - End If 'If CONSTRUCT_EXPAND = True Then ' TreeViewMain.ExpandAll() 'End If End Sub - Sub START_BW_LoadTreeView() - If BW_LoadTreeView.IsBusy <> True Then - TreeViewMain.Nodes.Clear() - BW_LoadTreeView.RunWorkerAsync() - End If - End Sub + Sub Load_Tree_View() Try TreeViewMain.Nodes.Clear() - Dim sw As New SW("Load_Tree_View") + If NODE_NAVIGATION = True Then + Load_TreeView_Node_Navigation() Try - Load_TreeView_Node_Navigation() + For Each row As DataRow In DT_TREEVIEW_CONFIGURATION.Rows + Try + Dim bimage = row.Item("NODE_IMAGE") + If Not IsDBNull(bimage) Then + Dim Node_image = ByteArrayToBitmap(bimage) + ImageCollection1.AddImage(Node_image, row.Item("GUID")) 'row.Item("GUID").ToString & "#" & row.Item("ENTITY_ID") + End If + Catch ex As Exception + + End Try + + Next + Dim sw As New SW("Devexpress TreeView") + + TreeList1.DataSource = DT_TREEVIEW_NODES_DEVEXPRESS + TreeList1.KeyFieldName = "GUID" + TreeList1.ParentFieldName = "PARENT_GUID" + Try + TreeList1.Columns.ColumnByName("colRECORD_ID").Visible = False + Catch ex As Exception + + End Try + Try + TreeList1.Columns.ColumnByName("colNODE_CONFIG_ID").Visible = False + Catch ex As Exception + + End Try + Try + TreeList1.Columns.ColumnByName("colBACK_COLOR").Visible = False + Catch ex As Exception + + End Try + + + sw.Done() Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Load_TreeView_Node_Navigation", ex.Message, ex.StackTrace) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Devexpress TreeView Load", ex.Message, ex.StackTrace) End Try Else + Dim sw As New SW("Load_Tree_View") ' LINQ für Zugriff auf DT_VWPMO_CONSTRUCTOR_FORMS Dim query1 = From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() Select form @@ -1410,10 +1515,11 @@ Public Class frmConstructor_Main Next Next Next + sw.Done() End If - sw.Done() + Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try @@ -1427,11 +1533,9 @@ Public Class frmConstructor_Main End Sub Private Sub BW_Load_EntityData_DoWork(sender As Object, e As DoWorkEventArgs) Handles BW_LoadTreeView.DoWork - Try - Load_Tree_View() - Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in BW_Load_EntityData_DoWork", ex.Message, ex.StackTrace) - End Try + + Load_Tree_View() + End Sub Sub Create_variable_node() @@ -1813,61 +1917,61 @@ Public Class frmConstructor_Main End If End If Me.Cursor = Cursors.WaitCursor - ' Try - If TCDetails.SelectedTabPage.Text.StartsWith("Pos") = False Then - SELECTED_RECORD_ID = 0 - ' Lock_RecordControls(False) + Try + If TCDetails.SelectedTabPage.Text.StartsWith("Pos") = False Then + SELECTED_RECORD_ID = 0 + ' Lock_RecordControls(False) - CURRENT_PARENT_ENTITY_ID = PARENT_ENTITYID - ' Den Record anlegen, damit wir eine RECORD_ID bekommen + CURRENT_PARENT_ENTITY_ID = PARENT_ENTITYID + ' Den Record anlegen, damit wir eine RECORD_ID bekommen - Dim recordId = ClassRecordCommands.CreateRecordProcedure(ENTITY_ID) + Dim recordId = ClassRecordCommands.CreateRecordProcedure(ENTITY_ID) - If recordId > 0 Then - Lock_RecordControls(False) - tsButtonCancel.Visible = True - ' Die RECORD_ID auslesen und setzen - NEW_RECORD_ID = recordId - CURRENT_RECORD_ID = NEW_RECORD_ID - RECORD_ID = NEW_RECORD_ID - SELECTED_RECORD_ID = NEW_RECORD_ID - ClassProxy.PRPROXY_RECORD_UPD_INS(ENTITY_ID, SELECTED_RECORD_ID) - If PARENT_ENTITYID > 0 And PARENT_RECORDID > 0 Then - If ClassRecordCommands.ConnectRecord(PARENT_RECORDID, CURRENT_RECORD_ID, "INSERT RECORD") = False Then - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "In Connecting Record - Check the log!") - Else - ClassProxy.PRPROXY_RECORD_CONNECT(PARENT_RECORDID, CURRENT_RECORD_ID) + If recordId > 0 Then + Lock_RecordControls(False) + tsButtonCancel.Visible = True + ' Die RECORD_ID auslesen und setzen + NEW_RECORD_ID = recordId + CURRENT_RECORD_ID = NEW_RECORD_ID + RECORD_ID = NEW_RECORD_ID + SELECTED_RECORD_ID = NEW_RECORD_ID + ClassProxy.PRPROXY_RECORD_UPD_INS(ENTITY_ID, SELECTED_RECORD_ID) + If PARENT_ENTITYID > 0 And PARENT_RECORDID > 0 Then + If ClassRecordCommands.ConnectRecord(PARENT_RECORDID, CURRENT_RECORD_ID, "INSERT RECORD") = False Then + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "In Connecting Record - Check the log!") + Else + ClassProxy.PRPROXY_RECORD_CONNECT(PARENT_RECORDID, CURRENT_RECORD_ID) + End If End If - End If - ClassControlValues.LoadDefaultValues(ENTITY_ID, SELECTED_RECORD_ID, pnlDetails.Controls, CURRENT_PARENT_ENTITY_ID, ENTITY_ID) - ClassControlValues.Enable_Depending_Controls(ENTITY_ID, RECORD_ID, PARENT_RECORDID, CtrlBuilder.AllControls, ENTITY_ID) - ' Das StatusLabel aktualisieren - Update_Record_Label(NEW_RECORD_ID) - Doc_ReadOnlyHandler(True) - RUN_WDSEARCH_GRID() - ' Im gegensatz zu EnableEditMode muss hier nur der save button enabled werden - tsButtonSave.Enabled = True - ' Muss aktiviert werden, sonst funktionieren die Combobox Abhängigkeits Events nicht - CURRENT_RECORD_ENABLED = True - ' EDIT_STATE muss hier (immer?) Update sein, sonst wird beim Speichern noch ein Datensatz angelegt - EDIT_STATE = EditState.Update - RECORD_CHANGED = True - 'tsslblRecord.Text = "Adding record ......" - RIGHT_RECORD_AND_FILE_READ_ONLY = False - tslblLocked.Visible = False - tslblFileslocked.Visible = False - tsButtonAdd.Enabled = False - Else - Me.Cursor = Cursors.Default - MsgBox("Could not create a new record. Please check the log for further informations!", MsgBoxStyle.Critical) + ClassControlValues.LoadDefaultValues(ENTITY_ID, SELECTED_RECORD_ID, pnlDetails.Controls, CURRENT_PARENT_ENTITY_ID, ENTITY_ID) + ClassControlValues.Enable_Depending_Controls(ENTITY_ID, RECORD_ID, PARENT_RECORDID, CtrlBuilder.AllControls, ENTITY_ID) + ' Das StatusLabel aktualisieren + Update_Record_Label(NEW_RECORD_ID) + Doc_ReadOnlyHandler(True) + RUN_WDSEARCH_GRID() + ' Im gegensatz zu EnableEditMode muss hier nur der save button enabled werden + tsButtonSave.Enabled = True + ' Muss aktiviert werden, sonst funktionieren die Combobox Abhängigkeits Events nicht + CURRENT_RECORD_ENABLED = True + ' EDIT_STATE muss hier (immer?) Update sein, sonst wird beim Speichern noch ein Datensatz angelegt + EDIT_STATE = EditState.Update + RECORD_CHANGED = True + 'tsslblRecord.Text = "Adding record ......" + RIGHT_RECORD_AND_FILE_READ_ONLY = False + tslblLocked.Visible = False + tslblFileslocked.Visible = False + tsButtonAdd.Enabled = False + Else + Me.Cursor = Cursors.Default + MsgBox("Could not create a new record. Please check the log for further informations!", MsgBoxStyle.Critical) + End If End If - End If - ' Catch ex As Exception - 'ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error tsButtonAdd", ex.Message, ex.StackTrace) - ' Finally - 'Me.Cursor = Cursors.Default - ' End Try + Catch ex As Exception + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error tsButtonAdd", ex.Message, ex.StackTrace) + Finally + Me.Cursor = Cursors.Default + End Try End Sub Private Sub tsButtonSave_Click(sender As Object, e As EventArgs) Handles tsButtonSave.Click @@ -2322,8 +2426,12 @@ Public Class frmConstructor_Main Next If DT_CONTROLS_ENTITY.Rows.Count = COUNT_RO_CONTROLS Then tsButtonEdit.Enabled = False + tsButtonSave.Enabled = False + tsButtonDelete.Enabled = False Else tsButtonEdit.Enabled = True + tsButtonSave.Enabled = True + tsButtonDelete.Enabled = True End If Dim resultDT_VWPMO_CONSTRUCTOR_FORMS = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() @@ -2370,7 +2478,7 @@ Public Class frmConstructor_Main 'sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' ORDER BY SEQUENCE", ENTITY_ID, USER_LANGUAGE) 'TBPMO_WINDREAM_RESULTLIST_CONFIG" - expression = String.Format("VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE) + expression = String.Format("ENTITY_ID = {0} AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE) DT_WINDREAM_COLUMNS_GRID = ClassHelper.FILTER_DATATABLE(CURRENT_RESULTLIST_CONFIG, expression, "SEQUENCE") 'ClassDatabase.Return_Datatable(sql, True) expression = String.Format("ENTITY_ID = {0} AND TYPE_ID = 3 AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE) 'sql = String.Format("select T.*, T1.HEADER_CAPTION from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID AND T.CONFIG_ID IN (SELECT GUID FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND TYPE_ID = 3 AND LANGUAGE = '{1}') ORDER BY T.SEQUENCE ", ENTITY_ID, USER_LANGUAGE) @@ -2379,7 +2487,7 @@ Public Class frmConstructor_Main 'sql = String.Format("select * from TBPMO_DOCSEARCH_VARIABLE_CONTROLS WHERE ENTITY_ID = {0}", ENTITY_ID) DT_RESULTLIST_OPTIONS = ClassHelper.FILTER_DATATABLE(CURRENT_VARIABLE_CONTROLS, "ENTITY_ID = " & ENTITY_ID, "") ' ClassDatabase.Return_Datatable(sql, True) ' sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%' ORDER BY SEQUENCE", ENTITY_ID, USER_LANGUAGE) - expression = String.Format("VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%'", ENTITY_ID, USER_LANGUAGE) + expression = String.Format("ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%'", ENTITY_ID, USER_LANGUAGE) DT_RESULTLIST_VARIABLE_VALUE = ClassHelper.FILTER_DATATABLE(CURRENT_RESULTLIST_CONFIG, expression, "SEQUENCE") 'ClassDatabase.Return_Datatable(sql, True) Dim ENTITY_ROW = (From form In DT_ENTITY_DATA.AsEnumerable() Select form @@ -2610,7 +2718,7 @@ Public Class frmConstructor_Main progressLoadEntity.Visible = True labelLoadEntity.Visible = True - + labelLoadEntity.Text = "Loading record-data..." If LOCK_CONTROLS_BG_LOAD = True Then SplitContainerMain.Panel2.Enabled = False End If @@ -2639,7 +2747,7 @@ Public Class frmConstructor_Main CURRENT_DT_ENTITY_RECORDS.TableName = "VWPMO_ENTITY_TABLE" & ENTITY_ID ' Dim SQL_AutoValues = "SELECT GUID AS CONTROL_ID, CONNECTION_ID_1 AS CONNECTION_ID, SQL_COMMAND_1 AS SQL_COMMAND FROM TBPMO_CONTROL WHERE CONNECTION_ID_1 <> '' AND SQL_COMMAND_1 <> '' AND FORM_ID = " & ENTITY_ID - Dim DT_AUTOVALUES = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_CONTROL, "CONNECTION_ID_1 <> '' AND SQL_COMMAND_1 <> '' AND FORM_ID = " & ENTITY_ID, "") + Dim DT_AUTOVALUES = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_CONTROL, "CONNECTION_ID_1 > 0 AND SQL_COMMAND_1 <> '' AND FORM_ID = " & ENTITY_ID, "") 'Dim DT_AUTOVALUES As DataTable = ClassDatabase.Return_Datatable(SQL_AutoValues, True) CURRENT_SQL_AUTO_VALUES_DT = DT_AUTOVALUES @@ -4184,7 +4292,7 @@ Public Class frmConstructor_Main End If Load_DocGrid_Layout() Case "TabFollowUp" - 'tsButtonEdit.Enabled = False + Refresh_FollowUps() dtpFollowUp.Enabled = False lblWiedervorlage_Control.Text = "<< Waiting for Selection:" @@ -4192,7 +4300,7 @@ Public Class frmConstructor_Main Load_Variants() Case "TabPos" Dim stg As String - 'tsButtonEdit.Enabled = False + If POS_ENABLED = True Then tslblPoslocked.Visible = False BindingNavigatorAddNewItem.Enabled = True @@ -4372,6 +4480,14 @@ Public Class frmConstructor_Main If DropType.ToString.Contains("SCAN") = False Then ClassLogger.Add(">> Check_Dropped_Files:" & Str.ToString, False) Dim CURRENT_WORKFILE = Str.Substring(Str.LastIndexOf("@") + 1) + If CURRENT_WORKFILE.ToString.Contains("@") Then + MsgBox("File contains invalid operator @!" & vbNewLine & "Please rename file and try again!", MsgBoxStyle.Exclamation) + Continue For + End If + If CURRENT_WORKFILE.ToString.Contains("'") Then + MsgBox("File contains invalid operator '!" & vbNewLine & "Please rename file and try again!", MsgBoxStyle.Exclamation) + Continue For + End If ClassFolderWatcher.Insert_USER_File(CURRENT_WORKFILE, DropType) End If End If @@ -4895,7 +5011,7 @@ Public Class frmConstructor_Main End Sub - Private Sub grvwGridPos_CellValueChanged(sender As Object, e As CellValueChangedEventArgs) Handles grvwGridPos.CellValueChanged + Private Sub grvwGridPos_CellValueChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.CellValueChangedEventArgs) Handles grvwGridPos.CellValueChanged Try Dim column = e.Column.FieldName Dim sql = String.Format("select guid from TBPMO_CONTROL where COL_NAME = '{0}' and FORM_ID = {1}", column, POS_ENTITY) @@ -5194,7 +5310,7 @@ Public Class frmConstructor_Main End If End Sub - Private Sub GridViewDoc_Search_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles GridViewDoc_Search.FocusedColumnChanged + Private Sub GridViewDoc_Search_FocusedColumnChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedColumnChangedEventArgs) Handles GridViewDoc_Search.FocusedColumnChanged GridViewDoc_Search.EndSelection() ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) Refresh_DocID() @@ -5512,11 +5628,6 @@ Public Class frmConstructor_Main End Function #End Region - - Private Sub grvwGrid_CellValueChanged(sender As Object, e As CellValueChangedEventArgs) Handles grvwGrid.CellValueChanged - - End Sub - Private Sub SucheAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SucheAnzeigenToolStripMenuItem.Click grvwGrid.ShowFindPanel() grvwGrid.FindFilterText = "" @@ -5591,18 +5702,7 @@ Public Class frmConstructor_Main End Sub Private Sub DateiMitDatensatzVerknüpfenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles docCM_linkRecord.Click - Try - ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) - If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then - MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation) - Exit Sub - End If - Refresh_Selected_Table() - Dim frm As New frmDocRecordLink ' frmDocLink_Record_Entities() 'fileName, ClassWindreamDocGrid.RESULT_OBJECTTYPE) - frm.Show() - Catch ex As Exception - MsgBox("Unexpected Error in Linking Record: " & ex.Message, MsgBoxStyle.Critical) - End Try + End Sub Private Sub DetailAnsichtDatensatzToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DetailAnsichtDatensatzToolStripMenuItem.Click @@ -6111,7 +6211,7 @@ Public Class frmConstructor_Main If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED = True Then msg = "Sie benutzen einen Proxyserver. Die Daten des neu verlinkten Datensatzes werden Sie evtl. erst nach vollständiger Proxysynchronisation einsehen können!" If USER_LANGUAGE <> "de-DE" Then - msg = String.Format("You are using a proxy-Server. The new linked record in entity '{0}' will only be displayed after a full synchronisation!", ENTITY_STRING) + msg = String.Format("You are using a proxy-Server. The new linked record in entity '{0}' might only be displayed after a full synchronisation!", ENTITY_STRING) End If MsgBox(msg, MessageBoxIcon.Information) End If @@ -6398,14 +6498,32 @@ Public Class frmConstructor_Main e.Cancel = True End If If CURRENT_NODE_CONFIGURABLE_ID <> 0 Then - tsmi_NewNode.Visible = True + tsmiNodeNew.Visible = True Else - tsmi_NewNode.Visible = False + tsmiNodeNew.Visible = False End If If Not IsNothing(TreeViewMain.SelectedNode) Then - Dim nodetag = TreeViewMain.SelectedNode.Tag.ToString - Console.WriteLine(nodetag) - If nodetag.StartsWith("CONFIG_NODE") Then + Dim oNODE_GUID = ClassNodeNavigation.Return_NODEID_forTag(TreeViewMain.SelectedNode.Tag.ToString) + + Try + Dim oExpression As String + oExpression = "GUID = " & oNODE_GUID + Dim oRowNode() As DataRow = DT_TREEVIEW_NODES_ALL.Select(oExpression) + If oRowNode.Length = 1 Then + Dim oAllowRenameNode = oRowNode(0)("BOOL1") + If oAllowRenameNode = True Then + Me.tsmiNodeRename.Visible = True + Else + Me.tsmiNodeRename.Visible = False + End If + End If + + Catch ex As Exception + + End Try + + + If TreeViewMain.SelectedNode.Tag.ToString.StartsWith("CONFIG_NODE") Then tsmiNodeDelete.Visible = True End If End If @@ -6567,12 +6685,9 @@ Public Class frmConstructor_Main ElseIf where = "BELOW" Then PARENT_ID = ClassNodeNavigation.Return_NODEID_forTag(TreeViewMain.SelectedNode.Tag) End If - - Dim NEWRECORD As Integer If RECORD_CREATE = True Then Dim recordId = ClassRecordCommands.CreateRecordProcedure(ENTITY_ID) - If recordId = 0 Then ClassLogger.Add("Error in ADD_NODE: Could not create Record", True) ClassHelper.MSGBOX_Handler("ERROR", "Error in ADD_NODE", "Could not create Record") @@ -6581,7 +6696,6 @@ Public Class frmConstructor_Main NEWRECORD = recordId End If End If - 'Dim NEWRECORD As Integer = ClassControlCommandsUI.GetLastRecord(ENTITY_ID) Dim NEWNODE = New TreeNode(tsmINewText.Text) If Not IsNothing(NEWRECORD) Then @@ -6598,18 +6712,20 @@ Public Class frmConstructor_Main NEWNODE.ImageIndex = index NEWNODE.SelectedImageIndex = index End If - Dim ins - If RECORD_CREATE Then - ins = String.Format("INSERT INTO TBPMO_STRUCTURE_NODES (RECORD_ID,NODE_CONFIG_ID, NODE_CAPTION, ID1, PARENT_GUID, ADDED_WHO) VALUES (" & - "{0},{1},'{2}','{3}','{4}','{5}')", NEWRECORD, CURRENT_NODE_CONFIGURABLE_ID, tsmINewText.Text, "CONFIG " & NEWRECORD & "-" & CURRENT_NODE_CONFIGURABLE_ID, PARENT_ID, USER_USERNAME) - Else - ins = String.Format("INSERT INTO TBPMO_STRUCTURE_NODES (NODE_CONFIG_ID, NODE_CAPTION, ID1, PARENT_GUID, ADDED_WHO) VALUES (" & - "{1},'{2}','{3}','{4}','{5}')", NEWRECORD, CURRENT_NODE_CONFIGURABLE_ID, tsmINewText.Text, "CONFIG " & NEWRECORD & "-" & CURRENT_NODE_CONFIGURABLE_ID, PARENT_ID, USER_USERNAME) - End If - If ClassDatabase.Execute_non_Query(ins) Then - Dim sel = String.Format("SELECT MAX(GUID) FROM TBPMO_STRUCTURE_NODES WHERE NODE_CONFIG_ID = {0} AND NODE_CAPTION = '{1}'", CURRENT_NODE_CONFIGURABLE_ID, tsmINewText.Text) + 'Dim ins + 'If RECORD_CREATE Then - Dim NEW_GUID = ClassDatabase.Execute_Scalar(sel) + ' sdd + ' ins = String.Format("INSERT INTO TBPMO_STRUCTURE_NODES (RECORD_ID,NODE_CONFIG_ID, NODE_CAPTION, ID1, PARENT_GUID, ADDED_WHO) VALUES (" & + ' "{0},{1},'{2}','{3}','{4}','{5}')", NEWRECORD, CURRENT_NODE_CONFIGURABLE_ID, tsmINewText.Text, "CONFIG " & NEWRECORD & "-" & CURRENT_NODE_CONFIGURABLE_ID, PARENT_ID, USER_USERNAME) + 'Else + ' ins = String.Format("INSERT INTO TBPMO_STRUCTURE_NODES (NODE_CONFIG_ID, NODE_CAPTION, ID1, PARENT_GUID, ADDED_WHO) VALUES (" & + ' "{0},'{1}','{2}','{3}','{4}')", CURRENT_NODE_CONFIGURABLE_ID, tsmINewText.Text, "CONFIG " & NEWRECORD & "-" & CURRENT_NODE_CONFIGURABLE_ID, PARENT_ID, USER_USERNAME) + 'End If + 'If ClassDatabase.Execute_non_Query(ins) Then + + Dim NEW_GUID = ClassNodeNavigation.CreateNodeProcedure(NEWRECORD, CURRENT_NODE_CONFIGURABLE_ID, tsmINewText.Text, "CONFIG " & NEWRECORD & "-" & CURRENT_NODE_CONFIGURABLE_ID, PARENT_ID, USER_USERNAME) + If NEW_GUID > 0 Then ClassNodeNavigation.Check_NODE_CONFIG_ID(ENTITY_ID, Nothing) NEWNODE.Tag = ClassNodeNavigation.CreateNODE_TAG(ENTITY_ID, NEW_GUID, NEWRECORD, CURRENT_NODE_CONFIGURABLE_ID) @@ -6620,7 +6736,9 @@ Public Class frmConstructor_Main TreeViewMain.SelectedNode.Nodes.Add(NEWNODE) TreeViewMain.SelectedNode.Expand() End If + ' End If End If + End If Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Unexpected Error in Adding ConfigNode: ", ex.Message) @@ -6642,14 +6760,10 @@ Public Class frmConstructor_Main Dim result As MsgBoxResult result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then - Dim delete = String.Format("DELETE FROM TBPMO_STRUCTURE_NODES WHERE GUID = {0}", NODE_GUID) - If ClassDatabase.Execute_non_Query(delete) Then - If REC_Exists = True Then - If ClassHelper.DeleteRecord(SELECTED_RECORD_ID, "NodeDelete-Click") = True Then - ClassHelper.InsertEssential_Log(SELECTED_RECORD_ID, "RECORD-ID", "RECORD WAS DELETED MANUALLY by USER: " & USER_USERNAME) - TreeViewMain.Nodes.Remove(TreeViewMain.SelectedNode) - End If - End If + Dim oDelete = String.Format("EXEC PRPMO_DELETE_NODE {0},'{1}'", NODE_GUID, USER_USERNAME) + If ClassDatabase.Execute_non_Query(oDelete) Then + TreeViewMain.Nodes.Remove(TreeViewMain.SelectedNode) + Refresh_Entity_Data() End If End If End If @@ -6765,7 +6879,7 @@ Public Class frmConstructor_Main End Sub - Private Sub grvwGridPos_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles grvwGridPos.FocusedColumnChanged + Private Sub grvwGridPos_FocusedColumnChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedColumnChangedEventArgs) Handles grvwGridPos.FocusedColumnChanged Pos_COLROW_Changer() End Sub @@ -6939,5 +7053,125 @@ Public Class frmConstructor_Main End If End Sub + Private Sub TreeViewMain_BeforeExpand(sender As Object, e As TreeViewCancelEventArgs) Handles TreeViewMain.BeforeExpand + End Sub + + Private Sub TreeList1_GetStateImage(sender As Object, e As DevExpress.XtraTreeList.GetStateImageEventArgs) Handles TreeList1.GetStateImage + Dim Column_Config_ID As DevExpress.XtraTreeList.Columns.TreeListColumn = TreeList1.Columns("NODE_CONFIG_ID") + Dim configid = e.Node.GetDisplayText(Column_Config_ID) + + e.Node.StateImageIndex = ImageCollection1.Images.Keys.IndexOf(configid) + + End Sub + + Private Sub TreeList1_ColumnFilterChanged(sender As Object, e As EventArgs) Handles TreeList1.ColumnFilterChanged + Dim tree As TreeList = TryCast(sender, TreeList) + Dim filteredColumns As List(Of TreeListColumn) = tree.Columns.Cast(Of TreeListColumn)().Where(Function(c) c.FilterInfo.AutoFilterRowValue IsNot Nothing).ToList() + If filteredColumns.Count = 0 Then + tree.CollapseAll() + Return + End If + + tree.BeginUpdate() + For Each col As TreeListColumn In filteredColumns + Dim op As New CollapseChildrenOperation(col.FilterInfo.AutoFilterRowValue.ToString(), col) + tree.NodesIterator.DoOperation(op) + Next col + tree.EndUpdate() + End Sub + Public Class CollapseChildrenOperation + Inherits TreeListOperation + + Private filterValue As String + Private column As TreeListColumn + + Public Sub New(ByVal filter As String, ByVal col As TreeListColumn) + filterValue = filter + column = col + End Sub + + Private Function IsNodeMatchFilter(ByVal node As TreeListNode, ByVal column As TreeListColumn) As Boolean + Return node.GetDisplayText(column).Contains(filterValue) + End Function + Public Overrides Sub Execute(ByVal node As TreeListNode) + If IsNodeMatchFilter(node, column) Then + node.TreeList.MakeNodeVisible(node) + CollapseChildren(node) + End If + End Sub + + Public Sub CollapseChildren(ByVal node As TreeListNode) + 'node.Visible = true; + For Each childNode As TreeListNode In node.Nodes + CollapseChildren(childNode) + Next childNode + node.Expanded = False + End Sub + End Class + + Private Sub AusDieserEntitätToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AusDieserEntitätToolStripMenuItem.Click + Try + ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) + If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then + MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation) + Exit Sub + End If + Refresh_Selected_Table() + Dim frm As New frmDocRecordLink ' frmDocLink_Record_Entities() 'fileName, ClassWindreamDocGrid.RESULT_OBJECTTYPE) + frm.Show() + Catch ex As Exception + MsgBox("Unexpected Error in Linking Record: " & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + + Private Sub AusAndererEntitätToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AusAndererEntitätToolStripMenuItem.Click + Try + ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) + If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then + MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation) + Exit Sub + End If + Refresh_Selected_Table() + Dim frm As New frmDocLink_Record_Entities() 'fileName, ClassWindreamDocGrid.RESULT_OBJECTTYPE) + frm.Show() + Catch ex As Exception + MsgBox("Unexpected Error in Linking Record: " & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + + Private Sub tstxtRenameNode_KeyUp(sender As Object, e As KeyEventArgs) Handles tstxtRenameNode.KeyUp + If e.KeyCode = Keys.Return Then + Try + Dim oTag = TreeViewMain.SelectedNode.Tag + Dim oRecExists As Boolean = False + If oTag.ToString.ToString.Contains("RECORD-ID") Then + oRecExists = True + End If + Dim NODE_GUID = ClassNodeNavigation.Return_NODEID_forTag(oTag) + If IsNumeric(NODE_GUID) Then + Dim OMsg = "Sind Sie sicher, dass Sie den Knoten '" & TreeViewMain.SelectedNode.Text & "' umbenennen wollen?" + If USER_LANGUAGE <> "de-DE" Then + OMsg = "Are You sure You want to rename the node'" & TreeViewMain.SelectedNode.Text & "'?" + End If + Dim oResult As MsgBoxResult + oResult = MessageBox.Show(OMsg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If oResult = MsgBoxResult.Yes Then + Dim oUpdate = String.Format("UPDATE TBPMO_STRUCTURE_NODES SET NODE_CAPTION = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", Me.tstxtRenameNode.Text, USER_USERNAME, NODE_GUID) + If ClassDatabase.Execute_non_Query(oUpdate) Then + TreeViewMain.SelectedNode.Text = Me.tstxtRenameNode.Text + End If + End If + End If + Catch ex As Exception + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Unexpected Error in Renaming ConfigNode: ", ex.Message) + End Try + End If + End Sub + + Private Sub tsmiNodeRename_MouseHover(sender As Object, e As EventArgs) Handles tsmiNodeRename.MouseHover + If Not IsNothing(TreeViewMain.SelectedNode) Then + Me.tstxtRenameNode.Text = TreeViewMain.SelectedNode.Text + End If + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmDocLink_Record_Entities.vb b/app/DD-Record-Organizer/frmDocLink_Record_Entities.vb index 7ca2c64..9fc87d8 100644 --- a/app/DD-Record-Organizer/frmDocLink_Record_Entities.vb +++ b/app/DD-Record-Organizer/frmDocLink_Record_Entities.vb @@ -13,8 +13,9 @@ Public Class frmDocLink_Record_Entities Private ENTITY_LOADED As Boolean = False Private ENTITY_ID As Integer Private RECORD_ID As Integer + Private _FORM_ID As Integer ' Private _objecttype As String - Private Class ClassConstructor + Private Class ClassEntity Public title As String Public id As Integer @@ -23,8 +24,6 @@ Public Class frmDocLink_Record_Entities End Function End Class - Private CONSTRUCTOR_DETAIL_ID, CONSTRUCTOR_ID, FORM_ID As Integer - Public Sub New() 'fileName As String, Objecttype As String) InitializeComponent() If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then @@ -36,15 +35,14 @@ Public Class frmDocLink_Record_Entities '_objecttype = Objecttype End Sub - Private Function GetConstructorForms() As DataTable + Private Function GetENTITIES() As DataTable Try - Dim SQL As String = String.Format("SELECT GUID, dbo.FNPMO_GETOBJECTCAPTION('{0}', 'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID), {1}) AS FORM_TITLE, SEQUENCE_MENU, ADDED_WHO, ADDED_WHEN, CHANGED_WHO," & - "CHANGED_WHEN, MENU_IMG, SHORT_TITLE, LANGUAGE, " & - "'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID) as OBECTNAME FROM TBPMO_FORM_CONSTRUCTOR where GUID in (SELECT CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE HOME_MENUE = 1 AND USER_ID = {2}) ORDER BY SEQUENCE_MENU", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID) + Dim SQL As String = String.Format("SELECT DISTINCT FORM_ID,FORM_TITLE,SEQUENCE FROM VWPMO_CONSTRUCTOR_FORMS where CONSTRUCT_ID in " & +"(SELECT CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE USER_ID = {0}) ORDER BY SEQUENCE", USER_GUID) Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL) Return dt Catch ex As Exception - MsgBox("Constructor Forms could not be loaded in LinkToRecord: " & vbNewLine & ex.Message) + MsgBox("Entities could not be loaded in LinkToRecord: " & vbNewLine & ex.Message) Return Nothing End Try End Function @@ -54,23 +52,19 @@ Public Class frmDocLink_Record_Entities End Sub Private Sub frmWD_Link_to_Record_Load(sender As Object, e As EventArgs) Handles MyBase.Load - Dim constructorForms As DataTable = GetConstructorForms() + Dim DT_ENTITIES As DataTable = GetENTITIES() Dim selected As Integer = 0 - If constructorForms.Rows.Count = 0 Then + If DT_ENTITIES.Rows.Count = 0 Then Exit Sub End If - For Each row As DataRow In constructorForms.Rows - Dim constructor As New ClassConstructor - constructor.title = row.Item("FORM_TITLE") - constructor.id = row.Item("GUID") - cmbConstructorForms.Items.Add(constructor) + For Each row As DataRow In DT_ENTITIES.Rows + Dim entity As New ClassEntity + entity.title = row.Item("FORM_TITLE") + entity.id = row.Item("FORM_ID") + cmbConstructorForms.Items.Add(entity) - ' Von der aktuell geöffneten ConstructorForm den Index in Combobox speichern - If constructor.id = CURRENT_CONSTRUCTOR_ID Then - selected = cmbConstructorForms.Items.Count - 1 - End If Next If USER_LANGUAGE = "de-DE" Then Me.Text = CURRENT_DT_SELECTED_FILES.Rows.Count.ToString & " Datei(en) mit Datensatz verknüpfen:" @@ -181,21 +175,21 @@ Public Class frmDocLink_Record_Entities Public foundNode As TreeNode = Nothing Private Sub cmbConstructorForms_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbConstructorForms.SelectedIndexChanged - Dim constructor As ClassConstructor = DirectCast(cmbConstructorForms.SelectedItem, ClassConstructor) + Dim entity As ClassEntity = DirectCast(cmbConstructorForms.SelectedItem, ClassEntity) If cmbConstructorForms.SelectedIndex <> -1 Then - CONSTRUCTOR_ID = constructor.id + CURRENT_CONSTRUCTOR_ID = entity.id Dim SQL = String.Format("SELECT *, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), {1}) AS 'CAPTION' " & - "FROM VWPMO_CONSTRUCTOR_FORMS WHERE SCREEN_ID = {1} AND CONSTRUCT_ID = {2} ORDER BY SEQUENCE", USER_LANGUAGE, CURRENT_SCREEN_ID, CONSTRUCTOR_ID) + "FROM VWPMO_CONSTRUCTOR_FORMS WHERE SCREEN_ID = {1} AND CONSTRUCT_ID = {2} ORDER BY SEQUENCE", USER_LANGUAGE, CURRENT_SCREEN_ID, CURRENT_CONSTRUCTOR_ID) DT_VWPMO_CONSTRUCTOR_FORMS = ClassDatabase.Return_Datatable(SQL, True) - SQL = String.Format("select * from VWPMO_STRUCTURE_NODES where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTOR_ID) + SQL = String.Format("select * from VWPMO_STRUCTURE_NODES where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CURRENT_CONSTRUCTOR_ID) Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL) If DT.Rows.Count > 1 Then TreeView_perControl = True DT_TREEVIEW_PER_CONTROLS = DT - SQL = String.Format("select * from TBPMO_STRUCTURE_NODES_CONFIGURATION where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTOR_ID) + SQL = String.Format("select * from TBPMO_STRUCTURE_NODES_CONFIGURATION where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CURRENT_CONSTRUCTOR_ID) DT_TREEVIEW_CONFIGURATION = ClassDatabase.Return_Datatable(SQL) Try @@ -229,7 +223,7 @@ Public Class frmDocLink_Record_Entities ' Entitäten laden - Load_TreeViewEbene(constructor.id) + Load_TreeViewEbene(CURRENT_CONSTRUCTOR_ID) foundNode = Nothing SelectNodeRecursive(trvwMain, trvwMain.Nodes, CURRENT_CONSTRUCTOR_DETAIL_ID) @@ -263,15 +257,14 @@ Public Class frmDocLink_Record_Entities Private Sub trvwMain_AfterSelect(sender As Object, e As TreeViewEventArgs) Handles trvwMain.AfterSelect Try - Dim dt As DataTable If NODE_NAVIGATION = False Then SetSelectedNodeStyle(trvwMain.Nodes) - CONSTRUCTOR_DETAIL_ID = Integer.Parse(e.Node.Tag) - Dim SQL As String = String.Format("SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE GUID = {0} AND CONSTRUCT_ID = {1}", CONSTRUCTOR_DETAIL_ID, CONSTRUCTOR_ID) - FORM_ID = ClassDatabase.Execute_Scalar(SQL) - SQL = Get_Grid_Sql(FORM_ID, CONSTRUCTOR_DETAIL_ID) + CURRENT_CONSTRUCTOR_DETAIL_ID = Integer.Parse(e.Node.Tag) + Dim SQL As String = String.Format("SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE GUID = {0} AND CONSTRUCT_ID = {1}", CURRENT_CONSTRUCTOR_DETAIL_ID, CURRENT_CONSTRUCTOR_ID) + _FORM_ID = ClassDatabase.Execute_Scalar(SQL) + SQL = Get_Grid_Sql(_FORM_ID, CURRENT_CONSTRUCTOR_DETAIL_ID) dt = ClassDatabase.Return_Datatable(SQL) dgEntityRecords.DataSource = dt grvwGrid.PopulateColumns() @@ -289,8 +282,8 @@ Public Class frmDocLink_Record_Entities If NODE_NAVIGATION_LOADED = False Then ENTITY_ID = ClassNodeNavigation.Return_ENTITY_FOR_TAG(SelectedNode.Tag) - Dim SQL As String '= String.Format("SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0} AND FORM_ID = {1}", CONSTRUCTOR_ID, ENTITY_ID) - SQL = Get_Grid_Sql(ENTITY_ID, CONSTRUCTOR_DETAIL_ID) + Dim SQL As String '= String.Format("SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0} AND FORM_ID = {1}", CURRENT_CONSTRUCTOR_ID, ENTITY_ID) + SQL = Get_Grid_Sql(ENTITY_ID, CURRENT_CONSTRUCTOR_DETAIL_ID) dt = ClassDatabase.Return_Datatable(SQL) If IsNothing(dt) Then Exit Sub @@ -322,13 +315,13 @@ Public Class frmDocLink_Record_Entities End If ' Datasource neu setzen und columns laden - Dim constructor = DirectCast(cmbConstructorForms.Items.Item(cmbConstructorForms.SelectedIndex), ClassConstructor) - Dim constructorName As String = constructor.title - If Not IsNothing(dgEntityRecords.DataSource) Then - Load_Grid_Layout(constructorName) - grvwGrid.Columns.Item("Form-ID").Visible = False - grvwGrid.Columns.Item("ROW_COLOR").Visible = False - End If + 'Dim constructor = DirectCast(cmbConstructorForms.Items.Item(cmbConstructorForms.SelectedIndex), ClassConstructor) + 'Dim constructorName As String = constructor.title + 'If Not IsNothing(dgEntityRecords.DataSource) Then + ' Load_Grid_Layout(constructorName) + ' grvwGrid.Columns.Item("Form-ID").Visible = False + ' grvwGrid.Columns.Item("ROW_COLOR").Visible = False + 'End If If RECORD_ID > 0 Then Dim rowHandle = grvwGrid.LocateByValue(0, grvwGrid.Columns("Record-ID"), RECORD_ID) @@ -336,7 +329,7 @@ Public Class frmDocLink_Record_Entities End If Catch ex As Exception - MsgBox("Entität " + CONSTRUCTOR_DETAIL_ID + " konnte nicht geladen werden: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + MsgBox("Entität " + CURRENT_CONSTRUCTOR_DETAIL_ID + " konnte nicht geladen werden: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) Exit Sub End Try End Sub @@ -345,7 +338,7 @@ Public Class frmDocLink_Record_Entities End Function Private Function Get_Grid_Layout_Filename(EntityName As String) - Dim Filename As String = String.Format("{0}-{1}-{2}-UserLayout.xml", grvwGrid.Name, GetSafeFilename(EntityName), CONSTRUCTOR_ID) + Dim Filename As String = String.Format("{0}-{1}-{2}-UserLayout.xml", grvwGrid.Name, GetSafeFilename(EntityName), CURRENT_CONSTRUCTOR_ID) Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename) End Function Public Sub SetSelectedNodeStyle(tncoll As TreeNodeCollection) diff --git a/app/DD-Record-Organizer/frmDocRecordLink.Designer.vb b/app/DD-Record-Organizer/frmDocRecordLink.Designer.vb index 4fef35b..a928caf 100644 --- a/app/DD-Record-Organizer/frmDocRecordLink.Designer.vb +++ b/app/DD-Record-Organizer/frmDocRecordLink.Designer.vb @@ -30,6 +30,7 @@ Partial Class frmDocRecordLink Me.grvwGrid = New DevExpress.XtraGrid.Views.Grid.GridView() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tsslbl = New System.Windows.Forms.ToolStripStatusLabel() + Me.Button1 = New System.Windows.Forms.Button() CType(Me.dgEntityRecords, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).BeginInit() Me.StatusStrip1.SuspendLayout() @@ -56,7 +57,6 @@ Partial Class frmDocRecordLink 'dgEntityRecords ' resources.ApplyResources(Me.dgEntityRecords, "dgEntityRecords") - Me.dgEntityRecords.EmbeddedNavigator.Margin = CType(resources.GetObject("dgEntityRecords.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.dgEntityRecords.MainView = Me.grvwGrid Me.dgEntityRecords.Name = "dgEntityRecords" Me.dgEntityRecords.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwGrid}) @@ -95,10 +95,17 @@ Partial Class frmDocRecordLink Me.tsslbl.Name = "tsslbl" resources.ApplyResources(Me.tsslbl, "tsslbl") ' + 'Button1 + ' + resources.ApplyResources(Me.Button1, "Button1") + Me.Button1.Name = "Button1" + Me.Button1.UseVisualStyleBackColor = True + ' 'frmDocRecordLink ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.dgEntityRecords) Me.Controls.Add(Me.txtFileInfo) @@ -120,4 +127,5 @@ Partial Class frmDocRecordLink Friend WithEvents grvwGrid As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents StatusStrip1 As StatusStrip Friend WithEvents tsslbl As ToolStripStatusLabel + Friend WithEvents Button1 As Button End Class diff --git a/app/DD-Record-Organizer/frmDocRecordLink.resx b/app/DD-Record-Organizer/frmDocRecordLink.resx index 7fb6136..5b57f2c 100644 --- a/app/DD-Record-Organizer/frmDocRecordLink.resx +++ b/app/DD-Record-Organizer/frmDocRecordLink.resx @@ -123,13 +123,10 @@ - 148, 8 - - - 4, 4, 4, 4 + 125, 6 - 713, 24 + 515, 21 @@ -145,7 +142,7 @@ $this - 2 + 3 True @@ -157,13 +154,10 @@ NoControl - 12, 12 - - - 4, 0, 4, 0 + 9, 9 - 128, 19 + 110, 13 11 @@ -181,7 +175,7 @@ $this - 3 + 4 Top, Right @@ -196,13 +190,10 @@ NoControl - 869, 4 - - - 4, 4, 4, 4 + 646, 3 - 183, 30 + 155, 23 10 @@ -223,16 +214,13 @@ $this - 4 + 5 Top, Bottom, Left, Right - - 4, 4, 4, 4 - - 16, 35 + 12, 33 Aqua @@ -246,11 +234,8 @@ Yellow - - 4, 4, 4, 4 - - 1039, 482 + 791, 377 15 @@ -265,19 +250,22 @@ $this - 1 + 2 17, 17 - - 0, 534 + + 171, 17 - - 1, 0, 19, 0 + + Waiting for record-Selection..... + + + 0, 442 - 1071, 25 + 815, 22 16 @@ -295,22 +283,40 @@ $this + 1 + + + 726, 416 + + + 75, 23 + + + 17 + + + aus anderer Entität: + + + Button1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 - - 212, 20 - - - Waiting for record-Selection..... - True - 8, 17 + 6, 13 - 1071, 559 + 815, 464 Tahoma, 8.25pt @@ -1549,11 +1555,8 @@ AIPBAAD//wAA//8AAA== - - 4, 4, 4, 4 - - Datei mit Datensatz verknüpfen + Datei mit Datensatz aus aktueller Entität verknüpfen grvwGrid diff --git a/app/DD-Record-Organizer/frmDocRecordLink.vb b/app/DD-Record-Organizer/frmDocRecordLink.vb index 6832e1c..0f65e6c 100644 --- a/app/DD-Record-Organizer/frmDocRecordLink.vb +++ b/app/DD-Record-Organizer/frmDocRecordLink.vb @@ -13,10 +13,14 @@ Public Class frmDocRecordLink If IsNothing(CURRENT_DT_ENTITY_RECORDS) Then Me.Close() End If - Dim DT_RECORDS As DataTable = CURRENT_DT_ENTITY_RECORDS + Dim DT_RECORDS As DataTable = CURRENT_DT_ENTITY_RECORDS.Copy + Try + DT_RECORDS.Columns.Add("already linked", Type.GetType("System.Boolean")).SetOrdinal(0) + DT_RECORDS.Columns("already linked").DefaultValue = False + Catch ex As Exception + + End Try - DT_RECORDS.Columns.Add("already linked", Type.GetType("System.Boolean")).SetOrdinal(0) - DT_RECORDS.Columns("already linked").DefaultValue = False Try For Each row As DataRow In CURRENT_DT_SELECTED_FILES.Rows Dim DOC_ID = row.Item("DOC_ID") @@ -25,7 +29,7 @@ Public Class frmDocRecordLink For Each recrow As DataRow In DTRECS_LINKED.Rows For Each rowrecsdisplay As DataRow In DT_RECORDS.Rows If rowrecsdisplay.Item("Record-ID") = recrow.Item("RECORD_ID") Then - rowrecsdisplay.Item("file linked") = True + rowrecsdisplay.Item("already linked") = True End If Next Next @@ -63,6 +67,7 @@ Public Class frmDocRecordLink If IsNothing(SELECTED_RECORDID) Then Continue For End If + If LogErrorsOnly = False Then ClassLogger.Add(">>> Doc will be linked with Record: " & SELECTED_RECORDID.ToString, False) Try For Each row As DataRow In CURRENT_DT_SELECTED_FILES.Rows CURRENT_DOC_ID = row.Item("DOC_ID") @@ -78,6 +83,13 @@ Public Class frmDocRecordLink Dim proc = String.Format("EXEC PRPROXY_DOC_CHECK_DOC_REC_LINK {0},{1}", CURRENT_DOC_ID, SELECTED_RECORDID) ClassDatabase.Execute_non_Query(proc, True) End If + Dim msg = String.Format("Der Datensatz wurde erfolgreich verknüpft!") + If USER_LANGUAGE <> "de-DE" Then + msg = "The record was successfully linked" + End If + tsslbl.Text = msg + tsslbl.BackColor = Color.Yellow + ClassHelper.InsertEssential_Log(CURRENT_DOC_ID, "DOC-ID", "FILE LINK CREATED FOR RECORD: " & SELECTED_RECORDID.ToString) End If Dim sql = String.Format("SELECT * FROM TBPMO_WD_OBJECTTYPE WHERE OBJECT_TYPE = '{0}'", _objecttype) Dim DT_OBJTYPE As DataTable = ClassDatabase.Return_Datatable(sql, True) @@ -85,7 +97,7 @@ Public Class frmDocRecordLink Dim Entity_Index = DT_OBJTYPE.Rows(0).Item("IDXNAME_ENTITYID") Dim Record_Index = DT_OBJTYPE.Rows(0).Item("IDXNAME_RECORDID") Dim ENT_ID = ClassDatabase.Execute_Scalar(String.Format("SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}", SELECTED_RECORDID)) - If ENT_ID > 1 Then + If ENT_ID > 1 And Entity_Index <> String.Empty Then If clsWD_SET.IndexFile(DOC_PATH, Entity_Index, ENT_ID, _objecttype) = False Then Dim msg = "Die Entität-ID konnte nicht gesetzt werden! Bitte überprüfen Sie die Logfile" If USER_LANGUAGE <> "de-DE" Then @@ -94,21 +106,16 @@ Public Class frmDocRecordLink MsgBox(msg, MsgBoxStyle.Exclamation) End If End If - If clsWD_SET.IndexFile(DOC_PATH, Record_Index, SELECTED_RECORDID, _objecttype) = False Then - Dim msg = "Die Record-ID konnte nicht gesetzt werden! Bitte überprüfen Sie die Logfile" - If USER_LANGUAGE <> "de-DE" Then - msg = "Could not index Record-ID! Please check logfile!" + If Record_Index <> String.Empty Then + If clsWD_SET.IndexFile(DOC_PATH, Record_Index, SELECTED_RECORDID, _objecttype) = False Then + Dim msg = "Die Record-ID konnte nicht gesetzt werden! Bitte überprüfen Sie die Logfile" + If USER_LANGUAGE <> "de-DE" Then + msg = "Could not index Record-ID! Please check logfile!" + End If + MsgBox(msg, MsgBoxStyle.Exclamation) End If - MsgBox(msg, MsgBoxStyle.Exclamation) - Else - Dim msg = String.Format("Der Datensatz wurde erfolgreich mit der Datei " & vbNewLine & "{0}" & vbNewLine & "verknüpft!", DOC_PATH) - If USER_LANGUAGE <> "de-DE" Then - msg = "The record was successfully linked to the file: " & vbNewLine & DOC_PATH - End If - tsslbl.Text = msg - tsslbl.BackColor = Color.Yellow - ClassHelper.InsertEssential_Log(CURRENT_DOC_ID, "DOC-ID", "FILE LINK CREATED FOR RECORD: " & SELECTED_RECORDID.ToString) + End If End If Next diff --git a/app/DD-Record-Organizer/frmDoctype_NameConvention.vb b/app/DD-Record-Organizer/frmDoctype_NameConvention.vb index 9041548..250c49c 100644 --- a/app/DD-Record-Organizer/frmDoctype_NameConvention.vb +++ b/app/DD-Record-Organizer/frmDoctype_NameConvention.vb @@ -4,6 +4,7 @@ Private FORM_VIEW_ID As Integer Private TBPMO_WD_FORMVIEW_DOKTYPES_GUID As Integer Private loaded As Boolean = False + Dim DTTBPMO_WD_FORMVIEW_DOKTYPES As DataTable Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnAddIndexM.Click If Not Me.cmbIndex_AUTO.Text = "" Then @@ -90,8 +91,14 @@ Else sf = 0 End If - Dim sql = "UPDATE TBPMO_WD_FORMVIEW_DOKTYPES SET NAME_CONVENTION = '" & txtnamenKonv.Text & "', MANUAL_SUBFOLDER = " & sf & ", CHANGED_WHO = '" & USER_USERNAME & "' WHERE GUID = " & TBPMO_WD_FORMVIEW_DOKTYPES_GUID + Dim sql = "" + If DTTBPMO_WD_FORMVIEW_DOKTYPES.Rows.Count = 1 Then + sql = "UPDATE TBPMO_WD_FORMVIEW_DOKTYPES SET NAME_CONVENTION = '" & txtnamenKonv.Text & "', MANUAL_SUBFOLDER = " & sf & ", CHANGED_WHO = '" & USER_USERNAME & "' WHERE GUID = " & TBPMO_WD_FORMVIEW_DOKTYPES_GUID + Else + sql = $"INSERT INTO TBPMO_WD_FORMVIEW_DOKTYPES (NAME_CONVENTION,MANUAL_SUBFOLDER,ADDED_WHO) VALUES ('{txtnamenKonv.Text}',{sf},'{USER_USERNAME}')" + End If If ClassDatabase.Execute_non_Query(sql) = True Then + DTTBPMO_WD_FORMVIEW_DOKTYPES = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE GUID = " & TBPMO_WD_FORMVIEW_DOKTYPES_GUID) lblSave.Visible = True lblSave.Text = "Data saved - " & Now.ToString Return True @@ -129,11 +136,11 @@ Try If cmbEntity.SelectedIndex <> -1 Then TBPMO_WD_FORMVIEW_DOKTYPES_GUID = Me.cmbEntity.SelectedValue - Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE GUID = " & TBPMO_WD_FORMVIEW_DOKTYPES_GUID) - If DT.Rows.Count = 1 Then - FORM_VIEW_ID = DT.Rows(0).Item("FORMVIEW_ID") - Dim NameConv = DT.Rows(0).Item("NAME_CONVENTION") - chkManFolder.Checked = CBool(DT.Rows(0).Item("MANUAL_SUBFOLDER")) + DTTBPMO_WD_FORMVIEW_DOKTYPES = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE GUID = " & TBPMO_WD_FORMVIEW_DOKTYPES_GUID) + If DTTBPMO_WD_FORMVIEW_DOKTYPES.Rows.Count = 1 Then + FORM_VIEW_ID = DTTBPMO_WD_FORMVIEW_DOKTYPES.Rows(0).Item("FORMVIEW_ID") + Dim NameConv = DTTBPMO_WD_FORMVIEW_DOKTYPES.Rows(0).Item("NAME_CONVENTION") + chkManFolder.Checked = CBool(DTTBPMO_WD_FORMVIEW_DOKTYPES.Rows(0).Item("MANUAL_SUBFOLDER")) If Not IsDBNull(NameConv) Then Me.txtnamenKonv.Text = NameConv Load_Controls() diff --git a/app/DD-Record-Organizer/frmMain.Designer.vb b/app/DD-Record-Organizer/frmMain.Designer.vb index 830e0ea..f21203c 100644 --- a/app/DD-Record-Organizer/frmMain.Designer.vb +++ b/app/DD-Record-Organizer/frmMain.Designer.vb @@ -79,6 +79,7 @@ Partial Class frmMain Me.BarButtonItem13 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItemSwitchCon = New DevExpress.XtraBars.BarButtonItem() Me.LabelConString = New DevExpress.XtraBars.BarStaticItem() + Me.StatusVersionDB = New DevExpress.XtraBars.BarStaticItem() Me.pageHome = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.groupQuickAccessForm = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -99,7 +100,6 @@ Partial Class frmMain Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() Me.TimerInformation = New System.Windows.Forms.Timer(Me.components) Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.StatusVersionDB = New DevExpress.XtraBars.BarStaticItem() Me.cmsSystray.SuspendLayout() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -561,6 +561,13 @@ Partial Class frmMain Me.LabelConString.Name = "LabelConString" Me.LabelConString.TextAlignment = System.Drawing.StringAlignment.Near ' + 'StatusVersionDB + ' + resources.ApplyResources(Me.StatusVersionDB, "StatusVersionDB") + Me.StatusVersionDB.Id = 11 + Me.StatusVersionDB.Name = "StatusVersionDB" + Me.StatusVersionDB.TextAlignment = System.Drawing.StringAlignment.Near + ' 'pageHome ' Me.pageHome.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.groupQuickAccessForm, Me.groupSearchAllOver, Me.RibbonPageGroupConnManager}) @@ -715,13 +722,6 @@ Partial Class frmMain Me.ContextMenuStrip1.Name = "ContextMenuStrip1" resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1") ' - 'StatusVersionDB - ' - resources.ApplyResources(Me.StatusVersionDB, "StatusVersionDB") - Me.StatusVersionDB.Id = 11 - Me.StatusVersionDB.Name = "StatusVersionDB" - Me.StatusVersionDB.TextAlignment = System.Drawing.StringAlignment.Near - ' 'frmMain ' Me.Appearance.BackColor = CType(resources.GetObject("frmMain.Appearance.BackColor"), System.Drawing.Color) diff --git a/app/DD-Record-Organizer/frmMain.resx b/app/DD-Record-Organizer/frmMain.resx index 2717a84..509e31c 100644 --- a/app/DD-Record-Organizer/frmMain.resx +++ b/app/DD-Record-Organizer/frmMain.resx @@ -124,20 +124,8 @@ 17, 56 - - 196, 26 - - - ADDI beenden - - - 196, 26 - - - Cockpit anzeigen - - 197, 56 + 170, 56 cmsSystray @@ -1044,6 +1032,18 @@ True + + 169, 26 + + + ADDI beenden + + + 169, 26 + + + Cockpit anzeigen + 1208, 17 @@ -2284,105 +2284,6 @@ rGVfvYI98TWlNa9PnJGLMGDjunfB71xCckbODKy2/jgAln/eXvihrcNlZ8s+M+l3XnAsLt75Z+/2Vnxq 3VuxbKCBYrmRgXjPPNVdUWINbcGQISPf6BVwYl7NvE359uCFxlG70jtXN/HfF33ijFw4KcMCLMTblOF6 z5X+PxSF4t+qN/szT9oWSwAAAABJRU5ErkJggg== - - - - Synchronisation windream-Dateien - - - - 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 @@ -2494,6 +2395,105 @@ wqLj0c+lRxMLoJwoFOnR7OgBY/UIxOZ10lFccwVkCmP1cZXV/VhpcT2UpW7JQ9/Kh4WPXCQiLCQqkd6C X6NvUWGs8aCPmpBz0CRczCdxLA8m1bTXdNFQ2X1vOZ4oAMhPlaEK0Xj6clp5J6AxxFwA8No/K4uTvqJI kmkAAAAASUVORK5CYII= + + + + Synchronisation windream-Dateien + + + + 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 @@ -2688,60 +2688,26 @@ 0, 0 - - - 4, 4, 4, 4 - - - Kalender - - - Views/Sichten - - - Weitere Views - - - Client Connection - Home Yellow - - Views/Sichten - Weitere Sichten - - Programm Konfiguration - - - Tasks und windream-Konfigurationen - - - Menü Konfiguration - - - Connections - Administration - 1196, 187 + 995, 150 - 0, 616 - - - 4, 4, 4, 4 + 0, 508 - 1196, 29 + 995, 23 RibbonStatusBar1 @@ -2767,6 +2733,33 @@ 4 + + Kalender + + + Views/Sichten + + + Weitere Views + + + Client Connection + + + Views/Sichten + + + Programm Konfiguration + + + Tasks und windream-Konfigurationen + + + Menü Konfiguration + + + Connections + 242, 17 @@ -2807,10 +2800,10 @@ White - 8, 19 + 6, 13 - 1196, 645 + 995, 531 Segoe UI, 8.25pt @@ -3707,9 +3700,6 @@ /////////////wA///////////////////8f//////////////////// - - 4, 4, 4, 4 - Form1 @@ -4031,6 +4021,12 @@ DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + StatusVersionDB + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + pageHome @@ -4139,12 +4135,6 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - StatusVersionDB - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmMain diff --git a/app/DD-Record-Organizer/frmMass_Change.vb b/app/DD-Record-Organizer/frmMass_Change.vb index 1648e8a..44fe33d 100644 --- a/app/DD-Record-Organizer/frmMass_Change.vb +++ b/app/DD-Record-Organizer/frmMass_Change.vb @@ -2,6 +2,7 @@ Public Class frmMass_Change Dim SQL As String + Dim _CONTROLID As Integer Private Sub frmMass_Change_Load(sender As Object, e As EventArgs) Handles Me.Load Try SUCCESSFULL = False @@ -30,6 +31,7 @@ Public Class frmMass_Change End Sub Private Sub btnRefresh_Click(sender As Object, e As EventArgs) Handles btnRefresh.Click Try + _CONTROLID = 0 If txtNewValue.Text <> "" And Me.cmbColumn.SelectedIndex <> -1 Then Dim msg = "Sind Sie sicher, dass Sie diese Massenänderung durchführen wollen?" & vbNewLine & MASS_RECORD_IDs2CHANGE.Count.ToString & " Datensätze werden geändert!" If USER_LANGUAGE <> "de-DE" Then @@ -44,6 +46,11 @@ Public Class frmMass_Change ClassHelper.InsertEssential_Log(USER_GUID, "User-ID", String.Format("### Starting MassChange of column '{0}' with value '{1}'....###", cmbColumn.Text, txtNewValue.Text)) Me.Cursor = Cursors.WaitCursor SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL WHERE COL_NAME = '{0}' AND FORM_ID = {1}", cmbColumn.Text, CURRENT_ENTITY_ID) + Dim control_Id = ClassDatabase.Execute_Scalar(SQL, True) + + If Not IsNothing(control_Id) Then + _CONTROLID = control_Id + End If ProgressBar1.Visible = True lblStateBW.Text = "Preparing BackgroundWorker..." lblStateBW.Visible = True @@ -66,11 +73,10 @@ Public Class frmMass_Change Dim worker As BackgroundWorker = CType(sender, BackgroundWorker) Dim val = txtNewValue.Text - Dim control_Id = ClassDatabase.Execute_Scalar(SQL, True) - If Not IsNothing(control_Id) Then - If control_Id > 0 Then - SQL = String.Format("SELECT CONTROL_TYPE_ID FROM TBPMO_CONTROL WHERE GUID = {0}", control_Id) - Dim control_type_ID = ClassDatabase.Execute_Scalar(SQL, True) + + If _CONTROLID <> 0 Then + SQL = String.Format("SELECT CONTROL_TYPE_ID FROM TBPMO_CONTROL WHERE GUID = {0}", _CONTROLID) + Dim control_type_ID = ClassDatabase.Execute_Scalar(SQL, True) If control_type_ID = 4 Then Try val = CDate(val) @@ -90,10 +96,10 @@ Public Class frmMass_Change 'Dim result1 As MsgBoxResult 'result1 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) For Each Record As String In MASS_RECORD_IDs2CHANGE - Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", control_Id, CInt(Record)) - ClassDatabase.Execute_non_Query(del, False) - ClassProxy.PRPROXY_CONTROL_DEL(CInt(Record), CURRENT_ENTITY_ID, control_Id) - Next + Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", _CONTROLID, CInt(Record)) + ClassDatabase.Execute_non_Query(del, False) + ClassProxy.PRPROXY_CONTROL_DEL(CInt(Record), CURRENT_ENTITY_ID, _CONTROLID) + Next End If Try Dim RIGHT_ONLY_READ_RECORD_FILE = False @@ -104,8 +110,8 @@ Public Class frmMass_Change RIGHT_ONLY_READ_RECORD_FILE = ClassHelper.Check_Record_Read_only(CInt(Record), CURRENT_ENTITY_ID) End If If RIGHT_ONLY_READ_RECORD_FILE = False Then - SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", control_Id, CInt(Record)) - Dim ex_GUID = ClassDatabase.Execute_Scalar(SQL, True) + SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", _CONTROLID, CInt(Record)) + Dim ex_GUID = ClassDatabase.Execute_Scalar(SQL, True) If Not IsNothing(ex_GUID) Then SQL = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}',CHANGED_WHO = '{1}' WHERE GUID = {2}", val, USER_USERNAME, ex_GUID) If ClassDatabase.Execute_non_Query(SQL, False) = False Then @@ -113,16 +119,16 @@ Public Class frmMass_Change ClassLogger.Add(">> Error in updating the value for Record: " & Record, False) Else - ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, control_Id, CInt(Record), val) - End If + ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, _CONTROLID, CInt(Record), val) + End If Else - SQL = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", control_Id, CInt(Record), val, USER_USERNAME) - If ClassDatabase.Execute_non_Query(SQL, False) = False Then + SQL = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", _CONTROLID, CInt(Record), val, USER_USERNAME) + If ClassDatabase.Execute_non_Query(SQL, False) = False Then _Error = True ClassLogger.Add(">> Error in inserting the value for Record: " & Record, False) Else - ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, control_Id, CInt(Record), val) - End If + ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, _CONTROLID, CInt(Record), val) + End If End If End If BackgroundWorker.ReportProgress(i) @@ -135,11 +141,7 @@ Public Class frmMass_Change _Error = True End Try Else - ClassLogger.Add("No defined column found! (1)") - _Error = True - End If - Else - ClassLogger.Add("No defined column found! (2) - SQL: " & SQL) + ClassLogger.Add("No defined Control found!") _Error = True End If diff --git a/app/DD-Record-Organizer/frmRecordView.vb b/app/DD-Record-Organizer/frmRecordView.vb index d754c3b..6b0f861 100644 --- a/app/DD-Record-Organizer/frmRecordView.vb +++ b/app/DD-Record-Organizer/frmRecordView.vb @@ -63,7 +63,7 @@ Public Class frmRecordView 'sql = String.Format("select * from TBPMO_DOCSEARCH_VARIABLE_CONTROLS WHERE ENTITY_ID = {0}", ENTITY_ID) DT_RESULTLIST_OPTIONS = ClassHelper.FILTER_DATATABLE(CURRENT_VARIABLE_CONTROLS, "ENTITY_ID = " & ENTITY_ID, "") 'ClassDatabase.Return_Datatable(sql, True) ' sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%' ORDER BY SEQUENCE", ENTITY_ID, USER_LANGUAGE) - Dim expression As String = String.Format("VISIBLE = 1 And ENTITY_ID = {0} And LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%'", ENTITY_ID, USER_LANGUAGE) + Dim expression As String = String.Format("ENTITY_ID = {0} And LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%'", ENTITY_ID, USER_LANGUAGE) DT_RESULTLIST_VARIABLE_VALUE = ClassHelper.FILTER_DATATABLE(CURRENT_RESULTLIST_CONFIG, expression, "SEQUENCE") 'ClassDatabase.Return_Datatable(sql, True) 'Dim sql_ResultList = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND LANGUAGE = '{1}' ORDER BY SEQUENCE", ENTITY_ID, USER_LANGUAGE) diff --git a/app/DD-Record-Organizer/frmSplash.vb b/app/DD-Record-Organizer/frmSplash.vb index ccd7306..fca91a6 100644 --- a/app/DD-Record-Organizer/frmSplash.vb +++ b/app/DD-Record-Organizer/frmSplash.vb @@ -3,7 +3,7 @@ Public NotInheritable Class frmSplash 'TODO: Dieses Formular kann einfach als Begrüßungsbildschirm für die Anwendung festgelegt werden, indem Sie zur Registerkarte "Anwendung" ' des Projekt-Designers wechseln (Menü "Projekt", Option "Eigenschaften"). - Private InitSteps As Integer = 6 + Private InitSteps As Integer = 7 Private bw As New BackgroundWorker() Private mainForm As Form @@ -98,9 +98,14 @@ Public NotInheritable Class frmSplash System.Threading.Thread.Sleep(500) - bw.ReportProgress(CalcProgress(6), "Initializing Frontend") + ' InitInterface wurde in frmMain integriert 'Init.InitInterface(mainForm) + bw.ReportProgress(CalcProgress(6), "Initializing Node-Configuration") + 'ClassConstructors.Init_Tuple() + + + bw.ReportProgress(CalcProgress(7), "Initializing Frontend") System.Threading.Thread.Sleep(500) Else diff --git a/app/DD-Record-Organizer/frmWM_ChangeDoctype.vb b/app/DD-Record-Organizer/frmWM_ChangeDoctype.vb index 7c27458..11ab304 100644 --- a/app/DD-Record-Organizer/frmWM_ChangeDoctype.vb +++ b/app/DD-Record-Organizer/frmWM_ChangeDoctype.vb @@ -321,7 +321,6 @@ Public Class frmWM_ChangeDoctype MsgBox("Oracle not yet implememnted!", MsgBoxStyle.Exclamation) Exit Sub 'oracleConn = New OracleConnection(connectionString) - '' Try 'oracleConn.Open() 'oracleCmd = New OracleCommand(sql, oracleConn) 'oracleadapter.SelectCommand = oracleCmd @@ -409,7 +408,6 @@ Public Class frmWM_ChangeDoctype MsgBox("Oracle not yet implememnted!", MsgBoxStyle.Exclamation) Exit Sub 'oracleConn = New OracleConnection(connectionString) - '' Try 'oracleConn.Open() 'oracleCmd = New OracleCommand(sql_Vorschlag, oracleConn) 'oracleadapter.SelectCommand = oracleCmd diff --git a/app/DD-Record-Organizer/frmWM_DoctypeConfig.Designer.vb b/app/DD-Record-Organizer/frmWM_DoctypeConfig.Designer.vb index 19798d5..b7576f3 100644 --- a/app/DD-Record-Organizer/frmWM_DoctypeConfig.Designer.vb +++ b/app/DD-Record-Organizer/frmWM_DoctypeConfig.Designer.vb @@ -42,7 +42,7 @@ Partial Class frmWM_DoctypeConfig Dim CHANGED_WHOLabel As System.Windows.Forms.Label Dim CHANGED_WHENLabel As System.Windows.Forms.Label Dim OBJEKTTYPLabel As System.Windows.Forms.Label - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.TBDD_DOKUMENTARTBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() Me.TBDD_DOKUMENTARTBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -173,6 +173,8 @@ Partial Class frmWM_DoctypeConfig Me.ToolStripButton14 = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton15 = New System.Windows.Forms.ToolStripButton() Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage() + Me.Label8 = New System.Windows.Forms.Label() + Me.cmbFormViewVariablePath = New System.Windows.Forms.ComboBox() Me.lblpathsaved = New System.Windows.Forms.Label() Me.Button3 = New System.Windows.Forms.Button() Me.FOLDER_FOR_INDEXTextBox = New System.Windows.Forms.TextBox() @@ -473,7 +475,6 @@ Partial Class frmWM_DoctypeConfig 'GridControl1 ' Me.GridControl1.DataSource = Me.TBDD_DOKUMENTARTBindingSource - Me.GridControl1.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControl1.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) resources.ApplyResources(Me.GridControl1, "GridControl1") Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.Name = "GridControl1" @@ -1002,8 +1003,8 @@ Partial Class frmWM_DoctypeConfig ' Me.XtraTabPage3.Controls.Add(Me.ListBox1) Me.XtraTabPage3.Controls.Add(Me.BindingNavigator2) - resources.ApplyResources(Me.XtraTabPage3, "XtraTabPage3") Me.XtraTabPage3.Name = "XtraTabPage3" + resources.ApplyResources(Me.XtraTabPage3, "XtraTabPage3") ' 'ListBox1 ' @@ -1121,8 +1122,8 @@ Partial Class frmWM_DoctypeConfig ' Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AllowUserToAddRows = False Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AllowUserToDeleteRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua - Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua + Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 resources.ApplyResources(Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView, "TBPMO_WD_FORMVIEW_DOKTYPESDataGridView") Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AutoGenerateColumns = False Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -1298,13 +1299,29 @@ Partial Class frmWM_DoctypeConfig ' 'XtraTabPage4 ' + Me.XtraTabPage4.Controls.Add(Me.Label8) + Me.XtraTabPage4.Controls.Add(Me.cmbFormViewVariablePath) Me.XtraTabPage4.Controls.Add(Me.lblpathsaved) Me.XtraTabPage4.Controls.Add(Me.Button3) Me.XtraTabPage4.Controls.Add(Me.FOLDER_FOR_INDEXTextBox) Me.XtraTabPage4.Controls.Add(Me.grbxFolderforIndex) Me.XtraTabPage4.Controls.Add(Me.Label17) - resources.ApplyResources(Me.XtraTabPage4, "XtraTabPage4") Me.XtraTabPage4.Name = "XtraTabPage4" + resources.ApplyResources(Me.XtraTabPage4, "XtraTabPage4") + ' + 'Label8 + ' + resources.ApplyResources(Me.Label8, "Label8") + Me.Label8.Name = "Label8" + ' + 'cmbFormViewVariablePath + ' + Me.cmbFormViewVariablePath.DataSource = Me.TBPMO_WD_FORMVIEW_DOKTYPESBindingSource + Me.cmbFormViewVariablePath.DisplayMember = "FORM_TITLE" + Me.cmbFormViewVariablePath.FormattingEnabled = True + resources.ApplyResources(Me.cmbFormViewVariablePath, "cmbFormViewVariablePath") + Me.cmbFormViewVariablePath.Name = "cmbFormViewVariablePath" + Me.cmbFormViewVariablePath.ValueMember = "FORMVIEW_ID" ' 'lblpathsaved ' @@ -1593,4 +1610,6 @@ Partial Class frmWM_DoctypeConfig Friend WithEvents Button3 As System.Windows.Forms.Button Friend WithEvents lblpathsaved As System.Windows.Forms.Label Friend WithEvents colBESCHREIBUNG As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents Label8 As Label + Friend WithEvents cmbFormViewVariablePath As ComboBox End Class diff --git a/app/DD-Record-Organizer/frmWM_DoctypeConfig.resx b/app/DD-Record-Organizer/frmWM_DoctypeConfig.resx index 45263ea..bcaf128 100644 --- a/app/DD-Record-Organizer/frmWM_DoctypeConfig.resx +++ b/app/DD-Record-Organizer/frmWM_DoctypeConfig.resx @@ -129,10 +129,10 @@ Segoe UI, 9pt - 360, 79 + 315, 59 - 78, 20 + 61, 15 2 @@ -162,10 +162,10 @@ Segoe UI, 9pt - 498, 79 + 436, 59 - 96, 20 + 78, 15 4 @@ -195,10 +195,10 @@ Segoe UI, 9pt - 360, 137 + 315, 103 - 78, 20 + 63, 15 8 @@ -228,10 +228,10 @@ Segoe UI, 9pt - 360, 196 + 315, 147 - 73, 20 + 58, 15 10 @@ -261,10 +261,10 @@ Segoe UI, 9pt - 680, 255 + 595, 191 - 101, 20 + 82, 15 12 @@ -294,10 +294,10 @@ Segoe UI, 9pt - 360, 255 + 315, 191 - 85, 20 + 67, 15 18 @@ -327,10 +327,10 @@ Segoe UI, 9pt - 501, 255 + 438, 191 - 96, 20 + 77, 15 20 @@ -360,10 +360,10 @@ Segoe UI, 9pt - 360, 313 + 315, 235 - 101, 20 + 80, 15 22 @@ -393,10 +393,10 @@ Segoe UI, 9pt - 501, 313 + 438, 235 - 112, 20 + 90, 15 24 @@ -423,10 +423,10 @@ True - 355, 84 + 311, 63 - 27, 17 + 22, 13 2 @@ -453,10 +453,10 @@ True - 443, 84 + 388, 63 - 82, 17 + 65, 13 4 @@ -483,10 +483,10 @@ True - 757, 84 + 662, 63 - 75, 17 + 62, 13 6 @@ -513,10 +513,10 @@ True - 355, 143 + 311, 107 - 83, 17 + 64, 13 8 @@ -543,10 +543,10 @@ True - 355, 207 + 311, 155 - 79, 17 + 65, 13 12 @@ -573,10 +573,10 @@ True - 496, 207 + 434, 155 - 90, 17 + 73, 13 14 @@ -603,10 +603,10 @@ True - 666, 207 + 583, 155 - 91, 17 + 73, 13 16 @@ -633,10 +633,10 @@ True - 803, 207 + 703, 155 - 106, 17 + 85, 13 18 @@ -666,10 +666,10 @@ Segoe UI, 9pt - 889, 79 + 778, 59 - 77, 20 + 62, 15 26 @@ -720,7 +720,7 @@ 17, 17 - 162, 24 + 130, 24 von {0} Dokumentarten @@ -797,7 +797,7 @@ False - 57, 27 + 50, 23 0 @@ -875,16 +875,16 @@ Magenta - 200, 24 + 163, 24 Lade alle Dokumentarten - 3, 24 + 3, 19 - 1493, 27 + 1306, 27 0 @@ -904,267 +904,8 @@ 28 - - 17, 17 - - - GridControl1 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - GroupBox1 - - - 0 - - - Button1 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 1 - - - Label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 2 - - - ListBox3 - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 3 - - - lblSaveDokart - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 4 - - - btnNamenkonvention - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 5 - - - OBJEKTTYPComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 6 - - - btnZielpfad - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 8 - - - GUIDTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 10 - - - BEZEICHNUNGTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 12 - - - KURZNAMETextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 14 - - - ZIEL_PFADTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 16 - - - BESCHREIBUNGTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 18 - - - AKTIVCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 19 - - - ERSTELLTWERTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 21 - - - ERSTELLTWANNTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 23 - - - GEANDERTWERTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 25 - - - GEAENDERTWANNTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 27 - - - - Top - - - Segoe UI, 9pt, style=Bold - - - 0, 0 - - - 3, 4, 3, 4 - - - 3, 4, 3, 4 - - - 1499, 419 - - - 1 - - - Dokumentarten - - - GroupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - 3, 4, 3, 4 - - 3, 79 + 3, 59 Cyan @@ -1205,11 +946,8 @@ 2 - - 3, 4, 3, 4 - - 350, 316 + 306, 237 85 @@ -1226,17 +964,15 @@ 0 + Top, Right - 1457, 103 - - - 3, 4, 3, 4 + 1275, 77 - 33, 31 + 29, 23 80 @@ -1263,10 +999,10 @@ Segoe UI, 9pt, style=Italic - 1207, 79 + 1056, 59 - 260, 20 + 213, 15 79 @@ -1286,26 +1022,23 @@ 2 - - 339, 95 - Top, Right + + 339, 95 + Segoe UI, 9pt, style=Italic - 20 + 15 - 1210, 103 - - - 3, 4, 3, 4 + 1059, 77 - 239, 124 + 210, 94 78 @@ -1322,9 +1055,6 @@ 3 - - 339, 95 - True @@ -1332,10 +1062,10 @@ Segoe UI, 9.75pt, style=Bold - 360, 372 + 315, 279 - 127, 23 + 98, 17 77 @@ -1365,13 +1095,10 @@ MiddleLeft - 893, 141 - - - 3, 4, 3, 4 + 781, 106 - 280, 49 + 245, 37 27 @@ -1395,13 +1122,10 @@ Segoe UI, 9pt - 894, 103 - - - 3, 4, 3, 4 + 782, 77 - 278, 28 + 244, 23 1 @@ -1422,13 +1146,10 @@ Segoe UI, 9pt - 1050, 219 - - - 3, 4, 3, 4 + 919, 164 - 43, 31 + 38, 23 5 @@ -1452,13 +1173,10 @@ Segoe UI, 9pt - 363, 103 - - - 3, 4, 3, 4 + 318, 77 - 73, 27 + 64, 23 3 @@ -1479,13 +1197,10 @@ Segoe UI, 9pt - 502, 103 - - - 3, 4, 3, 4 + 439, 77 - 380, 27 + 333, 23 0 @@ -1506,13 +1221,10 @@ Segoe UI, 9pt - 363, 161 - - - 3, 4, 3, 4 + 318, 121 - 126, 27 + 111, 23 2 @@ -1533,13 +1245,10 @@ Segoe UI, 9pt - 363, 220 - - - 3, 4, 3, 4 + 318, 165 - 679, 27 + 595, 23 4 @@ -1560,16 +1269,13 @@ Segoe UI, 9pt - 683, 279 - - - 3, 4, 3, 4 + 598, 209 True - 359, 88 + 315, 67 6 @@ -1590,13 +1296,10 @@ Segoe UI, 9pt - 1118, 220 - - - 3, 4, 3, 4 + 978, 165 - 66, 32 + 58, 24 15 @@ -1620,13 +1323,10 @@ Segoe UI, 9pt - 363, 279 - - - 3, 4, 3, 4 + 318, 209 - 126, 27 + 111, 23 19 @@ -1647,13 +1347,10 @@ Segoe UI, 9pt - 504, 279 - - - 3, 4, 3, 4 + 441, 209 - 159, 27 + 140, 23 21 @@ -1674,13 +1371,10 @@ Segoe UI, 9pt - 363, 337 - - - 3, 4, 3, 4 + 318, 253 - 126, 27 + 111, 23 23 @@ -1701,13 +1395,10 @@ Segoe UI, 9pt - 504, 337 - - - 3, 4, 3, 4 + 441, 253 - 159, 27 + 140, 23 25 @@ -1724,6 +1415,36 @@ 27 + + Top + + + Segoe UI, 9pt, style=Bold + + + 0, 0 + + + 1312, 314 + + + 1 + + + Dokumentarten + + + GroupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + 160, 17 @@ -1748,14 +1469,17 @@ 403, 56 - - 0, 779 + + 120, 17 - - 1, 0, 16, 0 + + ToolStripStatusLabel1 + + + 0, 581 - 1499, 25 + 1312, 22 2 @@ -1775,20 +1499,11 @@ 1 - - 153, 20 - - - ToolStripStatusLabel1 - Top, Bottom, Left, Right - 3, 405 - - - 3, 4, 3, 4 + 3, 304 True @@ -1797,13 +1512,10 @@ True - 999, 79 - - - 3, 4, 3, 4 + 874, 59 - 181, 21 + 145, 17 81 @@ -1823,6 +1535,15 @@ 0 + + 9, 110 + + + 218, 21 + + + 15 + VALUETextBox @@ -1835,6 +1556,27 @@ 0 + + MiddleLeft + + + NoControl + + + 233, 70 + + + 78, 25 + + + 14 + + + Save + + + MiddleRight + Button2 @@ -1847,6 +1589,15 @@ 1 + + 9, 73 + + + 218, 21 + + + 13 + cmbControlsEntity @@ -1859,6 +1610,21 @@ 2 + + False + + + NoControl + + + 429, 58 + + + 30, 25 + + + 10 + btnAddIndexA @@ -1871,6 +1637,27 @@ 3 + + True + + + Segoe UI, 8.25pt + + + NoControl + + + 6, 17 + + + 85, 13 + + + 12 + + + Entität wählen: + Label5 @@ -1883,6 +1670,18 @@ 4 + + Segoe UI, 8.25pt + + + 9, 33 + + + 218, 21 + + + 11 + cmbEntity @@ -1895,6 +1694,27 @@ 5 + + True + + + Segoe UI, 8.25pt + + + NoControl + + + 6, 57 + + + 107, 13 + + + 8 + + + Control aus Entität: + Label6 @@ -1911,16 +1731,10 @@ False - 992, 84 - - - 3, 4, 3, 4 - - - 3, 4, 3, 4 + 868, 63 - 547, 191 + 479, 143 80 @@ -1944,10 +1758,10 @@ Segoe UI, 9.75pt, style=Italic - 355, 33 + 311, 25 - 673, 25 + 510, 19 79 @@ -1974,10 +1788,10 @@ Segoe UI, 9.75pt, style=Bold - 945, 33 + 827, 25 - 104, 23 + 81, 17 78 @@ -2001,13 +1815,10 @@ 3 - 807, 231 - - - 3, 4, 3, 4 + 706, 173 - 162, 23 + 142, 21 19 @@ -2025,13 +1836,10 @@ 5 - 670, 231 - - - 3, 4, 3, 4 + 586, 173 - 126, 23 + 111, 21 17 @@ -2049,13 +1857,10 @@ 7 - 497, 231 - - - 3, 4, 3, 4 + 435, 173 - 162, 23 + 142, 21 15 @@ -2073,13 +1878,10 @@ 9 - 359, 231 - - - 3, 4, 3, 4 + 314, 173 - 126, 23 + 111, 21 13 @@ -2097,13 +1899,10 @@ 11 - 1075, 31 - - - 3, 4, 3, 4 + 941, 23 - 119, 32 + 104, 24 11 @@ -2124,13 +1923,10 @@ 12 - 359, 167 - - - 3, 4, 3, 4 + 314, 125 - 610, 23 + 534, 21 2 @@ -2154,13 +1950,10 @@ @Dokart - 760, 108 - - - 3, 4, 3, 4 + 665, 81 - 209, 24 + 183, 21 1 @@ -2178,13 +1971,10 @@ 15 - 447, 107 - - - 3, 4, 3, 4 + 391, 80 - 306, 24 + 268, 21 0 @@ -2202,13 +1992,10 @@ 17 - 359, 108 - - - 3, 4, 3, 4 + 314, 81 - 77, 23 + 68, 21 3 @@ -2232,16 +2019,13 @@ Segoe UI, 9pt, style=Italic - 20 + 15 0, 27 - - 3, 4, 3, 4 - - 348, 291 + 305, 205 2 @@ -2283,7 +2067,7 @@ Neu hinzufügen - 111, 24 + 88, 24 von {0} Indexen @@ -2360,7 +2144,7 @@ False - 57, 27 + 50, 23 0 @@ -2429,7 +2213,7 @@ 0, 0 - 1539, 27 + 1347, 27 1 @@ -2449,11 +2233,8 @@ 22 - - 3, 4, 3, 4 - - 1446, 339 + 1261, 249 Automatische Indexe @@ -2471,458 +2252,11 @@ 0 - 1448, 369 + 1267, 277 2 - - 1029, 95 - - - ListBox1 - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage3 - - - 0 - - - BindingNavigator2 - - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage3 - - - 1 - - - 3, 4, 3, 4 - - - 1446, 339 - - - Manuelle Indexe - - - XtraTabPage3 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl1 - - - 1 - - - 786, 56 - - - True - - - Label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 0 - - - TBPMO_WD_FORMVIEW_DOKTYPESDataGridView - - - System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 1 - - - Label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 2 - - - btnAddDokart_Entity - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 3 - - - cmbEntity_Doctype - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 4 - - - BindingNavigator1 - - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 5 - - - 3, 4, 3, 4 - - - 1446, 339 - - - Zurodnung Dokumentart - Entität - - - XtraTabPage2 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl1 - - - 2 - - - lblpathsaved - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage4 - - - 0 - - - Button3 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage4 - - - 1 - - - FOLDER_FOR_INDEXTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage4 - - - 2 - - - grbxFolderforIndex - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage4 - - - 3 - - - Label17 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage4 - - - 4 - - - 3, 4, 3, 4 - - - 1446, 339 - - - Variabler Ordnerpfad - - - XtraTabPage4 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl1 - - - 3 - - - XtraTabControl1 - - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 0 - - - 10, 147 - - - 3, 4, 3, 4 - - - 249, 23 - - - 15 - - - VALUETextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 0 - - - MiddleLeft - - - NoControl - - - 266, 93 - - - 3, 4, 3, 4 - - - 89, 33 - - - 14 - - - Save - - - MiddleRight - - - Button2 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 1 - - - 10, 97 - - - 3, 4, 3, 4 - - - 249, 24 - - - 13 - - - cmbControlsEntity - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 2 - - - False - - - NoControl - - - 490, 77 - - - 3, 4, 3, 4 - - - 34, 33 - - - 10 - - - btnAddIndexA - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 3 - - - True - - - Segoe UI, 8.25pt - - - NoControl - - - 7, 23 - - - 99, 19 - - - 12 - - - Entität wählen: - - - Label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 4 - - - Segoe UI, 8.25pt - - - 10, 44 - - - 3, 4, 3, 4 - - - 249, 27 - - - 11 - - - cmbEntity - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 5 - - - True - - - Segoe UI, 8.25pt - - - NoControl - - - 7, 76 - - - 127, 19 - - - 8 - - - Control aus Entität: - - - Label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 6 - Left @@ -2930,16 +2264,13 @@ Segoe UI, 9pt, style=Italic - 20 + 15 0, 27 - - 3, 4, 3, 4 - - 348, 312 + 305, 222 3 @@ -2981,7 +2312,7 @@ Neu hinzufügen - 111, 24 + 88, 24 von {0} Indexen @@ -3058,7 +2389,7 @@ False - 57, 27 + 50, 23 0 @@ -3127,7 +2458,7 @@ 0, 0 - 1446, 27 + 1261, 27 2 @@ -3147,6 +2478,27 @@ 1 + + 1261, 249 + + + Manuelle Indexe + + + XtraTabPage3 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 1 + + + True + True @@ -3154,10 +2506,10 @@ Segoe UI, 9.75pt, style=Italic - 13, 33 + 11, 25 - 573, 25 + 432, 19 80 @@ -3205,13 +2557,10 @@ 1422, 56 - 13, 141 - - - 3, 4, 3, 4 + 11, 106 - 1102, 187 + 964, 140 5 @@ -3232,10 +2581,10 @@ True - 9, 76 + 8, 57 - 264, 17 + 212, 13 5 @@ -3259,13 +2608,10 @@ MiddleLeft - 333, 101 - - - 3, 4, 3, 4 + 291, 76 - 261, 31 + 228, 23 4 @@ -3292,13 +2638,10 @@ 940, 56 - 13, 103 - - - 3, 4, 3, 4 + 11, 77 - 313, 24 + 274, 21 3 @@ -3315,14 +2658,11 @@ 4 - - 940, 56 - 786, 56 - 115, 24 + 91, 24 of {0} Mappings @@ -3399,7 +2739,7 @@ False - 57, 27 + 50, 23 0 @@ -3477,7 +2817,7 @@ 0, 0 - 1446, 27 + 1261, 27 2 @@ -3497,17 +2837,86 @@ 5 + + 1261, 249 + + + Zurodnung Dokumentart - Entität + + + XtraTabPage2 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 2 + + + True + + + NoControl + + + 8, 9 + + + 97, 13 + + + 20 + + + Entität auswählen: + + + Label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage4 + + + 0 + + + 11, 25 + + + 213, 21 + + + 19 + + + cmbFormViewVariablePath + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage4 + + + 1 + Tahoma, 8.25pt, style=Bold, Italic - 568, 12 + 716, 9 No - 341, 17 + 298, 13 18 @@ -3531,19 +2940,16 @@ XtraTabPage4 - 0 + 2 MiddleLeft - 816, 35 - - - 3, 4, 3, 4 + 933, 25 - 93, 32 + 81, 24 17 @@ -3564,19 +2970,16 @@ XtraTabPage4 - 1 + 3 Segoe UI, 9.75pt - 13, 33 - - - 3, 4, 3, 4 + 230, 25 - 796, 29 + 697, 25 16 @@ -3591,125 +2994,8 @@ XtraTabPage4 - 2 - - - Label7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grbxFolderforIndex - - - 0 - - - cmbIndex_Controls - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grbxFolderforIndex - - - 1 - - - cmbCrFolderDate - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grbxFolderforIndex - - - 2 - - - Label20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grbxFolderforIndex - - - 3 - - - btnaddcrFolderParameter - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grbxFolderforIndex - - 4 - - Label18 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grbxFolderforIndex - - - 5 - - - cmbCrFolderIndex - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grbxFolderforIndex - - - 6 - - - False - - - 13, 75 - - - 3, 4, 3, 4 - - - 3, 4, 3, 4 - - - 655, 159 - - - 13 - - - Neuer Unterordner: - - - grbxFolderforIndex - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage4 - - - 3 - True @@ -3720,10 +3006,10 @@ NoControl - 229, 32 + 200, 24 - 146, 20 + 116, 15 8 @@ -3747,13 +3033,10 @@ Segoe UI, 9pt - 232, 56 - - - 3, 4, 3, 4 + 203, 42 - 214, 28 + 188, 23 7 @@ -3786,13 +3069,10 @@ YYYY-MM - 10, 115 - - - 3, 4, 3, 4 + 9, 86 - 214, 28 + 188, 23 6 @@ -3819,10 +3099,10 @@ NoControl - 7, 91 + 6, 68 - 122, 20 + 97, 15 5 @@ -3852,13 +3132,10 @@ NoControl - 466, 49 - - - 3, 4, 3, 4 + 408, 37 - 171, 37 + 150, 28 4 @@ -3891,10 +3168,10 @@ NoControl - 7, 32 + 6, 24 - 213, 20 + 166, 15 1 @@ -3918,13 +3195,10 @@ Segoe UI, 9pt - 10, 56 - - - 3, 4, 3, 4 + 9, 42 - 214, 28 + 188, 23 0 @@ -3941,6 +3215,33 @@ 6 + + False + + + 11, 56 + + + 573, 119 + + + 13 + + + Neuer Unterordner: + + + grbxFolderforIndex + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage4 + + + 5 + True @@ -3948,10 +3249,10 @@ NoControl - 9, 12 + 227, 9 - 133, 17 + 108, 13 12 @@ -3969,7 +3270,37 @@ XtraTabPage4 - 4 + 6 + + + 1261, 249 + + + Variabler Ordnerpfad + + + XtraTabPage4 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 3 + + + XtraTabControl1 + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 0 1184, 56 @@ -3990,10 +3321,10 @@ 136 - 8, 20 + 7, 15 - 1499, 804 + 1312, 603 Segoe UI, 9pt @@ -4026,9 +3357,6 @@ AACAAQAAgAEAAMADAADhhwAA888AAP//AAA= - - 3, 4, 3, 4 - Dokumentart - Konfiguration diff --git a/app/DD-Record-Organizer/frmWM_DoctypeConfig.vb b/app/DD-Record-Organizer/frmWM_DoctypeConfig.vb index 23ad488..100dddd 100644 --- a/app/DD-Record-Organizer/frmWM_DoctypeConfig.vb +++ b/app/DD-Record-Organizer/frmWM_DoctypeConfig.vb @@ -252,6 +252,7 @@ Public Class frmWM_DoctypeConfig Refresh_DokID_FORM_VIEW() Me.btnAddDokart_Entity.Text = "Entität zu Dokumentart ' " & Me.KURZNAMETextBox.Text & "' hinzufügen" Case 3 + Refresh_DokID_FORM_VIEW() Load_Variable_Folder() End Select @@ -262,12 +263,12 @@ Public Class frmWM_DoctypeConfig If GUIDTextBox.Text <> "" Then FOLDER_FOR_INDEXTextBox.Enabled = True grbxFolderforIndex.Enabled = True - Dim sql As String = "SELECT FOLDER_FOR_INDEX FROM TBDD_DOKUMENTART WHERE GUID = " & GUIDTextBox.Text - Dim result = ClassDatabase.Execute_Scalar(sql) - If IsDBNull(result) Then - FOLDER_FOR_INDEXTextBox.Text = "" + Dim sel = $"SELECT DYNAMIC_FOLDER FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = '{GUIDTextBox.Text}' AND FORMVIEW_ID = {cmbFormViewVariablePath.SelectedValue}" + Dim dynamic_Folder = ClassDatabase.Execute_Scalar(sel, False) + If Not IsNothing(dynamic_Folder) Then + FOLDER_FOR_INDEXTextBox.Text = dynamic_Folder Else - FOLDER_FOR_INDEXTextBox.Text = result.ToString + FOLDER_FOR_INDEXTextBox.Text = "" End If Else FOLDER_FOR_INDEXTextBox.Enabled = False @@ -517,7 +518,7 @@ Public Class frmWM_DoctypeConfig Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click Try - Dim upd = String.Format("UPDATE TBDD_DOKUMENTART SET FOLDER_FOR_INDEX = '{0}', GEANDERTWER = '{1}' WHERE GUID = {2}", FOLDER_FOR_INDEXTextBox.Text, USER_USERNAME, GUIDTextBox.Text) + Dim upd = String.Format("UPDATE TBPMO_WD_FORMVIEW_DOKTYPES SET DYNAMIC_FOLDER = '{0}', CHANGED_WHO = '{1}' WHERE DOCTYPE_ID = {2} AND FORMVIEW_ID = {3}", FOLDER_FOR_INDEXTextBox.Text, USER_USERNAME, GUIDTextBox.Text, cmbFormViewVariablePath.SelectedValue) If ClassDatabase.Execute_non_Query(upd, False) = False Then MsgBox("Unexpected Error in Adding Variable path - Check logfile", MsgBoxStyle.Exclamation) Else @@ -533,4 +534,10 @@ Public Class frmWM_DoctypeConfig End Try End Sub + + Private Sub cmbFormViewVariablePath_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbFormViewVariablePath.SelectedIndexChanged + If cmbFormViewVariablePath.SelectedIndex <> -1 Then + Load_Variable_Folder() + End If + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmWM_IndexFile.vb b/app/DD-Record-Organizer/frmWM_IndexFile.vb index 3137a32..09ba0af 100644 --- a/app/DD-Record-Organizer/frmWM_IndexFile.vb +++ b/app/DD-Record-Organizer/frmWM_IndexFile.vb @@ -594,7 +594,10 @@ Public Class frmWM_IndexFile 'nur eine Textbox AddTextBox(DR.Item("GUID"), DR.Item("NAME"), y, VORBELGUNG) End If + Case "FOLDERSELECT" + AddFOLDERSELECTBUTTON(DR.Item("GUID"), DR.Item("NAME"), y) Case "VARCHAR" + If DR.Item("SUGGESTION") = True And DR.Item("SQL_RESULT").ToString.Length > 0 Then AddVorschlag_ComboBox(DR.Item("GUID"), DR.Item("NAME"), y, DR.Item("CONNECTION_ID"), DR.Item("SQL_RESULT"), DefaultValue) 'AddAutoSuggest_Textbox(DR.Item("NAME"), y, DR.Item("CONNECTION_ID"), DR.Item("SQL_RESULT"), DefaultValue) @@ -696,6 +699,56 @@ Public Class frmWM_IndexFile Public Sub OncmbLostFocus(sender As System.Object, e As System.EventArgs) Dim cmb As ComboBox = sender cmb.BackColor = Color.White + End Sub + Function AddFOLDERSELECTBUTTON(ID As Integer, indexname As String, y As Integer) + Dim btn As New Button + btn.Name = "btn" & indexname + If USER_LANGUAGE <> "de-DE" Then + btn.Text = "Select the folder" + Else + btn.Text = "Wählen Sie einen Ordner" + End If + + btn.Size = New Size(260, 27) + + btn.Tag = ID + grbxControls.Controls.Add(btn) + btn.Location = New Point(11, y) + + AddHandler btn.Click, AddressOf OnbtnClick + Return btn + End Function + Public Sub OnbtnClick(sender As System.Object, e As System.EventArgs) + Dim btn As Button = sender + Dim folderBrowserDialog1 As New FolderBrowserDialog + If USER_LANGUAGE <> "de-DE" Then + folderBrowserDialog1.Description = + "Select the directory:" + Else + folderBrowserDialog1.Description = + "Wählen Sie einen Ordner:" + End If + + ' Do not allow the user to create New files via the FolderBrowserDialog. + folderBrowserDialog1.ShowNewFolderButton = True + Try + folderBrowserDialog1.RootFolder = PATHTextBox.Text + Catch ex As Exception + + End Try + Try + folderBrowserDialog1.SelectedPath = PATHTextBox.Text + Catch ex As Exception + + End Try + + Dim result As DialogResult = folderBrowserDialog1.ShowDialog() + + If (result = DialogResult.OK) Then + ClassFileResult.SET_CURRENT_TBPMO_INDEX_MAN_VALUE(btn.Tag, folderBrowserDialog1.SelectedPath) + End If + + End Sub Function AddTextBox(ID As Integer, indexname As String, y As Integer, text As String) Dim txt As New TextBox @@ -828,7 +881,6 @@ Public Class frmWM_IndexFile adapter.Fill(NewDataset) ElseIf connectionString.StartsWith("Data Source=") And connectionString.Contains("SERVICE_NAME") Then oracleConn = New OracleConnection(connectionString) - ' Try oracleConn.Open() oracleCmd = New OracleCommand(sql, oracleConn) oracleadapter.SelectCommand = oracleCmd @@ -919,7 +971,6 @@ Public Class frmWM_IndexFile ElseIf connectionString.StartsWith("Data Source=") And connectionString.Contains("SERVICE_NAME") Then oracleConn = New OracleConnection(connectionString) - ' Try oracleConn.Open() oracleCmd = New OracleCommand(sql_Vorschlag, oracleConn) oracleadapter.SelectCommand = oracleCmd