Commit 72153057 authored by Alberto Pascual's avatar Alberto Pascual
Browse files

dashboard updated, cron job for scraping news

parent f078fdcf
......@@ -11,6 +11,7 @@
<link rel="import" href="/bower_components/iron-pages/iron-pages.html">
<link rel="import" href="/bower_components/paper-item/paper-item.html">
<link rel="import" href="/bower_components/paper-menu/paper-menu.html">
<link rel="import" href="/elements/news-chart/news-chart.html">
<dom-module id="dashboard-reddit">
......@@ -45,9 +46,9 @@
<div style="width: 32%; margin-right: 2%; float: left">
<number-chart
data="{{data}}"
object="BlogPosting"
aggKey="type"
title="BlogPosting"
object="cnn"
aggKey="creator"
title="CNN"
icon="icons:receipt"
stylebg="bg-yellow">
</number-chart>
......@@ -55,10 +56,10 @@
<div style="width: 32%; float: left">
<number-chart
data="{{data}}"
object="Comment"
aggKey="type"
title="Comments"
icon="maps:rate-review"
object="The New York Times"
aggKey="creator"
title="The New York Times"
icon="icons:receipt"
aggkey="location"
stylebg="bg-green">
</number-chart>
......@@ -69,7 +70,7 @@
<div class="chart_container" style="right: 0; float: right">
<google-chart
data="{{data}}"
field="articlesection"
field="about"
id='pie-chart4'
extra-id='pie-chart4'
type='pie'
......@@ -82,14 +83,14 @@
</div>
<div class="chart_container" style="left: 0; float: left">
<google-chart
field="type"
field="creator"
data="{{data}}"
id='pie-chart3'
extra-id='pie-chart3'
type='pie'
filters="{{filters}}"
icon='icons:reorder'
options='{"title": "Publication Type"}'
options='{"title": "Newspapers"}'
cols='[{"label": "type", "type": "string"},{"label": "Count", "type": "number"}]'
</google-chart>
</div>
......@@ -120,38 +121,22 @@
options='{"title": "Emotions"}'
cols='[{"label": "Sentiment", "type": "string"},{"label": "Count", "type": "number"}]'
</google-chart>
</div>
<div style="clear: both"></div>
</div>
<div>
<div class="chart_container" style="left: 0; float: left; width: 100%">
</div>
</div>
<div class="chart_container" style="left: 0; float: left; width: 100%">
<news-chart
datos = "{{data}}"
title="List of news"
filters="{{filters}}"
icon='social:people'>
icon='icons:receipt'>
</news-chart>
</div>
<!--<div class="chart_container" style="left: 0; float: right">
<google-chart
data = {{data}}
field="subreddit"
id='column-chart1'
extra-id='column-chart1'
type='column'
filters="{{filters}}"
icon='maps:local-play'
param='{{param}}'
optionsbi='{"legend": "none"}'
options='{"title": "Subreddits sentiment count"}'
cols='[{"label": "Subreddits", "type": "string"},{"label": "Count", "type": "number"}]'>
</google-chart>
</div>-->
</div>
</div>
</div>
<div>
<yasgui-ui
endpoint="http://homer.gsi:13030/gsicrawler/query"
endpoint="http://krusti.gsi:13030/gsicrawler/query"
queries="{{queries}}">
</yasgui-ui>
</div>
......@@ -233,9 +218,9 @@
}
}
},
articlesection: {
creator: {
terms: {
field: "articleSection.keyword",
field: "creator.keyword",
order: {
_count: "desc"
}
......
......@@ -2,4 +2,3 @@
<link rel="import" href="/bower_components/elastic-client/elastic-client.html">
<link rel="import" href="/bower_components/dashboard-reddit/dashboard-reddit.html">
<link rel="import" href="/elements/news-chart/news-chart.html"
......@@ -60,6 +60,7 @@ services:
- ES_ENDPOINT=${ES_ENDPOINT}
- ES_PORT=${ES_PORT}
- FUSEKI_ENDPOINT_EXTERNAL=${FUSEKI_ENDPOINT_EXTERNAL}
- API_KEY_MEANING_CLOUD=${API_KEY_MEANING_CLOUD}
depends_on:
- elasticsearch
......@@ -69,4 +70,4 @@ networks:
driver: bridge
volumes:
esdata:
esdata:
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment