Add group filtering on teams

Author: bacali95

DOMjura.pro

@@ -32,7 +32,8 @@ SOURCES += main.cpp \
         gradientcache.cpp \
         domjudgeapimanager.cpp \
     submission.cpp \
-    judging.cpp
+    judging.cpp \
+    group.cpp
 
 HEADERS  += problemgraphicsitem.h \
         defines.h \
@@ -53,7 +54,8 @@ HEADERS  += problemgraphicsitem.h \
         gradientcache.h \
         domjudgeapimanager.h \
     submission.h \
-    judging.h
+    judging.h \
+    group.h
 
 FORMS += \
         maindialog.ui \

domjudgeapimanager.cpp

@@ -30,6 +30,13 @@ void DomjudgeApiManager::loadContestData(QString cid) {
     this->accessManager->get(request);
 }
 
+void DomjudgeApiManager::loadGroupsData(QString cid) {
+    DomjudgeApiRequest request("contests/" + cid + "/groups");
+    this->groupsRequests.append(request);
+
+    this->accessManager->get(request);
+}
+
 void DomjudgeApiManager::loadTeamData(QString cid) {
     DomjudgeApiRequest request("contests/" + cid + "/teams");
     this->teamsRequests.append(request);
@@ -98,6 +105,11 @@ void DomjudgeApiManager::replyFinished(QNetworkReply *reply) {
                            &DomjudgeApiManager::contestDataLoaded)) {
         return;
     }
