Merge pull request #495 from IDEMSInternational/master

updated my master

.github/workflows/CreateInstaller.yml

@@ -95,7 +95,7 @@ jobs:
 
     # upload 32 bit installer without R
     - name: Upload the 32 bit installer as an artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: ${{ github.event_name != 'pull_request' }}
       with:
         path: "Output/"
@@ -113,7 +113,7 @@ jobs:
 
     # Upload 64 bit installer without R
     - name: Upload the 64 bit installer as an artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: ${{ github.event_name != 'pull_request' }}
       with:
         path: "Output/"
@@ -183,7 +183,7 @@ jobs:
       shell: cmd
 
     - name: Upload the 64 bit installer with R as an artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: ${{ github.event_name != 'pull_request' }}
       with:
         path: "Output/"
@@ -208,7 +208,7 @@ jobs:
       shell: cmd
 
     - name: Upload the 32 bit installer with R as an artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: ${{ github.event_name != 'pull_request' }}
       with:
         path: "Output/"

instat/dlgColumnStats.vb

@@ -46,7 +46,7 @@ Public Class dlgColumnStats
         ucrBase.clsRsyntax.iCallType = 0
         ucrBase.iHelpTopicID = 64
 
-        ucrChkDropUnusedLevels.Enabled = False ' removed this functionality so this is disabled
+        'ucrChkDropUnusedLevels.Enabled = False ' removed this functionality so this is disabled
         cmdMissingOptions.Enabled = False
 
         ucrSelectorForColumnStatistics.SetParameter(New RParameter("data_name", 0))
@@ -56,6 +56,7 @@ Public Class dlgColumnStats
         ucrReceiverSelectedVariables.SetParameter(New RParameter("columns_to_summarise", 1))
         ucrReceiverSelectedVariables.SetParameterIsString()
         ucrReceiverSelectedVariables.Selector = ucrSelectorForColumnStatistics
+        'ucrReceiverSelectedVariables.SetSingleTypeStatus(True)
 
         ucrReceiverByFactor.SetParameter(New RParameter("factors", 2))
         ucrReceiverByFactor.Selector = ucrSelectorForColumnStatistics
@@ -79,7 +80,7 @@ Public Class dlgColumnStats
         ucrChkDropUnusedLevels.SetParameter(New RParameter("drop", 5))
         ucrChkDropUnusedLevels.SetText("Drop Unused Levels")
         ucrChkDropUnusedLevels.SetValuesCheckedAndUnchecked("TRUE", "FALSE")
-        ucrChkDropUnusedLevels.SetRDefault("FALSE")
+        ucrChkDropUnusedLevels.SetRDefault("TRUE")
 
         ucrChkOmitMissing.SetParameter(New RParameter("na.rm", 6))
         ucrChkOmitMissing.SetText("Omit Missing Values")
@@ -121,6 +122,7 @@ Public Class dlgColumnStats
         clsDefaultFunction.AddParameter("silent", "TRUE")
         ucrBase.clsRsyntax.SetBaseRFunction(clsDefaultFunction)
         bResetSubdialog = True
+
     End Sub
 
     Public Sub SetRCodeForControls(bReset As Boolean)
@@ -225,6 +227,13 @@ Public Class dlgColumnStats
         sdgMissingOptions.ShowDialog()
     End Sub
 
+    'Private Sub ucrReceiverSelectedVariables_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSelectedVariables.ControlValueChanged
+    '    Dim bSameType As Boolean = Not ucrReceiverSelectedVariables.IsEmpty _
+    '                            AndAlso ucrReceiverSelectedVariables.GetCurrentItemTypes().All(Function(x) x = "factor")
+    '    ucrChkDropUnusedLevels.Enabled = bSameType
+    '    ucrChkDropUnusedLevels.Checked = Not bSameType
+    'End Sub
+
     Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkPrintOutput.ControlContentsChanged, ucrChkStoreResults.ControlContentsChanged
         TestOKEnabled()
     End Sub

instat/dlgImportFromRapidPro.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="ttFlow.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>