Progress FollowMyVote#19: Add contestants to contest creation form

nathanielhourt · Feb 8, 2016 · 319963c · 319963c
1 parent e035a2d
commit 319963c
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 26 deletions.
diff --git a/VotingApp/qml/CreateContestPage.qml b/VotingApp/qml/CreateContestPage.qml
@@ -14,40 +14,86 @@ Page {
 
     property var contestCreator
     property VotingSystem votingSystem
+    property var purchaseRequest: contestCreator.getPurchaseContestRequest()
 
     SwipeView {
         id: swiper
         anchors.fill: parent
 
         Item {
-            ColumnLayout {
-                anchors.fill: parent
-                anchors.margins: window.dp(16)
-
-                AppTextField {
-                    Layout.fillWidth: true
-                    placeholderText: qsTr("Contest Name")
-                    maximumLength: contestCreator.contestLimits[ContestLimits.NameLength]
+            Flickable {
+                id: flickable
+                interactive: true
+                flickableDirection: Flickable.VerticalFlick
+                contentHeight: createContestFormColumn.height
+                anchors {
+                    left: parent.left
+                    right: parent.horizontalCenter
+                    top: parent.top
+                    bottom: parent.bottom
+                    margins: window.dp(16)
+                    rightMargin: window.dp(8)
                 }
-                AppTextEdit {
-                    Layout.fillWidth: true
-                    placeholderText: qsTr("Description")
-                    wrapMode: TextEdit.Wrap
-                }
-                Row {
-                    spacing: window.dp(8)
 
-                    AppText {
-                        id: weightCoinLabel
-                        text: qsTr("Coin to Poll:")
+                Column {
+                    id: createContestFormColumn
+                    width: parent.width
+
+                    AppTextField {
+                        width: parent.width
+                        placeholderText: qsTr("Contest Name")
+                        maximumLength: contestCreator.contestLimits[ContestLimits.NameLength]
+                    }
+                    AppTextEdit {
+                        width: parent.width
+                        placeholderText: qsTr("Description")
+                        wrapMode: TextEdit.Wrap
+                    }
+                    Row {
+                        spacing: window.dp(8)
+
+                        AppText {
+                            id: weightCoinLabel
+                            text: qsTr("Coin to Poll:")
+                        }
+                        Controls.ComboBox {
+                            width: window.dp(120)
+                            model: ["a", "b", "c"]
+                            style: ControlStyles.ComboBoxStyle {
+                                font: weightCoinLabel.font
+                            }
+                        }
                     }
-                    Controls.ComboBox {
-                        width: window.dp(120)
-                        model: ["a", "b", "c"]
-                        style: ControlStyles.ComboBoxStyle {
-                            font: weightCoinLabel.font
+                    Column {
+                        width: parent.width
+                        Repeater {
+                            model: purchaseRequest.contestants
+                            delegate: Row {
+                                width: parent.width
+
+                                IconButton {
+                                    icon: IconType.remove
+                                    onClicked: purchaseRequest.contestants.remove(index)
+                                }
+                                IconButton {
+                                    icon: IconType.edit
+                                }
+                                ColumnLayout {
+                                    AppText {
+                                        text: modelData.name
+                                    }
+                                    AppText {
+                                        text: modelData.description
+                                    }
+                                }
+                            }
                         }
                     }
+                    AppButton {
+                        text: qsTr("Add Contestant")
+
+                        onClicked: purchaseRequest.contestants.append({"name": "Joe", "description": "Joe is a candidate."})
+                    }
                 }
             }
         }

diff --git a/VotingApp/wrappers/PurchaseContestRequest.cpp b/VotingApp/wrappers/PurchaseContestRequest.cpp
@@ -49,6 +49,8 @@
 // Macro to generate getter and setter for simple properties in the sponsorship options
 #define SPONSORSHIP_SIMPLE_GETTER_SETTER(property, upperProperty, type, requestField) \
     type PurchaseContestRequestWrapper::property() { \
+        if (!sponsorshipEnabled()) \
+            return {}; \
         _SIMPLE_GETTER_IMPL(Sponsorship().getOptions().get ## requestField) \
     } \
     void PurchaseContestRequestWrapper::set ## upperProperty(type property) { \

diff --git a/VotingApp/wrappers/PurchaseContestRequest.hpp b/VotingApp/wrappers/PurchaseContestRequest.hpp
@@ -29,12 +29,12 @@ QML_ENUM_CLASS(TallyAlgorithm,
 class PurchaseContestRequestWrapper : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(ContestType::Type contestType READ contestType WRITE setContestType NOTIFY contestTypeChanged)
-    Q_PROPERTY(TallyAlgorithm::Type tallyAlgorithm READ tallyAlgorithm WRITE setTallyAlgorithm
+    Q_PROPERTY(swv::ContestType::Type contestType READ contestType WRITE setContestType NOTIFY contestTypeChanged)
+    Q_PROPERTY(swv::TallyAlgorithm::Type tallyAlgorithm READ tallyAlgorithm WRITE setTallyAlgorithm
                NOTIFY tallyAlgorithmChanged)
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(QString description READ description WRITE setDescription NOTIFY descriptionChanged)
-    /// Contestants is a list of Javascript options containing "name" and "description" properties, each being strings
+    /// Contestants is a list of Javascript objects containing "name" and "description" properties, each being strings
     Q_PROPERTY(QQmlVariantListModel* contestants READ contestants CONSTANT)
     Q_PROPERTY(QQmlVariantListModel* promoCodes READ promoCodes CONSTANT)
     Q_PROPERTY(quint64 weightCoin READ weightCoin WRITE setWeightCoin NOTIFY weightCoinChanged)