Skip to content

Commit

Permalink
Merge pull request #292 from PEM-Humboldt/release/2.7.0
Browse files Browse the repository at this point in the history 
Release/2.7.0
  • Loading branch information
@erikasv
erikasv authored Feb 15, 2021
2 parents 816534f + d29b1e6 commit bb080b2
Show file tree
Hide file tree
Showing 6 changed files with 133 additions and 103 deletions.
8 changes: 4 additions & 4 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ source 'https://rubygems.org'


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '6.0.3.2'
gem 'rails', '~> 6.1', '>= 6.0.3.2'
# Dependence required by rails
gem 'actionpack', '6.0.3.2'
gem 'actionpack', '~> 6.1', '>= 6.0.3.2'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 6.0'
# Use Uglifier as compressor for JavaScript assets
Expand All @@ -21,7 +21,7 @@ gem 'turbolinks', '~> 5.2.0'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'sdoc', '~> 2.0', '>= 2.0.3'
gem 'devise', '~> 4.7', '>= 4.7.1'
gem 'simple_form', '>= 3.5.0'
gem 'httparty', '~> 0.18.0' #HTTP Requests
Expand Down Expand Up @@ -59,4 +59,4 @@ end


# Added at 2017-09-21 13:51:12 -0500 by valentina:
gem "pg", "~> 0.21.0"
gem "pg", "~> 1.2.3"
176 changes: 90 additions & 86 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,61 +1,65 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (6.0.3.2)
actionpack (= 6.0.3.2)
actioncable (6.1.1)
actionpack (= 6.1.1)
activesupport (= 6.1.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.3.2)
actionpack (= 6.0.3.2)
activejob (= 6.0.3.2)
activerecord (= 6.0.3.2)
activestorage (= 6.0.3.2)
activesupport (= 6.0.3.2)
actionmailbox (6.1.1)
actionpack (= 6.1.1)
activejob (= 6.1.1)
activerecord (= 6.1.1)
activestorage (= 6.1.1)
activesupport (= 6.1.1)
mail (>= 2.7.1)
actionmailer (6.0.3.2)
actionpack (= 6.0.3.2)
actionview (= 6.0.3.2)
activejob (= 6.0.3.2)
actionmailer (6.1.1)
actionpack (= 6.1.1)
actionview (= 6.1.1)
activejob (= 6.1.1)
activesupport (= 6.1.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.3.2)
actionview (= 6.0.3.2)
activesupport (= 6.0.3.2)
rack (~> 2.0, >= 2.0.8)
actionpack (6.1.1)
actionview (= 6.1.1)
activesupport (= 6.1.1)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.3.2)
actionpack (= 6.0.3.2)
activerecord (= 6.0.3.2)
activestorage (= 6.0.3.2)
activesupport (= 6.0.3.2)
actiontext (6.1.1)
actionpack (= 6.1.1)
activerecord (= 6.1.1)
activestorage (= 6.1.1)
activesupport (= 6.1.1)
nokogiri (>= 1.8.5)
actionview (6.0.3.2)
activesupport (= 6.0.3.2)
actionview (6.1.1)
activesupport (= 6.1.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.3.2)
activesupport (= 6.0.3.2)
activejob (6.1.1)
activesupport (= 6.1.1)
globalid (>= 0.3.6)
activemodel (6.0.3.2)
activesupport (= 6.0.3.2)
activerecord (6.0.3.2)
activemodel (= 6.0.3.2)
activesupport (= 6.0.3.2)
activestorage (6.0.3.2)
actionpack (= 6.0.3.2)
activejob (= 6.0.3.2)
activerecord (= 6.0.3.2)
activemodel (6.1.1)
activesupport (= 6.1.1)
activerecord (6.1.1)
activemodel (= 6.1.1)
activesupport (= 6.1.1)
activestorage (6.1.1)
actionpack (= 6.1.1)
activejob (= 6.1.1)
activerecord (= 6.1.1)
activesupport (= 6.1.1)
marcel (~> 0.3.1)
activesupport (6.0.3.2)
mimemagic (~> 0.3.2)
activesupport (6.1.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
alertifyjs-rails (1.12.0)
Expand Down Expand Up @@ -88,7 +92,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.6)
concurrent-ruby (1.1.8)
crass (1.0.6)
devise (4.7.2)
bcrypt (~> 3.0)
Expand All @@ -97,7 +101,7 @@ GEM
responders
warden (~> 1.2.3)
diff-lcs (1.4.4)
erubi (1.9.0)
erubi (1.10.0)
execjs (2.7.0)
factory_girl (4.7.0)
activesupport (>= 3.0.0)
Expand All @@ -111,7 +115,7 @@ GEM
httparty (0.18.1)
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
i18n (1.8.5)
i18n (1.8.7)
concurrent-ruby (~> 1.0)
image_processing (1.11.0)
mini_magick (>= 4.9.5, < 5)
Expand All @@ -122,8 +126,8 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
loofah (2.6.0)
json (2.5.1)
loofah (2.9.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand All @@ -137,47 +141,49 @@ GEM
mimemagic (0.3.5)
mini_magick (4.10.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.1)
mini_portile2 (2.5.0)
minitest (5.14.3)
multi_xml (0.6.0)
nio4r (2.5.2)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nio4r (2.5.4)
nokogiri (1.11.1)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
orm_adapter (0.5.0)
pg (0.21.0)
pg (1.2.3)
public_suffix (4.0.5)
racc (1.5.2)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.0.3.2)
actioncable (= 6.0.3.2)
actionmailbox (= 6.0.3.2)
actionmailer (= 6.0.3.2)
actionpack (= 6.0.3.2)
actiontext (= 6.0.3.2)
actionview (= 6.0.3.2)
activejob (= 6.0.3.2)
activemodel (= 6.0.3.2)
activerecord (= 6.0.3.2)
activestorage (= 6.0.3.2)
activesupport (= 6.0.3.2)
bundler (>= 1.3.0)
railties (= 6.0.3.2)
rails (6.1.1)
actioncable (= 6.1.1)
actionmailbox (= 6.1.1)
actionmailer (= 6.1.1)
actionpack (= 6.1.1)
actiontext (= 6.1.1)
actionview (= 6.1.1)
activejob (= 6.1.1)
activemodel (= 6.1.1)
activerecord (= 6.1.1)
activestorage (= 6.1.1)
activesupport (= 6.1.1)
bundler (>= 1.15.0)
railties (= 6.1.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (6.0.3.2)
actionpack (= 6.0.3.2)
activesupport (= 6.0.3.2)
railties (6.1.1)
actionpack (= 6.1.1)
activesupport (= 6.1.1)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
rake (13.0.1)
rdoc (4.3.0)
recaptcha (5.5.0)
thor (~> 1.0)
rake (13.0.3)
rdoc (6.3.0)
recaptcha (5.6.0)
json
responders (3.0.1)
actionpack (>= 5.0)
Expand Down Expand Up @@ -211,9 +217,8 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
sdoc (2.0.3)
rdoc (>= 5.0)
simple_form (5.0.2)
actionpack (>= 5.0)
activemodel (>= 5.0)
Expand All @@ -222,23 +227,22 @@ GEM
sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (1.0.1)
thread_safe (0.3.6)
thor (1.1.0)
tilt (2.0.10)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
warden (1.2.8)
rack (>= 2.0.6)
web-console (4.0.4)
web-console (4.1.0)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
Expand All @@ -248,13 +252,13 @@ GEM
websocket-extensions (0.1.5)
xpath (2.1.0)
nokogiri (~> 1.3)
zeitwerk (2.4.0)
zeitwerk (2.4.2)

PLATFORMS
ruby

DEPENDENCIES
actionpack (= 6.0.3.2)
actionpack (~> 6.1, >= 6.0.3.2)
alertifyjs-rails
byebug
capybara (~> 2.7.1)
Expand All @@ -267,17 +271,17 @@ DEPENDENCIES
jbuilder (~> 2.0)
jquery-rails
mini_magick (~> 4.9, >= 4.9.5)
pg (~> 0.21.0)
rails (= 6.0.3.2)
pg (~> 1.2.3)
rails (~> 6.1, >= 6.0.3.2)
recaptcha
rspec-rails (~> 3.9)
sass-rails (~> 6.0)
sdoc (~> 0.4.0)
sdoc (~> 2.0, >= 2.0.3)
simple_form (>= 3.5.0)
spring (~> 2.0.2)
turbolinks (~> 5.2.0)
uglifier (>= 1.3.0)
web-console (~> 4.0)

BUNDLED WITH
2.1.4
2.2.6
2 changes: 1 addition & 1 deletion README.MD
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# BioModelos v2.6.0
# BioModelos v2.7.0

[BioModelos](http://biomodelos.humboldt.org.co) is a web app that facilitates the generation, validation and consultation of hypothesis of species distribution for the continental biodiversity of Colombia. As such, it provides tools to (1) improve existing species distribution models (SDMs) by integrating expert's opinion, (2) generate expert maps and (3) publish SDMs. Our objective is to provide freely and openly access to the most up to date information on species distributions, validated by a large network of researchers, to support national environmental decision making processes and research.

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/models_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def download_model
model_options = JSON.parse(params[:download][:zip_url])
if @download.save
if model_options["type"] == "file"
send_file Rails.root.join("public" + params[:download][:zip_url]), :type => 'application/zip', :disposition => 'attachment'
send_file Rails.root.join("public" + model_options["fileName"]), :type => 'application/zip', :disposition => 'attachment'
else
redirect_to geoserver_zip_path :resource => model_options["layer"], :model_id => params[:download][:model_id]
end
Expand Down
16 changes: 16 additions & 0 deletions app/controllers/species_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,22 @@ def species_info
@eoo = Model.eoo(params[:species_id])
@rpa = Model.rpa(params[:species_id])
@forest_loss = Model.forest_loss(params[:species_id])
@forest_loss["years"] = []
@forest_loss["values"] = []
@forest_loss.keys.sort!.select do |key|
matches = key.match(/statForestLoss([0-9]+)$/)
unless matches.nil?
if (matches[1].to_i >= 90)
@forest_loss["years"].unshift("19#{matches[1]}")
@forest_loss["values"].unshift(@forest_loss[key])
else
@forest_loss["years"].push("20#{matches[1]}")
@forest_loss["values"].push(@forest_loss[key])
end
end
end
@forest_loss["years"] = @forest_loss["years"].to_json.html_safe
@forest_loss["values"] = @forest_loss["values"].to_json.html_safe
@all_covers = Model.covers(params[:species_id])
# Sort the covers by value
@covers = nil
Expand Down
Loading

0 comments on commit bb080b2

Please sign in to comment.