Merge pull request #86 from africanmathsinitiative/master

updating master
IDEMSInternational · Nov 7, 2022 · 9b99bf3 · 9b99bf3
2 parents b22d5ec + 02da925
commit 9b99bf3
Show file tree

Hide file tree

Showing 18 changed files with 891 additions and 396 deletions.
diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb
@@ -188,7 +188,7 @@ Public Class dlgCalculator
                 Me.Width = iBasicWidth * 1.27
                 ucrBase.iHelpTopicID = 598
             Case "Integer"
-                Me.Width = iBasicWidth * 1.38
+                Me.Width = iBasicWidth * 1.5
             Case Else
                 Me.Width = iBasicWidth
         End Select

diff --git a/instat/dlgColumnStats.vb b/instat/dlgColumnStats.vb
@@ -192,6 +192,10 @@ Public Class dlgColumnStats
         End If
         If Not ucrChkOmitMissing.Checked Then
             clsDefaultFunction.RemoveParameterByName("na_type")
+            clsDefaultFunction.RemoveParameterByName("na_max_n")
+            clsDefaultFunction.RemoveParameterByName("na_min_n")
+            clsDefaultFunction.RemoveParameterByName("na_max_prop")
+            clsDefaultFunction.RemoveParameterByName("na_consecutive_n")
         Else
             clsDefaultFunction.AddParameter("na_type", clsRFunctionParameter:=clsConcFunction, iPosition:=9)
         End If

diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb
diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb
@@ -470,6 +470,7 @@ Public Class dlgDescribeTwoVariable
         EnableDisableFrequencyControls()
         AddRemoveFrequencyParameters()
         ChangeLocations()
+        MissingOptions()
         TestOKEnabled()
     End Sub
 
@@ -479,6 +480,24 @@ Public Class dlgDescribeTwoVariable
         Else
             clsRCorrelationFunction.RemoveParameterByName("use")
         End If
+        If Not ucrChkOmitMissing.Checked Then
+            clsRCustomSummaryFunction.RemoveParameterByName("na_type")
+            clsRCustomSummaryFunction.RemoveParameterByName("na_max_n")
+            clsRCustomSummaryFunction.RemoveParameterByName("na_min_n")
+            clsRCustomSummaryFunction.RemoveParameterByName("na_max_prop")
+            clsRCustomSummaryFunction.RemoveParameterByName("na_consecutive_n")
+        Else
+            clsRCustomSummaryFunction.AddParameter("na_type", clsRFunctionParameter:=clsCombineFunction, iPosition:=9)
+        End If
+        MissingOptions()
+    End Sub
+
+    Private Sub MissingOptions()
+        If ucrChkOmitMissing.Checked AndAlso strFirstVariablesType = "numeric" AndAlso strSecondVariableType = "categorical" Then
+            cmdMissingOptions.Enabled = True
+        Else
+            cmdMissingOptions.Enabled = False
+        End If
     End Sub
 
     Private Sub ucrPnlDescribe_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlDescribe.ControlValueChanged
@@ -601,4 +620,10 @@ Public Class dlgDescribeTwoVariable
         clsMapFrequencyPipeOperator.AddParameter("data", clsRFunctionParameter:=ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0)
         clsFrequencyTablesFunction.AddParameter("data_name", Chr(34) & ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0)
     End Sub
+
+    Private Sub cmdMissingOptions_Click(sender As Object, e As EventArgs) Handles cmdMissingOptions.Click
+        sdgMissingOptions.SetRFunction(clsNewSummaryFunction:=clsRCustomSummaryFunction, clsNewConcFunction:=clsCombineFunction, bReset:=bResetSubdialog)
+        bResetSubdialog = False
+        sdgMissingOptions.ShowDialog()
+    End Sub
 End Class