This commit is contained in:
Digital Data - Marlon Schreiber 2018-05-11 10:37:00 +02:00
parent 17946f1a19
commit f4d1a8c8b1
13 changed files with 273 additions and 187 deletions

View File

@ -9,7 +9,9 @@
</sectionGroup>
</configSections>
<connectionStrings>
<add name="DD_Record_Organizer.My.MySettings.DD_DMSConnectionString" connectionString="Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_RENOLIT;Persist Security Info=True;User ID=sa;Password=ddd" providerName="System.Data.SqlClient"/>
<add name="DD_Record_Organizer.My.MySettings.DD_DMSConnectionString"
connectionString="Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_RENOLIT;Persist Security Info=True;User ID=sa;Password=ddd"
providerName="System.Data.SqlClient" />
</connectionStrings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
@ -58,6 +60,9 @@
<setting name="TBPMO_RIGHT_USERDataGridView" serializeAs="String">
<value />
</setting>
<setting name="UserDocIDIndexname" serializeAs="String">
<value>Dokument-ID</value>
</setting>
</DD_Record_Organizer.My.MySettings>
</userSettings>
<applicationSettings>

View File

@ -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

View File

@ -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()

View File

@ -416,6 +416,7 @@ Public Class ClassWindreamDocGrid
End Sub
Private Shared Sub gridView_CustomColumnDisplayText(sender As Object, e As CustomColumnDisplayTextEventArgs)
Try
Dim view As ColumnView = sender
Dim parsedDate As DateTime
@ -444,9 +445,15 @@ Public Class ClassWindreamDocGrid
e.DisplayText = parsedDate.ToString(CURRENT_DATE_FORMAT)
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
End Sub
Public Shared Sub gridView_MasterRowExpanded(sender As GridView, e As DevExpress.XtraGrid.Views.Grid.CustomMasterRowEventArgs)
Try
ClassWindreamDocGrid.GetDocItems(sender)
Dim GW As GridView = sender
If SELECTED_DOC_ID = 0 Then
@ -491,6 +498,11 @@ Public Class ClassWindreamDocGrid
End If
End If
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

View File

@ -15,7 +15,7 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0"), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.5.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
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
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("Dokument-ID")> _
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

View File

@ -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

View File

@ -369,7 +369,7 @@
<value>Suche Knoten</value>
</data>
<data name="cmsTreeView.Size" type="System.Drawing.Size, System.Drawing">
<value>221, 185</value>
<value>221, 207</value>
</data>
<data name="&gt;&gt;cmsTreeView.Name" xml:space="preserve">
<value>cmsTreeView</value>

View File

@ -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
@ -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)

View File

@ -118,6 +118,28 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="ChartTopLeft.Size" type="System.Drawing.Size, System.Drawing">
<value>386, 362</value>
</data>
<data name="ChartTopRight.Size" type="System.Drawing.Size, System.Drawing">
<value>770, 362</value>
</data>
<data name="SplitContainerTop.Size" type="System.Drawing.Size, System.Drawing">
<value>1160, 387</value>
</data>
<data name="ChartBottomLeft.Size" type="System.Drawing.Size, System.Drawing">
<value>386, 227</value>
</data>
<data name="ChartBottomRight.Size" type="System.Drawing.Size, System.Drawing">
<value>770, 227</value>
</data>
<data name="SplitContainerBottom.Size" type="System.Drawing.Size, System.Drawing">
<value>1160, 252</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="SplitContainerMain.SplitterDistance" type="System.Int32, mscorlib">
<value>387</value>
</data>
<data name="ToolStripButton1.Size" type="System.Drawing.Size, System.Drawing">
<value>98, 22</value>
</data>

View File

