MS22062016_2

This commit is contained in:
SchreiberM
2016-06-22 16:06:34 +02:00
parent b85ed334e4
commit 3df7d269e9
9 changed files with 122 additions and 320 deletions

View File

@@ -130,4 +130,32 @@ Public Class ClassSAP
Return Nothing Return Nothing
End Try End Try
End Function End Function
Public Shared Function Return_Datatable_for_Table(tablename As String, where_clause As String, Optional RowLimit As Integer = 0)
Try
Dim RESULT_TABLE As DataTable = New DataTable
If LogErrorsOnly = False Then ClassLogger.Add(">> Get data from SAP Table", False)
Dim table As New ERPConnect.Utils.ReadTable(SAP_CONNECTION)
'Dim cWhereClause = "SAP_OBJECT EQ '<ObjectType>' AND AR_DATE GE '<AR_DATE>'"
'Dim sSearchDate1 = "20160101"
'cWhereClause = Replace(cWhereClause, "<ObjectType>", Objekttyp.Text)
'cWhereClause = Replace(cWhereClause, "<AR_DATE>", sSearchDate1)
If where_clause <> "" Then
table.AddCriteria(where_clause)
End If
table.TableName = tablename
If RowLimit <> 0 Then
table.RowCount = RowLimit
End If
If LogErrorsOnly = False Then ClassLogger.Add(">>Table.Run executing.....", False)
table.Run()
If LogErrorsOnly = False Then ClassLogger.Add(">>Table.Run executed", False)
RESULT_TABLE = table.Result
SAP_CONNECTION.Close()
Return RESULT_TABLE
Catch ex As Exception
ClassLogger.Add(">> Unexpected Error in SAP Table Result: " & ex.Message, False)
MsgBox("Unexpected Error in SAP Table Result: " & ex.Message, MsgBoxStyle.Critical)
Return Nothing
End Try
End Function
End Class End Class

View File

@@ -72,7 +72,7 @@
Public CURRENT_PARENT_DT As DataTable Public CURRENT_PARENT_DT As DataTable
Public MASS_RECORD_CHANGE As ArrayList Public MASS_RECORD_IDs2CHANGE As ArrayList
Public MASS_COLUMN_LIST As ArrayList Public MASS_COLUMN_LIST As ArrayList
Public SUCCESSFULL As Boolean = False Public SUCCESSFULL As Boolean = False

View File

@@ -5267,7 +5267,7 @@ Public Class frmConstructor_Main
collist.Add(name) collist.Add(name)
Next Next
MASS_COLUMN_LIST = collist MASS_COLUMN_LIST = collist
MASS_RECORD_CHANGE = list MASS_RECORD_IDs2CHANGE = list
Save_Grid_Layout() Save_Grid_Layout()
frmMass_Change.ShowDialog() frmMass_Change.ShowDialog()
If SUCCESSFULL = True Then If SUCCESSFULL = True Then

View File

@@ -50,6 +50,7 @@ Partial Class frmMass_Change
'lblCount 'lblCount
' '
resources.ApplyResources(Me.lblCount, "lblCount") resources.ApplyResources(Me.lblCount, "lblCount")
Me.lblCount.ForeColor = System.Drawing.Color.DarkRed
Me.lblCount.Name = "lblCount" Me.lblCount.Name = "lblCount"
' '
'cmbColumn 'cmbColumn

View File

@@ -129,7 +129,7 @@
<value>True</value> <value>True</value>
</data> </data>
<data name="lblCount.Location" type="System.Drawing.Point, System.Drawing"> <data name="lblCount.Location" type="System.Drawing.Point, System.Drawing">
<value>406, 50</value> <value>378, 49</value>
</data> </data>
<data name="&gt;&gt;cmbColumn.ZOrder" xml:space="preserve"> <data name="&gt;&gt;cmbColumn.ZOrder" xml:space="preserve">
<value>1</value> <value>1</value>

View File

