Merge pull request #698 from shadrackkibet/summary

Summary
shadrackkibet · Sep 4, 2017 · 68c7969 · 68c7969
2 parents 9e8f125 + 43ec4ec
commit 68c7969
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 77 deletions.
diff --git a/instat/dlgColumnStats.Designer.vb b/instat/dlgColumnStats.Designer.vb
diff --git a/instat/dlgColumnStats.vb b/instat/dlgColumnStats.vb
@@ -80,6 +80,9 @@ Public Class dlgColumnStats
         ucrChkOmitMissing.SetText("Omit Missing Values")
         ucrChkOmitMissing.SetValuesCheckedAndUnchecked("TRUE", "FALSE")
         ucrChkOmitMissing.SetRDefault("FALSE")
+
+        'TODO:Disabling this for now still needs discussions.
+        cmdProportionsPercentages.Enabled = False
     End Sub
 
     Private Sub SetDefaults()
@@ -101,7 +104,6 @@ Public Class dlgColumnStats
         clsDefaultFunction.AddParameter("silent", "TRUE")
         ucrBase.clsRsyntax.SetBaseRFunction(clsDefaultFunction)
         bResetSubdialog = True
-        bResetSubdialog = True
     End Sub
 
     Public Sub SetRCodeForControls(bReset As Boolean)
@@ -128,7 +130,7 @@ Public Class dlgColumnStats
     End Sub
 
     Public Sub TestOKEnabled()
-        If Not ucrReceiverByFactor.IsEmpty AndAlso Not clsSummariesList.clsParameters.Count = 0 Then
+        If Not ucrReceiverByFactor.IsEmpty AndAlso (ucrChkStoreResults.Checked OrElse ucrChkPrintOutput.Checked) AndAlso Not clsSummariesList.clsParameters.Count = 0 Then
             ucrBase.OKEnabled(True)
         Else
             ucrBase.OKEnabled(False)
@@ -148,7 +150,7 @@ Public Class dlgColumnStats
         TestOKEnabled()
     End Sub
 
-    Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSelectedVariables.ControlContentsChanged, ucrReceiverByFactor.ControlContentsChanged
+    Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSelectedVariables.ControlContentsChanged, ucrReceiverByFactor.ControlContentsChanged, ucrChkPrintOutput.ControlContentsChanged, ucrChkStoreResults.ControlContentsChanged
         TestOKEnabled()
     End Sub
 

diff --git a/instat/sdgSummaries.Designer.vb b/instat/sdgSummaries.Designer.vb
diff --git a/instat/sdgSummaries.vb b/instat/sdgSummaries.vb
@@ -87,16 +87,18 @@ Public Class sdgSummaries
         ucrChkSn.SetParameter(New RParameter("summary_Sn", 20), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_Sn" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34))
         ucrChkSn.SetText("Sn")
 
-        ucrPnlMissingOptions.AddRadioButton(rdoNumber)
-        ucrPnlMissingOptions.AddRadioButton(rdoPercentage)
+        'ucrPnlMissingOptions.AddRadioButton(rdoNumber)
+        'ucrPnlMissingOptions.AddRadioButton(rdoPercentage)
 
-        ucrPnlMissingOptions.AddToLinkedControls({ucrNudNumber}, {rdoNumber}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
-        ucrPnlMissingOptions.AddToLinkedControls({ucrNudPercentage}, {rdoPercentage}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
+        'ucrPnlMissingOptions.AddToLinkedControls({ucrNudNumber}, {rdoNumber}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
+        'ucrPnlMissingOptions.AddToLinkedControls({ucrNudPercentage}, {rdoPercentage}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
         ucrNudPercentage.SetLinkedDisplayControl(lblPercentage)
         ucrNudNumber.SetLinkedDisplayControl(lblNumber)
 
         lstCheckboxes = New List(Of ucrCheck)
         lstCheckboxes.AddRange({ucrChkNTotal, ucrChkNonMissing, ucrChkNMissing, ucrChkMean, ucrChkMinimum, ucrChkMode, ucrChkMaximum, ucrChkMedian, ucrChkStdDev, ucrChkVariance, ucrChkRange, ucrChkSum, ucrChkUpperQuartile, ucrChkLowerQuartile, ucrChkMedianAbsoluteDeviation, ucrChkKurtosis, ucrChkCoefficientOfVariation, ucrChkSkewness, ucrChkQn, ucrChkSn})
+        'TODO: This needs modifying summaries functions to allow this options to be implemented.
+        tbMissingOptions.Enabled = False
         For Each ctrTemp As ucrCheck In lstCheckboxes
             ctrTemp.SetParameterIncludeArgumentName(False)
             ctrTemp.SetRDefault(Chr(34) & Chr(34))
@@ -110,6 +112,10 @@ Public Class sdgSummaries
         End If
         clsListFunction = clsNewRFunction
         SetRCode(Me, clsListFunction, bReset)
+
+        If bReset Then
+            tbSummaries.SelectedIndex = 0
+        End If
     End Sub
 
     Public ReadOnly Property SummaryCount As Integer