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

fix: Wrong scale digit number if currency NumberDataFormatter ends with "_)" #336

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: Wrong scale digit number if currency NumberDataFormatter ends with "_)" #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bfc77a
fix: Wrong scale if NumberDataFormatter ends with "_)" - ExcelReader.cs
imckl May 20, 2020
d1230b8
fix: Wrong scale if NumberDataFormatter ends with "_*" - ExcelReader.cs
imckl May 20, 2020
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
11 changes: 11 additions & 0 deletions ReoGrid/IO/ExcelReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1534,6 +1534,17 @@ private static NumberDataFormatter.INumberFormatArgs ReadNumberFormatArgs(string
arg.DecimalPlaces = 0;
}

// End with _*
// reference: https://github.com/unvell/ReoGrid/pull/336
if (pattern.Length >= 2 && pattern[pattern.Length - 2] == '_')
{
if (decimalSeparatorIndex >= 0)
{
// Adjust DecimalPlaces minus 2
arg.DecimalPlaces -= 2;
}
}

arg.UseSeparator = (pattern.IndexOf(culture.NumberFormat.NumberGroupSeparator) > 0);

return arg;
Expand Down
4 changes: 4 additions & 0 deletions TestCase/Tests/ExcelInTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ void A03_Styles()
AssertCellText("G15", "7.00 €");
AssertCellText("H15", "₱8.00");
AssertCellText("I15", "USD 9.00");
AssertCellText("J15", "CNY 9.00");

// currency line 2
AssertCellText("A16", "$1,234");
Expand All @@ -203,6 +204,7 @@ void A03_Styles()
AssertCellText("G16", "1,234.00 €");
AssertCellText("H16", "₱1,234.00");
AssertCellText("I16", "USD 1,234.00");
AssertCellText("J16", "CNY 1,234.00");

// currency line 3
AssertCellText("A17", "-$1");
Expand All @@ -214,6 +216,7 @@ void A03_Styles()
AssertCellText("G17", "-1.23 €");
AssertCellText("H17", "-₱1.23");
AssertCellText("I17", "-USD 1.23");
AssertCellText("J17", "-CNY 1.23");

// currency line 4
AssertCellText("A18", "-$1.2340");
Expand All @@ -225,6 +228,7 @@ void A03_Styles()
AssertCellText("G18", "-1.2340 €");
AssertCellText("H18", "-₱1.2340");
AssertCellText("I18", "-USD 1.2340");
AssertCellText("J18", "-CNY 1.2340");

// negative number formats
Cell cell;
Expand Down
Binary file modified TestCase/xlsx/A03.xlsx
View file
Open in desktop
Binary file not shown.