@@ -5,9 +5,9 @@
SUCCESSFULL = False SUCCESSFULL = False
Dim msg = "Anzahl zu ändernde Datensätze: " Dim msg = "Anzahl zu ändernde Datensätze: "
If USER_LANGUAGE <> "de-DE" Then If USER_LANGUAGE <> "de-DE" Then
msg = "Record Count to be changed:" msg = "Count of records to be changed:"
End If End If
lblCount.Text = msg & MASS_RECORD_CHANGE.Count lblCount.Text = msg & MASS_RECORD_IDs2CHANGE.Count
cmbColumn.Items.Clear() cmbColumn.Items.Clear()
For Each Str As String In MASS_COLUMN_LIST For Each Str As String In MASS_COLUMN_LIST
If Str.ToLower = "addedwho" Or Str.ToLower = "changedwho" Or Str.ToLower = "addedwhen" Or Str.ToLower = "changedwhen" Then If Str.ToLower = "addedwho" Or Str.ToLower = "changedwho" Or Str.ToLower = "addedwhen" Or Str.ToLower = "changedwhen" Then
@@ -28,9 +28,9 @@
Private Sub btnRefresh_Click(sender As Object, e As EventArgs) Handles btnRefresh.Click Private Sub btnRefresh_Click(sender As Object, e As EventArgs) Handles btnRefresh.Click
Try Try
If txtNewValue.Text <> "" And Me.cmbColumn.SelectedIndex <> -1 And cmbColumn.Text <> "" Then If txtNewValue.Text <> "" And Me.cmbColumn.SelectedIndex <> -1 And cmbColumn.Text <> "" Then
Dim msg = "Sind Sie sicher, dass Sie diese Massenändeurng durchführen wollen?" Dim msg = "Sind Sie sicher, dass Sie diese Massenänderung durchführen wollen?" & vbNewLine & MASS_RECORD_IDs2CHANGE.Count.ToString & " Datensätze werden geändert!"
If USER_LANGUAGE <> "de-DE" Then If USER_LANGUAGE <> "de-DE" Then
msg = "Are You sure You want to execute this mass change?" msg = "Are You sure You want to execute this mass change?" & vbNewLine & MASS_RECORD_IDs2CHANGE.Count.ToString & " records will be changed!"
End If End If
Cursor = Cursors.WaitCursor Cursor = Cursors.WaitCursor
Dim result As MsgBoxResult Dim result As MsgBoxResult
@@ -63,7 +63,7 @@
If result1 = MsgBoxResult.No Then If result1 = MsgBoxResult.No Then
Exit Sub Exit Sub
Else Else
For Each Record As String In MASS_RECORD_CHANGE For Each Record As String In MASS_RECORD_IDs2CHANGE
Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", control_Id, CInt(Record)) Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", control_Id, CInt(Record))
ClassDatabase.Execute_non_Query(del) ClassDatabase.Execute_non_Query(del)
Next Next
@@ -72,7 +72,7 @@
End If End If
Try Try
Dim err As Boolean = False Dim err As Boolean = False
For Each Record As String In MASS_RECORD_CHANGE For Each Record As String In MASS_RECORD_IDs2CHANGE
SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", control_Id, CInt(Record)) SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", control_Id, CInt(Record))
Dim ex_GUID = ClassDatabase.Execute_Scalar(SQL) Dim ex_GUID = ClassDatabase.Execute_Scalar(SQL)

View File

