From 1d331c03915a5183609fd50f3fe5b13444c8cb49 Mon Sep 17 00:00:00 2001
From: Ntalumeso <antoine.ntalumeso@idems.international>
Date: Wed, 19 Jun 2024 10:07:00 +0300
Subject: [PATCH 1/2] reverted the code

---
 instat/ucrDataView.vb | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb
index 6344c61b532..226cd4653ac 100644
--- a/instat/ucrDataView.vb
+++ b/instat/ucrDataView.vb
@@ -661,23 +661,18 @@ Public Class ucrDataView
                 GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, True)
             Else
                 Dim bCheckLabels As Boolean = GetCurrentDataFrameFocus().clsPrepareFunctions.CheckHasLabels(strColumn)
-                If bCheckLabels Then
-                    frmConvertToNumeric.SetDataFrameName(GetCurrentDataFrameFocus().strName)
-                    frmConvertToNumeric.SetColumnName(strColumn)
-                    frmConvertToNumeric.CheckLabels(bCheckLabels)
-                    frmConvertToNumeric.SetNonNumeric(iNonNumericValues)
-                    frmConvertToNumeric.ShowDialog()
-                    ' Yes for "normal" convert and No for "ordinal" convert
-                    Select Case frmConvertToNumeric.DialogResult
-                        Case DialogResult.Yes
-                            GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, True)
-                        Case DialogResult.No
-                            GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, False)
-                        Case DialogResult.Cancel
-                            Continue For
-                    End Select
-                Else
+                frmConvertToNumeric.SetDataFrameName(GetCurrentDataFrameFocus().strName)
+                frmConvertToNumeric.SetColumnName(strColumn)
+                frmConvertToNumeric.CheckLabels(bCheckLabels)
+                frmConvertToNumeric.SetNonNumeric(iNonNumericValues)
+                frmConvertToNumeric.ShowDialog()
+                ' Yes for "normal" convert and No for "ordinal" convert
+                If frmConvertToNumeric.DialogResult = DialogResult.Yes Then
+                    GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, True)
+                ElseIf frmConvertToNumeric.DialogResult = DialogResult.No Then
                     GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, False)
+                ElseIf frmConvertToNumeric.DialogResult = DialogResult.Cancel Then
+                    Continue For
                 End If
                 frmConvertToNumeric.Close()
             End If

From f4b5373983675512fc6c070669d54aea436c5064 Mon Sep 17 00:00:00 2001
From: Ntalumeso <antoine.ntalumeso@idems.international>
Date: Wed, 19 Jun 2024 10:50:30 +0300
Subject: [PATCH 2/2] minor code change

---
 instat/ucrDataView.vb | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb
index 226cd4653ac..3f77aed3c2f 100644
--- a/instat/ucrDataView.vb
+++ b/instat/ucrDataView.vb
@@ -667,13 +667,14 @@ Public Class ucrDataView
                 frmConvertToNumeric.SetNonNumeric(iNonNumericValues)
                 frmConvertToNumeric.ShowDialog()
                 ' Yes for "normal" convert and No for "ordinal" convert
-                If frmConvertToNumeric.DialogResult = DialogResult.Yes Then
-                    GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, True)
-                ElseIf frmConvertToNumeric.DialogResult = DialogResult.No Then
-                    GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, False)
-                ElseIf frmConvertToNumeric.DialogResult = DialogResult.Cancel Then
-                    Continue For
-                End If
+                Select Case frmConvertToNumeric.DialogResult
+                    Case DialogResult.Yes
+                        GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, True)
+                    Case DialogResult.No
+                        GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, False)
+                    Case DialogResult.Cancel
+                        Continue For
+                End Select
                 frmConvertToNumeric.Close()
             End If
         Next