From 546d6ea3ef26da2f65202f45e01a69c1743bde2f Mon Sep 17 00:00:00 2001 From: Bent Witthold Date: Mon, 16 Feb 2026 19:00:06 +0100 Subject: [PATCH] Added two skips in calculation of amount of expected biddings (depending on share type & share amount). --- libs/BeetRoundCore/model/tablemodel.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libs/BeetRoundCore/model/tablemodel.cpp b/libs/BeetRoundCore/model/tablemodel.cpp index 8fac24f..8e638e3 100644 --- a/libs/BeetRoundCore/model/tablemodel.cpp +++ b/libs/BeetRoundCore/model/tablemodel.cpp @@ -309,9 +309,18 @@ int TableModel::nExpectedBiddings() const { int result = 0; for (auto i = m_items.begin(), end = m_items.end(); i != end; ++i) { const QString biddingType = (*i)->data(BiddingTypeRole).toString(); - if (!biddingType.isEmpty()) { - result++; + if (biddingType.isEmpty()) { + continue; } + const QString shareType = (*i)->data(ShareTypeRole).toString(); + if (shareType.isEmpty() || shareType == "erarbeitet") { + continue; + } + const double shareAmount = (*i)->data(ShareAmountRole).toDouble(); + if (shareAmount == 0.0) { + continue; + } + result++; } return result; }