AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MassValidatorChanges in Conlict

Browse Source
This commit is contained in:
Digital Data - Marlon Schreiber
2018-09-25 09:19:31 +02:00
parent 3d903b627b
commit a004317c51
3 changed files with 347 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/DD_PM_WINDREAM/frmMain.vb
View File

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