From 9e1c0ac927de1f6517d240d9d811f0699d6f6174 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 28 Jun 2018 15:24:19 +0200 Subject: [PATCH] jj: fix mass validation not working for single profile, fix context menu not disabling certain actions --- app/DD_PM_WINDREAM/frmMain.Designer.vb | 10 +++++----- app/DD_PM_WINDREAM/frmMain.vb | 26 ++++++++++++++++---------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index f9548e3..c3fe4dd 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -72,7 +72,7 @@ Partial Class frmMain Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.CMGroupStart = 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.GridView_Docs = New DevExpress.XtraGrid.Views.Grid.GridView() Me.lblViewType = New System.Windows.Forms.Label() @@ -453,7 +453,7 @@ Partial Class frmMain ' '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" resources.ApplyResources(Me.ContextMenuGrid, "ContextMenuGrid") ' @@ -471,8 +471,8 @@ Partial Class frmMain ' 'MarkierteDateienAbschliessenToolStripMenuItem ' - resources.ApplyResources(Me.MarkierteDateienAbschliessenToolStripMenuItem, "MarkierteDateienAbschliessenToolStripMenuItem") - Me.MarkierteDateienAbschliessenToolStripMenuItem.Name = "MarkierteDateienAbschliessenToolStripMenuItem" + resources.ApplyResources(Me.CMMassValidation, "MarkierteDateienAbschliessenToolStripMenuItem") + Me.CMMassValidation.Name = "MarkierteDateienAbschliessenToolStripMenuItem" ' 'TabellenlayoutZurücksetzenToolStripMenuItem ' @@ -695,7 +695,7 @@ Partial Class frmMain Friend WithEvents ToolStripBottomRight As ToolStrip Friend WithEvents TabellenlayoutZurücksetzenToolStripMenuItem As ToolStripMenuItem 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 GridView_Docs As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents pnlNavigator As Panel diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 9de6b30..91b4287 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -796,11 +796,18 @@ Public Class frmMain Private Sub ContextMenuGrid_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles ContextMenuGrid.Opening CMFileStart.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 Case "GROUP" CMGroupStart.Enabled = True Case "ROW" - Dim selectedRows As Integer() = GridView_Docs.GetSelectedRows() If selectedRows.Count > 1 Then CMFileStart.Enabled = False Else @@ -902,12 +909,11 @@ Public Class frmMain Return False End Try 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 hitInfo As GridHitInfo = GridView_Docs.CalcHitInfo(GridCursorLocation) Dim workedFiles As Integer = 0 - Dim profileId = 0 If selectedRows.Count = 0 Then @@ -933,10 +939,14 @@ Public Class frmMain MsgBox("This profile has no documents!") End If Else - Dim parentRowHandle = GridView_Docs.GetParentRowHandle(hitInfo.RowHandle) - Dim dataRowHandle = GridView_Docs.GetDataRowHandleByGroupRowHandle(parentRowHandle) + If hitInfo.RowHandle >= 0 Then + profileId = GridView_Docs.GetRowCellValue(hitInfo.RowHandle, "PROFILE_ID") + Else + Dim parentRowHandle = GridView_Docs.GetParentRowHandle(hitInfo.RowHandle) + Dim dataRowHandle = GridView_Docs.GetDataRowHandleByGroupRowHandle(parentRowHandle) - profileId = GridView_Docs.GetRowCellValue(dataRowHandle, "PROFILE_ID") + profileId = GridView_Docs.GetRowCellValue(dataRowHandle, "PROFILE_ID") + End If End If If Init_windream() Then @@ -1228,10 +1238,6 @@ Public Class frmMain End Try 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 Item_Scope() End Sub