mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

User survey: actually collect and send the data to the backend

Browse source 
This switches the QTextEdit fields to QPlainTextEdit (I don't see a reason
why we should allow HTML here), no longer tries to have a default text but
instead adds labels for the two fields, connects the UI so th data is
collected and uses a bastardized WebServices subclass to send the data to
our backend.

Fixes #546

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-06-30 07:19:22 -07:00
parent bc1e9edd5d
commit b2f473d927
5 changed files with 122 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

69
qt-ui/usersurvey.cpp
View file

@ -6,9 +6,11 @@
#include "usersurvey.h"
#include "ui_usersurvey.h"
#include "ssrf-version.h"
#include "subsurfacewebservices.h"
#include "helpers.h"
#include "subsurfacesysinfo.h"
UserSurvey::UserSurvey(QWidget *parent) : QDialog(parent),
ui(new Ui::UserSurvey)
{
@ -19,10 +21,17 @@ UserSurvey::UserSurvey(QWidget *parent) : QDialog(parent),
connect(quitKey, SIGNAL(activated()), parent, SLOT(close()));
// fill in the system data
ui->system->append(tr("Subsurface %1").arg(VERSION_STRING));
ui->system->append(tr("Operating System: %1").arg(SubsurfaceSysInfo::prettyOsName()));
ui->system->append(tr("CPU Architecture: %1").arg(SubsurfaceSysInfo::cpuArchitecture()));
ui->system->append(tr("Language: %1").arg(uiLanguage(NULL)));
QString sysInfo = QString("Subsurface %1").arg(VERSION_STRING);
os = QString("ssrfVers=%1").arg(VERSION_STRING);
sysInfo.append(tr("\nOperating System: %1").arg(SubsurfaceSysInfo::prettyOsName()));
os.append(QString("&prettyOsName=%1").arg(SubsurfaceSysInfo::prettyOsName()));
sysInfo.append(tr("\nCPU Architecture: %1").arg(SubsurfaceSysInfo::cpuArchitecture()));
os.append(QString("&cpuArch=%1").arg(SubsurfaceSysInfo::cpuArchitecture()));
sysInfo.append(tr("\nLanguage: %1").arg(uiLanguage(NULL)));
os.append(QString("&uiLang=%1").arg(uiLanguage(NULL)));
ui->system->setPlainText(sysInfo);
manager = SubsurfaceWebServices::manager();
connect(manager, SIGNAL(finished(QNetworkReply *)), SLOT(requestReceived(QNetworkReply *)));
}
UserSurvey::~UserSurvey()
@ -30,12 +39,22 @@ UserSurvey::~UserSurvey()
delete ui;
}
#define ADD_OPTION(_name) values.append(ui->_name->isChecked() ? "&" #_name "=1" : "&" #_name "=0")
void UserSurvey::on_buttonBox_accepted()
{
// now we need to collect the data and submit it
QSettings s;
s.beginGroup("UserSurvey");
s.setValue("SurveyDone", "submitted");
QString values = os;
ADD_OPTION(recreational);
ADD_OPTION(tech);
ADD_OPTION(planning);
ADD_OPTION(download);
ADD_OPTION(divecomputer);
ADD_OPTION(manual);
ADD_OPTION(companion);
values.append(QString("&suggestion=%1").arg(ui->suggestions->toPlainText()));
UserSurveyServices uss(this);
uss.sendSurvey(values);
hide();
}
@ -60,3 +79,39 @@ void UserSurvey::on_buttonBox_rejected()
}
hide();
}
void UserSurvey::requestReceived(QNetworkReply *reply)
{
QMessageBox msgbox;
QString msgTitle = tr("Submit User Survey.");
QString msgText = tr("<h3>Subsurface was unable to submit the user survey.</h3>");
if (reply->error() != QNetworkReply::NoError) {
//Network Error
msgText = msgText + tr("<br/><b>The following error occurred:</b><br/>") + reply->errorString()
+ tr("<br/><br/><b>Please check your internet connection.</b>");
} else {
//No network error
QString response(reply->readAll());
QString responseBody = response.split("\"").at(1);
msgbox.setIcon(QMessageBox::Information);
if (responseBody == "OK") {
msgText = tr("Survey successfully submitted.");
QSettings s;
s.beginGroup("UserSurvey");
s.setValue("SurveyDone", "submitted");
} else {
msgText = tr("There was an error while trying to check for updates.<br/><br/>%1").arg(responseBody);
msgbox.setIcon(QMessageBox::Warning);
}
}
msgbox.setWindowTitle(msgTitle);
msgbox.setText(msgText);
msgbox.setTextFormat(Qt::RichText);
msgbox.exec();
reply->deleteLater();
}