+    if (this->processReply(reply, &apiManager->groupsRequests,
+                           &DomjudgeApiManager::groupsDataFailedLoading,
+                           &DomjudgeApiManager::groupsDataLoaded)) {
+        return;
+    }
     if (this->processReply(reply, &apiManager->teamsRequests,
                            &DomjudgeApiManager::teamsDataFailedLoading,
                            &DomjudgeApiManager::teamsDataLoaded)) {

domjudgeapimanager.h

@@ -32,6 +32,7 @@ class DomjudgeApiManager : public QObject
     void loadUserData();
     void loadContestData(QString contestId);
     void loadTeamData(QString cid);
+    void loadGroupsData(QString cid);
     void loadProblemData(QString cid);
     void loadSubmissions(QString cid);
     void loadJudgings(QString cid);
@@ -50,6 +51,7 @@ class DomjudgeApiManager : public QObject
     QList<QNetworkRequest> userRequests;
     QList<QNetworkRequest> contestRequests;
     QList<QNetworkRequest> teamsRequests;
+    QList<QNetworkRequest> groupsRequests;
     QList<QNetworkRequest> problemRequests;
     QList<QNetworkRequest> submissionRequests;
     QList<QNetworkRequest> judgingRequests;
@@ -67,8 +69,8 @@ class DomjudgeApiManager : public QObject
     void contestDataLoaded(QJsonDocument contestData);
     void contestDataFailedLoading(QString error);
 
-    void categoriesDataLoaded(QJsonDocument data);
-    void categoriesDataFailedLoading(QString error);
+    void groupsDataLoaded(QJsonDocument data);
+    void groupsDataFailedLoading(QString error);
 
     void teamsDataLoaded(QJsonDocument data);
     void teamsDataFailedLoading(QString error);

group.cpp

@@ -0,0 +1,44 @@
+#include "group.h"
+
+#include <QJsonObject>
+
+#include "team.h"
+
+namespace DJ {
+namespace Model {
+Group::Group(QJsonObject group, QObject *parent) : QObject(parent) {
+    this->id = group.value("id").toString();
+    this->name = group.value("name").toString("UNKNOWN");
+    this->color = group.value("color").toString("");
+}
+
+QString Group::getName() {
+    return this->name;
+}
+
+QString Group::getId() {
+    return this->id;
+}
+
+QString Group::getColor() {
+    return this->color;
+}
+
+void Group::addTeam(Team *team) {
+    this->teams[team->getId()] = team;
+}
+
+int Group::numTeams() {
+    return this->teams.size();
+}
+
+QString Group::toString() {
+    QString s;
+    s += "    id    = " + this->id + "\n";
+    s += "    color = " + this->color + "\n";
+    s += "    name  = " + this->name + "\n";
+    return s;
+}
+
+}
+}

group.h

@@ -0,0 +1,66 @@
+/** \file group.h
+  * \brief Contains a class for a group.
+  */
+
+#ifndef GROUP_H
+#define GROUP_H
+
+#include <QObject>
+#include <QHash>
+
+namespace DJ {
+namespace Model {
+
+class Team;
+
+/** A group (from the API).
+  */
+class Group : public QObject
+{
+    Q_OBJECT
+public:
+    /** Constructs a new group.
+          * \param group The team as returned from the DOMjudge API
+          * \param parent The parent of this object
+          */
+        explicit Group(QJsonObject group, QObject *parent = nullptr);
+        /** Returns the name of this group.
+          * \return The name of this group.
+          */
+        QString getName();
+        /** Returns the ID of this group.
+          * \return The ID of this group.
+          */
+        QString getId();
+        /** Returns the color of this group.
+          * \return The color of this group.
+          */
+        QString getColor();
+        /** Returns a string representing this group.
+          * \return A string representation of this group.
+          * Useful for debug printing.
+          */
+        QString toString();
+
+        /**
+         * Add a team to this group
+         * \param team The team to add
+         */
+        void addTeam(Team *team);
+
+        /**
+         * @brief Returns the number of teams in this group
+         * @return The number of teams in this group
+         */
+        int numTeams();
+
+    private:
+        QString id;
+        QString name;
+        QString color;
+        QHash<QString, Team *> teams;
+};
+}
+}
+
+#endif // GROUP_H

maincontroller.cpp

@@ -1,5 +1,5 @@
 #include "maincontroller.h"
-#include <iostream>
+
 #include <QMessageBox>
 #include <QDebug>
 
@@ -8,12 +8,11 @@
 #include "domjudgeapimanager.h"
 #include "contest.h"
 #include "team.h"
+#include "group.h"
 #include "problem.h"
 #include "submission.h"
 #include "judging.h"
 
-using namespace std;
-
 namespace DJ {
 namespace Controller {
 
@@ -38,6 +37,8 @@ MainController::MainController(QObject *parent) : QObject(parent) {
     connect(apiManager, &Shared::DomjudgeApiManager::contestDataFailedLoading, this, &MainController::processContestLoadError);
     connect(apiManager, &Shared::DomjudgeApiManager::teamsDataLoaded, this, &MainController::processTeamData);
     connect(apiManager, &Shared::DomjudgeApiManager::teamsDataFailedLoading, this, &MainController::processContestLoadError);
+    connect(apiManager, &Shared::DomjudgeApiManager::groupsDataLoaded, this, &MainController::processGroupData);
+    connect(apiManager, &Shared::DomjudgeApiManager::groupsDataFailedLoading, this, &MainController::processContestLoadError);
     connect(apiManager, &Shared::DomjudgeApiManager::problemsDataLoaded, this, &MainController::processProblemData);
     connect(apiManager, &Shared::DomjudgeApiManager::problemsDataFailedLoading, this, &MainController::processContestLoadError);
 
@@ -68,6 +69,11 @@ void MainController::connectToServer() {
         this->contest = nullptr;
     }
 
+    if (!this->groups.empty()) {
+        qDeleteAll(this->groups);
+        this->groups.clear();
+    }
+
     if (!this->teams.empty()) {
         qDeleteAll(this->teams);
         this->teams.clear();
@@ -107,7 +113,7 @@ void MainController::processUser(QJsonDocument userData) {
 void MainController::processContestData(QJsonDocument contestData) {
     this->contest = new Model::Contest(contestData.object());
     Shared::DomjudgeApiManager *apiManager = Shared::DomjudgeApiManager::sharedApiManager();
-    apiManager->loadTeamData(this->mainDialog->getContestId());
+    apiManager->loadGroupsData(this->mainDialog->getContestId());
 }
 
 void MainController::processContestLoadError(QString error) {
@@ -116,14 +122,28 @@ void MainController::processContestLoadError(QString error) {
     this->mainDialog->hideContest();
 }
 
+void MainController::processGroupData(QJsonDocument groupsData) {
+    foreach (auto groupValue, groupsData.array()) {
+        auto groupObject = groupValue.toObject();
+        Model::Group *group = new Model::Group(groupObject);
+        this->groups[group->getId()] = group;
+    }
+
+    Shared::DomjudgeApiManager *apiManager = Shared::DomjudgeApiManager::sharedApiManager();
+    apiManager->loadTeamData(this->mainDialog->getContestId());
+}
+
 void MainController::processTeamData(QJsonDocument teamData) {
     foreach (auto teamValue, teamData.array()) {
         auto teamObject = teamValue.toObject();
-        Model::Team *team = new Model::Team(teamObject);
-        this->teams[team->getId()] = team;
+        Model::Team *team = new Model::Team(teamObject, this->groups);
+        if (team->getGroup()) {
+            // Only teams in a category are useful
+            this->teams[team->getId()] = team;
+        } else {
+            delete team;
+        }
     }
-    cout << teamData.array().size() << endl;
-    cout << this->teams.size() << endl;
 
     Shared::DomjudgeApiManager *apiManager = Shared::DomjudgeApiManager::sharedApiManager();
     apiManager->loadProblemData(this->mainDialog->getContestId());
@@ -136,7 +156,7 @@ void MainController::processProblemData(QJsonDocument problemData) {
         this->problems[problem->getId()] = problem;
     }
 
-    this->mainDialog->displayContest(this->contest);
+    this->mainDialog->displayContest(this->contest, this->groups);
 }
 
 void MainController::processEventLoadError(QString error) {
@@ -160,7 +180,7 @@ void MainController::processSubmissionData(QJsonDocument submissionData) {
     apiManager->loadJudgings(this->mainDialog->getContestId());
 }
 
-void MainController::   processJudgingData(QJsonDocument judgingData) {
+void MainController::processJudgingData(QJsonDocument judgingData) {
     foreach (QJsonValue judgingValue, judgingData.array()) {
         QJsonObject judgingObject = judgingValue.toObject();
         Model::Judging *judging = new Model::Judging(judgingObject,
@@ -177,14 +197,12 @@ void MainController::   processJudgingData(QJsonDocument judgingData) {
         this->standingsController = nullptr;
     }
 
-    cout << this->teams.size() << endl;
-    cout << this->submissions.size() << endl;
-    cout << this->problems.size() << endl;
-    cout << this->judgings.size() << endl;
-
     QHash<QString, Model::Team *> selectedTeams;
+    QList<QString> selectedGroups = this->mainDialog->selectedGroups().keys();
     foreach (Model::Team *team, this->teams) {
-        selectedTeams[team->getId()] = team;
+        if (selectedGroups.contains(team->getGroup()->getId())) {
+            selectedTeams[team->getId()] = team;
+        }
     }
 
     this->standingsController = new StandingsController(this->contest,

maincontroller.h

@@ -43,6 +43,7 @@ class MainController : public QObject {
 
     StandingsController *standingsController;
     Model::Contest *contest;
+    QHash<QString, Model::Group *> groups;
     QHash<QString, Model::Team *> teams;
     QHash<QString, Model::Problem *> problems;
     QHash<QString, Model::Submission *> submissions;
@@ -52,6 +53,7 @@ private slots:
     void connectToServer();
     void processUser(QJsonDocument userData);
     void processContestData(QJsonDocument contestData);
+    void processGroupData(QJsonDocument groupData);
     void processTeamData(QJsonDocument teamData);
     void processProblemData(QJsonDocument problemData);
     void processSubmissionData(QJsonDocument submissionData);

maindialog.cpp

@@ -5,6 +5,7 @@
 #include <QDebug>
 
 #include "contest.h"
+#include "group.h"
 
 namespace DJ {
 namespace View {
@@ -36,6 +37,7 @@ void MainDialog::on_buttonStart_clicked() {
 }
 
 void MainDialog::hideContest() {
+    this->ui->groupBoxGroups->setEnabled(false);
     this->ui->groupBoxContest->setEnabled(false);
     this->ui->groupBoxMode->setEnabled(false);
 
@@ -45,9 +47,16 @@ void MainDialog::hideContest() {
     this->ui->labelContestEnd->setText("");
     this->ui->labelContestPenalty->setText("");
 
+    qDeleteAll(this->groupCheckboxes);
+    this->groupCheckboxes.clear();
+    this->selectedGroupsHash.clear();
 }
 
-void MainDialog::displayContest(Model::Contest *contest) {
+void MainDialog::displayContest(Model::Contest *contest, QHash<QString, Model::Group *> groups) {
+    qDeleteAll(this->groupCheckboxes);
+    this->groupCheckboxes.clear();
+
+    this->ui->groupBoxGroups->setEnabled(true);
     this->ui->groupBoxContest->setEnabled(true);
     this->ui->groupBoxMode->setEnabled(true);
 
@@ -56,6 +65,41 @@ void MainDialog::displayContest(Model::Contest *contest) {
     this->ui->labelContestFreeze->setText(contest->getFreeze().toString("yyyy-MM-dd hh:mm:ss"));
     this->ui->labelContestEnd->setText(contest->getEnd().toString("yyyy-MM-dd hh:mm:ss"));
     this->ui->labelContestPenalty->setText(QString::number(contest->getPenaltyMinutes()) + " minutes");
+
+    int row = 0;
+    foreach (auto group, groups) {
+        QString groupText = group->getName();
+        groupText += " (";
+        int numTeams = group->numTeams();
+        groupText += QString::number(numTeams);
+        groupText += " ";
+        groupText += (numTeams == 1) ? "team)" : "teams)";
+        QCheckBox *checkbox = new QCheckBox(groupText);
+        checkbox->setProperty("group", QVariant::fromValue(group));
+        this->ui->gridLayoutGroups->addWidget(checkbox, row, 0);
+        this->groupCheckboxes.append(checkbox);
+        ++row;
+
+        connect(checkbox, &QCheckBox::clicked, this, &MainDialog::groupCheckboxClicked);
+    }
+}
+
+void MainDialog::groupCheckboxClicked(bool checked) {
+    QCheckBox *sender = (QCheckBox *)this->sender();
+    Model::Group *group = sender->property("group").value<Model::Group *>();
+    if (checked) {
+        this->selectedGroupsHash[group->getId()] = group;
+        this->ui->groupBoxMode->setEnabled(true);
+    } else {
+        this->selectedGroupsHash.remove(group->getId());
+        if (this->selectedGroupsHash.isEmpty()) {
+            this->ui->groupBoxMode->setEnabled(false);
+        }
+    }
+}
+
+QHash<QString, Model::Group *> MainDialog::selectedGroups() {
+    return this->selectedGroupsHash;
 }
 
 QString MainDialog::getProtocol() {