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

HTML: Make export statistics optional.

Browse source 
Make exporting statistics to the HTML page optional.

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Gehad elrobey 2014-08-04 14:02:16 +03:00 • committed by Dirk Hohndel
parent 4b22b74091
commit 93a15d471c
3 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
qt-ui/divelogexportdialog.cpp
View file

@ -93,6 +93,7 @@ void DiveLogExportDialog::exportHtmlInit(const QString &filename)
exportHTMLsettings(json_settings); exportHTMLsettings(json_settings);
exportHTMLstatistics(stat_file); exportHTMLstatistics(stat_file);
export_HTML(json_dive_data.toUtf8().data(), photos_directory.toUtf8().data(), ui->exportSelectedDives->isChecked(), ui->exportListOnly->isChecked()); export_HTML(json_dive_data.toUtf8().data(), photos_directory.toUtf8().data(), ui->exportSelectedDives->isChecked(), ui->exportListOnly->isChecked());
QString searchPath = getSubsurfaceDataPath("theme"); QString searchPath = getSubsurfaceDataPath("theme");
@ -140,6 +141,7 @@ void DiveLogExportDialog::exportHTMLstatistics(const QString &filename)
QTextStream out(&file); QTextStream out(&file);
int i = 0; int i = 0;
out << "divestat=["; out << "divestat=[";
if (ui->exportStatistics->isChecked()) {
while (stats_yearly != NULL && stats_yearly[i].period) { while (stats_yearly != NULL && stats_yearly[i].period) {
out << "{"; out << "{";
out << "\"YEAR\":\"" << stats_yearly[i].period << "\","; out << "\"YEAR\":\"" << stats_yearly[i].period << "\",";
@ -160,6 +162,7 @@ void DiveLogExportDialog::exportHTMLstatistics(const QString &filename)
out << "},"; out << "},";
i++; i++;
} }
}
out << "]"; out << "]";
file.close(); file.close();
} }

4
qt-ui/divelogexportdialog.ui
View file

@ -216,9 +216,9 @@
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QCheckBox" name="checkBox_2"> <widget class="QCheckBox" name="exportStatistics">
<property name="text"> <property name="text">
<string>Minimum Javascript</string> <string>Export Yearly Statistics</string>
</property> </property>
</widget> </widget>
</item> </item>

3
theme/dive_export.html
View file

@ -121,6 +121,9 @@ window.onload=function(){
showAllDives(); showAllDives();
document.getElementById("divePanel").style.display='none'; document.getElementById("divePanel").style.display='none';
document.getElementById("diveStat").style.display='none'; document.getElementById("diveStat").style.display='none';
if (divestat.length <= 0)
document.getElementById("stats_button").style.display='none';
document.body.style.visibility='visible'; document.body.style.visibility='visible';
document.onkeydown = switchDives; document.onkeydown = switchDives;