From 88289deec41ff615d3342b5c8779b9f1d16cc1c8 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Wed, 10 Jun 2020 14:34:18 -0700 Subject: [PATCH] Clean up Statistics page HTML Now passes HTML 4.01 Transitional validator with no errors Also fix table alignment regression introduced in last commit Adjust column widths differently for Monthly vs Standard tables --- oscar/statistics.cpp | 218 ++++++++++++++++++++++--------------------- 1 file changed, 113 insertions(+), 105 deletions(-) diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp index a1c2b63b..aa6c0ea9 100644 --- a/oscar/statistics.cpp +++ b/oscar/statistics.cpp @@ -39,7 +39,7 @@ QString resizeHTMLPixmap(QPixmap &pixmap, int width, int height) { QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray buffer.open(QIODevice::WriteOnly); pixmap.scaled(width, height, Qt::KeepAspectRatio, Qt::SmoothTransformation).save(&buffer, "PNG"); - return QString(""); + return QString("logo"); } QString formatTime(float time) @@ -624,44 +624,46 @@ QString Statistics::getUserInfo () { return ""; QString address = p_profile->user->address(); - address.replace("\n", "
"); + address.replace("\n", "
"); QString userinfo = ""; if (!p_profile->user->firstName().isEmpty()) { - userinfo = tr("Name: %1, %2").arg(p_profile->user->lastName()).arg(p_profile->user->firstName()) + "
"; + userinfo = tr("Name: %1, %2").arg(p_profile->user->lastName()).arg(p_profile->user->firstName()) + "
"; if (!p_profile->user->DOB().isNull()) { - userinfo += tr("DOB: %1").arg(p_profile->user->DOB().toString(MedDateFormat)) + "
"; + userinfo += tr("DOB: %1").arg(p_profile->user->DOB().toString(MedDateFormat)) + "
"; } if (!p_profile->user->phone().isEmpty()) { - userinfo += tr("Phone: %1").arg(p_profile->user->phone()) + "
"; + userinfo += tr("Phone: %1").arg(p_profile->user->phone()) + "
"; } if (!p_profile->user->email().isEmpty()) { - userinfo += tr("Email: %1").arg(p_profile->user->email()) + "

"; + userinfo += tr("Email: %1").arg(p_profile->user->email()) + "

"; } if (!p_profile->user->address().isEmpty()) { - userinfo += tr("Address:")+"
"+address; + userinfo += tr("Address:")+"
"+address; } } - while (userinfo.length() > 0 && userinfo.endsWith("
")) // Strip trailing newlines + while (userinfo.length() > 0 && userinfo.endsWith("
")) // Strip trailing newlines userinfo = userinfo.mid(0, userinfo.length()-5); return userinfo; } -const QString table_width = "width=100%"; +const QString table_width = "width='100%'"; // Create the page header in HTML. Includes everything from through QString Statistics::generateHeader(bool onScreen) { - QString html = QString("")+ - "" - "" + "" "