Skip to content

Feature/startersimprove - try to minimize the diffs in the starters list function #1163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ljezek wants to merge 13 commits into
base: main
Choose a base branch
from
Draft

Feature/startersimprove - try to minimize the diffs in the starters list function #1163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6d7a060
Add option to generate vacants in all classes - including free start …
ljezek May 31, 2026
7cdead3
Make XML export for vacants respect IOF.xsd (omit Person & Organizati…
ljezek May 31, 2026
54449aa
Add start time to vacants and fix export to match
ljezek May 31, 2026
67a38e1
Unassign the start time
ljezek Jun 1, 2026
e8dc4e8
Translations
ljezek Jun 1, 2026
7542bae
Fix the XML report and remove accidentally added files. Perform a review
ljezek Jun 1, 2026
5cdbcb0
Fix a preexisting bug where runners in free classes didn't get startt…
ljezek Jun 1, 2026
edcc26a
Remove unused var
ljezek Jun 1, 2026
57acc48
Minimize the diffs
ljezek Jun 1, 2026
9d948f3
Unindent to minimize diff.
ljezek Jun 1, 2026
0d2486c
Clamp vacant options
ljezek Jun 1, 2026
1c75fee
Try reverting back to the previous version of starters start list to …
ljezek Jun 1, 2026
64f8647
Simplify the starterslist to the previous version
ljezek Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion libquickevent/libquickeventgui/libquickeventgui-cs_CZ.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,21 @@
<source>Print vacants</source>
<translation>Tisknout vakanty</translation>
</message>
<message>
<location filename="src/reportoptionsdialog.ui" line="0"/>
<source>Only runners</source>
<translation>Pouze závodníci</translation>
</message>
<message>
<location filename="src/reportoptionsdialog.ui" line="0"/>
<source>Include vacants with time</source>
<translation>Včetně vakantů s časem</translation>
</message>
<message>
<location filename="src/reportoptionsdialog.ui" line="0"/>
<source>Include all vacants</source>
<translation>Včetně všech vakantů</translation>
</message>
<message>
<location filename="src/reportoptionsdialog.ui" line="361"/>
<source>Print start numbers</source>
Expand Down Expand Up @@ -172,7 +187,7 @@
<message>
<location filename="src/reportoptionsdialog.ui" line="368"/>
<source>Use only class from selected start</source>
<translation>Pooužít pouze kategorie z vybraného startu</translation>
<translation>Použít pouze kategorie z vybraného startu</translation>
</message>
<message>
<location filename="src/reportoptionsdialog.ui" line="97"/>
Expand Down
20 changes: 11 additions & 9 deletions libquickevent/libquickeventgui/src/reportoptionsdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ ReportOptionsDialog::ReportOptionsDialog(QWidget *parent)
connect(this, &ReportOptionsDialog::startListOptionsVisibleChanged, ui->grpStartOptions, &QGroupBox::setVisible);
connect(this, &ReportOptionsDialog::classFilterVisibleChanged, ui->grpClassFilter, &QGroupBox::setVisible);
connect(this, &ReportOptionsDialog::startersOptionsVisibleChanged, ui->grpStartersOptions, &QGroupBox::setVisible);
connect(this, &ReportOptionsDialog::vacantsVisibleChanged, ui->chkStartOpts_PrintVacants, &QCheckBox::setVisible);
connect(this, &ReportOptionsDialog::vacantsVisibleChanged, ui->cbxStartOpts_PrintVacants, &QComboBox::setVisible);
connect(this, &ReportOptionsDialog::stagesOptionVisibleChanged, ui->grpStages, &QGroupBox::setVisible);
connect(this, &ReportOptionsDialog::legsOptionVisibleChanged, ui->grpLegs, &QGroupBox::setVisible);
connect(this, &ReportOptionsDialog::pageLayoutVisibleChanged, ui->grpPageLayout, &QGroupBox::setVisible);
Expand Down Expand Up @@ -117,9 +117,11 @@ ReportOptionsDialog::BreakType ReportOptionsDialog::breakType() const
return static_cast<BreakType>(ui->cbxBreakAfterClassType->currentIndex());
}

bool ReportOptionsDialog::isStartListPrintVacants() const
ReportOptionsDialog::VacantsOption ReportOptionsDialog::startListPrintVacantsOption() const
{
return ui->chkStartOpts_PrintVacants->isChecked();
int ix = ui->cbxStartOpts_PrintVacants->currentIndex();
if (ix < 0) ix = 0;
return static_cast<ReportOptionsDialog::VacantsOption>(ix);
}

bool ReportOptionsDialog::isStartListPrintStartNumbers() const
Expand Down Expand Up @@ -207,8 +209,8 @@ int ReportOptionsDialog::exec()
void ReportOptionsDialog::setStartListPrintVacantsVisible(bool b)
{
if(!b)
ui->chkStartOpts_PrintVacants->setChecked(b);
ui->chkStartOpts_PrintVacants->setVisible(b);
ui->cbxStartOpts_PrintVacants->setCurrentIndex(0);
ui->cbxStartOpts_PrintVacants->setVisible(b);
}

