diff options
-rw-r--r-- | res/gui/EventInfoPage.qml | 30 | ||||
-rw-r--r-- | res/gui/EventsPage.qml | 2 | ||||
-rw-r--r-- | src/model/SportModel.cpp | 2 |
3 files changed, 22 insertions, 12 deletions
diff --git a/res/gui/EventInfoPage.qml b/res/gui/EventInfoPage.qml index 6c46a7f..2934931 100644 --- a/res/gui/EventInfoPage.qml +++ b/res/gui/EventInfoPage.qml @@ -4,8 +4,8 @@ import QtQuick.Controls Page { id: root - property string eventName - property list<QtObject> competitors + required property string eventName + required property list<QtObject> competitors header: ToolBar { ToolButton { @@ -31,17 +31,27 @@ Page { bottomMargin: 48 rightMargin: 48 spacing: 20 - model: eventName + model: competitors delegate: ItemDelegate { - text: "sadly not working..." + required property string name + required property string noc + required property string mark + required property string statistic + required property string gold + required property string silver + required property string bronze width: listView.width - listView.leftMargin - listView.rightMargin - height: avatar.implicitHeight + 32 - leftPadding: avatar.implicitWidth + 32 - - Image { - id: avatar - // source: "images/" + modelData.replace(" ", "_") + ".png" + height: 32 + Text { + anchors.left: parent.left + text: name + " (" + noc + ")" + } + Text { + anchors.right: parent.right + horizontalAlignment: Text.AlignRight + text: mark + " " + statistic + " | " + gold + "🥇 " + silver + "🥈 " + bronze + "🥉" } + } } diff --git a/res/gui/EventsPage.qml b/res/gui/EventsPage.qml index 92cb343..1ee6d61 100644 --- a/res/gui/EventsPage.qml +++ b/res/gui/EventsPage.qml @@ -265,7 +265,7 @@ Page { model: sports delegate: ItemDelegate { required property string eventName - property list<QtObject> competitors + required property list<QtObject> competitors text: eventName width: listView.width - listView.leftMargin - listView.rightMargin height: avatar.height diff --git a/src/model/SportModel.cpp b/src/model/SportModel.cpp index b393498..6b71b88 100644 --- a/src/model/SportModel.cpp +++ b/src/model/SportModel.cpp @@ -100,9 +100,9 @@ void SportModel::parseData() { Competitor *comp = new Competitor(this); comp->setCompetitor(competitor.toObject()); if (medals.find(comp->name()) != medals.end()) comp->setMedals(medals.find(comp->name())->second); - if (!competitors.empty()) comp->setStatistic(competitors.first()->mark()); competitors << comp; } + addRelativeToFirst(competitors); event->setCompetitors(competitors); qDebug() << entry["eventUnitName"].toString(); |