MassValidatorChanges in Conlict
This commit is contained in:
Digital Data - Marlon Schreiber
parent
3d903b627b
commit
a004317c51
17
app/DD_PM_WINDREAM/frmMain.Designer.vb
generated
17
app/DD_PM_WINDREAM/frmMain.Designer.vb
generated
@ -72,8 +72,8 @@ 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.TabellenlayoutZurücksetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.tsmiMarkedFilesFinish = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.GridView_Docs = New DevExpress.XtraGrid.Views.Grid.GridView()
|
||||
Me.lblViewType = New System.Windows.Forms.Label()
|
||||
Me.NavBarControl1 = New DevExpress.XtraNavBar.NavBarControl()
|
||||
@ -454,7 +454,6 @@ Partial Class frmMain
|
||||
'
|
||||
resources.ApplyResources(Me.GridControl_Docs, "GridControl_Docs")
|
||||
Me.GridControl_Docs.ContextMenuStrip = Me.ContextMenuGrid
|
||||
Me.GridControl_Docs.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControl_Docs.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
|
||||
Me.GridControl_Docs.MainView = Me.GridView_Docs
|
||||
Me.GridControl_Docs.Name = "GridControl_Docs"
|
||||
Me.GridControl_Docs.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView_Docs})
|
||||
@ -462,7 +461,7 @@ Partial Class frmMain
|
||||
'ContextMenuGrid
|
||||
'
|
||||
Me.ContextMenuGrid.ImageScalingSize = New System.Drawing.Size(20, 20)
|
||||
Me.ContextMenuGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CMGroupStart, Me.CMFileStart, Me.TabellenlayoutZurücksetzenToolStripMenuItem, Me.MarkierteDateienAbschliessenToolStripMenuItem})
|
||||
Me.ContextMenuGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CMGroupStart, Me.CMFileStart, Me.TabellenlayoutZurücksetzenToolStripMenuItem, Me.tsmiMarkedFilesFinish})
|
||||
Me.ContextMenuGrid.Name = "ContextMenuStrip1"
|
||||
resources.ApplyResources(Me.ContextMenuGrid, "ContextMenuGrid")
|
||||
'
|
||||
@ -478,16 +477,16 @@ Partial Class frmMain
|
||||
Me.CMFileStart.Name = "CMFileStart"
|
||||
resources.ApplyResources(Me.CMFileStart, "CMFileStart")
|
||||
'
|
||||
'MarkierteDateienAbschliessenToolStripMenuItem
|
||||
'
|
||||
resources.ApplyResources(Me.MarkierteDateienAbschliessenToolStripMenuItem, "MarkierteDateienAbschliessenToolStripMenuItem")
|
||||
Me.MarkierteDateienAbschliessenToolStripMenuItem.Name = "MarkierteDateienAbschliessenToolStripMenuItem"
|
||||
'
|
||||
'TabellenlayoutZurücksetzenToolStripMenuItem
|
||||
'
|
||||
Me.TabellenlayoutZurücksetzenToolStripMenuItem.Name = "TabellenlayoutZurücksetzenToolStripMenuItem"
|
||||
resources.ApplyResources(Me.TabellenlayoutZurücksetzenToolStripMenuItem, "TabellenlayoutZurücksetzenToolStripMenuItem")
|
||||
'
|
||||
'tsmiMarkedFilesFinish
|
||||
'
|
||||
resources.ApplyResources(Me.tsmiMarkedFilesFinish, "tsmiMarkedFilesFinish")
|
||||
Me.tsmiMarkedFilesFinish.Name = "tsmiMarkedFilesFinish"
|
||||
'
|
||||
'GridView_Docs
|
||||
'
|
||||
Me.GridView_Docs.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView_Docs.Appearance.EvenRow.BackColor"), System.Drawing.Color)
|
||||
@ -706,7 +705,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 tsmiMarkedFilesFinish 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
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -298,7 +298,7 @@ Public Class frmMain
|
||||
End Sub
|
||||
Function Load_Profiles_for_User() As Boolean
|
||||
Try
|
||||
Dim sql = String.Format("SELECT T.* FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_GET_ACTIVE_PROFILES_USER] ({0}))", CURRENT_USER_ID)
|
||||
Dim sql = String.Format("SELECT T.* FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_GET_ACTIVE_PROFILES_USER] ({0}))", USER_ID)
|
||||
CURR_DT_VWPM_PROFILE_ACTIVE = ClassDatabase.Return_Datatable(sql)
|
||||
|
||||
If IsNothing(CURR_DT_VWPM_PROFILE_ACTIVE) Then
|
||||
@ -392,7 +392,7 @@ Public Class frmMain
|
||||
Dim value = row.Item("VALUE")
|
||||
Dim argument = row.Item("ARGUMENT")
|
||||
Dim sqlchart = row.Item("SQL_COMMAND")
|
||||
sqlchart = sqlchart.ToString.ToUpper.Replace("@USER_ID", CURRENT_USER_ID)
|
||||
sqlchart = sqlchart.ToString.ToUpper.Replace("@USER_ID", USER_ID)
|
||||
sqlchart = sqlchart.ToString.ToUpper.Replace("@USER", USER_USERNAME)
|
||||
Dim DATA_DT As DataTable = ClassDatabase.Return_Datatable(sqlchart)
|
||||
|
||||
@ -501,7 +501,7 @@ Public Class frmMain
|
||||
lblViewType.Text = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE
|
||||
|
||||
Dim sql = foundRows(0)("SQL_VIEW")
|
||||
sql = sql.Replace("@USER_ID", CURRENT_USER_ID)
|
||||
sql = sql.Replace("@USER_ID", USER_ID)
|
||||
sql = sql.Replace("@USERNAME", Environment.UserName)
|
||||
sql = sql.Replace("@MACHINE_NAME", Environment.MachineName)
|
||||
sql = sql.Replace("@DATE", Now.ToShortDateString)
|
||||
@ -620,7 +620,7 @@ Public Class frmMain
|
||||
ClassInit.InitBasics()
|
||||
Dim sql = CURRENT_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW")
|
||||
|
||||
sql = sql.Replace("@USER_ID", CURRENT_USER_ID)
|
||||
sql = sql.Replace("@USER_ID", USER_ID)
|
||||
sql = sql.Replace("@USERNAME", Environment.UserName)
|
||||
sql = sql.Replace("@MACHINE_NAME", Environment.MachineName)
|
||||
sql = sql.Replace("@DATE", Now.ToShortDateString)
|
||||
@ -804,12 +804,12 @@ 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
|
||||
tsmiMarkedFilesFinish.Enabled = False
|
||||
|
||||
Dim selectedRows As Integer() = GridView_Docs.GetSelectedRows()
|
||||
|
||||
If selectedRows.Count > 0 Then
|
||||
CMMassValidation.Enabled = True
|
||||
tsmiMarkedFilesFinish.Enabled = True
|
||||
End If
|
||||
|
||||
Select Case GridViewItem_Clicked
|
||||
@ -917,7 +917,7 @@ Public Class frmMain
|
||||
Return False
|
||||
End Try
|
||||
End Function
|
||||
Private Sub MarkierteDateienAbschliessenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CMMassValidation.Click
|
||||
Private Sub tsmiMarkedFilesFinish_Click(sender As Object, e As EventArgs) Handles tsmiMarkedFilesFinish.Click
|
||||
Dim selectedRows As Integer() = GridView_Docs.GetSelectedRows()
|
||||
Dim hitInfo As GridHitInfo = GridView_Docs.CalcHitInfo(GridCursorLocation)
|
||||
Dim workedFiles As Integer = 0
|
||||
@ -925,7 +925,7 @@ Public Class frmMain
|
||||
Dim profileId = 0
|
||||
|
||||
If selectedRows.Count = 0 Then
|
||||
If CURRENT_USER_LANGUAGE = "de-DE" Then
|
||||
If USER_LANGUAGE = "de-DE" Then
|
||||
MsgBox("Bitte selektieren Sie einige 1 oder mehr Dokumente", MsgBoxStyle.Exclamation, "Massenabschluss")
|
||||
Else
|
||||
MsgBox("Please select some documents!", MsgBoxStyle.Exclamation, "Mass Validation")
|
||||
@ -994,7 +994,7 @@ Public Class frmMain
|
||||
Load_Profile_items()
|
||||
Decide_Load()
|
||||
Else
|
||||
If CURRENT_USER_LANGUAGE = "de-DE" Then
|
||||
If USER_LANGUAGE = "de-DE" Then
|
||||
MsgBox("Massenabschluss konnte nicht ausgeführt werden, weil windream nicht initialisiert werden konnte!", MsgBoxStyle.Critical, "Massenabschluss")
|
||||
Else
|
||||
MsgBox("Massvalidation could not be completed because of an error in windream", MsgBoxStyle.Critical, "Massvalidation")
|
||||
@ -1019,7 +1019,7 @@ Public Class frmMain
|
||||
lblViewType.Text = "Gesamtübersicht"
|
||||
Cursor = Cursors.WaitCursor
|
||||
Try
|
||||
Dim sel = String.Format("SELECT * FROM VWPM_PROFILE_USER WHERE USER_ID ={0}", CURRENT_USER_ID)
|
||||
Dim sel = String.Format("SELECT * FROM VWPM_PROFILE_USER WHERE USER_ID ={0}", USER_ID)
|
||||
CURRENT_DT_VW_PROFILE_USER = ClassDatabase.Return_Datatable(sel, True)
|
||||
tslblmessage.Text = ""
|
||||
|
||||
@ -1041,7 +1041,7 @@ Public Class frmMain
|
||||
tslblmessage.Text = "No GROUP-CONFIG (SQL_PROFILE_MAIN_VIEW) in Baseconfig"
|
||||
Exit Sub
|
||||
End If
|
||||
sql = sql.Replace("@USER_ID", CURRENT_USER_ID)
|
||||
sql = sql.Replace("@USER_ID", USER_ID)
|
||||
sql = sql.Replace("@USERNAME", Environment.UserName)
|
||||
sql = sql.Replace("@MACHINE_NAME", Environment.MachineName)
|
||||
sql = sql.Replace("@DATE", Now.ToShortDateString)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user