jj: fix mass validation not working for single profile, fix context menu not disabling certain actions

This commit is contained in:
Jonathan Jenne 2018-06-28 15:24:19 +02:00
parent 4c45b66098
commit 9e1c0ac927
2 changed files with 21 additions and 15 deletions

View File

@ -72,7 +72,7 @@ Partial Class frmMain
Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.CMGroupStart = New System.Windows.Forms.ToolStripMenuItem() Me.CMGroupStart = New System.Windows.Forms.ToolStripMenuItem()
Me.CMFileStart = New System.Windows.Forms.ToolStripMenuItem() Me.CMFileStart = New System.Windows.Forms.ToolStripMenuItem()
Me.MarkierteDateienAbschliessenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CMMassValidation = New System.Windows.Forms.ToolStripMenuItem()
Me.TabellenlayoutZurücksetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TabellenlayoutZurücksetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.GridView_Docs = New DevExpress.XtraGrid.Views.Grid.GridView() Me.GridView_Docs = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.lblViewType = New System.Windows.Forms.Label() Me.lblViewType = New System.Windows.Forms.Label()
@ -453,7 +453,7 @@ Partial Class frmMain
' '
'ContextMenuGrid 'ContextMenuGrid
' '
Me.ContextMenuGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CMGroupStart, Me.CMFileStart, Me.MarkierteDateienAbschliessenToolStripMenuItem, Me.TabellenlayoutZurücksetzenToolStripMenuItem}) Me.ContextMenuGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CMGroupStart, Me.CMFileStart, Me.CMMassValidation, Me.TabellenlayoutZurücksetzenToolStripMenuItem})
Me.ContextMenuGrid.Name = "ContextMenuStrip1" Me.ContextMenuGrid.Name = "ContextMenuStrip1"
resources.ApplyResources(Me.ContextMenuGrid, "ContextMenuGrid") resources.ApplyResources(Me.ContextMenuGrid, "ContextMenuGrid")
' '
@ -471,8 +471,8 @@ Partial Class frmMain
' '
'MarkierteDateienAbschliessenToolStripMenuItem 'MarkierteDateienAbschliessenToolStripMenuItem
' '
resources.ApplyResources(Me.MarkierteDateienAbschliessenToolStripMenuItem, "MarkierteDateienAbschliessenToolStripMenuItem") resources.ApplyResources(Me.CMMassValidation, "MarkierteDateienAbschliessenToolStripMenuItem")
Me.MarkierteDateienAbschliessenToolStripMenuItem.Name = "MarkierteDateienAbschliessenToolStripMenuItem" Me.CMMassValidation.Name = "MarkierteDateienAbschliessenToolStripMenuItem"
' '
'TabellenlayoutZurücksetzenToolStripMenuItem 'TabellenlayoutZurücksetzenToolStripMenuItem
' '
@ -695,7 +695,7 @@ Partial Class frmMain
Friend WithEvents ToolStripBottomRight As ToolStrip Friend WithEvents ToolStripBottomRight As ToolStrip
Friend WithEvents TabellenlayoutZurücksetzenToolStripMenuItem As ToolStripMenuItem Friend WithEvents TabellenlayoutZurücksetzenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents tslblmessage As ToolStripStatusLabel Friend WithEvents tslblmessage As ToolStripStatusLabel
Friend WithEvents MarkierteDateienAbschliessenToolStripMenuItem As ToolStripMenuItem Friend WithEvents CMMassValidation As ToolStripMenuItem
Friend WithEvents GridControl_Docs As DevExpress.XtraGrid.GridControl Friend WithEvents GridControl_Docs As DevExpress.XtraGrid.GridControl
Friend WithEvents GridView_Docs As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents GridView_Docs As DevExpress.XtraGrid.Views.Grid.GridView
Friend WithEvents pnlNavigator As Panel Friend WithEvents pnlNavigator As Panel

View File

@ -796,11 +796,18 @@ Public Class frmMain
Private Sub ContextMenuGrid_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles ContextMenuGrid.Opening Private Sub ContextMenuGrid_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles ContextMenuGrid.Opening
CMFileStart.Enabled = False CMFileStart.Enabled = False
CMGroupStart.Enabled = False CMGroupStart.Enabled = False
CMMassValidation.Enabled = False
Dim selectedRows As Integer() = GridView_Docs.GetSelectedRows()
If selectedRows.Count > 0 Then
CMMassValidation.Enabled = True
End If
Select Case GridViewItem_Clicked Select Case GridViewItem_Clicked
Case "GROUP" Case "GROUP"
CMGroupStart.Enabled = True CMGroupStart.Enabled = True
Case "ROW" Case "ROW"
Dim selectedRows As Integer() = GridView_Docs.GetSelectedRows()
If selectedRows.Count > 1 Then If selectedRows.Count > 1 Then
CMFileStart.Enabled = False CMFileStart.Enabled = False
Else Else
@ -902,12 +909,11 @@ Public Class frmMain
Return False Return False
End Try End Try
End Function End Function
Private Sub MarkierteDateienAbschliessenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MarkierteDateienAbschliessenToolStripMenuItem.Click Private Sub MarkierteDateienAbschliessenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CMMassValidation.Click
Dim selectedRows As Integer() = GridView_Docs.GetSelectedRows() Dim selectedRows As Integer() = GridView_Docs.GetSelectedRows()
Dim hitInfo As GridHitInfo = GridView_Docs.CalcHitInfo(GridCursorLocation) Dim hitInfo As GridHitInfo = GridView_Docs.CalcHitInfo(GridCursorLocation)
Dim workedFiles As Integer = 0 Dim workedFiles As Integer = 0
Dim profileId = 0 Dim profileId = 0
If selectedRows.Count = 0 Then If selectedRows.Count = 0 Then
@ -932,12 +938,16 @@ Public Class frmMain
Else Else
MsgBox("This profile has no documents!") MsgBox("This profile has no documents!")
End If End If
Else
If hitInfo.RowHandle >= 0 Then
profileId = GridView_Docs.GetRowCellValue(hitInfo.RowHandle, "PROFILE_ID")
Else Else
Dim parentRowHandle = GridView_Docs.GetParentRowHandle(hitInfo.RowHandle) Dim parentRowHandle = GridView_Docs.GetParentRowHandle(hitInfo.RowHandle)
Dim dataRowHandle = GridView_Docs.GetDataRowHandleByGroupRowHandle(parentRowHandle) Dim dataRowHandle = GridView_Docs.GetDataRowHandleByGroupRowHandle(parentRowHandle)
profileId = GridView_Docs.GetRowCellValue(dataRowHandle, "PROFILE_ID") profileId = GridView_Docs.GetRowCellValue(dataRowHandle, "PROFILE_ID")
End If End If
End If
If Init_windream() Then If Init_windream() Then
@ -1228,10 +1238,6 @@ Public Class frmMain
End Try End Try
End Sub End Sub
Private Sub GridView_Docs_RowClick(sender As Object, e As RowClickEventArgs) Handles GridView_Docs.RowClick
End Sub
Private Sub GridView_Docs_DoubleClick(sender As Object, e As EventArgs) Handles GridView_Docs.DoubleClick Private Sub GridView_Docs_DoubleClick(sender As Object, e As EventArgs) Handles GridView_Docs.DoubleClick
Item_Scope() Item_Scope()
End Sub End Sub