Merge pull request IDEMSInternational#677 from africanmathsinitiative…

…/master update
N-thony · Apr 14, 2021 · b314039 · b314039
2 parents 6b1f9e0 + 2827adb
commit b314039
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/instat/dlgImportDataset.vb b/instat/dlgImportDataset.vb
@@ -616,9 +616,7 @@ Public Class dlgImportDataset
                 'get the name of the file (without extension), with any special characters removed
                 strFileName = GetCleanFileName(strFilePath)
                 strCurrentDirectory = Path.GetDirectoryName(strFilePath)
-                If Not bFromLibrary Then
-                    strFileExtension = Path.GetExtension(strFilePath).ToLower()
-                End If
+                strFileExtension = Path.GetExtension(strFilePath).ToLower()
             ElseIf Directory.Exists(strFilePath) AndAlso strNewFileExt <> "" Then
                 strCurrentDirectory = strFilePath
                 strFileExtension = strNewFileExt
@@ -660,7 +658,7 @@ Public Class dlgImportDataset
             End If
             ucrBase.clsRsyntax.SetBaseRFunction(clsImportMultipleFiles)
         Else
-            'enable multiple files import for the following files only
+            'don't enable multiple files import for the following files only; .rds, .xlsx, .xls
             ucrChkMultipleFiles.SetVisible(Not (strFileExtension = ".rds" OrElse strFileExtension = ".xlsx" OrElse strFileExtension = ".xls"))
 
             'TODO This needs to be different when RDS is a data frame

diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb
diff --git a/instat/frmMain.resx b/instat/frmMain.resx
@@ -1151,6 +1151,15 @@
   <data name="ToolStripSeparator69.Size" type="System.Drawing.Size, System.Drawing">
     <value>212, 6</value>
   </data>
+  <data name="mnuSetupForDataEntry.Size" type="System.Drawing.Size, System.Drawing">
+    <value>215, 22</value>
+  </data>
+  <data name="mnuSetupForDataEntry.Text" xml:space="preserve">
+    <value>Setup for Data Entry...</value>
+  </data>
+  <data name="mnuSetupForDataEntry.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="mnuTidyandExamineClimaticDataEntry.Size" type="System.Drawing.Size, System.Drawing">
     <value>215, 22</value>
   </data>
@@ -7446,6 +7455,12 @@
   <data name="&gt;&gt;ToolStripSeparator69.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;mnuSetupForDataEntry.Name" xml:space="preserve">
+    <value>mnuSetupForDataEntry</value>
+  </data>
+  <data name="&gt;&gt;mnuSetupForDataEntry.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;mnuTidyandExamineClimaticDataEntry.Name" xml:space="preserve">
     <value>mnuTidyandExamineClimaticDataEntry</value>
   </data>

diff --git a/instat/frmMain.vb b/instat/frmMain.vb
@@ -2360,4 +2360,8 @@ Public Class frmMain
     Private Sub mnuClimaticFileImportfromClimateDataStore_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileImportfromClimateDataStore.Click
         dlgImportERA5Data.ShowDialog()
     End Sub
+
+    Private Sub mnuSetupForDataEntry_Click(sender As Object, e As EventArgs) Handles mnuSetupForDataEntry.Click
+        dlgSetupForDataEntry.ShowDialog()
+    End Sub
 End Class