@ -150,9 +150,6 @@
<data name="ChartTopRight.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="SplitContainerBottom.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="ToolStripTopLeft.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
@ -160,7 +157,7 @@
<value>0</value>
</data>
<data name="&gt;&gt;ChartTopRight.Type" xml:space="preserve">
<value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="ChartBottomLeft.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -222,6 +219,9 @@
<data name="&gt;&gt;ToolStripBottomRight.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;ToolStripBottomLeft.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;SplitContainerMain.Panel2.Name" xml:space="preserve">
<value>SplitContainerMain.Panel2</value>
</data>
@ -420,7 +420,7 @@
<value>SplitContainerMain.Panel1</value>
</data>
<data name="&gt;&gt;ChartTopLeft.Type" xml:space="preserve">
<value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;SplitContainerTop.Panel1.Name" xml:space="preserve">
<value>SplitContainerTop.Panel1</value>
@ -446,9 +446,6 @@
<data name="&gt;&gt;ToolStripBottomLeft.Parent" xml:space="preserve">
<value>SplitContainerBottom.Panel1</value>
</data>
<data name="&gt;&gt;ToolStripSeparator1.Name" xml:space="preserve">
<value>ToolStripSeparator1</value>
</data>
<data name="&gt;&gt;saveDialog.Name" xml:space="preserve">
<value>saveDialog</value>
</data>
@ -458,6 +455,9 @@
<data name="&gt;&gt;ToolStripLabel1.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;SplitContainerMain.Panel2.Type" xml:space="preserve">
<value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;SplitContainerTop.Panel1.Parent" xml:space="preserve">
<value>SplitContainerTop</value>
</data>
@ -470,9 +470,6 @@
<data name="ToolStripBottomLeft.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;ToolStripSeparator1.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;SplitContainerTop.Panel2.Type" xml:space="preserve">
<value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@ -483,15 +480,15 @@
<value>101, 22</value>
</data>
<data name="&gt;&gt;ChartBottomRight.Type" xml:space="preserve">
<value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;ToolStripBottomLeft.Name" xml:space="preserve">
<value>ToolStripBottomLeft</value>
</data>
<data name="&gt;&gt;ToolStripBottomLeft.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="&gt;&gt;ToolStripSeparator1.Name" xml:space="preserve">
<value>ToolStripSeparator1</value>
</data>
<data name="SplitContainerTop.Location" type="System.Drawing.Point, System.Drawing">
<data name="SplitContainerBottom.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="&gt;&gt;ChartBottomLeft.Name" xml:space="preserve">
@ -566,8 +563,11 @@
<data name="SplitContainerMain.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<data name="&gt;&gt;SplitContainerMain.Panel2.Type" xml:space="preserve">
<value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="SplitContainerTop.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="&gt;&gt;ToolStripSeparator1.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="ToolStripBottomLeft.Text" xml:space="preserve">
<value>ToolStrip4</value>
@ -614,9 +614,6 @@
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="ToolStripLabel1.Size" type="System.Drawing.Size, System.Drawing">
<value>87, 22</value>
</data>
<data name="SplitContainerMain.Size" type="System.Drawing.Size, System.Drawing">
<value>1160, 643</value>
</data>
@ -632,6 +629,9 @@
<data name="ToolStripTopRight.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="ToolStripMain.Text" xml:space="preserve">
<value>ToolStrip1</value>
</data>
<data name="ToolStripMain.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
@ -675,13 +675,13 @@
<value>770, 25</value>
</data>
<data name="&gt;&gt;ChartBottomLeft.Type" xml:space="preserve">
<value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<value>DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1160, 671</value>
</data>
<data name="ToolStripMain.Text" xml:space="preserve">
<value>ToolStrip1</value>
<data name="ToolStripLabel1.Size" type="System.Drawing.Size, System.Drawing">
<value>87, 22</value>
</data>
<data name="ToolStripBottomRight.Text" xml:space="preserve">
<value>ToolStrip3</value>
@ -746,13 +746,13 @@
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ToolStripTopRight.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>270, 17</value>
</metadata>
<metadata name="ToolStripBottomLeft.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>591, 17</value>
</metadata>
<metadata name="ToolStripBottomRight.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>421, 17</value>
</metadata>
<metadata name="ToolStripTopRight.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>270, 17</value>
</metadata>
</root>

View File

@ -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)

View File

@ -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,14 +252,14 @@ 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 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") _
@ -267,8 +270,8 @@ 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
@ -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
'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
Next
Else
lbGroups.Items.Add(group)
End If
End If
' 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
'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
Else
lbllimited.Visible = False
End If
' End If
End Sub
End Class

View File

@ -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
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