@@ -73,6 +73,14 @@ Partial Class frmRecordView
Me.TabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.TabControl1 = New DevExpress.XtraTab.XtraTabControl()
Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl() Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl()
Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator()
Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator()
Me.DeleteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator()
Me.PropertiesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.GridViewDoc_Search = New DevExpress.XtraGrid.Views.Grid.GridView() Me.GridViewDoc_Search = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.ToolStrip2 = New System.Windows.Forms.ToolStrip() Me.ToolStrip2 = New System.Windows.Forms.ToolStrip()
Me.tslblWindreamView = New System.Windows.Forms.ToolStripLabel() Me.tslblWindreamView = New System.Windows.Forms.ToolStripLabel()
@@ -98,14 +106,6 @@ Partial Class frmRecordView
Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter() Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
Me.TBPMO_WORKFLOW_TASK_STATETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_WORKFLOW_TASK_STATETableAdapter() Me.TBPMO_WORKFLOW_TASK_STATETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_WORKFLOW_TASK_STATETableAdapter()
Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator()
Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator()
Me.DeleteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator()
Me.PropertiesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Label4 = New System.Windows.Forms.Label() Label4 = New System.Windows.Forms.Label()
TITLELabel = New System.Windows.Forms.Label() TITLELabel = New System.Windows.Forms.Label()
COMMENTLabel = New System.Windows.Forms.Label() COMMENTLabel = New System.Windows.Forms.Label()
@@ -131,6 +131,7 @@ Partial Class frmRecordView
Me.TabControl1.SuspendLayout() Me.TabControl1.SuspendLayout()
Me.XtraTabPage2.SuspendLayout() Me.XtraTabPage2.SuspendLayout()
CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit()
Me.ContextMenuStripResultFiles.SuspendLayout()
CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit()
Me.ToolStrip2.SuspendLayout() Me.ToolStrip2.SuspendLayout()
Me.XtraTabPage1.SuspendLayout() Me.XtraTabPage1.SuspendLayout()
@@ -143,7 +144,6 @@ Partial Class frmRecordView
Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel1.SuspendLayout()
Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout()
Me.SplitContainer1.SuspendLayout() Me.SplitContainer1.SuspendLayout()
Me.ContextMenuStripResultFiles.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
' '
'Label4 'Label4
@@ -285,7 +285,7 @@ Partial Class frmRecordView
Me.TabFollowUp.Controls.Add(Me.Label5) Me.TabFollowUp.Controls.Add(Me.Label5)
Me.TabFollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.Task_16xMD Me.TabFollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.Task_16xMD
Me.TabFollowUp.Name = "TabFollowUp" Me.TabFollowUp.Name = "TabFollowUp"
Me.TabFollowUp.Size = New System.Drawing.Size(791, 315) Me.TabFollowUp.Size = New System.Drawing.Size(799, 358)
Me.TabFollowUp.Text = "Wiedervorlage" Me.TabFollowUp.Text = "Wiedervorlage"
' '
'ListViewFollowUps 'ListViewFollowUps
@@ -297,7 +297,7 @@ Partial Class frmRecordView
Me.ListViewFollowUps.HideSelection = False Me.ListViewFollowUps.HideSelection = False
Me.ListViewFollowUps.Location = New System.Drawing.Point(14, 36) Me.ListViewFollowUps.Location = New System.Drawing.Point(14, 36)
Me.ListViewFollowUps.Name = "ListViewFollowUps" Me.ListViewFollowUps.Name = "ListViewFollowUps"
Me.ListViewFollowUps.Size = New System.Drawing.Size(263, 140) Me.ListViewFollowUps.Size = New System.Drawing.Size(263, 183)
Me.ListViewFollowUps.TabIndex = 5 Me.ListViewFollowUps.TabIndex = 5
Me.ListViewFollowUps.UseCompatibleStateImageBehavior = False Me.ListViewFollowUps.UseCompatibleStateImageBehavior = False
Me.ListViewFollowUps.View = System.Windows.Forms.View.Details Me.ListViewFollowUps.View = System.Windows.Forms.View.Details
@@ -323,7 +323,7 @@ Partial Class frmRecordView
Me.grpbxFU_Profile.Controls.Add(Me.lblWiedervorlage_Control) Me.grpbxFU_Profile.Controls.Add(Me.lblWiedervorlage_Control)
Me.grpbxFU_Profile.Location = New System.Drawing.Point(283, 28) Me.grpbxFU_Profile.Location = New System.Drawing.Point(283, 28)
Me.grpbxFU_Profile.Name = "grpbxFU_Profile" Me.grpbxFU_Profile.Name = "grpbxFU_Profile"
Me.grpbxFU_Profile.Size = New System.Drawing.Size(774, 148) Me.grpbxFU_Profile.Size = New System.Drawing.Size(774, 191)
Me.grpbxFU_Profile.TabIndex = 4 Me.grpbxFU_Profile.TabIndex = 4
Me.grpbxFU_Profile.TabStop = False Me.grpbxFU_Profile.TabStop = False
' '
@@ -340,7 +340,7 @@ Partial Class frmRecordView
Me.GroupBox4.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold) Me.GroupBox4.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold)
Me.GroupBox4.Location = New System.Drawing.Point(177, 20) Me.GroupBox4.Location = New System.Drawing.Point(177, 20)
Me.GroupBox4.Name = "GroupBox4" Me.GroupBox4.Name = "GroupBox4"
Me.GroupBox4.Size = New System.Drawing.Size(594, 122) Me.GroupBox4.Size = New System.Drawing.Size(594, 165)
Me.GroupBox4.TabIndex = 4 Me.GroupBox4.TabIndex = 4
Me.GroupBox4.TabStop = False Me.GroupBox4.TabStop = False
Me.GroupBox4.Text = "Individuelle Empfänger für diesen Datensatz:" Me.GroupBox4.Text = "Individuelle Empfänger für diesen Datensatz:"
@@ -399,7 +399,7 @@ Partial Class frmRecordView
Me.ListBoxUser2Profile.FormattingEnabled = True Me.ListBoxUser2Profile.FormattingEnabled = True
Me.ListBoxUser2Profile.Location = New System.Drawing.Point(9, 50) Me.ListBoxUser2Profile.Location = New System.Drawing.Point(9, 50)
Me.ListBoxUser2Profile.Name = "ListBoxUser2Profile" Me.ListBoxUser2Profile.Name = "ListBoxUser2Profile"
Me.ListBoxUser2Profile.Size = New System.Drawing.Size(230, 43) Me.ListBoxUser2Profile.Size = New System.Drawing.Size(230, 82)
Me.ListBoxUser2Profile.TabIndex = 1 Me.ListBoxUser2Profile.TabIndex = 1
' '
'Label7 'Label7
@@ -472,7 +472,7 @@ Partial Class frmRecordView
Me.TabPos.Image = CType(resources.GetObject("TabPos.Image"), System.Drawing.Image) Me.TabPos.Image = CType(resources.GetObject("TabPos.Image"), System.Drawing.Image)
Me.TabPos.Name = "TabPos" Me.TabPos.Name = "TabPos"
Me.TabPos.PageVisible = False Me.TabPos.PageVisible = False
Me.TabPos.Size = New System.Drawing.Size(791, 315) Me.TabPos.Size = New System.Drawing.Size(799, 358)
Me.TabPos.Text = "Positionen" Me.TabPos.Text = "Positionen"
' '
'Panel1 'Panel1
@@ -481,7 +481,7 @@ Partial Class frmRecordView
Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill
Me.Panel1.Location = New System.Drawing.Point(0, 25) Me.Panel1.Location = New System.Drawing.Point(0, 25)
Me.Panel1.Name = "Panel1" Me.Panel1.Name = "Panel1"
Me.Panel1.Size = New System.Drawing.Size(791, 290) Me.Panel1.Size = New System.Drawing.Size(799, 333)
Me.Panel1.TabIndex = 2 Me.Panel1.TabIndex = 2
' '
'GridControlPos 'GridControlPos
@@ -490,7 +490,7 @@ Partial Class frmRecordView
Me.GridControlPos.Location = New System.Drawing.Point(0, 0) Me.GridControlPos.Location = New System.Drawing.Point(0, 0)
Me.GridControlPos.MainView = Me.grvwGridPos Me.GridControlPos.MainView = Me.grvwGridPos
Me.GridControlPos.Name = "GridControlPos" Me.GridControlPos.Name = "GridControlPos"
Me.GridControlPos.Size = New System.Drawing.Size(791, 290) Me.GridControlPos.Size = New System.Drawing.Size(799, 333)
Me.GridControlPos.TabIndex = 0 Me.GridControlPos.TabIndex = 0
Me.GridControlPos.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwGridPos}) Me.GridControlPos.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwGridPos})
' '
@@ -517,7 +517,7 @@ Partial Class frmRecordView
Me.BindingNavigatorPOS.MovePreviousItem = Me.BindingNavigatorMovePreviousItem Me.BindingNavigatorPOS.MovePreviousItem = Me.BindingNavigatorMovePreviousItem
Me.BindingNavigatorPOS.Name = "BindingNavigatorPOS" Me.BindingNavigatorPOS.Name = "BindingNavigatorPOS"
Me.BindingNavigatorPOS.PositionItem = Me.BindingNavigatorPositionItem Me.BindingNavigatorPOS.PositionItem = Me.BindingNavigatorPositionItem
Me.BindingNavigatorPOS.Size = New System.Drawing.Size(791, 25) Me.BindingNavigatorPOS.Size = New System.Drawing.Size(799, 25)
Me.BindingNavigatorPOS.TabIndex = 1 Me.BindingNavigatorPOS.TabIndex = 1
Me.BindingNavigatorPOS.Text = "BindingNavigator1" Me.BindingNavigatorPOS.Text = "BindingNavigator1"
' '
@@ -643,6 +643,54 @@ Partial Class frmRecordView
Me.GridControlDocSearch.TabIndex = 7 Me.GridControlDocSearch.TabIndex = 7
Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search}) Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search})
' '
'ContextMenuStripResultFiles
'
Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.ToolStripSeparator7, Me.CopyToolStripMenuItem, Me.ToolStripSeparator8, Me.DeleteToolStripMenuItem, Me.ToolStripSeparator9, Me.PropertiesToolStripMenuItem})
Me.ContextMenuStripResultFiles.Name = "ContextMenuStripResultFiles"
Me.ContextMenuStripResultFiles.Size = New System.Drawing.Size(149, 110)
'
'DateiÖffnenToolStripMenuItem
'
Me.DateiÖffnenToolStripMenuItem.Name = "DateiÖffnenToolStripMenuItem"
Me.DateiÖffnenToolStripMenuItem.Size = New System.Drawing.Size(148, 22)
Me.DateiÖffnenToolStripMenuItem.Text = "Datei Öffnen"
'
'ToolStripSeparator7
'
Me.ToolStripSeparator7.Name = "ToolStripSeparator7"
Me.ToolStripSeparator7.Size = New System.Drawing.Size(145, 6)
'
'CopyToolStripMenuItem
'
Me.CopyToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.Copy_6524
Me.CopyToolStripMenuItem.Name = "CopyToolStripMenuItem"
Me.CopyToolStripMenuItem.Size = New System.Drawing.Size(148, 22)
Me.CopyToolStripMenuItem.Text = "Kopieren"
'
'ToolStripSeparator8
'
Me.ToolStripSeparator8.Name = "ToolStripSeparator8"
Me.ToolStripSeparator8.Size = New System.Drawing.Size(145, 6)
'
'DeleteToolStripMenuItem
'
Me.DeleteToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
Me.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem"
Me.DeleteToolStripMenuItem.Size = New System.Drawing.Size(148, 22)
Me.DeleteToolStripMenuItem.Text = "Löschen"
'
'ToolStripSeparator9
'
Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
Me.ToolStripSeparator9.Size = New System.Drawing.Size(145, 6)
'
'PropertiesToolStripMenuItem
'
Me.PropertiesToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.PropertyGridEditorPart_6041
Me.PropertiesToolStripMenuItem.Name = "PropertiesToolStripMenuItem"
Me.PropertiesToolStripMenuItem.Size = New System.Drawing.Size(148, 22)
Me.PropertiesToolStripMenuItem.Text = "Eigenschaften"
'
'GridViewDoc_Search 'GridViewDoc_Search
' '
Me.GridViewDoc_Search.Appearance.OddRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) Me.GridViewDoc_Search.Appearance.OddRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
@@ -713,7 +761,7 @@ Partial Class frmRecordView
Me.XtraTabPage1.Controls.Add(STATE_IDLabel) Me.XtraTabPage1.Controls.Add(STATE_IDLabel)
Me.XtraTabPage1.Controls.Add(Me.STATE_IDComboBox) Me.XtraTabPage1.Controls.Add(Me.STATE_IDComboBox)
Me.XtraTabPage1.Name = "XtraTabPage1" Me.XtraTabPage1.Name = "XtraTabPage1"
Me.XtraTabPage1.Size = New System.Drawing.Size(791, 335) Me.XtraTabPage1.Size = New System.Drawing.Size(799, 318)
Me.XtraTabPage1.Text = "Workflows/Tasks" Me.XtraTabPage1.Text = "Workflows/Tasks"
' '
'WF_IDTextBox 'WF_IDTextBox
@@ -921,54 +969,6 @@ Partial Class frmRecordView
' '
Me.TBPMO_WORKFLOW_TASK_STATETableAdapter.ClearBeforeFill = True Me.TBPMO_WORKFLOW_TASK_STATETableAdapter.ClearBeforeFill = True
' '
'ContextMenuStripResultFiles
'
Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.ToolStripSeparator7, Me.CopyToolStripMenuItem, Me.ToolStripSeparator8, Me.DeleteToolStripMenuItem, Me.ToolStripSeparator9, Me.PropertiesToolStripMenuItem})
Me.ContextMenuStripResultFiles.Name = "ContextMenuStripResultFiles"
Me.ContextMenuStripResultFiles.Size = New System.Drawing.Size(149, 110)
'
'DateiÖffnenToolStripMenuItem
'
Me.DateiÖffnenToolStripMenuItem.Name = "DateiÖffnenToolStripMenuItem"
Me.DateiÖffnenToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.DateiÖffnenToolStripMenuItem.Text = "Datei Öffnen"
'
'ToolStripSeparator7
'
Me.ToolStripSeparator7.Name = "ToolStripSeparator7"
Me.ToolStripSeparator7.Size = New System.Drawing.Size(145, 6)
'
'CopyToolStripMenuItem
'
Me.CopyToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.Copy_6524
Me.CopyToolStripMenuItem.Name = "CopyToolStripMenuItem"
Me.CopyToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.CopyToolStripMenuItem.Text = "Kopieren"
'
'ToolStripSeparator8
'
Me.ToolStripSeparator8.Name = "ToolStripSeparator8"
Me.ToolStripSeparator8.Size = New System.Drawing.Size(145, 6)
'
'DeleteToolStripMenuItem
'
Me.DeleteToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
Me.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem"
Me.DeleteToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.DeleteToolStripMenuItem.Text = "Löschen"
'
'ToolStripSeparator9
'
Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
Me.ToolStripSeparator9.Size = New System.Drawing.Size(145, 6)
'
'PropertiesToolStripMenuItem
'
Me.PropertiesToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.PropertyGridEditorPart_6041
Me.PropertiesToolStripMenuItem.Name = "PropertiesToolStripMenuItem"
Me.PropertiesToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.PropertiesToolStripMenuItem.Text = "Eigenschaften"
'
'frmRecordView 'frmRecordView
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1002,6 +1002,7 @@ Partial Class frmRecordView
Me.XtraTabPage2.ResumeLayout(False) Me.XtraTabPage2.ResumeLayout(False)
Me.XtraTabPage2.PerformLayout() Me.XtraTabPage2.PerformLayout()
CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).EndInit()
Me.ContextMenuStripResultFiles.ResumeLayout(False)
CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit()
Me.ToolStrip2.ResumeLayout(False) Me.ToolStrip2.ResumeLayout(False)
Me.ToolStrip2.PerformLayout() Me.ToolStrip2.PerformLayout()
@@ -1016,7 +1017,6 @@ Partial Class frmRecordView
Me.SplitContainer1.Panel2.ResumeLayout(False) Me.SplitContainer1.Panel2.ResumeLayout(False)
CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainer1.ResumeLayout(False) Me.SplitContainer1.ResumeLayout(False)
Me.ContextMenuStripResultFiles.ResumeLayout(False)
Me.ResumeLayout(False) Me.ResumeLayout(False)
Me.PerformLayout() Me.PerformLayout()

