delegation list displays unilateral received delegations

DemocracyEarth · Oct 27, 2017 · ec40bd4 · ec40bd4
1 parent 947dbf4
commit ec40bd4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/imports/ui/modules/menu.js b/imports/ui/modules/menu.js
@@ -234,9 +234,27 @@ const _getDelegatesMenu = () => {
   let sent;
   let received;
   let source;
+  let contracts = [];
   const politics = [];
+
+  // unilaterally received delegations
+  if (Meteor.user()) {
+    contracts = _.pluck(Contracts.find({ signatures: { $elemMatch: { username: Meteor.user().username } } }).fetch(), '_id');
+  }
+
+  // sent delegations
   const transactions = _.filter(Transactions.find({ kind: 'DELEGATION' }).fetch(),
-    (item) => { return (item.input.entityId === Meteor.userId() || item.output.entityId === Meteor.userId()); }, 0);
+    (item) => {
+      if (contracts.length > 0) {
+        for (const signed in contracts) {
+          if (item.input.entityId === contracts[signed] || item.output.entityId === contracts[signed]) {
+            return true;
+          }
+        }
+      }
+      return (item.input.entityId === Meteor.userId() || item.output.entityId === Meteor.userId());
+    }, 0);
+
 
   if (transactions.length > 0) {
     delegations = _.uniq(_.pluck(transactions, 'contractId'));

diff --git a/imports/ui/templates/layout/main.js b/imports/ui/templates/layout/main.js
@@ -79,8 +79,6 @@ Meteor.startup(() => {
   });
 
   // geographical Info
-  // HTTP.get(Meteor.absoluteUrl('data/geo.json'), (err, result) => {
-  // });
   globalObj.geoJSON = geo;
   Session.set('filteredCountries', geo.country);
 });

diff --git a/imports/ui/templates/layout/sidebar/sidebar.js b/imports/ui/templates/layout/sidebar/sidebar.js
@@ -70,6 +70,7 @@ function getList(db, sort) {
 */
 function getDelegates() {
   const delegates = _.sortBy(getDelegatesMenu(), (user) => { return parseInt(0 - (user.sent + user.received), 10); });
+  console.log(delegates);
   const delegateList = [];
   for (const i in delegates) {
     delegateList.push(Meteor.users.find({ _id: delegates[i].userId }).fetch()[0]);