From 100b901581f40fd44e23bdebee729285a894434c Mon Sep 17 00:00:00 2001
From: Mario Colque <mario.colque@globant.com>
Date: Thu, 9 Jan 2014 14:53:28 -0300
Subject: [PATCH 1/3] reusing the blocklist template. Parsing new model

---
 public/js/config.js                |  2 +-
 public/js/controllers/blocks.js    |  8 +-------
 public/views/blocks/list.html      | 21 ++++++++++++++-------
 public/views/blocks/list_date.html | 10 ----------
 4 files changed, 16 insertions(+), 25 deletions(-)
 delete mode 100644 public/views/blocks/list_date.html

diff --git a/public/js/config.js b/public/js/config.js
index 35fe383..1b06b84 100755
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -14,7 +14,7 @@ angular.module('mystery').config(['$routeProvider',
       templateUrl: 'views/blocks/list.html'
     }).
     when('/blocks-date/:blockDate', {
-      templateUrl: 'views/blocks/list_date.html'
+      templateUrl: 'views/blocks/list.html'
     }).
     otherwise({
       redirectTo: '/'
diff --git a/public/js/controllers/blocks.js b/public/js/controllers/blocks.js
index 98e8801..002aea0 100644
--- a/public/js/controllers/blocks.js
+++ b/public/js/controllers/blocks.js
@@ -3,13 +3,7 @@
 angular.module('mystery.blocks').controller('BlocksController', ['$scope', '$routeParams', '$location', 'Global', 'Block', 'Blocks', function ($scope, $routeParams, $location, Global, Block, Blocks) {
   $scope.global = Global;
 
-  $scope.list_blocks = function() {
-    Blocks.query(function(blocks) {
-      $scope.blocks = blocks;
-    });
-  };
-
-  $scope.list_blocks_date = function() {
+  $scope.list = function() {
     Blocks.query({
       blockDate: $routeParams.blockDate
     }, function(blocks) {
diff --git a/public/views/blocks/list.html b/public/views/blocks/list.html
index f258705..656793f 100644
--- a/public/views/blocks/list.html
+++ b/public/views/blocks/list.html
@@ -1,10 +1,17 @@
-<section data-ng-controller="BlocksController" data-ng-init="list_blocks()">
+<section data-ng-controller="BlocksController" data-ng-init="list()">
   <div class="page-header">
     <h1>Blocks by Date</h1>
   </div>
-  <ul>
-    <li data-ng-repeat="block in blocks">
-      <span>{{block.hash}}</span> {{block.time}}
-    </li>
-  </ul>
-</section>
\ No newline at end of file
+  <table class="table table-striped">
+    <thead>
+      <th>Hash</th>
+      <th>Solved at</th>
+    </thead>
+    <tbody>
+      <tr data-ng-repeat="block in blocks">
+        <td><a href="#!/block/{{block.hash}}">{{block.hash}}</a></td>
+        <td>{{block.time}}</td>
+      </tr>
+    </tbody>
+  </table>
+</section>
diff --git a/public/views/blocks/list_date.html b/public/views/blocks/list_date.html
deleted file mode 100644
index 349857c..0000000
--- a/public/views/blocks/list_date.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<section data-ng-controller="BlocksController" data-ng-init="list_blocks_date()">
-  <div class="page-header">
-    <h1>Blocks by defined date</h1>
-  </div>
-  <ul>
-    <li data-ng-repeat="block in blocks">
-      <span>{{block.hash}}</span> {{block.time}}
-    </li>
-  </ul>
-</section>

From aa771bf4dd6bdfdc69d49d1911437ca0f278566f Mon Sep 17 00:00:00 2001
From: Mario Colque <mario.colque@globant.com>
Date: Thu, 9 Jan 2014 15:15:30 -0300
Subject: [PATCH 2/3] blocks controller improved to find blocks by date

---
 app/controllers/blocks.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/controllers/blocks.js b/app/controllers/blocks.js
index 3a38d8d..8939f21 100644
--- a/app/controllers/blocks.js
+++ b/app/controllers/blocks.js
@@ -51,7 +51,13 @@ exports.list = function(req, res) {
   var findParam = {};
 
   if (req.query.blockDate) {
-    findParam = {};
+    var gte = Math.round((new Date(req.query.blockDate)).getTime() / 1000);
+    var lte = gte + 86400;
+
+    findParam = { time: {
+      '$gte': gte,
+      '$lte': lte
+    }};
   }
 
   Block
@@ -67,3 +73,14 @@ exports.list = function(req, res) {
       }
     });
 };
+
+
+1296688602
+
+
+
+1296615600
+
+1296615600000
+
+

From aab6121dd00994cf8688822be0a786adf7d00f1a Mon Sep 17 00:00:00 2001
From: Mario Colque <mario.colque@globant.com>
Date: Thu, 9 Jan 2014 15:21:51 -0300
Subject: [PATCH 3/3] unnecessary number removed

---
 app/controllers/blocks.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/app/controllers/blocks.js b/app/controllers/blocks.js
index 8939f21..5375940 100644
--- a/app/controllers/blocks.js
+++ b/app/controllers/blocks.js
@@ -75,12 +75,3 @@ exports.list = function(req, res) {
 };
 
 
-1296688602
-
-
-
-1296615600
-
-1296615600000
-
-