diff --git a/app.rb b/app.rb index 857f9db..e0a0d66 100644 --- a/app.rb +++ b/app.rb @@ -8,6 +8,8 @@ set :database_file, 'config/database.yml' Time.now.utc.localtime("-04:00") get '/' do + @down_everage = Rate.average_download + @up_everage = Rate.average_upload @data = [ { 'name': 'Download Rate', diff --git a/models/rate.rb b/models/rate.rb index 1cdf4b7..bd8ae77 100644 --- a/models/rate.rb +++ b/models/rate.rb @@ -13,6 +13,14 @@ class Rate < ActiveRecord::Base where(created_at: Date.today.all_day).collect { |p| [p.created_at.strftime('%d/%m %H:%M'), p.upload] } end + def self.average_download + average(:download).ceil(2) + end + + def self.average_upload + average(:upload).ceil(2) + end + def self.save test = Speedtest::Test.new(debug: false) result = test.run diff --git a/public/style.css b/public/style.css index f4334db..2bda1a7 100644 --- a/public/style.css +++ b/public/style.css @@ -6,4 +6,9 @@ body { h1 { text-align: center !important; +} + +.everage { + text-align: center; + margin-bottom: 13px; } \ No newline at end of file diff --git a/views/layout.erb b/views/layout.erb index f62754b..d2f6941 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -13,6 +13,10 @@

Data Transfer Test

+
+ Download: <%= @down_everage %> + Upload: <%= @up_everage %> +
<%= yield %> \ No newline at end of file