Merge pull request IDEMSInternational#8796 from N-thony/column_summary

Moved the Percentage sub-dialog into the Summaries sub-dialog in Prepare > Data Reshape > Column Summaries

instat/dlgColumnStats.vb

@@ -177,13 +177,6 @@ Public Class dlgColumnStats
         TestOKEnabled()
     End Sub
 
-    Private Sub cmdProportionsPercentages_Click(sender As Object, e As EventArgs) Handles cmdProportionsPercentages.Click
-        sdgProportionsPercentages.SetRFunction(clsDefaultFunction, bResetSubdialog)
-        sdgProportionsPercentages.ShowDialog()
-        bResetSubdialog = False
-        TestOKEnabled()
-    End Sub
-
     Private Sub ucrChkOmitMissing_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkOmitMissing.ControlValueChanged
         If clsSummariesList.ContainsParameter("summary_cor") OrElse clsSummariesList.ContainsParameter("summary_cov") Then
             clsDefaultFunction.AddParameter("use", Chr(34) & "'na.or.complete'" & Chr(34))

instat/sdgProportionsPercentages.vb

@@ -49,7 +49,6 @@ Public Class sdgProportionsPercentages
 
         ucrChkProportionsPercentages.SetParameter(New RParameter("percentage_type"))
         ucrChkProportionsPercentages.SetValuesCheckedAndUnchecked(Chr(34) & "factors" & Chr(34), Chr(34) & "none" & Chr(34))
-        ucrChkProportionsPercentages.SetRDefault(Chr(34) & "none" & Chr(34))
         ucrChkProportionsPercentages.SetText("Calculate Proportions or Percentages")
 
         ucrPnlBY.AddToLinkedControls({ucrReceiverByFactor, ucrChkDisplayAsDecimal}, objValues:={rdoByFactors}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
@@ -70,6 +69,8 @@ Public Class sdgProportionsPercentages
             InitialiseControls()
         End If
         clsDefaultFunction = clsNewDefaultFunction
+        clsDefaultFunction.AddParameter("percentage_type", Chr(34) & "factors" & Chr(34))
+
         SetRCode(Me, clsDefaultFunction, bReset)
     End Sub