diff --git a/sleepyhead/statistics.cpp b/sleepyhead/statistics.cpp index 357b06b0..67dcc360 100644 --- a/sleepyhead/statistics.cpp +++ b/sleepyhead/statistics.cpp @@ -91,7 +91,7 @@ Statistics::Statistics(QObject *parent) : { SC_MIN, tr("Min %1") }, { SC_MAX, tr("Max %1") }, { SC_CPH, tr("%1 Index") }, - { SC_SPH, tr("% of night in %1") }, + { SC_SPH, tr("% of time in %1") }, }; machinenames = { { MT_UNKNOWN, STR_TR_Unknown }, @@ -120,15 +120,15 @@ QString htmlHeader() if (!PROFILE.user->DOB().isNull()) { userinfo += QString(QObject::tr("DOB: %1")).arg(PROFILE.user->DOB().toString()) + "
"; } - } - if (!PROFILE.user->phone().isEmpty()) { - userinfo += QString(QObject::tr("Phone: %1")).arg(PROFILE.user->phone()) + "
"; - } - if (!PROFILE.user->email().isEmpty()) { - userinfo += QString(QObject::tr("Email: %1")).arg(PROFILE.user->email()) + "

"; - } - if (!PROFILE.user->address().isEmpty()) { - userinfo += QObject::tr("Address:")+"
"+address; + if (!PROFILE.user->phone().isEmpty()) { + userinfo += QString(QObject::tr("Phone: %1")).arg(PROFILE.user->phone()) + "
"; + } + if (!PROFILE.user->email().isEmpty()) { + userinfo += QString(QObject::tr("Email: %1")).arg(PROFILE.user->email()) + "

"; + } + if (!PROFILE.user->address().isEmpty()) { + userinfo += QObject::tr("Address:")+"
"+address; + } } @@ -600,7 +600,7 @@ QString Statistics::GenerateHTML() } else if (row.calc == SC_COLUMNHEADERS) { html += QString("%1").arg(tr("Details")); for (int j=0; j < periods.size(); j++) { - html += QString("%1").arg(periods.at(j).header); + html += QString("%3").arg(periods.at(j).start.toString(Qt::ISODate)).arg(periods.at(j).end.toString(Qt::ISODate)).arg(periods.at(j).header); } html += "\n"; continue;