Fix OverTime flaf after merge

Quick-Event · Oct 21, 2022 · 9e21ebc · 9e21ebc
1 parent 1cfce4d
commit 9e21ebc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/quickevent/app/quickevent/plugins/Runs/src/runflagsdialog.cpp b/quickevent/app/quickevent/plugins/Runs/src/runflagsdialog.cpp
@@ -15,6 +15,7 @@ RunFlagsDialog::RunFlagsDialog(QWidget *parent) :
 	connect(ui->cbxNotStart, &QCheckBox::toggled, this, &RunFlagsDialog::updateStatus);
 	connect(ui->cbxNotFinish, &QCheckBox::toggled, this, &RunFlagsDialog::updateStatus);
 	connect(ui->cbxDisqualifiedByOrganizer, &QCheckBox::toggled, this, &RunFlagsDialog::updateStatus);
+	connect(ui->cbxOverTime, &QCheckBox::toggled, this, &RunFlagsDialog::updateStatus);
 	connect(ui->cbxNotCompeting, &QCheckBox::toggled, this, &RunFlagsDialog::updateStatus);
 }
 
@@ -65,7 +66,8 @@ bool RunFlagsDialog::isDisqualified() const {
 		ui->cbxBadCheck->isChecked() ||
 		ui->cbxNotStart->isChecked() ||
 		ui->cbxNotFinish->isChecked() ||
-		ui->cbxDisqualifiedByOrganizer->isChecked();
+		ui->cbxDisqualifiedByOrganizer->isChecked() ||
+		ui->cbxOverTime->isChecked();
 }
 
 } // namespace Runs
diff --git a/quickevent/app/quickevent/plugins/Runs/src/runflagsdialog.ui b/quickevent/app/quickevent/plugins/Runs/src/runflagsdialog.ui
@@ -77,6 +77,13 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QCheckBox" name="cbxOverTime">
+     <property name="text">
+      <string>Over time</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="Line" name="line">
      <property name="orientation">
@@ -121,6 +128,9 @@
   <tabstop>cbxBadCheck</tabstop>
   <tabstop>cbxNotStart</tabstop>
   <tabstop>cbxNotFinish</tabstop>
+  <tabstop>cbxDisqualifiedByOrganizer</tabstop>
+  <tabstop>cbxOverTime</tabstop>
+  <tabstop>cbxNotCompeting</tabstop>
  </tabstops>
  <resources/>
  <connections>

diff --git a/quickevent/app/quickevent/plugins/Runs/src/runstablemodel.cpp b/quickevent/app/quickevent/plugins/Runs/src/runstablemodel.cpp
@@ -90,7 +90,7 @@ QVariant RunsTableModel::value(int row_ix, int column_ix) const
 			sl << tr("DO", "disqualifiedByOrganizer");
 		if(over_time)
 			sl << tr("OT", "OverTime");
-		if(is_disqualified && !mis_punch && !bad_check && !not_start && !not_finish && !is_disqualified_by_organizer)
+		if(is_disqualified && !mis_punch && !bad_check && !not_start && !not_finish && !is_disqualified_by_organizer && !over_time)
 			sl << tr("DSQ", "Disqualified");
 		if(sl.isEmpty())
 			return QStringLiteral("");