View File

@@ -147,18 +147,7 @@
<metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<metadata name="BindingNavigatorPOS.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>667, 134</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="TabPos.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAExpc3Q7QnVsbGV0O1FzfzkAAABa
SURBVDhPY/j//z9FGEPAxsaGEYhBNF4MUw/TVADED0A0kkHMQMyCBbOCaHQDQJr/g2gkA0B8nBimDqYY
wwXEYqyCpGCsgqRgMEGxF6CaQYEzGogjMRD/MwAARTWKOO3Nn7MAAAAASUVORK5CYII=
</value>
</data>
<data name="btnRemoveUser_FollowUp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnRemoveUser_FollowUp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
@@ -241,6 +230,14 @@
kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
</value>
</data>
<data name="TabPos.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAExpc3Q7QnVsbGV0O1FzfzkAAABa
SURBVDhPY/j//z9FGEPAxsaGEYhBNF4MUw/TVADED0A0kkHMQMyCBbOCaHQDQJr/g2gkA0B8nBimDqYY
wwXEYqyCpGCsgqRgMEGxF6CaQYEzGogjMRD/MwAARTWKOO3Nn7MAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<metadata name="ContextMenuStripResultFiles.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ContextMenuStripResultFiles.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -265,18 +262,9 @@
<metadata name="VWPMO_WF_ACTIVEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="VWPMO_WF_ACTIVEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 173</value> <value>17, 173</value>
</metadata> </metadata>
<metadata name="VWPMO_WF_ACTIVEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 173</value>
</metadata>
<metadata name="DD_DMSDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="DD_DMSDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>928, 134</value> <value>928, 134</value>
</metadata> </metadata>
<metadata name="DD_DMSDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>928, 134</value>
</metadata>
<metadata name="TBPMO_WORKFLOW_TASK_STATEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>672, 173</value>
</metadata>
<metadata name="TBPMO_WORKFLOW_TASK_STATEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TBPMO_WORKFLOW_TASK_STATEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>672, 173</value> <value>672, 173</value>
</metadata> </metadata>

