diff --git a/app/DD-Record-Organiser/App.config b/app/DD-Record-Organiser/App.config index 0bd6fb6..42d5569 100644 --- a/app/DD-Record-Organiser/App.config +++ b/app/DD-Record-Organiser/App.config @@ -4,6 +4,9 @@
+ +
+ + + + + sDigital Data - windream-Benutzer + + + \ No newline at end of file diff --git a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb index 1dac7be..c01522a 100644 --- a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb +++ b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb @@ -336,20 +336,66 @@ Public Class ClassDOC_SEARCH If DD_Rights.clsDatabase.Init(MyConnectionString) = True Then If DD_Rights.ClassRights.Init(ENTITY_ID, LogErrorsOnly) = True Then If DD_Rights.ClassRights.Collect_Users(CURRENT_RECORD_ID, ENTITY_ID) = True Then - If DD_Rights.ClassRights.File_DeleteAndSetRight(RESULT_DOCID, RESULT_DOC_PATH, True) Then - If DD_Rights.ClassRights.MSG_RESULT <> "" Then - Dim msg = "Achtung: einige Rechte konnten nicht gesetzt werden: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT - If USER_LANGUAGE <> "de-DE" Then - msg = "Attention: some rights could not be set: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT + If DD_Rights.ClassRights.TransferRights2Service(RESULT_DOCID, RESULT_DOC_PATH, False) Then + Dim sql_select = String.Format("SELECT * FROM VWPMO_RIGHTS_2B_WORKED WHERE DOC_ID = {0}", RESULT_DOCID) + Dim DT_RIGHTS2B_CHANGED As DataTable = ClassDatabase.Return_Datatable(sql_select) + If Not IsNothing(DT_RIGHTS2B_CHANGED) Then + If DT_RIGHTS2B_CHANGED.Rows.Count > 0 Then + Try + For Each rightRow As DataRow In DT_RIGHTS2B_CHANGED.Rows + Dim GUID = rightRow.Item("GUID") + Dim USER_ID = rightRow.Item("USER_ID") + Dim USERNAME = rightRow.Item("USERNAME").ToString.ToUpper + Dim TYPE = rightRow.Item("RIGHT_MODIFY") + Dim FILE_RIGHT = rightRow.Item("FILE_RIGHT_ID") + Dim upd + Dim Result As Boolean + Select Case TYPE + Case "ADD RIGHT" + Result = DD_Rights.ClassRights.SetRightExplicit(RESULT_DOCID, RESULT_DOC_PATH, USERNAME, FILE_RIGHT, ClassWindream.oSession) + End Select + 'upd = String.Format("UPDATE TBPMO_RIGHTS_WORK_SERVICE SET WORKING = 0 WHERE GUID = {0}", GUID) + 'If clsDatabase.Execute_non_Query(upd) = True Then + If Result = True Then + upd = String.Format("UPDATE TBPMO_RIGHTS_WORK_SERVICE SET WORKED = 1 WHERE GUID = {0}", GUID) + ClassDatabase.Execute_non_Query(upd) + Dim msg = DD_Rights.ClassRights.MSG_RESULT + ClassLogger.Add(msg, False) + If DD_Rights.ClassRights.DeleteRightExplicit(RESULT_DOCID, RESULT_DOC_PATH, WD_GROUP1, ClassWindream.oSession) = False Then + msg = DD_Rights.ClassRights.MSG_RESULT + ClassLogger.Add(msg, False) + Else + Return True + End If + + Else + Dim msg = String.Format("ERROR: {0} ", DD_Rights.ClassRights.MSG_RESULT) + ClassLogger.Add(msg, True) + End If + 'End If + + + Next + Catch ex As Exception + ClassLogger.Add("Unexpected Error : " & ex.Message, True) + End Try End If - MsgBox(msg, MsgBoxStyle.Exclamation) - Return True - Else - Return True End If - Else - Return False End If + 'If DD_Rights.ClassRights.File_DeleteAndSetRight(RESULT_DOCID, RESULT_DOC_PATH, True) Then + ' If DD_Rights.ClassRights.MSG_RESULT <> "" Then + ' Dim msg = "Achtung: einige Rechte konnten nicht gesetzt werden: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT + ' If USER_LANGUAGE <> "de-DE" Then + ' msg = "Attention: some rights could not be set: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT + ' End If + ' MsgBox(msg, MsgBoxStyle.Exclamation) + ' Return True + ' Else + ' Return True + ' End If + 'Else + ' Return False + 'End If Else Return False End If diff --git a/app/DD-Record-Organiser/ClassInit.vb b/app/DD-Record-Organiser/ClassInit.vb index 531d4e9..7cf30eb 100644 --- a/app/DD-Record-Organiser/ClassInit.vb +++ b/app/DD-Record-Organiser/ClassInit.vb @@ -90,6 +90,7 @@ Public Class ClassInit If KONFIG_DT.Rows.Count = 1 Then Try MY_WIKISTRING = KONFIG_DT.Rows(0).Item("WIKI_STRING") + WD_GROUP1 = KONFIG_DT.Rows(0).Item("WD_GROUP1") Catch ex As Exception MY_WIKISTRING = "" End Try diff --git a/app/DD-Record-Organiser/ClassWindream.vb b/app/DD-Record-Organiser/ClassWindream.vb index f89cea2..a438ed8 100644 --- a/app/DD-Record-Organiser/ClassWindream.vb +++ b/app/DD-Record-Organiser/ClassWindream.vb @@ -678,6 +678,7 @@ Public Class ClassWindream 'windream Objekte erstellen ohne Indexierungs-Event Session.SwitchEvents(WMCOMEventWMSessionNeedIndex, False) + oSession = Session '================================================================== ' check if files exist '================================================================== diff --git a/app/DD-Record-Organiser/ModuleMySettings.vb b/app/DD-Record-Organiser/ModuleMySettings.vb index e7b8435..644c659 100644 --- a/app/DD-Record-Organiser/ModuleMySettings.vb +++ b/app/DD-Record-Organiser/ModuleMySettings.vb @@ -15,6 +15,7 @@ Module ModuleMySettings Public Sett_ConstructorStart As Integer Public MY_ADDON_PATH As String Public MY_WIKISTRING As String + Public WD_GROUP1 As String Public WD_UNICODE As Boolean = False Public WD_ShowEnitityDocs As Boolean = True diff --git a/app/DD-Record-Organiser/My Project/Settings.Designer.vb b/app/DD-Record-Organiser/My Project/Settings.Designer.vb index 8d0b742..235d25c 100644 --- a/app/DD-Record-Organiser/My Project/Settings.Designer.vb +++ b/app/DD-Record-Organiser/My Project/Settings.Designer.vb @@ -245,6 +245,15 @@ Namespace My Me("TBPMO_RIGHT_USERDataGridView") = value End Set End Property + + _ + Public ReadOnly Property windreamGruppe() As String + Get + Return CType(Me("windreamGruppe"),String) + End Get + End Property End Class End Namespace diff --git a/app/DD-Record-Organiser/My Project/Settings.Settings b/app/DD-Record-Organiser/My Project/Settings.Settings index 6731d9c..fe6e57e 100644 --- a/app/DD-Record-Organiser/My Project/Settings.Settings +++ b/app/DD-Record-Organiser/My Project/Settings.Settings @@ -52,5 +52,8 @@ + + sDigital Data - windream-Benutzer + \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index 4ac3aab..fce4157 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb @@ -22,7 +22,6 @@ Partial Class frmConstructor_Main 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main)) Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() @@ -30,13 +29,13 @@ Partial Class frmConstructor_Main Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainerTop = New DevExpress.XtraEditors.SplitContainerControl() Me.TreeViewMain = New System.Windows.Forms.TreeView() - Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip() Me.ResetEbenenAuswahlToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.EntitätssucheStartenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GridControlMain = New DevExpress.XtraGrid.GridControl() - Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip() Me.FunktionenDataGridToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.AnsichtUmschaltenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -63,7 +62,7 @@ Partial Class frmConstructor_Main Me.pnlDetails = New System.Windows.Forms.Panel() Me.TabWindream = New DevExpress.XtraTab.XtraTabPage() Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl() - Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip() Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator() Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -107,7 +106,7 @@ Partial Class frmConstructor_Main Me.Panel1 = New System.Windows.Forms.Panel() Me.GridControlPos = New DevExpress.XtraGrid.GridControl() Me.grvwGridPos = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator(Me.components) + Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator() Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton() @@ -141,7 +140,7 @@ Partial Class frmConstructor_Main Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() Me.AnwendungscacheFreigebenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SplitContainer1 = New DevExpress.XtraEditors.SplitContainerControl() - Me.BindingSource_Entity = New System.Windows.Forms.BindingSource(Me.components) + Me.BindingSource_Entity = New System.Windows.Forms.BindingSource() Me.NavPane = New DevExpress.XtraBars.Navigation.TileNavPane() Me.NavButtonHome = New DevExpress.XtraBars.Navigation.NavButton() Me.NavButtonRefresh = New DevExpress.XtraBars.Navigation.NavButton() @@ -153,18 +152,18 @@ Partial Class frmConstructor_Main Me.progressLoadEntity = New System.Windows.Forms.ToolStripProgressBar() Me.labelLoadEntity = New System.Windows.Forms.ToolStripStatusLabel() Me.DD_ECMAdmin = New DD_Record_Organiser.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.ImageCollection1 = New DevExpress.Utils.ImageCollection() + Me.ttToolTip = New System.Windows.Forms.ToolTip() + Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip() Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() - Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource() Me.VWPMO_WF_USER_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter() Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() Me.TBPMO_FILES_USERTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FILES_USERTableAdapter() - Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource() Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter() - Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.ToolTipController = New DevExpress.Utils.ToolTipController(Me.components) + Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource() + Me.ToolTipController = New DevExpress.Utils.ToolTipController() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerMain.SuspendLayout() CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit() diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index 6d88082..176ab12 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -5174,34 +5174,43 @@ Public Class frmConstructor_Main End If End Sub Private Sub grvwGrid_MouseDown(sender As Object, e As MouseEventArgs) Handles grvwGrid.MouseDown, grvwTiles.MouseDown, grvwCarousel.MouseDown - Dim view As GridView = CType(sender, GridView) - If e.Button = Windows.Forms.MouseButtons.Right Then - GRIDRightMouse_Clicked = True - Else - GRIDRightMouse_Clicked = False - End If - Dim hitInfo As GridHitInfo = View.CalcHitInfo(New Point(e.X, e.Y)) - If e.Button = Windows.Forms.MouseButtons.Left AndAlso hitInfo.InRow AndAlso hitInfo.HitTest <> GridHitTest.RowIndicator Then - GRIDdownHitInfo = hitInfo - End If + Try + Dim view As GridView = CType(sender, GridView) + If e.Button = Windows.Forms.MouseButtons.Right Then + GRIDRightMouse_Clicked = True + Else + GRIDRightMouse_Clicked = False + End If + Dim hitInfo As GridHitInfo = view.CalcHitInfo(New Point(e.X, e.Y)) + If e.Button = Windows.Forms.MouseButtons.Left AndAlso hitInfo.InRow AndAlso hitInfo.HitTest <> GridHitTest.RowIndicator Then + GRIDdownHitInfo = hitInfo + End If + Catch ex As Exception + Exit Sub + End Try + End Sub Private Sub grvwGrid_MouseMove(sender As Object, e As MouseEventArgs) Handles grvwGrid.MouseMove, grvwTiles.MouseMove, grvwCarousel.MouseMove - Dim view As GridView = CType(sender, GridView) + Try + Dim view As GridView = CType(sender, GridView) + If e.Button = MouseButtons.Left And Not GRIDdownHitInfo Is Nothing Then + Dim dragSize As Size = SystemInformation.DragSize - If e.Button = MouseButtons.Left And Not GRIDdownHitInfo Is Nothing Then - Dim dragSize As Size = SystemInformation.DragSize + Dim dragRect As Rectangle = New Rectangle(New Point(GRIDdownHitInfo.HitPoint.X - dragSize.Width / 2, GRIDdownHitInfo.HitPoint.Y - dragSize.Height / 2), dragSize) - Dim dragRect As Rectangle = New Rectangle(New Point(GRIDdownHitInfo.HitPoint.X - dragSize.Width / 2, GRIDdownHitInfo.HitPoint.Y - dragSize.Height / 2), dragSize) + If Not dragRect.Contains(New Point(e.X, e.Y)) Then - If Not dragRect.Contains(New Point(e.X, e.Y)) Then - - view.GridControl.DoDragDrop(GetDragData(view), DragDropEffects.All) - - GRIDdownHitInfo = Nothing + view.GridControl.DoDragDrop(GetDragData(view), DragDropEffects.All) + GRIDdownHitInfo = Nothing + End If End If + Catch ex As Exception + Exit Sub + End Try - End If + + End Sub Private Function GetDragData(ByVal view As GridView) As String() Dim selection() As Integer = view.GetSelectedRows() diff --git a/app/DD-Record-Organiser/frmWD_IndexFile.vb b/app/DD-Record-Organiser/frmWD_IndexFile.vb index ee5106f..b5a66c4 100644 --- a/app/DD-Record-Organiser/frmWD_IndexFile.vb +++ b/app/DD-Record-Organiser/frmWD_IndexFile.vb @@ -340,7 +340,6 @@ Public Class frmWD_IndexFile End If End If If cmbDokumentart.SelectedIndex <> -1 Then - My.Settings.WD_INDEXDOKART_SAVE = cmbDokumentart.Text My.Settings.Save() Indexing_File(cmbDokumentart.SelectedValue) @@ -518,10 +517,8 @@ Public Class frmWD_IndexFile NEW_FILES_ADDED = True Me.Close() End If - End If Me.Cursor = Cursors.Default - Catch ex As Exception MsgBox("Error in Indexing_File:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try diff --git a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb index e0999b3..77057fa 100644 --- a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb +++ b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb @@ -73,7 +73,7 @@ Public Class frmCheckRightsEntity If DD_Rights.ClassRights.Collect_Users(row.Item("RECORD_ID"), row.Item("ENTITY_ID")) = True Then WorkingFiles += 1 CURR_DOCID = row.Item("DocID") - If DD_Rights.ClassRights.TransferRights2Service(row.Item("DocID"), row.Item("FULL_FILENAME")) Then + If DD_Rights.ClassRights.TransferRights2Service(row.Item("DocID"), row.Item("FULL_FILENAME"), 1) Then If DD_Rights.ClassRights.MSG_RESULT <> "" Then righterrors = True End If