Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small bug fixes on Import Dataset dialog #6242

Merged
merged 8 commits into from
Mar 15, 2021
Merged

Small bug fixes on Import Dataset dialog #6242

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d0d3332
Resolving issue #6229
N-thony Feb 25, 2021
9753730
Update instat/dlgImportDataset.vb
N-thony Mar 2, 2021
d7a7a7b
Rving comment about replacing If with a select/case statement
N-thony Mar 2, 2021
3e9e62b
Resolving comments about the design
N-thony Mar 7, 2021
5cdfeec
Resolving comment about design
N-thony Mar 7, 2021
d880dcc
Resolving comment about new data frame name
N-thony Mar 10, 2021
53ca773
Resolving comment about new data frame name
N-thony Mar 10, 2021
dd46561
Resolving comment about file name
N-thony Mar 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions instat/dlgImportDataset.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,13 +446,15 @@ Public Class dlgImportDataset

If DialogResult.OK = dlgOpen.ShowDialog() Then
ucrSaveFile.Reset()
'ucrSaveFile.SetAssignToBooleans(bTempDataFrameList:=False)
N-thony marked this conversation as resolved.
Show resolved Hide resolved
'TODO This is in place for when we allow multiple files selected.
bMultiFiles = (dlgOpen.FileNames.Count > 1)
If NumberOfFileTypes(dlgOpen.FileNames) > 1 Then
MsgBox("All files must be of the same type", MsgBoxStyle.Information, "Multiple file types")
SetControlsFromFile("")
Else
dctSelectedExcelSheets.Clear()
clbSheets.Items.Clear()
SetControlsFromFile(dlgOpen.FileName)
End If
Else
Expand Down Expand Up @@ -636,15 +638,22 @@ Public Class dlgImportDataset
strFileType = ""
End If
If strFileType <> "" AndAlso strFileType <> "RDS" Then
'ucrSaveFile.Show()
'ucrSaveFile.SetName(frmMain.clsRLink.MakeValidText(strFileName), bSilent:=True)
'don't ovewrite the name for excel sheets if there is a selected sheet name
If (strFileType <> "XLSX" OrElse strFileType <> "XLS") AndAlso clbSheets.CheckedItems.Count = 0 Then
If (strFileType = "XLSX" OrElse strFileType = "XLS") Then
ucrSaveFile.SetAssignToBooleans(bTempDataFrameList:=True)
If clbSheets.CheckedItems.Count > 1 Then
ucrSaveFile.Hide()
ElseIf clbSheets.CheckedItems.Count = 1 Then
ucrSaveFile.Show()
ucrSaveFile.SetName(dctSelectedExcelSheets.Values.First(), bSilent:=True)
ElseIf clbSheets.CheckedItems.Count = 0 Then
ucrSaveFile.Show()
ucrSaveFile.SetName(frmMain.clsRLink.MakeValidText(strFileName), bSilent:=True)
End If
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replace with a select/case statement?

Else
ucrSaveFile.SetAssignToBooleans(bTempDataFrameList:=False)
ucrSaveFile.Show()
ucrSaveFile.SetName(frmMain.clsRLink.MakeValidText(strFileName), bSilent:=True)
End If
Else
ucrSaveFile.Hide()
End If
RefreshFilePreview()
RefreshFrameView()
Expand Down