void ReportOptionsDialog::setOptions(const ReportOptionsDialog::Options &options)
Expand All @@ -232,7 +234,7 @@ void ReportOptionsDialog::setOptions(const ReportOptionsDialog::Options &options
ui->btClassNames->setChecked(filter_type == FilterType::ClassName);
auto index = ui->cbxStartNumber->findData(options.startNumber());
ui->cbxStartNumber->setCurrentIndex(index);
ui->chkStartOpts_PrintVacants->setChecked(options.isStartListPrintVacants());
ui->cbxStartOpts_PrintVacants->setCurrentIndex(options.startListPrintVacantsOption());
ui->chkStartOpts_PrintStartNumbers->setChecked(options.isStartListPrintStartNumbers());
ui->edStartersOptionsLineSpacing->setValue(options.startersOptionsLineSpacing());
ui->edNumPlaces->setValue(options.resultNumPlaces());
Expand Down Expand Up @@ -268,7 +270,7 @@ ReportOptionsDialog::Options ReportOptionsDialog::options() const
opts.setStartNumber(ui->cbxStartNumber->currentData().toInt());
FilterType filter_type = ui->btWildCard->isChecked()? FilterType::WildCard: ui->btRegExp->isChecked()? FilterType::RegExp: FilterType::ClassName;
opts.setClassFilterType((int)filter_type);
opts.setStartListPrintVacants(isStartListPrintVacants());
opts.setStartListPrintVacantsOption((int)startListPrintVacantsOption());
opts.setStartListPrintStartNumbers(isStartListPrintStartNumbers());
opts.setStartersOptionsLineSpacing(ui->edStartersOptionsLineSpacing->value());
opts[QStringLiteral("isBreakAfterEachClass")] = isBreakAfterEachClass();
Expand Down Expand Up @@ -379,7 +381,7 @@ void ReportOptionsDialog::setStartListForRelays()
void ReportOptionsDialog::setCurrentStageId(int stageId)
{
ui->cbxStartNumber->clear();
ui->cbxStartNumber->addItem(QString("All"), 0);
ui->cbxStartNumber->addItem(tr("All"), 0);
QString query_str;
if (stageId > 0) {
query_str = QString("SELECT DISTINCT codes.code FROM codes, coursecodes, classdefs"
Expand All @@ -394,7 +396,7 @@ void ReportOptionsDialog::setCurrentStageId(int stageId)
while (q.next()) {
auto code = q.value(0).toInt();
if(auto n = core::CodeDef::codeToStartNumber(code); n.has_value()) {
ui->cbxStartNumber->addItem(QString("Start %1").arg(n.value()), n.value());
ui->cbxStartNumber->addItem(tr("Start %1").arg(n.value()), n.value());
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions libquickevent/libquickeventgui/src/reportoptionsdialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class QUICKEVENTGUI_DECL_EXPORT ReportOptionsDialog : public QDialog, public qf:
enum class FilterType : int {WildCard = 0, RegExp, ClassName};
enum class StartTimeFormat : int {RelativeToClassStart = 0, DayTime};
enum class StartlistOrderFirstBy : int { ClassName = 0, StartTime, Names };
enum class VacantsOption : int { OnlyRunners = 0, RegularVacants = 1, AllVacants = 2 };

class Options : public QVariantMap
{
Expand All @@ -69,7 +70,7 @@ class QUICKEVENTGUI_DECL_EXPORT ReportOptionsDialog : public QDialog, public qf:
QF_VARIANTMAP_FIELD2(int, c, setC, lassFilterType, 0)
QF_VARIANTMAP_FIELD(bool, is, set, UseClassFilter)
QF_VARIANTMAP_FIELD(bool, is, set, InvertClassFilter)
QF_VARIANTMAP_FIELD(bool, is, set, StartListPrintVacants)
QF_VARIANTMAP_FIELD2(int, s, setS, tartListPrintVacantsOption, 0)
QF_VARIANTMAP_FIELD(bool, is, set, StartListPrintStartNumbers)
QF_VARIANTMAP_FIELD2(int, s, setS, tagesCount, 1)
QF_VARIANTMAP_FIELD2(int, l, setL, egsCount, 1)
Expand Down Expand Up @@ -119,7 +120,7 @@ class QUICKEVENTGUI_DECL_EXPORT ReportOptionsDialog : public QDialog, public qf:
StartTimeFormat startTimeFormat() const;
StartlistOrderFirstBy startlistOrderFirstBy() const;
BreakType breakType() const;
Q_INVOKABLE bool isStartListPrintVacants() const;
Q_INVOKABLE VacantsOption startListPrintVacantsOption() const;
Q_INVOKABLE bool isStartListPrintStartNumbers() const;
Q_INVOKABLE bool isBreakAfterEachClass() const {return breakType() != BreakType::None;}
Q_INVOKABLE bool isColumnBreak() const {return breakType() == BreakType::Column;}
Expand Down
22 changes: 17 additions & 5 deletions libquickevent/libquickeventgui/src/reportoptionsdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,10 +349,22 @@
<number>5</number>
</property>
<item row="1" column="1">
<widget class="QCheckBox" name="chkStartOpts_PrintVacants">
<property name="text">
<string>Print vacants</string>
</property>
<widget class="QComboBox" name="cbxStartOpts_PrintVacants">
<item>
<property name="text">
<string>Only runners</string>
</property>
</item>
<item>
<property name="text">
<string>Include vacants with time</string>
</property>
</item>
<item>
<property name="text">
<string>Include all vacants</string>
</property>
</item>
</widget>
</item>
<item row="1" column="2">
Expand Down Expand Up @@ -567,7 +579,7 @@
<tabstop>chkExcludeDisq</tabstop>
<tabstop>edStartersOptionsLineSpacing</tabstop>
<tabstop>cbxStartNumber</tabstop>
<tabstop>chkStartOpts_PrintVacants</tabstop>
<tabstop>cbxStartOpts_PrintVacants</tabstop>
<tabstop>chkStartOpts_PrintStartNumbers</tabstop>
<tabstop>btStartTimes1</tabstop>
<tabstop>btStartTimes2</tabstop>
Expand Down
2 changes: 1 addition & 1 deletion quickevent/app/quickevent/plugins/Event/src/services/emmaclient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ void EmmaClient::exportStartListIofXml3()

QString str = is_relays
? getPlugin<RelaysPlugin>()->startListIofXml30()
: getPlugin<RunsPlugin>()->startListStageIofXml30(current_stage, false);
: getPlugin<RunsPlugin>()->startListStageIofXml30(current_stage, quickevent::gui::ReportOptionsDialog::VacantsOption::OnlyRunners);

QFile f(file_name);
if(f.open(QFile::WriteOnly)) {
Expand Down
2 changes: 1 addition & 1 deletion quickevent/app/quickevent/plugins/Event/src/services/ofeed/ofeedclient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ void OFeedClient::exportStartListIofXml3(std::function<void()> on_success)

QString str = is_relays
? getPlugin<RelaysPlugin>()->startListIofXml30()
: getPlugin<RunsPlugin>()->startListStageIofXml30(current_stage, false);
: getPlugin<RunsPlugin>()->startListStageIofXml30(current_stage, quickevent::gui::ReportOptionsDialog::VacantsOption::OnlyRunners);

sendFile(tr("start list upload"), "/rest/v1/upload/iof", str, on_success);
}
Expand Down
2 changes: 1 addition & 1 deletion quickevent/app/quickevent/plugins/Event/src/services/oresultsclient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ void OResultsClient::exportStartListIofXml3(std::function<void()> on_success)

QString str = is_relays
? getPlugin<RelaysPlugin>()->startListIofXml30()
: getPlugin<RunsPlugin>()->startListStageIofXml30(current_stage, false);
: getPlugin<RunsPlugin>()->startListStageIofXml30(current_stage, quickevent::gui::ReportOptionsDialog::VacantsOption::OnlyRunners);

sendFile("start list upload", "/start-lists", str, on_success);
}
Expand Down
2 changes: 1 addition & 1 deletion quickevent/app/quickevent/plugins/Event/src/services/qx/qxclientservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ void QxClientService::postStartListIofXml3(QObject *context, std::function<void
int current_stage = ep->currentStageId();
bool is_relays = ep->eventConfig()->isRelays();
if (!is_relays) {
auto xml = getPlugin<RunsPlugin>()->startListStageIofXml30(current_stage, false);
auto xml = getPlugin<RunsPlugin>()->startListStageIofXml30(current_stage, quickevent::gui::ReportOptionsDialog::VacantsOption::OnlyRunners);
uploadSpecFile(SpecFile::StartListIofXml3, xml.toUtf8(), context, call_back);
}
}
Expand Down
4 changes: 2 additions & 2 deletions quickevent/app/quickevent/plugins/Relays/src/relayswidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ void RelaysWidget::print_start_list_classes()
if(!dlg.exec())
return;
QVariantMap props = dlg.reportProperties();
bool vacants = dlg.isStartListPrintVacants();
bool vacants = dlg.startListPrintVacantsOption() != quickevent::gui::ReportOptionsDialog::VacantsOption::OnlyRunners;
QVariant td = getPlugin<RelaysPlugin>()->startListByClassesTableData(dlg.sqlWhereExpression(), vacants);
auto report_name = (dlg.options().isRelayShowLegsDetails()) ? "startList_classes.qml" : "startList_classes_condensed.qml";
qf::gui::reports::ReportViewWidget::showReport(this
Expand All @@ -477,7 +477,7 @@ void RelaysWidget::print_start_list_clubs()
if(!dlg.exec())
return;
QVariantMap props = dlg.reportProperties();
bool vacants = dlg.isStartListPrintVacants();
bool vacants = dlg.startListPrintVacantsOption() != quickevent::gui::ReportOptionsDialog::VacantsOption::OnlyRunners;
QVariant td = startListByClubsTableData(vacants);
auto report_name = (dlg.options().isRelayShowLegsDetails()) ? "startList_clubs.qml" : "startList_clubs_condensed.qml";
qf::gui::reports::ReportViewWidget::showReport(this,
Expand Down
Loading
Loading