From 5073c4757db61924f523427048d425049fdb2bc1 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sun, 18 Oct 2020 13:57:32 -0500 Subject: [PATCH] check --- admin/app/controllers/arses_controller.rb | 15 ++++++++++++++- admin/config/initializers/jam_ruby_ars.rb | 6 ++++++ db/up/find_sessions_2020.sql | 9 ++++++++- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 admin/config/initializers/jam_ruby_ars.rb diff --git a/admin/app/controllers/arses_controller.rb b/admin/app/controllers/arses_controller.rb index 9e1559d35..82d73c2f1 100644 --- a/admin/app/controllers/arses_controller.rb +++ b/admin/app/controllers/arses_controller.rb @@ -10,8 +10,13 @@ class ArsesController < ApplicationController ip = params[:ip] username = params[:username] password = params[:password] + topology = params[:topology] + ars_id = params[:ars_id] + puts "TOPOLOGY #{topology}" - ars = Ars.find_by_name(name) + if ars_id + ars = Ars.find_by_id_int(ars_id) + end if ars.nil? ars = Ars.new ars.name = name @@ -22,6 +27,14 @@ class ArsesController < ApplicationController ars.ip = ip ars.password = password ars.username = username + if topology + ars.city = topology['city'] + ars.country = topology['country'] + ars.continent = topology['continent'] + ars.latitude = topology['latitude'] + ars.longitude = topology['longitude'] + ars.subdivision = topology['subdivision'] + end ars.save @ars = ars diff --git a/admin/config/initializers/jam_ruby_ars.rb b/admin/config/initializers/jam_ruby_ars.rb new file mode 100644 index 000000000..5b879aa4e --- /dev/null +++ b/admin/config/initializers/jam_ruby_ars.rb @@ -0,0 +1,6 @@ +class JamRuby::Ars + + attr_accessible :password + + +end diff --git a/db/up/find_sessions_2020.sql b/db/up/find_sessions_2020.sql index b2b9a0b03..ada4d8db3 100644 --- a/db/up/find_sessions_2020.sql +++ b/db/up/find_sessions_2020.sql @@ -84,4 +84,11 @@ CREATE INDEX ams_is_platform_instructor_idx ON active_music_sessions((1)) WHERE CREATE INDEX sms_is_platform_instructor_idx ON music_sessions((1)) WHERE is_platform_instructor; CREATE INDEX users_schood_id_idx ON users USING btree (school_id); CREATE INDEX feeds_schood_id_idx ON feeds USING btree (school_id); -CREATE INDEX feeds_is_platform_instructor_idx ON feeds((1)) WHERE is_platform_instructor; \ No newline at end of file +CREATE INDEX feeds_is_platform_instructor_idx ON feeds((1)) WHERE is_platform_instructor; + +ALTER TABLE arses ADD COLUMN country VARCHAR(200); +ALTER TABLE arses ADD COLUMN city VARCHAR(200); +ALTER TABLE arses ADD COLUMN latitude NUMERIC(15,10); +ALTER TABLE arses ADD COLUMN longitude NUMERIC(15,10); +ALTER TABLE arses ADD COLUMN subdivision VARCHAR(200); +ALTER TABLE arses ADD COLUMN continent VARCHAR(200); \ No newline at end of file