Finished implementing faceted search

lib/client/app.js

@@ -17,9 +17,13 @@ angular.module("roarmap-h2020-view", ["ngRoute"])
                 templateUrl: "partials/institution.html",
                 controller: "InstitutionController",
             })
-            .when("/by/:facet", {
-                templateUrl: "partials/by.html",
-                controller: "ByController",
+            .when("/by/type", {
+                templateUrl: "partials/by_type.html",
+                controller: "ByTypeController",
+            })
+            .when("/by/country", {
+                templateUrl: "partials/by_country.html",
+                controller: "ByCountryController",
             })
             .otherwise({
                 redirectTo: "/search",
@@ -84,7 +88,7 @@ angular.module("roarmap-h2020-view", ["ngRoute"])
         };
     })
 
-    .controller("SearchController", function ($scope, $http, roarmapSearch) {
+    .controller("SearchController", function ($scope, roarmapSearch) {
         $scope.g = {
             terms: "",
             result: roarmapSearch.getCurrentSearch(),
@@ -101,7 +105,7 @@ angular.module("roarmap-h2020-view", ["ngRoute"])
     })
 
     .controller("InstitutionController",
-                function ($scope, $http, $routeParams, roarmapLoader) {
+                function ($scope, $routeParams, roarmapLoader) {
         $scope.g = {
             selected: null,
         };
@@ -112,7 +116,6 @@ angular.module("roarmap-h2020-view", ["ngRoute"])
             // TODO: consider implementing a map if speed becomes a problem
             for (i = 0; i < institutions.length; ++i) {
                 if (institutions[i].eprintid === ($routeParams.eprintid | 0)) {
-                    console.log(institutions[i]);
                     $scope.g.selected = institutions[i];
                     $scope.g.selected.nexa = rules.apply(institutions[i]);
                     var total = 0.0;
@@ -133,10 +136,52 @@ angular.module("roarmap-h2020-view", ["ngRoute"])
         });
     })
 
-    .controller("ByController",
-                function ($scope, $http, $routeParams, roarmapLoader) {
+    .controller("ByTypeController", function ($scope, roarmapLoader) {
         $scope.g = {
-            tree: null
+            aggregate: null,
+            view: {},
         };
-        console.log($routeParams);
+
+        roarmapLoader(function (error, institutions) {
+            if (error) {
+                throw error;
+            }
+            $scope.g.aggregate = {};
+            $scope.g.view = {};
+            institutions.forEach(function (e) {
+                var k = e.policymaker_type;
+                if (!$scope.g.aggregate[k]) {
+                    $scope.g.aggregate[k] = [];
+                }
+                $scope.g.aggregate[k].push(e);
+            });
+        });
+    })
+
+    .controller("ByCountryController", function ($scope, roarmapLoader) {
+        $scope.g = {
+            aggregate: null,
+            view: {},
+        };
+
+        roarmapLoader(function (error, institutions) {
+            if (error) {
+                throw error;
+            }
+            $scope.g.view = {};
+            var p = {};
+            institutions.forEach(function (e) {
+                if (!p[e.country_names[0]]) {
+                    p[e.country_names[0]] = {};
+                }
+                if (!p[e.country_names[0]][e.country_names[1]]) {
+                    p[e.country_names[0]][e.country_names[1]] = {};
+                }
+                if (!p[e.country_names[0]][e.country_names[1]][e.country_names[2]]) {
+                    p[e.country_names[0]][e.country_names[1]][e.country_names[2]] = [];
+                }
+                p[e.country_names[0]][e.country_names[1]][e.country_names[2]].push(e);
+            });
+            $scope.g.aggregate = p;
+        });
     });

static/partials/by_country.html

@@ -0,0 +1,18 @@
+<div ng-controller="ByCountryController">
+  <div ng-show="g.aggregate">
+    <ul ng-repeat="(k, v) in g.aggregate">
+      <li>{{k}}</li>
+      <ul ng-repeat="(k1, v1) in v">
+        <li>{{k1}}</li>
+        <ul ng-repeat="(k2, v2) in v1">
+          <li>{{k2}}</li>
+          <ul ng-repeat="inst in v2">
+            <li>
+              <a href="#/institutions/{{inst.eprintid}}">{{inst.title}}</a>
+            </li>
+          </ul>
+        </ul>
+      </ul>
+    </ul>
+  </div>
+</div>

static/partials/by_type.html

@@ -0,0 +1,14 @@
+<div ng-controller="ByTypeController">
+
+  <div ng-show="g.aggregate">
+    <ul ng-repeat="(k, v) in g.aggregate">
+      <li>{{k}}</li>
+      <ul>
+        <li ng-repeat="elem in v">
+          <a href="#/institutions/{{elem.eprintid}}">{{elem.title}}</a>
+        </li>
+      </ul>
+    </ul>
+  </div>
+
+</div>

static/partials/institution.html

@@ -2,7 +2,7 @@
 
   <div ng-show="g.selected">
 
-    <p>[<a href="/">&lt;&lt;</a>] <b>{{g.selected.title}}</b>
+    <p><b>{{g.selected.title}}</b>
       ({{g.selected.policymaker_type}})<br />
       Last Modified: {{g.selected.lastmod}}<br />