diff --git a/app/DD-Record-Organizer/App.config b/app/DD-Record-Organizer/App.config index 84213b7..007cdf7 100644 --- a/app/DD-Record-Organizer/App.config +++ b/app/DD-Record-Organizer/App.config @@ -9,7 +9,9 @@ - + @@ -23,19 +25,19 @@ *.* - + - + - + - + - + True @@ -50,13 +52,16 @@ False - + 332 - + + + + Dokument-ID diff --git a/app/DD-Record-Organizer/ClassDOC_SEARCH.vb b/app/DD-Record-Organizer/ClassDOC_SEARCH.vb index 6c43e92..c0d25a3 100644 --- a/app/DD-Record-Organizer/ClassDOC_SEARCH.vb +++ b/app/DD-Record-Organizer/ClassDOC_SEARCH.vb @@ -369,6 +369,8 @@ Public Class ClassDOC_SEARCH NewRow.Item(0) = My.Resources.xls Case ".xlsx".ToUpper NewRow.Item(0) = My.Resources.xls + Case ".xlsm".ToUpper + NewRow.Item(0) = My.Resources.xls Case ".ppt".ToUpper NewRow.Item(0) = My.Resources.ppt Case ".pptx".ToUpper diff --git a/app/DD-Record-Organizer/ClassInit.vb b/app/DD-Record-Organizer/ClassInit.vb index 6f946a5..3a187c1 100644 --- a/app/DD-Record-Organizer/ClassInit.vb +++ b/app/DD-Record-Organizer/ClassInit.vb @@ -149,10 +149,10 @@ Public Class ClassInit clsCURRENT.USER_LANGUAGE = USER_LANGUAGE USER_DATE_FORMAT = USER_DT.Rows(0).Item("DATE_FORMAT") USER_GENERAL_VIEWER = USER_DT.Rows(0).Item("GENERAL_VIEWER") - sql = String.Format("SELECT COUNT(T.GUID) FROM TBDD_USER_MODULES T, TBDD_MODULES T1 WHERE T.MODULE_ID = T1.GUID AND T1.NAME = 'Record-Organizer' AND T.USER_ID = {0}", USER_GUID) - Dim USER2MODULE = clsDatabase.Execute_Scalar(sql) + sql = String.Format("SELECT * FROM TBDD_USER_MODULES T, TBDD_MODULES T1 WHERE T.MODULE_ID = T1.GUID AND T1.NAME = 'Record-Organizer' AND T.USER_ID = {0}", USER_GUID) + Dim USER2MODULE As DataTable = clsDatabase.Return_Datatable(sql) If Not IsNothing(USER2MODULE) Then - If USER2MODULE = 1 Then + If USER2MODULE.Rows.Count = 1 Then Right_RO = True End If Else @@ -207,7 +207,7 @@ Public Class ClassInit sql = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME,CONNECTION_STRING) VALUES ({0},{1},'Record-Organizer','{2}','{3}','{4}')", USER_GUID, CLIENT_SELECTED, My.Application.Info.Version.ToString, Environment.MachineName, ConStringMain) ClassDatabase.Execute_non_Query(sql) - USER_IS_ADMIN = USER_DT.Rows(0).Item("RECORD_ADMIN") + USER_IS_ADMIN = USER2MODULE.Rows(0).Item("IS_ADMIN") 'vorher RECORD_ADMIN If USER_IS_ADMIN = True Then If ESC_Hidden = True Then frmLoginUserSelect.ShowDialog() diff --git a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb index 1916561..b2d9370 100644 --- a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb +++ b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb @@ -416,81 +416,93 @@ Public Class ClassWindreamDocGrid End Sub Private Shared Sub gridView_CustomColumnDisplayText(sender As Object, e As CustomColumnDisplayTextEventArgs) - Dim view As ColumnView = sender - Dim parsedDate As DateTime + Try + Dim view As ColumnView = sender + Dim parsedDate As DateTime - If DATE_COLUMNS.Contains(e.Column.FieldName) And e.ListSourceRowIndex <> DevExpress.XtraGrid.GridControl.InvalidRowHandle Then + If DATE_COLUMNS.Contains(e.Column.FieldName) And e.ListSourceRowIndex <> DevExpress.XtraGrid.GridControl.InvalidRowHandle Then + + If e.Value.ToString() = String.Empty Then + e.DisplayText = "" + Exit Sub + End If + + If Not DateTime.TryParse(e.Value, parsedDate) Then + parsedDate = DateTime.ParseExact(e.Value, CURRENT_DATE_FORMAT & " HH:MM:ss", System.Globalization.DateTimeFormatInfo.InvariantInfo) + End If + + e.DisplayText = parsedDate.ToString(CURRENT_DATE_FORMAT & " HH:MM:ss") + ElseIf DATE_COLUMNS_CONFIG.Contains(e.Column.FieldName) And e.ListSourceRowIndex <> DevExpress.XtraGrid.GridControl.InvalidRowHandle Then + If e.Value.ToString() = String.Empty Then + e.DisplayText = "" + Exit Sub + End If + + If Not DateTime.TryParse(e.Value, parsedDate) Then + parsedDate = DateTime.ParseExact(e.Value, CURRENT_DATE_FORMAT, System.Globalization.DateTimeFormatInfo.InvariantInfo) + End If + + e.DisplayText = parsedDate.ToString(CURRENT_DATE_FORMAT) - If e.Value.ToString() = String.Empty Then - e.DisplayText = "" - Exit Sub End If + Catch ex As Exception + ClassLogger.Add("Unexpected error in gridView_CustomColumnDisplayText: " & ex.Message, False, False) + MsgBox("Unexpected error in gridView_CustomColumnDisplayText: " & ex.Message, MsgBoxStyle.Critical) + End Try - If Not DateTime.TryParse(e.Value, parsedDate) Then - parsedDate = DateTime.ParseExact(e.Value, CURRENT_DATE_FORMAT & " HH:MM:ss", System.Globalization.DateTimeFormatInfo.InvariantInfo) - End If - - e.DisplayText = parsedDate.ToString(CURRENT_DATE_FORMAT & " HH:MM:ss") - ElseIf DATE_COLUMNS_CONFIG.Contains(e.Column.FieldName) And e.ListSourceRowIndex <> DevExpress.XtraGrid.GridControl.InvalidRowHandle Then - If e.Value.ToString() = String.Empty Then - e.DisplayText = "" - Exit Sub - End If - - If Not DateTime.TryParse(e.Value, parsedDate) Then - parsedDate = DateTime.ParseExact(e.Value, CURRENT_DATE_FORMAT, System.Globalization.DateTimeFormatInfo.InvariantInfo) - End If - - e.DisplayText = parsedDate.ToString(CURRENT_DATE_FORMAT) - - End If End Sub Public Shared Sub gridView_MasterRowExpanded(sender As GridView, e As DevExpress.XtraGrid.Views.Grid.CustomMasterRowEventArgs) - ClassWindreamDocGrid.GetDocItems(sender) - Dim GW As GridView = sender - If SELECTED_DOC_ID = 0 Then - MsgBox("Sorry no document was selected! Please try again!", MsgBoxStyle.Exclamation) - Exit Sub - End If - - Dim detailView As GridView = sender.GetDetailView(e.RowHandle, e.RelationIndex) - With detailView.Columns - 'Spalten ausblenden - .Item("GUID").Visible = False - .Item("DocID").Visible = False - .Item("CONFIG_ID").Visible = False - .Item("LANGUAGE").Visible = False - .Item("COLUMN_VIEW").Visible = False - .Item("EDITABLE").Visible = False - .Item("TYPE_ID").Visible = False - .Item("VISIBLE").Visible = False - - 'Spalten formatieren - - .Item("CHANGED_WHEN").DisplayFormat.FormatType = FormatType.DateTime - .Item("CHANGED_WHEN").DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss" - - If USER_LANGUAGE = "de-DE" Then - .Item("HEADER_CAPTION").Caption = "Beschreibung" - .Item("VALUE").Caption = "Wert" - .Item("CHANGED_WHEN").Caption = "Geändert Wann" - .Item("CHANGED_WHO").Caption = "Geändert Wer" - Else - .Item("HEADER_CAPTION").Caption = "Description" - .Item("VALUE").Caption = "Value" - .Item("CHANGED_WHEN").Caption = "Changed when" - .Item("CHANGED_WHO").Caption = "changed Who" + Try + ClassWindreamDocGrid.GetDocItems(sender) + Dim GW As GridView = sender + If SELECTED_DOC_ID = 0 Then + MsgBox("Sorry no document was selected! Please try again!", MsgBoxStyle.Exclamation) + Exit Sub End If - End With - If Not IsNothing(GW.GridControl.ContextMenuStrip.Name) Then - If GW.GridControl.ContextMenuStrip.Name = "cmsResultFilesBasic" Then - detailView.OptionsBehavior.Editable = False - Else - detailView.OptionsBehavior.Editable = True + + Dim detailView As GridView = sender.GetDetailView(e.RowHandle, e.RelationIndex) + With detailView.Columns + 'Spalten ausblenden + .Item("GUID").Visible = False + .Item("DocID").Visible = False + .Item("CONFIG_ID").Visible = False + .Item("LANGUAGE").Visible = False + .Item("COLUMN_VIEW").Visible = False + .Item("EDITABLE").Visible = False + .Item("TYPE_ID").Visible = False + .Item("VISIBLE").Visible = False + + 'Spalten formatieren + + .Item("CHANGED_WHEN").DisplayFormat.FormatType = FormatType.DateTime + .Item("CHANGED_WHEN").DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss" + + If USER_LANGUAGE = "de-DE" Then + .Item("HEADER_CAPTION").Caption = "Beschreibung" + .Item("VALUE").Caption = "Wert" + .Item("CHANGED_WHEN").Caption = "Geändert Wann" + .Item("CHANGED_WHO").Caption = "Geändert Wer" + Else + .Item("HEADER_CAPTION").Caption = "Description" + .Item("VALUE").Caption = "Value" + .Item("CHANGED_WHEN").Caption = "Changed when" + .Item("CHANGED_WHO").Caption = "changed Who" + End If + End With + If Not IsNothing(GW.GridControl.ContextMenuStrip.Name) Then + If GW.GridControl.ContextMenuStrip.Name = "cmsResultFilesBasic" Then + detailView.OptionsBehavior.Editable = False + Else + detailView.OptionsBehavior.Editable = True + End If End If - End If - AddHandler detailView.CustomRowCellEdit, AddressOf detailView_CustomRowCellEdit + AddHandler detailView.CustomRowCellEdit, AddressOf detailView_CustomRowCellEdit + Catch ex As Exception + ClassLogger.Add("Unexpected error in gridView_MasterRowExpanded: " & ex.Message, False, False) + MsgBox("Unexpected error in gridView_MasterRowExpanded: " & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub Public Class WindreamDocGridComboboxItem diff --git a/app/DD-Record-Organizer/My Project/Settings.Designer.vb b/app/DD-Record-Organizer/My Project/Settings.Designer.vb index 5fd6205..ad62b55 100644 --- a/app/DD-Record-Organizer/My Project/Settings.Designer.vb +++ b/app/DD-Record-Organizer/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -254,6 +254,18 @@ Namespace My Return CType(Me("windreamGruppe"),String) End Get End Property + + _ + Public Property UserDocIDIndexname() As String + Get + Return CType(Me("UserDocIDIndexname"),String) + End Get + Set + Me("UserDocIDIndexname") = value + End Set + End Property End Class End Namespace diff --git a/app/DD-Record-Organizer/My Project/licenses.licx b/app/DD-Record-Organizer/My Project/licenses.licx index d249eb8..7222df5 100644 --- a/app/DD-Record-Organizer/My Project/licenses.licx +++ b/app/DD-Record-Organizer/My Project/licenses.licx @@ -1,3 +1,4 @@ -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.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.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.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx index 4efc968..16a9b6c 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.resx +++ b/app/DD-Record-Organizer/frmConstructor_Main.resx @@ -369,7 +369,7 @@ Suche Knoten - 221, 185 + 221, 207 cmsTreeView diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index 2e20dea..46417df 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -130,7 +130,7 @@ Public Class frmConstructor_Main Private _FormClosing As Boolean = False - Private ENTITY_LOADED As Boolean = False + Private ENTITY_LOADING_PROCESS As Boolean = False Private LinkParentID As Integer @@ -850,7 +850,7 @@ Public Class frmConstructor_Main GridControlMain.MainView = grvwTiles End Sub Public Function Get_Pos_SQL(FormId As Integer) - POS_SQL = "Select T.* FROM VWPMO_ENTITY_TABLE" & FormId.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID And T1.RECORD1_ID = @PARENT_ID" + POS_SQL = String.Format("Select T.* FROM VWPMO_ENTITY_TABLE{0} T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID And T1.RECORD1_ID = @PARENT_ID", FormId.ToString) End Function Public Sub Clear_Grid_View() GridControlMain.DataSource = Nothing @@ -961,7 +961,7 @@ Public Class frmConstructor_Main Exit Sub End If 'Aussteigen, wenng erade die Entität gewechselt wird - If ENTITY_LOADED = False Then + If ENTITY_LOADING_PROCESS = False Then Exit Sub End If If GRIDRightMouse_Clicked Then @@ -1234,7 +1234,7 @@ Public Class frmConstructor_Main Update_Status_Label(True, SelectedNode.Tag) ClassNodeNavigation.Check_NODE_CONFIG_ID(ENTITY_ID) - + If SelectedNode.Tag.ToString.Contains("RECORD-ID") Then Dim Record = ClassNodeNavigation.Return_RECORD_forTag(SelectedNode.Tag) If Record <> 0 Then @@ -1436,25 +1436,37 @@ Public Class frmConstructor_Main ' Exit Sub 'End If Try - - - 'CURRENT_DATE_FORMAT = USER_DATE_FORMAT - - If NODE_NAVIGATION = True Then - If NODE_NAVIGATION_LOADED = True Then - Exit Sub + Dim SelectedNode As TreeNode = TryCast(TreeViewMain.SelectedNode, TreeNode) + If SelectedNode IsNot Nothing Then + Dim _TagENT_ID = ClassNodeNavigation.Return_ENTITY_FOR_TAG(SelectedNode.Tag) + If _TagENT_ID <> 0 And _TagENT_ID <> ENTITY_ID Then + ENTITY_ID = _TagENT_ID + CURRENT_ENTITY_ID = ENTITY_ID Else - NODE_NAVIGATION_LOADED = True + Exit Sub End If + + End If + 'If NODE_NAVIGATION = True Then + ' If NODE_NAVIGATION_LOADED = True Then + ' Exit Sub + ' Else + ' NODE_NAVIGATION_LOADED = True + ' End If + 'End If + Dim sw As New SW("Load_Datafor_Entity") - Dim SelectedNode As TreeNode = TryCast(TreeViewMain.SelectedNode, TreeNode) + If SelectedNode IsNot Nothing Then - ENTITY_LOADED = False - ENTITY_ID = ClassNodeNavigation.Return_ENTITY_FOR_TAG(SelectedNode.Tag) - CURRENT_ENTITY_ID = ENTITY_ID + ENTITY_LOADING_PROCESS = False + 'If NODE_NAVIGATION = True Then + ' ENTITY_ID = ClassNodeNavigation.Return_ENTITY_FOR_TAG(SelectedNode.Tag) + ' CURRENT_ENTITY_ID = ENTITY_ID + 'End If + Dim result = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() Select form Where form.Item("FORM_ID") = ENTITY_ID).Single() @@ -1534,7 +1546,7 @@ Public Class frmConstructor_Main Get_RecordCounts_Nodes() End If sw.Done() - Load_Entity_Data() + Load_Entity_Data_CONTROLS_RECORDS() @@ -1731,7 +1743,7 @@ Public Class frmConstructor_Main End Sub Private Sub OnRecordChanged(sender As Object, e As System.EventArgs) - If ENTITY_LOADED Then + If ENTITY_LOADING_PROCESS Then RECORD_CHANGED = True End If @@ -2088,7 +2100,7 @@ Public Class frmConstructor_Main RECORD_CHANGED = False 'Den derzeitigen Record Neuladen DisableEditMode() - Load_Entity_Data() + Load_Entity_Data_CONTROLS_RECORDS() RECORD_CHANGED = False End If End If @@ -2275,7 +2287,7 @@ Public Class frmConstructor_Main #End Region - Sub Load_Entity_Data() + Sub Load_Entity_Data_CONTROLS_RECORDS() Try If LogErrorsOnly = False Then ClassLogger.Add("START Load_Entity_Data", False) Dim sw As New SW("Load_Entity_Data") @@ -2625,7 +2637,7 @@ Public Class frmConstructor_Main End Try DT_SELECTION = DTEntity - LoadGrid_Selection() + LoadGrid_Records() If GRID_TYPE = GridType.Grid Then grvwGrid.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.None grvwGrid.OptionsBehavior.Editable = False @@ -2673,7 +2685,7 @@ Public Class frmConstructor_Main CtrlBuilder.WatchRecordChanges = True 'Zurücksetzen - ENTITY_LOADED = True + ENTITY_LOADING_PROCESS = True Dim RecLoaded As Boolean = False If LOAD_DIRECT = True Then Load_Record_Direct() @@ -2720,7 +2732,7 @@ Public Class frmConstructor_Main ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Load_Entity_Data", ex.Message, ex.StackTrace) Finally 'Me.Cursor = Cursors.Default - ENTITY_LOADED = True + ENTITY_LOADING_PROCESS = True End Try @@ -2756,18 +2768,18 @@ Public Class frmConstructor_Main End Sub Sub Load_Entity_Data_Only() Try - ENTITY_LOADED = False + ENTITY_LOADING_PROCESS = False Dim DTEntity As DataTable = ClassDatabase.Return_Datatable(_ENTITYSQL, True) Dim primaryKey(1) As DataColumn primaryKey(0) = DTEntity.Columns("Record-ID") DTEntity.PrimaryKey = primaryKey DT_SELECTION = DTEntity - LoadGrid_Selection() + LoadGrid_Records() Load_Grid_Layout() Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try - ENTITY_LOADED = True + ENTITY_LOADING_PROCESS = True End Sub Sub CreateTile() @@ -3041,7 +3053,7 @@ Public Class frmConstructor_Main Return 0 End Try End Function - Private Function LoadGrid_Selection() + Private Function LoadGrid_Records() Try If GRID_TYPE = GridType.Tiles Then CreateTile() @@ -3089,7 +3101,7 @@ Public Class frmConstructor_Main tslbldisplayRecords.Text = msg & Get_Grid_Row_Count() End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in LoadGrid_Records", ex.Message, ex.StackTrace) Return False End Try @@ -3512,7 +3524,7 @@ Public Class frmConstructor_Main windream_inited = False End Try - SW.Done() + sw.Done() End If End If Catch ex As Exception @@ -4110,7 +4122,7 @@ Public Class frmConstructor_Main Dim XMLPath = Get_Grid_Layout_Filename() If File.Exists(XMLPath) Then File.Delete(XMLPath) - Load_Entity_Data() + Load_Entity_Data_CONTROLS_RECORDS() End If Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Reset Layout Grid: ", ex.Message) @@ -4481,7 +4493,7 @@ Public Class frmConstructor_Main End Try End Sub Private Sub dtpWV_ValueChanged(sender As Object, e As EventArgs) Handles dtpFollowUp.ValueChanged - If ENTITY_LOADED = False = False Then + If ENTITY_LOADING_PROCESS = False = False Then Exit Sub End If If ClassControlCommandsUI.UpdateControlValue(FOLL_UP_DATE_CTRL_ID, RECORD_ID, dtpFollowUp.Value, CURRENT_ENTITY_ID) = True Then @@ -4495,7 +4507,7 @@ Public Class frmConstructor_Main End Sub Private Sub chkFollowUp_CheckedChanged(sender As Object, e As EventArgs) Handles chkFollowUp.CheckedChanged - If ENTITY_LOADED = False Then + If ENTITY_LOADING_PROCESS = False Then Exit Sub End If If ClassControlCommandsUI.UpdateControlValue(FOLL_UP_DONE_CTRL_ID, RECORD_ID, chkFollowUp.Checked.ToString, CURRENT_ENTITY_ID) = True Then @@ -4952,6 +4964,7 @@ Public Class frmConstructor_Main Dim ColorRow As Color Try ColorRow = Color.FromName(rowCellValue) + If LogErrorsOnly = False Then ClassLogger.Add(">> RowBackColor '" & rowCellValue & "' will be used for record: " & Get_Focused_Row_Cell_Value("Record-ID"), False) Catch ex As Exception ClassLogger.Add(">> RowBackColor '" & rowCellValue & "'could not be converted from name!", False) Exit Sub @@ -6194,7 +6207,7 @@ Public Class frmConstructor_Main If result = MsgBoxResult.Yes Then Dim SQL = String.Format("EXEC PRPMO_COPY_RECORD {0}, '{1}'", RECORD_ID, USER_USERNAME) If ClassDatabase.Execute_non_Query_withConn(SQL, 1) = True Then - Load_Entity_Data() + Load_Entity_Data_CONTROLS_RECORDS() End If End If Else @@ -6224,7 +6237,7 @@ Public Class frmConstructor_Main CURRENT_ENTITY_ID = ENTITY_ID ClassControlValueCache.ClearCache() DisableEditMode() - Load_Entity_Data() + Load_Entity_Data_CONTROLS_RECORDS() RECORD_CHANGED = False Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Clear Cache: ", ex.Message) diff --git a/app/DD-Record-Organizer/frmDiagrams.en-US.resx b/app/DD-Record-Organizer/frmDiagrams.en-US.resx index 12b771b..dd57711 100644 --- a/app/DD-Record-Organizer/frmDiagrams.en-US.resx +++ b/app/DD-Record-Organizer/frmDiagrams.en-US.resx @@ -118,6 +118,28 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 386, 362 + + + 770, 362 + + + 1160, 387 + + + 386, 227 + + + 770, 227 + + + 1160, 252 + + + + 387 + 98, 22 diff --git a/app/DD-Record-Organizer/frmDiagrams.resx b/app/DD-Record-Organizer/frmDiagrams.resx index 9c6bbf2..d1f61f4 100644 --- a/app/DD-Record-Organizer/frmDiagrams.resx +++ b/app/DD-Record-Organizer/frmDiagrams.resx @@ -150,9 +150,6 @@ 1 - - 0, 0 - 0, 0 @@ -160,7 +157,7 @@ 0 - DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a Fill @@ -222,6 +219,9 @@ 1 + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + SplitContainerMain.Panel2 @@ -420,7 +420,7 @@ SplitContainerMain.Panel1 - DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a SplitContainerTop.Panel1 @@ -446,9 +446,6 @@ SplitContainerBottom.Panel1 - - ToolStripSeparator1 - saveDialog @@ -458,6 +455,9 @@ System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + SplitContainerTop @@ -470,9 +470,6 @@ 0 - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -483,15 +480,15 @@ 101, 22 - DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ToolStripBottomLeft - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripSeparator1 - + 0, 0 @@ -566,8 +563,11 @@ Top, Bottom, Left, Right - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 ToolStrip4 @@ -614,9 +614,6 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 87, 22 - 1160, 643 @@ -632,6 +629,9 @@ 0, 0 + + ToolStrip1 + 0, 0 @@ -675,13 +675,13 @@ 770, 25 - DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a 1160, 671 - - ToolStrip1 + + 87, 22 ToolStrip3 @@ -746,13 +746,13 @@ True + + 270, 17 + 591, 17 421, 17 - - 270, 17 - \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmEntities.vb b/app/DD-Record-Organizer/frmEntities.vb index 28514fa..998d412 100644 --- a/app/DD-Record-Organizer/frmEntities.vb +++ b/app/DD-Record-Organizer/frmEntities.vb @@ -61,8 +61,8 @@ Public Class frmEntities Node.Tag = Row.Item("GUID") Node.BackColor = Color.Orange 'Jetzt die Ebene1Knoten einhängen - DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' FROM " & _ - "TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID in (2,5) AND T.PARENT_ID = {2} AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {3})) ORDER BY LEVEL", USER_LANGUAGE, CURRENT_SCREEN_ID, Row.Item("GUID"), USER_GUID) + DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' FROM " & + "TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID in (2,5) AND T.PARENT_ID IN ({2},0) AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {3})) ORDER BY LEVEL", USER_LANGUAGE, CURRENT_SCREEN_ID, Row.Item("GUID"), USER_GUID) If LogErrorsOnly = False Then ClassLogger.Add(Now.ToString & ">> Level 1 >>" & DT_SQL, False) 'Dim sql As String = "SELECT T.GUID, T1.FORM_TITLE FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID in (2,5) AND T.PARENT_ID = " & Row.Item("GUID") & " ORDER BY LEVEL" Dim dtEbene1 As DataTable = ClassDatabase.Return_Datatable(DT_SQL) diff --git a/app/DD-Record-Organizer/frmUserKonfig_AddUsers.vb b/app/DD-Record-Organizer/frmUserKonfig_AddUsers.vb index d86bc77..39d80f3 100644 --- a/app/DD-Record-Organizer/frmUserKonfig_AddUsers.vb +++ b/app/DD-Record-Organizer/frmUserKonfig_AddUsers.vb @@ -4,7 +4,8 @@ Imports System.DirectoryServices.AccountManagement Imports System.IO Public Class frmUserKonfig_AddUsers - Private DT_GROUPS_EXCLUSIVE As DataTable + 'Private DT_GROUPS_EXCLUSIVE As DataTable + Private DT_ADD_USER As DataTable Private Sub frmUserKonfig_AddUsers_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing Try Dim Filename As String = String.Format("{0}-UserLayout.xml", GridViewUsers.Name) @@ -19,8 +20,10 @@ Public Class frmUserKonfig_AddUsers Private Sub formUserConfig_AddUsers_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try Cursor = Cursors.WaitCursor - Dim sql = "SELECT * FROM TBPMO_AD_GROUP_EXCLUSIVE" - DT_GROUPS_EXCLUSIVE = ClassDatabase.Return_Datatable(sql) + + + 'Dim sql = "SELECT * FROM TBPMO_AD_GROUP_EXCLUSIVE" + 'DT_GROUPS_EXCLUSIVE = ClassDatabase.Return_Datatable(sql) GetGroups(USER_USERNAME) Catch ex As Exception MsgBox("Error in Load Groups:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -225,9 +228,9 @@ Public Class frmUserKonfig_AddUsers End Sub Public Sub GetGroups(ByVal samAccountName As String) Try - If IsNothing(DT_GROUPS_EXCLUSIVE) Then - Exit Sub - End If + 'If IsNothing(DT_GROUPS_EXCLUSIVE) Then + ' Exit Sub + 'End If Cursor = Cursors.WaitCursor lbGroups.Items.Clear() Dim domainConnection = New DirectoryEntry() @@ -249,15 +252,15 @@ Public Class frmUserKonfig_AddUsers Dim sidResult = sidSearcher.FindOne() If sidResult IsNot Nothing Then Dim groupname = CStr(sidResult.Properties("name")(0)) - If Not IsNothing(DT_GROUPS_EXCLUSIVE) Then - If DT_GROUPS_EXCLUSIVE.Rows.Count > 0 Then - For Each GROUP_EXCL As DataRow In DT_GROUPS_EXCLUSIVE.Rows - If GROUP_EXCL.Item("GROUP_NAME").ToString.ToUpper = groupname.ToUpper Then - lbGroups.Items.Add(groupname) - End If - Next - Else - If Not groupname.StartsWith("WinRMR") And Not groupname.StartsWith("Gäst") And Not groupname.StartsWith("Druck") And Not groupname.StartsWith("Sicherungs") And Not groupname.StartsWith("Replikations") And Not groupname.StartsWith("Netzwerkskon") _ + 'If Not IsNothing(DT_GROUPS_EXCLUSIVE) Then + ' If DT_GROUPS_EXCLUSIVE.Rows.Count > 0 Then + ' For Each GROUP_EXCL As DataRow In DT_GROUPS_EXCLUSIVE.Rows + ' If GROUP_EXCL.Item("GROUP_NAME").ToString.ToUpper = groupname.ToUpper Then + ' lbGroups.Items.Add(groupname) + ' End If + ' Next + ' Else + If Not groupname.StartsWith("WinRMR") And Not groupname.StartsWith("Gäst") And Not groupname.StartsWith("Druck") And Not groupname.StartsWith("Sicherungs") And Not groupname.StartsWith("Replikations") And Not groupname.StartsWith("Netzwerkskon") _ And Not groupname.StartsWith("Leistungs") And Not groupname.StartsWith("Distributed COM") And Not groupname.StartsWith("IIS_") And Not groupname.StartsWith("Kryptografie") And Not groupname.StartsWith("Ereignis") And Not groupname.StartsWith("Zertifikat") _ And Not groupname.StartsWith("RDS-") And Not groupname.StartsWith("Hyper-V") And Not groupname.StartsWith("Zugriffssteuerungs") And Not groupname.StartsWith("Remoteverwaltungs") And Not groupname.StartsWith("Domänencomput") And Not groupname.StartsWith("Domänen-Gäste") _ And Not groupname.StartsWith("Richtlinien-Ersteller") And Not groupname.StartsWith("SQLAccess") And Not groupname.StartsWith("RAS- und IAS-Server") And Not groupname.StartsWith("Server-Operatore") And Not groupname.StartsWith("Konten-Oper") And Not groupname.StartsWith("Prä-Windows") _ @@ -267,10 +270,10 @@ Public Class frmUserKonfig_AddUsers ' Console.WriteLine(CStr(sidResult.Properties("name")(0))) lbGroups.Items.Add(groupname) End If - End If - End If + ' End If + 'End If + - End If Next resultBytes @@ -290,17 +293,17 @@ Public Class frmUserKonfig_AddUsers lbGroups.Items.Clear() If Not IsNothing(groups) Then For Each group In groups - If Not IsNothing(DT_GROUPS_EXCLUSIVE) Then - If DT_GROUPS_EXCLUSIVE.Rows.Count > 0 Then - For Each GROUP_EXCL As DataRow In DT_GROUPS_EXCLUSIVE.Rows - If GROUP_EXCL.Item("GROUP_NAME").ToString.ToUpper = group.ToUpper Then - lbGroups.Items.Add(group) - End If - Next - Else - lbGroups.Items.Add(group) - End If - End If + 'If Not IsNothing(DT_GROUPS_EXCLUSIVE) Then + ' If DT_GROUPS_EXCLUSIVE.Rows.Count > 0 Then + ' For Each GROUP_EXCL As DataRow In DT_GROUPS_EXCLUSIVE.Rows + ' If GROUP_EXCL.Item("GROUP_NAME").ToString.ToUpper = group.ToUpper Then + ' lbGroups.Items.Add(group) + ' End If + ' Next + ' Else + lbGroups.Items.Add(group) + ' End If + 'End If Next lblgroup_refresh() End If @@ -311,16 +314,16 @@ Public Class frmUserKonfig_AddUsers End If End Sub Sub lblgroup_refresh() - If Not IsNothing(DT_GROUPS_EXCLUSIVE) Then - If DT_GROUPS_EXCLUSIVE.Rows.Count > 0 Then - lbllimited.Text = String.Format("AD-Groups are limited through configuration to '{0}' group(s)!", DT_GROUPS_EXCLUSIVE.Rows.Count) - lbllimited.Visible = True - Else - lbllimited.Visible = False - End If - Else - lbllimited.Visible = False - End If + 'If Not IsNothing(DT_GROUPS_EXCLUSIVE) Then + ' If DT_GROUPS_EXCLUSIVE.Rows.Count > 0 Then + ' lbllimited.Text = String.Format("AD-Groups are limited through configuration to '{0}' group(s)!", DT_GROUPS_EXCLUSIVE.Rows.Count) + ' lbllimited.Visible = True + ' Else + ' lbllimited.Visible = False + ' End If + 'Else + lbllimited.Visible = False + ' 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 d4cdcef..e748e4d 100644 --- a/app/DD-Record-Organizer/frmWM_IndexFile.vb +++ b/app/DD-Record-Organizer/frmWM_IndexFile.vb @@ -35,6 +35,7 @@ Public Class frmWM_IndexFile Function WORK_FILE(ImportFilePath As String, VerzeichnisZiel As String, vDokart_ID As Integer, vDokart As String, multiindex As Boolean) Dim swWORK_FILE As New SW("WORK_FILE: " & DOCTYPE_IDTextBox.Text) Try + CURRENT_DOC_ID = Nothing CURRENT_DOKARTSTRING = vDokart Dim err As Boolean = False @@ -58,7 +59,7 @@ Public Class frmWM_IndexFile result = MessageBox.Show(msg, "File alredy exists:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then If clsWD_SET.Delete_WDFile(CURRENT_NEWFILENAME.Substring(2)) = False Then - swWORK_FILE + swWORK_FILE.Done() Return False End If Else @@ -88,6 +89,17 @@ Public Class frmWM_IndexFile sw = New SW("File Indexing") CURRENT_FILEIN_WD = CURRENT_NEWFILENAME + Dim DOCID + DOCID = clsWD_GET.Index_GetVariableValue(CURRENT_FILEIN_WD, "Dokument-ID") + If Not IsNothing(DOCID) Then + CURRENT_DOC_ID = DOCID + Else + DOCID = clsWD_GET.Index_GetVariableValue(CURRENT_FILEIN_WD, "Document-ID") + If Not IsNothing(DOCID) Then + CURRENT_DOC_ID = DOCID + End If + End If + Dim sql = "SELECT * FROM TBDD_INDEX_AUTOM WHERE ACTIVE = 1 AND UPPER(INDEXNAME) NOT LIKE UPPER('%ONLY %') AND SQL_ACTIVE = 0 AND DOCTYPE_ID = " & vDokart_ID Dim DT_AUTO_INDEXE As DataTable = ClassDatabase.Return_Datatable(sql, True) Dim indexierung_erfolgreich As Boolean = True @@ -251,10 +263,13 @@ Public Class frmWM_IndexFile End If End If Next - sw = New SW("GettingDocID") - sql = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE UPPER(FULL_FILENAME) = UPPER('{0}') AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD) - CURRENT_DOC_ID = ClassDatabase.Execute_Scalar(sql) - sw.Done() + If IsNothing(CURRENT_DOC_ID) Then + sw = New SW("GettingDocID") + sql = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE UPPER(FULL_FILENAME) = UPPER('{0}') AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD) + CURRENT_DOC_ID = ClassDatabase.Execute_Scalar(sql) + sw.Done() + End If + If Not IsNothing(CURRENT_DOC_ID) Then ClassHelper.InsertEssential_Log(CURRENT_DOC_ID, "DOC_ID", "File was imported and indexed!") @@ -315,6 +330,7 @@ Public Class frmWM_IndexFile stg = "Unexpected Error: Could not get a docId for transmitted file!" End If + ClassLogger.Add(stg, True) MsgBox(stg, MsgBoxStyle.Critical, stg1) End If Else