View File

@@ -265,231 +265,15 @@ Public Class frmSAP_FuBa
Dim SAPResulttable As DataTable = New DataTable Dim SAPResulttable As DataTable = New DataTable
If rbTable.Checked = True Then If rbTable.Checked = True Then
Try Dim result = ClassSAP.Return_Datatable_for_Table(TableNameTextBox.Text, WHERE_CLAUSETextBox.Text, txtLimitRows.Text)
If LogErrorsOnly = False Then ClassLogger.Add(">> Get data from SAP Table", False) If Not IsNothing(result) Then
Dim table As New ERPConnect.Utils.ReadTable(ClassSAP.SAP_CONNECTION) SAPResulttable = result
'Dim cWhereClause = "SAP_OBJECT EQ '<ObjectType>' AND AR_DATE GE '<AR_DATE>'"
'Dim sSearchDate1 = "20160101"
'cWhereClause = Replace(cWhereClause, "<ObjectType>", Objekttyp.Text)
'cWhereClause = Replace(cWhereClause, "<AR_DATE>", sSearchDate1)
If WHERE_CLAUSETextBox.Text <> "" Then
table.AddCriteria(WHERE_CLAUSETextBox.Text)
End If End If
ElseIf rBFuba.Checked = True Then 'FUBA Abruf
'ClassLogger.Add(">> cWhereClause: " & cWhereClause, False)
'table.AddField("MATNR")
'table.AddField("MAKTX")
' table.AddCriteria("SPRAS = 'DE'")
table.TableName = TableNameTextBox.Text
If txtLimitRows.Text <> "" Then
table.RowCount = CInt(txtLimitRows.Text)
End If
If LogErrorsOnly = False Then ClassLogger.Add(">>Table.Run executed", False)
table.Run()
SAPResulttable = table.Result
Try
GridControl2.DataSource = SAPResulttable
Catch ex As Exception
ClassLogger.Add(">> Unexpected Error in GridControl2 >> DataTable 1: " & ex.Message, False)
MsgBox("Unexpected Error in GridControl2 >> DataTable: " & ex.Message, MsgBoxStyle.Critical)
lblResult.Visible = False
Me.Cursor = Cursors.Default
lblSave.Visible = False
GridControl2.DataSource = Nothing
End Try
Dim i As Integer
'For Each row As DataRow In resulttable.Rows
' ClassLogger.Add(">> " & row.Item(0).ToString & "|" & row.Item(1).ToString & "|" & row.Item(2).ToString)
'Next
ClassSAP.SAP_CONNECTION.Close()
If txtLimitRows.Text <> "" Then
lblResult.Text = "Result of SAP Table (limited to " & txtLimitRows.Text & " rows)"
Else
lblResult.Text = "Result of SAP Table (unlimited) >> " & SAPResulttable.Rows.Count & " rows retreived"
End If
lblResult.Visible = True
Me.Cursor = Cursors.Default
lblSave.Visible = False
Catch ex As Exception
sw.Stop()
ClassLogger.Add(">> Unexpected Error in SAP Table Result: " & ex.Message, False)
MsgBox("Unexpected Error in SAP Table Result: " & ex.Message, MsgBoxStyle.Critical)
lblResult.Visible = False
Me.Cursor = Cursors.Default
lblSave.Visible = False
GridControl2.DataSource = Nothing
End Try
End If
If rBFuba.Checked = True Then
Dim result = ClassSAP.FuBa_Returndatatable_Seperated(TableNameTextBox.Text, FuBa_SplitCharacterTextBox.Text, txtLimitRows.Text) Dim result = ClassSAP.FuBa_Returndatatable_Seperated(TableNameTextBox.Text, FuBa_SplitCharacterTextBox.Text, txtLimitRows.Text)
If Not IsNothing(result) Then If Not IsNothing(result) Then
SAPResulttable = result SAPResulttable = result
End If End If
'If LogErrorsOnly = False Then ClassLogger.Add(" >> Get data from FuBa-Function", False)
'Dim func As RFCFunction
'Try
' func = SAPCon.CreateFunction(TableNameTextBox.Text)
' If LogErrorsOnly = False Then ClassLogger.Add(" >> func.Execute", False)
' func.Execute()
' If LogErrorsOnly = False Then ClassLogger.Add(" >> function was executed", False)
'Catch ex As Exception
' ClassLogger.Add(">> Unexpected Error in Create SAP Function: " & ex.Message, False)
' MsgBox("Error in Create SAP Function: " & ex.Message, MsgBoxStyle.Critical)
' lblResult.Visible = False
' Me.Cursor = Cursors.Default
' lblSave.Visible = False
' GridControl2.DataSource = Nothing
' Exit Sub
'End Try
'Dim FUNCT_ROW_COUNT As Integer = 1
'Dim RowMaskresult As String
'Try
' If LogErrorsOnly = False Then ClassLogger.Add(" >> Checking FunctionExecute", False)
' 'Den ersten Wert ausgeben lassen um die Spalten zu splitten
' For Each row As RFCStructure In func.Tables("T_INDEX").Rows
' Try
' If row.Item(1).ToString.Contains(FuBa_SplitCharacterTextBox.Text) Then
' RowMaskresult = row.Item(1).ToString
' If LogErrorsOnly = False Then ClassLogger.Add(" >> RowMask result: " & RowMaskresult, False)
' FUNCT_ROW_COUNT = 2
' End If
' Catch ex As Exception
' RowMaskresult = "ErrorInGetSeperatedResult: " & ex.Message
' End Try
' If FUNCT_ROW_COUNT = 2 Then Exit For
' Next
'Catch ex As Exception
' ClassLogger.Add(">> Unexpected Error in Checking FunctionExecute: " & ex.Message, False)
' MsgBox("Error in Checking FunctionExecute: " & ex.Message, MsgBoxStyle.Critical)
' SAPCon.Close()
' lblResult.Visible = False
' Me.Cursor = Cursors.Default
' lblSave.Visible = False
' GridControl2.DataSource = Nothing
' Exit Sub
'End Try
'FUNCT_ROW_COUNT = 1
'Dim ColCount As Integer
'If FuBa_SplitCharacterTextBox.Text <> "" And RowMaskresult.Contains(FuBa_SplitCharacterTextBox.Text) Then
' Try
' If LogErrorsOnly = False Then ClassLogger.Add(" >> Define Datatable with SplitCharacter method", False)
' Dim split() = RowMaskresult.Split(FuBa_SplitCharacterTextBox.Text)
' If split.Length > 0 Then
' ColCount = split.Length - 1
' If LogErrorsOnly = False Then
' ClassLogger.Add(" >> ColCount: " & ColCount.ToString, False)
' ClassLogger.Add(" >> Split-Results: ", False)
' For Each s As String In split
' ClassLogger.Add(" # " & s, False)
' Next
' End If
' For x = 0 To ColCount
' ' Declare DataColumn and DataRow variables.
' Dim column As DataColumn
' column = New DataColumn()
' column = New DataColumn()
' column.DataType = Type.GetType("System.String")
' column.ColumnName = "Column " & x.ToString
' SAPResulttable.Columns.Add(column)
' Next
' If LogErrorsOnly = False Then ClassLogger.Add(" >> Datatable Columns after Split created", False)
' ' Create new DataRow objects and add to DataTable.
' 'Jetzt die Zeilen der Function durchlaufen
' For Each row As RFCStructure In func.Tables("T_INDEX").Rows
' Dim new_row As DataRow
' If txtLimitRows.Text <> "" Then
' If CInt(txtLimitRows.Text) = FUNCT_ROW_COUNT Then
' If LogErrorsOnly = False Then ClassLogger.Add(" >> RowCount limited to" & txtLimitRows.Text & " rows. Exit SAP Function", False)
' Exit For
' End If
' End If
' new_row = SAPResulttable.NewRow()
' Dim Rowresult As String = row.Item(1).ToString
' If Rowresult.Contains(FuBa_SplitCharacterTextBox.Text) Then
' Dim RowSplit() = Rowresult.Split(FuBa_SplitCharacterTextBox.Text)
' Dim col_index = 0
' 'Jetzt die Spaltenwerte in die NewRow eintragen
' For x = 0 To ColCount
' new_row(x) = RowSplit(x)
' Next
' FUNCT_ROW_COUNT += 1
' SAPResulttable.Rows.Add(new_row)
' End If
' Next
' End If
' Catch ex As Exception
' ClassLogger.Add(">> Unexpected Error in Create Datatable with split-method: " & ex.Message, False)
' MsgBox("Unexpected Error in Create Datatable with split-method: " & ex.Message, MsgBoxStyle.Critical)
' SAPCon.Close()
' lblResult.Visible = False
' Me.Cursor = Cursors.Default
' lblSave.Visible = False
' GridControl2.DataSource = Nothing
' Exit Sub
' End Try
'Else
' If LogErrorsOnly = False Then ClassLogger.Add(" >> Define Datatable WITHOUT SplitCharacter method", False)
' ' Declare DataColumn and DataRow variables.
' Dim column As DataColumn
' ' Create new DataColumn, set DataType, ColumnName and add to DataTable.
' column = New DataColumn()
' column.DataType = System.Type.GetType("System.Int32")
' column.ColumnName = "id"
' SAPResulttable.Columns.Add(column)
' ' Create second column.
' column = New DataColumn()
' column.DataType = Type.GetType("System.String")
' column.ColumnName = "FuBa-Result"
' SAPResulttable.Columns.Add(column)
' If LogErrorsOnly = False Then ClassLogger.Add(" >> Datatable Columns created", False)
' ' Create new DataRow objects and add to DataTable.
' Try
' For Each row As RFCStructure In func.Tables("T_INDEX").Rows
' Dim new_row As DataRow
' If LogErrorsOnly = False And FUNCT_ROW_COUNT = 1 Then
' ClassLogger.Add(" >> The first 30 rows will be logged", False)
' End If
' If txtLimitRows.Text <> "" Then
' If CInt(txtLimitRows.Text) = FUNCT_ROW_COUNT Then
' Exit For
' End If
' End If
' new_row = SAPResulttable.NewRow()
' Dim Result As String
' Try
' Result = row.Item(1).ToString
' Catch ex As Exception
' Result = "2 Empty"
' End Try
' new_row("id") = FUNCT_ROW_COUNT
' new_row("FuBa-Result") = Result
' If LogErrorsOnly = False And FUNCT_ROW_COUNT <= 30 Then
' ClassLogger.Add(" >> Result Row: " & Result, False)
' End If
' FUNCT_ROW_COUNT += 1
' SAPResulttable.Rows.Add(new_row)
' Next
' Catch ex As Exception
' ClassLogger.Add(">> Unexpected Error in Create SAP Function-Create Datatable: " & ex.Message, False)
' MsgBox("Error in Create Datatable: " & ex.Message, MsgBoxStyle.Critical)
' SAPCon.Close()
' lblResult.Visible = False
' Me.Cursor = Cursors.Default
' lblSave.Visible = False
' GridControl2.DataSource = Nothing
' Exit Sub
' End Try
End If End If
If SAPResulttable Is Nothing Then If SAPResulttable Is Nothing Then
ClassSAP.SAP_CONNECTION.Close() ClassSAP.SAP_CONNECTION.Close()
@@ -499,6 +283,7 @@ Public Class frmSAP_FuBa
GridControl2.DataSource = Nothing GridControl2.DataSource = Nothing
sw.Stop() sw.Stop()
ClassLogger.Add(">> SAPResulttable is nothing", False) ClassLogger.Add(">> SAPResulttable is nothing", False)
Exit Sub
End If End If
@@ -513,9 +298,9 @@ Public Class frmSAP_FuBa
elapsed = sw.Elapsed.TotalSeconds elapsed = sw.Elapsed.TotalSeconds
sw.Stop() sw.Stop()
If txtLimitRows.Text <> "" And SAPResulttable.Rows.Count >= CInt(txtLimitRows.Text) Then If txtLimitRows.Text <> "" And SAPResulttable.Rows.Count >= CInt(txtLimitRows.Text) Then
lblResult.Text = "Result of FuBa (limited to " & txtLimitRows.Text & " rows) - Duration: " & Format(elapsed, "0.00") & " seconds" lblResult.Text = "Result (limited to " & txtLimitRows.Text & " rows) - Duration: " & Format(elapsed, "0.00") & " seconds"
Else Else
lblResult.Text = "Result of FuBa (unlimited) >> " & SAPResulttable.Rows.Count & " rows retrieved - Duration: " & Format(elapsed, "0.00") & " seconds" lblResult.Text = "Result (unlimited) >> " & SAPResulttable.Rows.Count & " rows retrieved - Duration: " & Format(elapsed, "0.00") & " seconds"
End If End If
lblResult.Visible = True lblResult.Visible = True
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default