diff --git a/Pearlception/apartment_copy.rb b/Pearlception/apartment_copy.rb
deleted file mode 100644
index dc08608..0000000
--- a/Pearlception/apartment_copy.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-# You can have Apartment route to the appropriate Tenant by adding some Rack middleware.
-# Apartment can support many different "Elevators" that can take care of this routing to your data.
-# Require whichever Elevator you're using below or none if you have a custom one.
-#
-# require 'apartment/elevators/generic'
-# require 'apartment/elevators/domain'
-require 'apartment/elevators/subdomain'
-# require 'apartment/elevators/first_subdomain'
-
-#
-# Apartment Configuration
-#
-Apartment.configure do |config|
-
- # Add any models that you do not want to be multi-tenanted, but remain in the global (public) namespace.
- # A typical example would be a Customer or Tenant model that stores each Tenant's information.
- #
- config.excluded_models = [ "User", "Company" ]
-
- # In order to migrate all of your Tenants you need to provide a list of Tenant names to Apartment.
- # You can make this dynamic by providing a Proc object to be called on migrations.
- # This object should yield either:
- # - an array of strings representing each Tenant name.
- # - a hash which keys are tenant names, and values custom db config (must contain all key/values required in database.yml)
- #
- # config.tenant_names = lambda{ Customer.pluck(:tenant_name) }
- # config.tenant_names = ['tenant1', 'tenant2']
- # config.tenant_names = {
- # 'tenant1' => {
- # adapter: 'postgresql',
- # host: 'some_server',
- # port: 5555,
- # database: 'postgres' # this is not the name of the tenant's db
- # # but the name of the database to connect to before creating the tenant's db
- # # mandatory in postgresql
- # },
- # 'tenant2' => {
- # adapter: 'postgresql',
- # database: 'postgres' # this is not the name of the tenant's db
- # # but the name of the database to connect to before creating the tenant's db
- # # mandatory in postgresql
- # }
- # }
- # config.tenant_names = lambda do
- # Tenant.all.each_with_object({}) do |tenant, hash|
- # hash[tenant.name] = tenant.db_configuration
- # end
- # end
- #
-
- names = (Company.pluck :company_name) - ["IVA"]
-
- names.map!{|tenant| tenant.gsub(/'/,'').gsub(/\s/,'')}
-
- config.tenant_names = names
-
- # ==> PostgreSQL only options
-
- # Specifies whether to use PostgreSQL schemas or create a new database per Tenant.
- # The default behaviour is true.
- #
- config.use_schemas = false
-
- # Apartment can be forced to use raw SQL dumps instead of schema.rb for creating new schemas.
- # Use this when you are using some extra features in PostgreSQL that can't be respresented in
- # schema.rb, like materialized views etc. (only applies with use_schemas set to true).
- # (Note: this option doesn't use db/structure.sql, it creates SQL dump by executing pg_dump)
- #
- # config.use_sql = false
-
- # There are cases where you might want some schemas to always be in your search_path
- # e.g when using a PostgreSQL extension like hstore.
- # Any schemas added here will be available along with your selected Tenant.
- #
- # config.persistent_schemas = %w{ hstore }
-
- # <== PostgreSQL only options
- #
-
- # By default, and only when not using PostgreSQL schemas, Apartment will prepend the environment
- # to the tenant name to ensure there is no conflict between your environments.
- # This is mainly for the benefit of your development and test environments.
- # Uncomment the line below if you want to disable this behaviour in production.
- #
- config.prepend_environment = !Rails.env.production?
-end
-
-# Setup a custom Tenant switching middleware. The Proc should return the name of the Tenant that
-# you want to switch to.
-# Rails.application.config.middleware.use 'Apartment::Elevators::Generic', lambda { |request|
-# request.host.split('.').first
-# }
-
-# Rails.application.config.middleware.use 'Apartment::Elevators::Domain'
-Rails.application.config.middleware.use 'Apartment::Elevators::Subdomain'
-# Rails.application.config.middleware.use 'Apartment::Elevators::FirstSubdomain'
diff --git a/Pearlception/app/assets/javascripts/statistics.coffee b/Pearlception/app/assets/javascripts/statistics.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/Pearlception/app/assets/javascripts/statistics.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/Pearlception/app/assets/stylesheets/statistics.scss b/Pearlception/app/assets/stylesheets/statistics.scss
new file mode 100644
index 0000000..8ccb962
--- /dev/null
+++ b/Pearlception/app/assets/stylesheets/statistics.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the statistics controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/Pearlception/app/controllers/statistics_controller.rb b/Pearlception/app/controllers/statistics_controller.rb
new file mode 100644
index 0000000..b1400fb
--- /dev/null
+++ b/Pearlception/app/controllers/statistics_controller.rb
@@ -0,0 +1,2 @@
+class StatisticsController < ApplicationController
+end
diff --git a/Pearlception/app/helpers/statistics_helper.rb b/Pearlception/app/helpers/statistics_helper.rb
new file mode 100644
index 0000000..2d25d41
--- /dev/null
+++ b/Pearlception/app/helpers/statistics_helper.rb
@@ -0,0 +1,2 @@
+module StatisticsHelper
+end
diff --git a/Pearlception/app/views/dashboard/index.html.erb b/Pearlception/app/views/dashboard/index.html.erb
index d6a2602..87791de 100644
--- a/Pearlception/app/views/dashboard/index.html.erb
+++ b/Pearlception/app/views/dashboard/index.html.erb
@@ -40,7 +40,7 @@
<% if current_user.admin? %>
Companies
<% else %>
- Statistics
+ Statistics
Grades
<% end %>
+
+
+ <%= link_to(destroy_user_session_path, class: 'logout-link', :method => :delete) do %>
+ Logout
+ <% end %>
+
+
+
+
+
+
+
+
+ <%= javascript_include_tag "bootstrap.min" %>_
+
diff --git a/Pearlception/config/routes.rb b/Pearlception/config/routes.rb
index d958c2f..8e66a38 100644
--- a/Pearlception/config/routes.rb
+++ b/Pearlception/config/routes.rb
@@ -7,6 +7,7 @@ Rails.application.routes.draw do
resources :runs
resources :companies
resources :grades
+ resources :statistics
devise_for :users, :controllers => {:registrations => 'registrations'}
devise_scope :users do
diff --git a/Pearlception/nohup.out b/Pearlception/nohup.out
deleted file mode 100644
index 24b7653..0000000
--- a/Pearlception/nohup.out
+++ /dev/null
@@ -1,2450 +0,0 @@
-=> Booting Puma
-=> Rails 5.0.1 application starting in development on http://0.0.0.0:3000
-=> Run `rails server -h` for more startup options
-Puma starting in single mode...
-* Version 3.6.2 (ruby 2.3.1-p112), codename: Sleepy Sunday Serenity
-* Min threads: 5, max threads: 5
-* Environment: development
-* Listening on tcp://0.0.0.0:3000
-Use Ctrl-C to stop
-Started GET "/" for 192.168.1.1 at 2017-01-20 15:09:58 -0500
-Cannot render console from 192.168.1.1! Allowed networks: 127.0.0.1, ::1, 127.0.0.0/127.255.255.255
- [1m[36mActiveRecord::SchemaMigration Load (0.3ms)[0m [1m[34mSELECT `schema_migrations`.* FROM `schema_migrations`[0m
-DEPRECATION WARNING: before_filter is deprecated and will be removed in Rails 5.1. Use before_action instead. (called from