StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

test conditional formats

Browse Source
This commit is contained in:
Thomas Fussell 2016-06-18 23:07:22 +01:00
parent d8eda2aeb4
commit 03080dbe1f
2 changed files with 139 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
source/styles/number_format.cpp
View File

@ -190,7 +190,7 @@ std::vector<std::string> split_string_any(const std::string &string, const std::
bool is_date_format(const std::string &format_string)
{
auto not_in = format_string.find_first_not_of("/-:, mMyYdDhHsS");
auto not_in = format_string.find_first_not_of("/-:, mMyYdDhHsSAP");
return not_in == std::string::npos;
}
@ -396,7 +396,14 @@ const std::unordered_map<int, std::string> known_locales()
bool is_valid_locale(const std::string &locale_string)
{
std::string country = locale_string.substr(locale_string.find('-') + 1);
auto hyphen_index = locale_string.find('-');
if (hyphen_index == std::string::npos)
{
return false;
}
std::string country = locale_string.substr(hyphen_index + 1);
if (country.empty())
{
@ -600,12 +607,25 @@ std::string format_section(long double number, const section &format, xlnt::cale
if (is_date_format(format.value))
{
auto lower_string = [](const std::string &s) {
std::string lower;
lower.resize(s.size());
for (std::size_t i = 0; i < s.size(); i++)
lower[i] = static_cast<char>(std::tolower(s[i]));
return lower;
};
auto value = format.value;
bool twelve_hour = false;
if (lower_string(value).substr(format.value.size() - 5) == "am/pm")
{
twelve_hour = true;
}
const std::string date_unquoted = ",-/: ";
const std::vector<std::string> dates = { "m", "mm", "mmm", "mmmmm", "mmmmmm", "d", "dd", "ddd", "dddd", "yy",
"yyyy", "h", "[h]", "hh", "m", "[m]", "mm", "s", "[s]", "ss", "AM/PM",
"am/pm", "A/P", "a/p" };
"yyyy", "h", "[h]", "hh", "m", "[m]", "mm", "s", "[s]", "ss" };
const std::vector<std::string> MonthNames = { "January", "February", "March",
"April", "May", "June", "July", "August", "September", "October", "November", "December" };
@ -615,14 +635,6 @@ std::string format_section(long double number, const section &format, xlnt::cale
auto d = xlnt::datetime::from_number(number, base_date);
bool processed_month = false;
auto lower_string = [](const std::string &s) {
std::string lower;
lower.resize(s.size());
for (std::size_t i = 0; i < s.size(); i++)
lower[i] = static_cast<char>(std::tolower(s[i]));
return lower;
};
for (auto part : split)
{
while (format.value.substr(index, part.size()) != part)
@ -630,11 +642,19 @@ std::string format_section(long double number, const section &format, xlnt::cale
index++;
}
auto between = format.value.substr(prev, index - prev);
result.append(between);
part = lower_string(part);
auto between = format.value.substr(prev, index - prev);
if (between == "/" and part == "pm")
{
index += part.size();
prev = index;
continue;
}
result.append(between);
if (part == "m" && !processed_month)
{
result.append(std::to_string(d.month));
@ -683,17 +703,39 @@ std::string format_section(long double number, const section &format, xlnt::cale
}
else if (part == "h")
{
if (twelve_hour)
{
result.append(std::to_string(d.hour % 12));
}
else
{
result.append(std::to_string(d.hour));
}
processed_month = true;
}
else if (part == "hh")
{
if (twelve_hour)
{
if (d.hour % 12 < 10)
{
result.append("0");
}
result.append(std::to_string(d.hour % 12));
}
else
{
if (d.hour < 10)
{
result.append("0");
}
result.append(std::to_string(d.hour));
}
result.append(std::to_string(d.hour));
processed_month = true;
}
@ -723,7 +765,7 @@ std::string format_section(long double number, const section &format, xlnt::cale
result.append(std::to_string(d.second));
}
else if (part == "am/pm" || part == "a/p")
else if (part == "am")
{
if (d.hour < 12)
{
@ -744,15 +786,33 @@ std::string format_section(long double number, const section &format, xlnt::cale
result.append(format.value.substr(index));
}
}
else if (format.value == "General" || format.value == "0")
else if (format.value.find_first_of("General") != std::string::npos || format.value == "0")
{
if (number == static_cast<long long int>(number))
std::string before_text, end_text;
auto open_quote = format.value.find('"');
if (open_quote != std::string::npos)
{
result = std::to_string(static_cast<long long int>(number));
auto close_quote = format.value.find('"', open_quote + 1);
auto quoted_text = format.value.substr(open_quote, close_quote - open_quote + 1);
if (open_quote == 0)
{
before_text = quoted_text.substr(1, quoted_text.size() - 2);
}
else
{
result = std::to_string(number);
end_text = quoted_text.substr(1, quoted_text.size() - 2);
}
}
if (number == static_cast<long long int>(number))
{
result = before_text + std::to_string(static_cast<long long int>(number)) + end_text;
}
else
{
result = before_text + std::to_string(number) + end_text;
}
}
else if (format.value.substr(0, 8) == "#,##0.00" || format.value.substr(0, 9) == "-#,##0.00")
@ -833,6 +893,32 @@ std::string format_number(long double number, const std::string &format, xlnt::c
{
auto sections = parse_format_sections(format);
if (sections.first.has_condition)
{
auto right_side = std::stod(sections.first.condition_value);
if ((sections.first.condition == condition_type::equal && number == right_side) ||
(sections.first.condition == condition_type::greater_or_equal && number >= right_side) ||
(sections.first.condition == condition_type::greater_than && number > right_side) ||
(sections.first.condition == condition_type::less_or_equal && number <= right_side) ||
(sections.first.condition == condition_type::less_than && number < right_side))
{
return format_section(number, sections.first, base_date);
}
right_side = std::stod(sections.second.condition_value);
if ((sections.second.condition == condition_type::equal && number == right_side) ||
(sections.second.condition == condition_type::greater_or_equal && number >= right_side) ||
(sections.second.condition == condition_type::greater_than && number > right_side) ||
(sections.second.condition == condition_type::less_or_equal && number <= right_side) ||
(sections.second.condition == condition_type::less_than && number < right_side))
{
return format_section(number, sections.second, base_date);
}
}
else
{
if (number > 0)
{
return format_section(number, sections.first, base_date);
@ -841,8 +927,9 @@ std::string format_number(long double number, const std::string &format, xlnt::c
{
return format_section(number, sections.second, base_date);
}
}
// number == 0
// number == 0 or default condition
return format_section(number, sections.third, base_date);
}

21
source/styles/tests/test_number_style.hpp
View File

@ -20,6 +20,17 @@ public:
TS_ASSERT_EQUALS(formatted, "18/06/16");
}
void test_simple_time()
{
auto time = xlnt::time(20, 15, 10);
auto time_number = time.to_number();
xlnt::number_format nf = xlnt::number_format::date_time2();
auto formatted = nf.format(time_number, xlnt::calendar::windows_1900);
TS_ASSERT_EQUALS(formatted, "8:15:10 PM");
}
void test_text_section_string()
{
xlnt::number_format nf;
@ -29,4 +40,14 @@ public:
TS_ASSERT_EQUALS(formatted, "atextb");
}
void test_conditional_format()
{
xlnt::number_format nf;
nf.set_format_string("[>5]\"first\"General;[>3]\"second\"General;\"third\"General");
auto formatted = nf.format(4, xlnt::calendar::windows_1900);
TS_ASSERT_EQUALS(formatted, "second4");
}
};