Merge pull request #177 from nathanhourt/master

Update

Author: nathanielhourt

VotingApp/BitsharesWalletBridge.cpp

@@ -293,6 +293,8 @@ kj::Promise<void> BWB::BlockchainWalletApiImpl::getContestById(GetContestByIdCon
 
         return blockPromise;
     }).then([context](QJsonValue block) mutable {
+        // Contests may have a start time of zero, which indicates that they start when published. If this is the case,
+        // set the start time to the time of publication.
         auto contest = context.getResults().getContest().getValue();
         auto timestamp = static_cast<uint64_t>(QDateTime::fromString(block.toObject()["timestamp"].toString(),
                                                Qt::ISODate).toMSecsSinceEpoch());

VotingApp/DataStructures/Contest.cpp

@@ -20,6 +20,7 @@
 
 #include <QDebug>
 #include <QQmlEngine>
+#include <QTimeZone>
 
 namespace swv { namespace data {
 
@@ -34,6 +35,8 @@ void Contest::updateFields(::Contest::Reader r) {
     update_description(QString::fromStdString(r.getDescription()));
     update_name(QString::fromStdString(r.getName()));
     update_startTime(QDateTime::fromMSecsSinceEpoch(r.getStartTime()));
+    // Blockchain time is UTC; update timezone to match.
+    m_startTime.setTimeZone(QTimeZone::utc());
     updateContestants(r.getContestants());
     updateTags(r.getTags());
 }

VotingApp/DataStructures/DecisionRecord.cpp

@@ -2,6 +2,8 @@
 #include "Decision.hpp"
 #include "Converters.hpp"
 
+#include <QTimeZone>
+
 namespace swv {
 namespace data {
 
@@ -15,6 +17,8 @@ void DecisionRecord::updateFields(::DecisionRecord::Reader r) {
     update_voter(QString::fromStdString(r.getVoter()));
     update_weight(r.getWeight());
     update_timestamp(QDateTime::fromMSecsSinceEpoch(r.getTimestamp()));
+    // Blockchain time is UTC; update timezone to match.
+    m_timestamp.setTimeZone(QTimeZone::utc());
 
     // Decision has a fair bit of code to parse the opinions and writeins. Just use that rather than rewrite it here.
     swv::data::Decision d(r.getDecision());