From 9216c3fd92c47e77c1ca5cb40602d6c47a4553ba Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Wed, 18 Mar 2020 08:39:53 +0100 Subject: [PATCH] MS --- app/DD_PM_WINDREAM/frmAdministration.vb | 8 +++-- app/DD_PM_WINDREAM/frmValidator.vb | 42 +++++++++++++++---------- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 08f011c..a1458d1 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -954,8 +954,12 @@ Public Class frmAdministration Dim oResult = oForm.ShowDialog() If oResult = DialogResult.OK Then - ClassDatabase.Execute_non_Query(String.Format("UPDATE TBPM_KONFIGURATION SET SQL_PROFILE_MAIN_VIEW = '{0}' WHERE GUID = 1", oForm.SQLCommand.Replace("'", "''"))) - BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") = oForm.SQLCommand + If oSQL <> oForm.SQLCommand Then + ClassDatabase.Execute_non_Query(String.Format("UPDATE TBPM_KONFIGURATION SET SQL_PROFILE_MAIN_VIEW = '{0}' WHERE GUID = 1", oForm.SQLCommand.Replace("'", "''"))) + BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") = oForm.SQLCommand + BASEDATA_DT_CONFIG.AcceptChanges() + End If + End If Catch ex As Exception MsgBox("Error in Saving SQL Overview: " & vbNewLine & vbNewLine & ex.Message) diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index e44fe53..353d4d1 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -2367,6 +2367,7 @@ Public Class frmValidator Next Else If omytype = "System.String" Then + MsgBox("IDB Fill Grid with String") oColValuesfromSource = Split(oValueFromSource.ToString, PMDelimiter) Select Case oColValuesfromSource.Length Case 2 @@ -2377,23 +2378,32 @@ Public Class frmValidator oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)}) End Select ElseIf omytype = "System.Data.DataTable" Then - Dim oMyDatatable As DataTable = oValueFromSource - For Each oRow As DataRow In oMyDatatable.Rows - LOGGER.Debug($"IDB ROW Vector {oRow.Item(0).ToString}...") - oColValuesfromSource = Split(oRow.Item(0).ToString, PMDelimiter) - - Select Case oColValuesfromSource.Length - Case 1 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0)}) - Case 2 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1)}) - Case 3 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)}) - Case 4 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)}) - End Select - Next + Try + Dim oMyDatatable As DataTable = oValueFromSource + MsgBox($"IDB Fill Grid with Datatable - Rows: " & oMyDatatable.Rows.Count) + For Each oRow As DataRow In oMyDatatable.Rows + LOGGER.Debug($"IDB-Wert Mehrfachfeld: {oRow.Item(0).ToString}...") + oColValuesfromSource = Split(oRow.Item(0).ToString, PMDelimiter) + MsgBox($"Item is: {oRow.Item(0).ToString}" & vbNewLine & $"oColValuesfromSource.Length: {oColValuesfromSource.Length}") + Select Case oColValuesfromSource.Length + Case 1 + oDataSource.Rows.Add(New String() {oColValuesfromSource(0)}) + Case 2 + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1)}) + Case 3 + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)}) + Case 4 + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)}) + End Select + Next + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical, ADDITIONAL_TITLE) + LOGGER.Error(ex) + End Try + + Else + LOGGER.Debug($"omytype is invalid... {omytype}...") End If End If