feedc0de/QtZeiterfassung
1
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Devel #56

Merged
0xFEEDC0DE64 merged 84 commits from devel into master 2017-12-29 13:34:28 +01:00
Conversation 0 Commits 84 Files Changed 223 +2280 -1539
141 changed files with 2280 additions and 1539 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 01889ffe68 - Show all commits

2
plugins/reportsplugin/reportswidget.cpp
View File

@@ -108,7 +108,7 @@ void ReportsWidget::finished()
}
{
static QRegularExpression regex(QStringLiteral("Urlaubsanspruch +([0-9]+\\.[0-9]+\\-?) +([0-9]+\\.[0-9]+\\-?)"));
static QRegularExpression regex(QStringLiteral("Urlaubsanspruch +(\\-?[0-9]+\\.[0-9]+) +(\\-?[0-9]+\\.[0-9]+)"));
auto match = regex.match(content);
if(match.hasMatch())
m_labelHolidays->setText(tr("%0: %1").arg(tr("Holidays")).arg(match.captured(2)));