Merge pull request #955 from arnost00/issue954

Fix issue #954, add missing ReportOptionsDialog PageLayout call
Quick-Event · Dec 29, 2023 · 6ba78dd · 6ba78dd
2 parents 732f4b3 + 2a05a46
commit 6ba78dd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/quickevent/app/quickevent/plugins/Runs/src/runswidget.cpp b/quickevent/app/quickevent/plugins/Runs/src/runswidget.cpp
@@ -220,8 +220,21 @@ void RunsWidget::settleDownInPartWidget(quickevent::gui::PartWidget *part_widget
 		auto *a = new qfw::Action(tr("&Competitors with rented cards"));
 		connect(a, &qfw::Action::triggered, [this]() {
 			qff::MainWindow *fwk = qff::MainWindow::frameWork();
+			quickevent::gui::ReportOptionsDialog dlg(fwk);
+			dlg.setPersistentSettingsId("competitorsWithRentedCards");
+			dlg.loadPersistentSettings();
+			dlg.setClassFilterVisible(false);
+			dlg.setStartListOptionsVisible(false);
+			dlg.setStartListPrintVacantsVisible(false);
+			dlg.setPageLayoutVisible(true);
+			dlg.setStartTimeFormatVisible(false);
+			dlg.setStartlistOrderFirstByVisible(false);
+			if(!dlg.exec())
+				return;
+			auto opts = dlg.optionsMap();
 			QVariantMap props;
 			props["stageId"] = selectedStageId();
+			props["options"] = opts;
 			qf::qmlwidgets::reports::ReportViewWidget::showReport(fwk
 										, getPlugin<RunsPlugin>()->findReportFile("competitorsWithCardRent.qml")
 										, QVariant()

diff --git a/quickevent/app/quickevent/src/appversion.h b/quickevent/app/quickevent/src/appversion.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#define APP_VERSION "2.6.26"
+#define APP_VERSION "2.6.27"