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

Importer latest fixes #997

Merged
merged 9 commits into from
Apr 30, 2021
Merged

Importer latest fixes #997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ca5c543
merge correction
georgeDaskalakis Apr 20, 2021
be912a7
Merge branch 'develop' of https://github.com/Open-Systems-Pharmacolog…
georgeDaskalakis Apr 22, 2021
51e2671
Merge branch 'develop' of https://github.com/Open-Systems-Pharmacolog…
georgeDaskalakis Apr 25, 2021
37a1e14
Merge branch 'develop' of https://github.com/Open-Systems-Pharmacolog…
georgeDaskalakis Apr 28, 2021
9cd4f4b
Merge branch 'develop' of https://github.com/Open-Systems-Pharmacolog…
georgeDaskalakis Apr 29, 2021
0ef69ec
Merge branch 'develop' of https://github.com/Open-Systems-Pharmacolog…
georgeDaskalakis Apr 29, 2021
ac174dd
Merge branch 'develop' of https://github.com/Open-Systems-Pharmacolog…
georgeDaskalakis Apr 30, 2021
6647186
support for .XLSX ending (capital letters)
georgeDaskalakis Apr 30, 2021
a6e6573
check unsupported file format upon changing file
georgeDaskalakis Apr 30, 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
4 changes: 2 additions & 2 deletions src/OSPSuite.Infrastructure.Import/Core/DataSourceFileReaders/ExcelReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public ExcelReader(string path, bool columnOffsetOn = true)

_columnOffsetOn = columnOffsetOn;
_sheetEnumerator = _book.GetEnumerator();
_isTypeXlsx = Path.GetExtension(path).Equals(Constants.Filter.XLSX_EXTENSION);
_isTypeXlsx = Path.GetExtension(path.ToLower()).Equals(Constants.Filter.XLSX_EXTENSION);
_formulaEvaluator = _book.GetCreationHelper().CreateFormulaEvaluator();
}

Expand All @@ -49,7 +49,7 @@ public void LoadNewWorkbook(string path, bool columnOffsetOn = true)

_sheetEnumerator = _book.GetEnumerator();
_columnOffsetOn = columnOffsetOn;
_isTypeXlsx = Path.GetExtension(path).Equals(Constants.Filter.XLSX_EXTENSION);
_isTypeXlsx = Path.GetExtension(path.ToLower()).Equals(Constants.Filter.XLSX_EXTENSION);
}

public bool MoveToNextSheet()
Expand Down
10 changes: 7 additions & 3 deletions src/OSPSuite.Presentation/Presenters/Importer/ImporterPresenter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,11 @@ public void SetDataSource(string dataSourceFileName)
{
if (string.IsNullOrEmpty(dataSourceFileName)) return;

SetSourceFile(dataSourceFileName);
if (!SetSourceFile(dataSourceFileName))
{
_dialogCreator.MessageBoxError(Captions.Importer.FileFormatNotSupported(dataSourceFileName));
return;
}
_view.DisableConfirmationView();
}

Expand Down Expand Up @@ -279,12 +283,12 @@ private void onCompletedMapping(object sender, EventArgs args)

public bool SetSourceFile(string path)
{
_sourceFilePresenter.SetFilePath(path);
_dataSourceFile = _importerDataPresenter.SetDataSource(path);

if (_dataSourceFile == null)
return false;

_sourceFilePresenter.SetFilePath(path);
_columnMappingPresenter.ValidateMapping();
_configuration.FileName = path;

Expand Down