Skip to content

Commit ec5b0df

Browse files
if analytics not enabled use the metrics to display home page visits
1 parent 8541d5f commit ec5b0df

File tree

4 files changed

+19
-9
lines changed

4 files changed

+19
-9
lines changed

app/controllers/home_controller.rb

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ def index
1616
@analytics.keys.size
1717
end
1818

19-
metrics = LinkedData::Client::Models::Metrics.all
20-
metrics = metrics.each_with_object(Hash.new(0)) do |h, sum|
19+
all_metrics = LinkedData::Client::Models::Metrics.all
20+
metrics = all_metrics.each_with_object(Hash.new(0)) do |h, sum|
2121
h.to_hash.slice(:classes, :properties, :individuals).each { |k, v| sum[k] += v }
2222
end
2323
@slices = LinkedData::Client::Models::Slice.all
@@ -39,11 +39,19 @@ def index
3939

4040
@anal_ont_names = []
4141
@anal_ont_numbers = []
42-
@analytics.sort_by{|ont, count| -count}[0..4].each do |ont, count|
43-
@anal_ont_names << ont
44-
@anal_ont_numbers << count
42+
if @analytics.empty?
43+
all_metrics.sort_by{|x| -(x.classes + x.individuals)}[0..4].each do |x|
44+
@anal_ont_names << x.links["ontology"].split('/').last
45+
@anal_ont_numbers << x.classes + x.individuals
46+
end
47+
else
48+
@analytics.sort_by{|ont, count| -count}[0..4].each do |ont, count|
49+
@anal_ont_names << ont
50+
@anal_ont_numbers << count
51+
end
4552
end
4653

54+
4755
end
4856

4957
def set_cookies

app/views/home/index.html.haml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@
2323
%a.h5{href:"/ontologies/#{@anal_ont_names[0]}", style: "color: white !important"}
2424
= @anal_ont_names[0]
2525
%p
26-
= @anal_ont_numbers[0].to_s + " " + t('visits.visits')
26+
= format_number_abbreviated(@anal_ont_numbers[0]) + " " + (@analytics.empty? ? t('visits.count') : t('visits.visits'))
2727
.home-bubble.home-bubble-two
2828
%a.h5{href:"/ontologies/#{@anal_ont_names[1]}", style: "color: white !important"}
2929
= @anal_ont_names[1]
3030
%p
31-
= @anal_ont_numbers[1].to_s + " " + t('visits.visits')
31+
= format_number_abbreviated(@anal_ont_numbers[1]) + " " + (@analytics.empty? ? t('visits.count') : t('visits.visits'))
3232
.home-bubble.home-bubble-three
3333
%a.h5{href:"/ontologies/#{@anal_ont_names[2]}", style: "color: white !important"}
3434
= @anal_ont_names[2]
3535
%p
36-
= @anal_ont_numbers[2].to_s + " " + t('visits.visits')
36+
= format_number_abbreviated(@anal_ont_numbers[2]) + " " + (@analytics.empty? ? t('visits.count') : t('visits.visits'))
3737
%a.home-bubble.home-bubble-four{:href => "/visits"}
3838
.h5 ...
3939

@@ -47,7 +47,7 @@
4747

4848
.home-body-container
4949
.home-section
50-
%h4= t('home.ontology_upload')
50+
%h4= t('home.ontology_upload', site: portal_name)
5151
%hr.home-section-line/
5252
%p= t('home.ontology_upload_desc')
5353
%p= t('home.ontology_upload_benefits', site: $SITE)

config/locales/en.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,6 +1441,7 @@ en:
14411441
ontology_visits: Ontology visits
14421442
name: name
14431443
visits: visits
1444+
count: concepts
14441445
ontologies_selector:
14451446
clear_selection: Clear selection
14461447
ontologies_advanced_selection: Ontologies advanced selection

config/locales/fr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,6 +1474,7 @@ fr:
14741474
ontology_visits: Visites de l'ontologie
14751475
name: nom
14761476
visits: visites
1477+
count: concepts
14771478

14781479
ontologies_selector:
14791480
clear_selection: Effacer la sélection

0 commit comments

Comments
 (0)