From 2f87425cf091e8a39b63633e024c6810ed9fdb1c Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Thu, 7 May 2015 18:29:03 -0300
Subject: [PATCH] New proposal ranking

---
 index.html                 |  20 +++++++++++---------
 js/handlebars-helpers.js   |  20 +++++---------------
 js/jquery.timeago.js       | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 js/jquery.timeago.pt-br.js |  18 ++++++++++++++++++
 js/main.js                 |   5 +++--
 js/requirejs-config.js     |  10 +++++++++-
 sass/_proposal_detail.scss |  22 +++++++++++-----------
 7 files changed, 278 insertions(+), 38 deletions(-)
 create mode 100644 js/jquery.timeago.js
 create mode 100644 js/jquery.timeago.pt-br.js

diff --git a/index.html b/index.html
index 9d69ad4..168ad30 100644
--- a/index.html
+++ b/index.html
@@ -298,21 +298,23 @@
             <td class="abstract-text">Propostas</td>
             <td class="votes-for"></td>
             <td class="votes-against"></td>
-            {{!-- <td class="apoio">Apoio</td> --}}
-            {{!-- <td class="participacao">Participacao</td> --}}
-            <td class="score">Pontuação</td>
+            <td class="support">Apoio</td>
+            <td class="participation">Participação</td>
           </tr>
-          {{#each articles}}
+          {{#each proposals}}
             <tr>
               <td class="abstract-text"><div class="truncate"><p class="truncated">{{abstract}}</p></div></td>
-              <td class="votes-for">{{votes_for}}</td>
-              <td class="votes-against">{{votes_against}}</td>
-              {{!-- <td class="apoio">{{#apoio .}}{{/apoio}}</td> --}}
-              {{!-- <td class="participacao">{{#participacao .}}{{/participacao}}</td> --}}
-              <td class="score">{{#score .}}{{/score}}</td>
+              <td class="votes-for value">{{votes_for}}</td>
+              <td class="votes-against value">{{votes_against}}</td>
+              <td class="support value">{{#round effective_support}}{{/round}}</td>
+              <td class="participation value">{{#round effective_participation}}{{/round}}</td>
             </tr>
           {{/each}}
         </table>
+        <div class="updated-at">
+          <span>Atualizado </span>
+          <span class="timeago" title="{{updated_at}}"></span>
+        </div>
       </div>
     </script>
 
diff --git a/js/handlebars-helpers.js b/js/handlebars-helpers.js
index df3ec76..4b8b4af 100644
--- a/js/handlebars-helpers.js
+++ b/js/handlebars-helpers.js
@@ -60,21 +60,7 @@ define(['handlebars'], function(Handlebars){
   Handlebars.registerHelper('replace', function(string, to_replace, replacement) {
     return (string || '').replace(new RegExp(to_replace, 'g'), replacement);
   });
-  
-  Handlebars.registerHelper('score', function(article) {
-    return article.votes_for - article.votes_against;
-  });
-  
-  Handlebars.registerHelper('apoio', function(article) {
-    // return (article.votes_for - article.votes_against)/(article.countViews);
-    return 0;
-  });
-  
-  Handlebars.registerHelper('participacao', function(article) {
-    // return (article.votes_for + article.votes_against)/(article.countViews);
-    return 0;
-  });
-  
+
   Handlebars.registerHelper('select_proposal', function(proposals, category_slug, selected_id) {
     var ret = '<label for="proposal-selection" class="sr-only">Selecione o programa</label>'
     ret =  ret + '<select id="proposal-selection" name="proposal-selection" data-proposal="'+selected_id+'" title="Selecione o programa" class="proposal-selection">';
@@ -101,6 +87,10 @@ define(['handlebars'], function(Handlebars){
     }
   });
 
+  Handlebars.registerHelper('round', function(num) {
+    return +(Math.round(num + "e+2")  + "e-2");
+  });
+
   function proposal_has_category(proposal, category_slug) {
     for(var i=0; i<proposal.categories.length; i++) {
       if(proposal.categories[i].slug == category_slug)
diff --git a/js/jquery.timeago.js b/js/jquery.timeago.js
new file mode 100644
index 0000000..15805a6
--- /dev/null
+++ b/js/jquery.timeago.js
@@ -0,0 +1,221 @@
+/**
+ * Timeago is a jQuery plugin that makes it easy to support automatically
+ * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
+ *
+ * @name timeago
+ * @version 1.4.1
+ * @requires jQuery v1.2.3+
+ * @author Ryan McGeary
+ * @license MIT License - http://www.opensource.org/licenses/mit-license.php
+ *
+ * For usage and examples, visit:
+ * http://timeago.yarp.com/
+ *
+ * Copyright (c) 2008-2015, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org)
+ */
+
+(function (factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['jquery'], factory);
+  } else {
+    // Browser globals
+    factory(jQuery);
+  }
+}(function ($) {
+  $.timeago = function(timestamp) {
+    if (timestamp instanceof Date) {
+      return inWords(timestamp);
+    } else if (typeof timestamp === "string") {
+      return inWords($.timeago.parse(timestamp));
+    } else if (typeof timestamp === "number") {
+      return inWords(new Date(timestamp));
+    } else {
+      return inWords($.timeago.datetime(timestamp));
+    }
+  };
+  var $t = $.timeago;
+
+  $.extend($.timeago, {
+    settings: {
+      refreshMillis: 60000,
+      allowPast: true,
+      allowFuture: false,
+      localeTitle: false,
+      cutoff: 0,
+      strings: {
+        prefixAgo: null,
+        prefixFromNow: null,
+        suffixAgo: "ago",
+        suffixFromNow: "from now",
+        inPast: 'any moment now',
+        seconds: "less than a minute",
+        minute: "about a minute",
+        minutes: "%d minutes",
+        hour: "about an hour",
+        hours: "about %d hours",
+        day: "a day",
+        days: "%d days",
+        month: "about a month",
+        months: "%d months",
+        year: "about a year",
+        years: "%d years",
+        wordSeparator: " ",
+        numbers: []
+      }
+    },
+
+    inWords: function(distanceMillis) {
+      if(!this.settings.allowPast && ! this.settings.allowFuture) {
+          throw 'timeago allowPast and allowFuture settings can not both be set to false.';
+      }
+
+      var $l = this.settings.strings;
+      var prefix = $l.prefixAgo;
+      var suffix = $l.suffixAgo;
+      if (this.settings.allowFuture) {
+        if (distanceMillis < 0) {
+          prefix = $l.prefixFromNow;
+          suffix = $l.suffixFromNow;
+        }
+      }
+
+      if(!this.settings.allowPast && distanceMillis >= 0) {
+        return this.settings.strings.inPast;
+      }
+
+      var seconds = Math.abs(distanceMillis) / 1000;
+      var minutes = seconds / 60;
+      var hours = minutes / 60;
+      var days = hours / 24;
+      var years = days / 365;
+
+      function substitute(stringOrFunction, number) {
+        var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
+        var value = ($l.numbers && $l.numbers[number]) || number;
+        return string.replace(/%d/i, value);
+      }
+
+      var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
+        seconds < 90 && substitute($l.minute, 1) ||
+        minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
+        minutes < 90 && substitute($l.hour, 1) ||
+        hours < 24 && substitute($l.hours, Math.round(hours)) ||
+        hours < 42 && substitute($l.day, 1) ||
+        days < 30 && substitute($l.days, Math.round(days)) ||
+        days < 45 && substitute($l.month, 1) ||
+        days < 365 && substitute($l.months, Math.round(days / 30)) ||
+        years < 1.5 && substitute($l.year, 1) ||
+        substitute($l.years, Math.round(years));
+
+      var separator = $l.wordSeparator || "";
+      if ($l.wordSeparator === undefined) { separator = " "; }
+      return $.trim([prefix, words, suffix].join(separator));
+    },
+
+    parse: function(iso8601) {
+      var s = $.trim(iso8601);
+      s = s.replace(/\.\d+/,""); // remove milliseconds
+      s = s.replace(/-/,"/").replace(/-/,"/");
+      s = s.replace(/T/," ").replace(/Z/," UTC");
+      s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
+      s = s.replace(/([\+\-]\d\d)$/," $100"); // +09 -> +0900
+      return new Date(s);
+    },
+    datetime: function(elem) {
+      var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
+      return $t.parse(iso8601);
+    },
+    isTime: function(elem) {
+      // jQuery's `is()` doesn't play well with HTML5 in IE
+      return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time");
+    }
+  });
+
+  // functions that can be called via $(el).timeago('action')
+  // init is default when no action is given
+  // functions are called with context of a single element
+  var functions = {
+    init: function(){
+      var refresh_el = $.proxy(refresh, this);
+      refresh_el();
+      var $s = $t.settings;
+      if ($s.refreshMillis > 0) {
+        this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis);
+      }
+    },
+    update: function(time){
+      var parsedTime = $t.parse(time);
+      $(this).data('timeago', { datetime: parsedTime });
+      if($t.settings.localeTitle) $(this).attr("title", parsedTime.toLocaleString());
+      refresh.apply(this);
+    },
+    updateFromDOM: function(){
+      $(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) });
+      refresh.apply(this);
+    },
+    dispose: function () {
+      if (this._timeagoInterval) {
+        window.clearInterval(this._timeagoInterval);
+        this._timeagoInterval = null;
+      }
+    }
+  };
+
+  $.fn.timeago = function(action, options) {
+    var fn = action ? functions[action] : functions.init;
+    if(!fn){
+      throw new Error("Unknown function name '"+ action +"' for timeago");
+    }
+    // each over objects here and call the requested function
+    this.each(function(){
+      fn.call(this, options);
+    });
+    return this;
+  };
+
+  function refresh() {
+    //check if it's still visible
+    if(!$.contains(document.documentElement,this)){
+      //stop if it has been removed
+      $(this).timeago("dispose");
+      return this;
+    }
+
+    var data = prepareData(this);
+    var $s = $t.settings;
+
+    if (!isNaN(data.datetime)) {
+      if ( $s.cutoff == 0 || Math.abs(distance(data.datetime)) < $s.cutoff) {
+        $(this).text(inWords(data.datetime));
+      }
+    }
+    return this;
+  }
+
+  function prepareData(element) {
+    element = $(element);
+    if (!element.data("timeago")) {
+      element.data("timeago", { datetime: $t.datetime(element) });
+      var text = $.trim(element.text());
+      if ($t.settings.localeTitle) {
+        element.attr("title", element.data('timeago').datetime.toLocaleString());
+      } else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) {
+        element.attr("title", text);
+      }
+    }
+    return element.data("timeago");
+  }
+
+  function inWords(date) {
+    return $t.inWords(distance(date));
+  }
+
+  function distance(date) {
+    return (new Date().getTime() - date.getTime());
+  }
+
+  // fix for IE6 suckage
+  document.createElement("abbr");
+  document.createElement("time");
+}));
diff --git a/js/jquery.timeago.pt-br.js b/js/jquery.timeago.pt-br.js
new file mode 100644
index 0000000..c72ea38
--- /dev/null
+++ b/js/jquery.timeago.pt-br.js
@@ -0,0 +1,18 @@
+// Brazilian Portuguese 
+jQuery.timeago.settings.strings = {
+   prefixAgo: "há",
+   prefixFromNow: "em",
+   suffixAgo: null,
+   suffixFromNow: null,
+   seconds: "alguns segundos",
+   minute: "um minuto",
+   minutes: "%d minutos",
+   hour: "uma hora",
+   hours: "%d horas",
+   day: "um dia",
+   days: "%d dias",
+   month: "um mês",
+   months: "%d meses",
+   year: "um ano",
+   years: "%d anos"
+};
diff --git a/js/main.js b/js/main.js
index 1f75b4c..8765d6d 100644
--- a/js/main.js
+++ b/js/main.js
@@ -17,7 +17,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
 
   var loginButton;
 
-  var participa = true;
+  var participa = false;
   if(participa){
     var host = 'http://www.participa.br';
     var private_token = '375bee7e17d0021af7160ce664874618';  //participa
@@ -102,12 +102,13 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
                 $resultsContainer.find('.loading').show();
                 $resultsContainer.find('.results-content').hide();
 
-                var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=10&order=votes_score&fields=id,name,abstract,votes_for,votes_against&content_type=ProposalsDiscussionPlugin::Proposal';
+                var url = host + '/api/v1/proposals_discussion_plugin/' + topic_id + '/ranking' + '?private_token=' + private_token + '&limit=10';
                 $.getJSON(url).done(function( data ) {
 
                   $resultsContainer.html(resultsTemplate(data));
                   $resultsContainer.find('.loading').hide();
                   $resultsContainer.find('.results-content').show();
+                  $(".timeago").timeago();
                   $resultsContainer.show();
 
                   // scroll to the end
diff --git a/js/requirejs-config.js b/js/requirejs-config.js
index 8114e91..fde4be3 100644
--- a/js/requirejs-config.js
+++ b/js/requirejs-config.js
@@ -12,6 +12,8 @@ requirejs.config({
         jquery_xdomainrequest: 'jquery.xdomainrequest.min',
         jquery_ui: 'jquery-ui-1.11.4.custom/jquery-ui.min',
         jquery_cookie: 'jquery.cookie',
+        jquery_timeago: 'jquery.timeago',
+        jquery_timeago_pt: 'jquery.timeago.pt-br',
         handlebars: 'handlebars-v3.0.1',
         handlebars_helpers: 'handlebars-helpers',
         jquery_maxlength: 'jquery.maxlength.min',
@@ -29,6 +31,12 @@ requirejs.config({
       'jquery_xdomainrequest': {
         deps: ['jquery']
       },
+      'jquery_timeago': {
+        deps: ['jquery']
+      },
+      'jquery_timeago_pt': {
+        deps: ['jquery_timeago']
+      },
       'jquery_ui': {
         deps: ['jquery']
       },
@@ -54,5 +62,5 @@ requirejs.config({
     }
 });
 
-requirejs(['jquery', 'proposal_app', 'jquery_ui', 'jquery_xdomainrequest', 'handlebars_helpers']);
+requirejs(['jquery', 'proposal_app', 'jquery_ui', 'jquery_xdomainrequest', 'jquery_timeago_pt', 'handlebars_helpers']);
 requirejs(['slick', 'fastclick', 'jquery_maxlength', 'layout','main']);
diff --git a/sass/_proposal_detail.scss b/sass/_proposal_detail.scss
index b788cbe..725da6a 100644
--- a/sass/_proposal_detail.scss
+++ b/sass/_proposal_detail.scss
@@ -135,10 +135,18 @@
             display: block;
             float: right;
           }
+          .updated-at {
+            font-size: 12px;
+            color: gray;
+            float: right;
+          }
         }
         table {
           clear: both;
           margin-top: 20px;
+          td {
+            padding: 0 5px;
+          }
           tbody tr:nth-child(odd) {
             background-color: #e5e5e5;
           }
@@ -146,18 +154,12 @@
           .abstract-text {
             width: 80%;
           }
-          .votes-for {
+          .value {
             width: 10%;
             text-align: center;
           }
-          .votes-against {
-            @extend .votes-for;
-          }
-          .score {
-            @extend .votes-for;
-          }
           .header {
-            line-height: 32px;
+            line-height: 22px;
             font-weight: bold;
             text-align: center;
             color: rgb(68, 68, 68);
@@ -168,11 +170,9 @@
               background-position: center;
             }
             .votes-against {
+              @extend .votes-for;
               background-image: url(./images/result-dislike.png);
             }
-            .score {
-              background-image: none;
-            }
           }
 
           .truncate {
--
libgit2 0.21.2