Merge pull request #6 from NLeSC/jsonSelection

fixed text search label, fixed perspectives not showing in breadcrumb…
NLeSC · Feb 22, 2017 · 3b1886c · 3b1886c
2 parents d26cdae + 8966e39
commit 3b1886c
Show file tree

Hide file tree

Showing 23 changed files with 264 additions and 541 deletions.
diff --git a/app/scripts/allactorchart/allActorChart.directive.html b/app/scripts/allactorchart/allActorChart.directive.html
@@ -1,2 +1,2 @@
 <b>Actors</b>
-<div id="rowchart_allActors"></div>
+<div id="actors"></div>
diff --git a/app/scripts/allauthorschart/allAuthorsChart.directive.html b/app/scripts/allauthorschart/allAuthorsChart.directive.html
@@ -1,2 +1,2 @@
 <b>Authors</b>
-<div id="rowchart_allAuthors"></div>
+<div id="authors"></div>
diff --git a/app/scripts/allcitationschart/allCitationsChart.directive.html b/app/scripts/allcitationschart/allCitationsChart.directive.html
@@ -1,2 +1,2 @@
 <b>Cited</b>
-<div id="rowchart_allCitations"></div>
+<div id="citations"></div>
diff --git a/app/scripts/allsourceschart/allSourcesChart.directive.html b/app/scripts/allsourceschart/allSourcesChart.directive.html
@@ -1 +1 @@
-<div id="rowchart_allSources"></div>
+<div id="sources"></div>
diff --git a/app/scripts/authentication/attribution.txt b/app/scripts/authentication/attribution.txt
diff --git a/app/scripts/authentication/authentication.controller.js b/app/scripts/authentication/authentication.controller.js
diff --git a/app/scripts/authentication/authentication.directive.html b/app/scripts/authentication/authentication.directive.html
diff --git a/app/scripts/authentication/authentication.directive.js b/app/scripts/authentication/authentication.directive.js
diff --git a/app/scripts/authentication/authentication.service.js b/app/scripts/authentication/authentication.service.js
diff --git a/app/scripts/authentication/base64.service.js b/app/scripts/authentication/base64.service.js
diff --git a/app/scripts/breadcrumbs/breadcrumbs.controller.js b/app/scripts/breadcrumbs/breadcrumbs.controller.js
@@ -41,6 +41,7 @@
         me.filters = [];
         var charts = Object.keys(me.charts);
         charts.forEach(function(chartID) {
+          var anchorName = me.charts[chartID].anchorName();
           me.charts[chartID].filters().forEach(function(f) {
             var filterText = f.toString();
             if (f.filterType === 'RangedTwoDimensionalFilter') {
@@ -52,6 +53,8 @@
               var textLeftBottom = dateLeft.getFullYear() + '-' + dateLeft.getMonth() + '-' + dateLeft.getDay() + ' / ' + bottom;
               var textRightTop = dateRight.getFullYear() + '-' + dateRight.getMonth() + '-' + dateRight.getDay() + ' / ' + top;
               filterText = textLeftBottom + ' : ' + textRightTop;
+            } else if (f.filterType === 'RangedFilter') {
+              filterText = (f[0]).toPrecision(2) + ' : ' + (f[1]).toPrecision(2);
             } else if (f instanceof Array) {
               filterText = '';
               f.forEach(function(element) {
@@ -69,7 +72,7 @@
             me.filters.push({
               chartID: chartID,
               filter: f,
-              filterString: '['+filterText+']',
+              filterString: anchorName+'['+filterText+']',
               dimension: dimension
             });            
           });

diff --git a/app/scripts/fullTextCrossfilterSearch/fullTextCrossfilterSearch.directive.html b/app/scripts/fullTextCrossfilterSearch/fullTextCrossfilterSearch.directive.html
@@ -1,4 +1,6 @@
-<div class="mdl-textfield mdl-js-textfield" id="fullltextSearch_{{fTCSCtrl.ndxServiceName}}">
-  <input class="mdl-textfield__input" type="text" id="freeSearch" ng-model="fTCSCtrl.input" ng-change="fTCSCtrl.applyFilter()" ng-model-options="{debounce: 1000}">
-  <label class="mdl-textfield__label" for="freeSearch">Search for keywords...</label>
-</div>
+<form action='#'>
+  <div class="mdl-textfield mdl-js-textfield" id="fullltextSearch_{{fTCSCtrl.ndxServiceName}}">
+    <input class="mdl-textfield__input" type="text" id="freeSearch" ng-model="fTCSCtrl.input" ng-change="fTCSCtrl.applyFilter()" ng-model-options="{debounce: 100}">
+    <label class="mdl-textfield__label" for="freeSearch" ng-show="!fTCSCtrl.input">Search for keywords...</label>
+  </div>
+</form>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<div id="rowchart_allSources"></div>
		<div id="sources"></div>