From 0a1ad3243a0b8d1b4adc5bc4fd5b9c9b1b0431cb Mon Sep 17 00:00:00 2001
From: KWAMBAI VITALIS <vitaliskwambai@gmail.com>
Date: Thu, 14 Nov 2024 17:27:17 +0300
Subject: [PATCH] changes to the code

---
 instat/dlgSummaryTables.Designer.vb | 15 ---------------
 instat/dlgSummaryTables.vb          | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/instat/dlgSummaryTables.Designer.vb b/instat/dlgSummaryTables.Designer.vb
index dc580406db..62161275db 100644
--- a/instat/dlgSummaryTables.Designer.vb
+++ b/instat/dlgSummaryTables.Designer.vb
@@ -55,7 +55,6 @@ Partial Class dlgSummaryTables
         Me.ucrPnlMargin = New instat.UcrPanel()
         Me.lblMarginName = New System.Windows.Forms.Label()
         Me.lblVariables = New System.Windows.Forms.Label()
-        Me.cmdFormatTable = New System.Windows.Forms.Button()
         Me.rdoFrequencyTable = New System.Windows.Forms.RadioButton()
         Me.rdoSummaryTable = New System.Windows.Forms.RadioButton()
         Me.grpPercentages = New System.Windows.Forms.GroupBox()
@@ -297,18 +296,6 @@ Partial Class dlgSummaryTables
         Me.lblVariables.Tag = ""
         Me.lblVariables.Text = "Variables :"
         '
-        'cmdFormatTable
-        '
-        Me.cmdFormatTable.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.cmdFormatTable.Location = New System.Drawing.Point(429, 696)
-        Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4)
-        Me.cmdFormatTable.Name = "cmdFormatTable"
-        Me.cmdFormatTable.Size = New System.Drawing.Size(156, 34)
-        Me.cmdFormatTable.TabIndex = 19
-        Me.cmdFormatTable.Text = "Format Table..."
-        Me.cmdFormatTable.UseVisualStyleBackColor = True
-        Me.cmdFormatTable.Visible = False
-        '
         'rdoFrequencyTable
         '
         Me.rdoFrequencyTable.Appearance = System.Windows.Forms.Appearance.Button
@@ -701,7 +688,6 @@ Partial Class dlgSummaryTables
         Me.Controls.Add(Me.rdoFrequencyTable)
         Me.Controls.Add(Me.rdoSummaryTable)
         Me.Controls.Add(Me.ucrPnlSummaryFrequencyTables)
-        Me.Controls.Add(Me.cmdFormatTable)
         Me.Controls.Add(Me.ucrReorderSummary)
         Me.Controls.Add(Me.lblVariables)
         Me.Controls.Add(Me.ucrInputMarginName)
@@ -763,7 +749,6 @@ Partial Class dlgSummaryTables
     Friend WithEvents ucrInputMarginName As ucrInputTextBox
     Friend WithEvents lblVariables As Label
     Friend WithEvents ucrReorderSummary As ucrReorder
-    Friend WithEvents cmdFormatTable As Button
     Friend WithEvents ucrPnlSummaryFrequencyTables As UcrPanel
     Friend WithEvents rdoFrequencyTable As RadioButton
     Friend WithEvents rdoSummaryTable As RadioButton
diff --git a/instat/dlgSummaryTables.vb b/instat/dlgSummaryTables.vb
index 909a040bf8..5239070065 100644
--- a/instat/dlgSummaryTables.vb
+++ b/instat/dlgSummaryTables.vb
@@ -313,8 +313,18 @@ Public Class dlgSummaryTables
         End If
 
     End Sub
+
     Private Sub btnMoreOptions_Click(sender As Object, e As EventArgs) Handles btnMoreOptions.Click
-        sdgTableOptions.Setup(ucrSelectorSummaryTables.strCurrentDataFrame, clsJoiningPipeOperator)
+        Dim clsROperator As ROperator
+        If rdoFrequencyTable.Checked Then
+            clsROperator = clsFrequencyOperator
+        ElseIf rdoSummaryTable.Checked Then
+            clsROperator = clsSummaryOperator
+        Else
+            Exit Sub
+        End If
+
+        sdgTableOptions.Setup(ucrSelectorSummaryTables.strCurrentDataFrame, clsROperator)
         sdgTableOptions.ShowDialog(Me)
 
     End Sub
@@ -338,7 +348,7 @@ Public Class dlgSummaryTables
         TestOKEnabled()
     End Sub
 
-    Private Sub cmdFormatTable_Click(sender As Object, e As EventArgs) Handles cmdFormatTable.Click
+    Private Sub cmdFormatTable_Click(sender As Object, e As EventArgs)
 
         Dim clsROperator As ROperator
         If rdoFrequencyTable.Checked Then
@@ -385,7 +395,6 @@ Public Class dlgSummaryTables
 
     Private Sub ucrPnlSummaryFrequencyTables_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlSummaryFrequencyTables.ControlValueChanged
         cmdSummaries.Visible = rdoSummaryTable.Checked
-        cmdFormatTable.Location = New Point(286, If(rdoSummaryTable.Checked, 464, 273))
 
         DialogueSize()
         SettingParameters()