From b6551e7d2efff6d8fff57ffecc359351f768f6b3 Mon Sep 17 00:00:00 2001 From: Tyler Sanders Date: Fri, 27 Dec 2019 00:26:21 +0000 Subject: [PATCH 01/11] stub initial csv generator for govt role --- .../incident/legacy_sites_controller.rb | 4 +- app/jobs/csv_generator_job.rb | 30 +++++++++++++-- app/models/legacy/legacy_site.rb | 38 +++++++++++++++++++ 3 files changed, 67 insertions(+), 5 deletions(-) diff --git a/app/controllers/worker/incident/legacy_sites_controller.rb b/app/controllers/worker/incident/legacy_sites_controller.rb index 35d7285e..0cdebfdd 100644 --- a/app/controllers/worker/incident/legacy_sites_controller.rb +++ b/app/controllers/worker/incident/legacy_sites_controller.rb @@ -308,7 +308,9 @@ def request_csv event = Legacy::LegacyEvent.find(params[:id]) download_file_name = "#{event.name}-#{Time.now.strftime('%F')}.csv" org_id = current_user.legacy_organization_id - job = CsvGeneratorJob.perform_later('generate_sites', prefix, download_file_name, bucket_name, params[:id], org_id) + is_govt = current_user.legacy_organization.government + + job = CsvGeneratorJob.perform_later('generate_sites', prefix, download_file_name, bucket_name, is_govt, params[:id], org_id) render json: {status: 200, job_id: job.job_id} end end diff --git a/app/jobs/csv_generator_job.rb b/app/jobs/csv_generator_job.rb index 94ffc21d..b5ea0e05 100644 --- a/app/jobs/csv_generator_job.rb +++ b/app/jobs/csv_generator_job.rb @@ -3,14 +3,21 @@ class CsvGeneratorJob < ActiveJob::Base queue_as :default - def perform(generator_type, file_prefix, download_file_name, bucket_name, *args) + def perform(generator_type, file_prefix, download_file_name, bucket_name, is_govt, *args) path = "/tmp/#{file_prefix}-#{self.job_id}.csv" file_basename = File.basename(path) begin File.open(path, "w+") do |f| - case generator_type - when "generate_sites" - generate_sites_csv(args[0], args[1]).each {|element| f.puts(element)} + if is_govt + case generator_type + when "generate_sites" + govt_generate_sites_csv(args[0], args[1]).each {|element| f.puts(element)} + end + else + case generator_type + when "generate_sites" + generate_sites_csv(args[0], args[1]).each {|element| f.puts(element)} + end end end rescue @@ -43,4 +50,19 @@ def generate_sites_csv(legacy_event_id, org_id) end end + + def govt_generate_sites_csv(legacy_event_id, org_id) + Enumerator.new do |y| + y << Legacy::LegacySite.csv_header.to_s + + Legacy::LegacySite.find_in_batches_claimed_reported(["legacy_event_id = ? AND (claimed_by = ? OR reported_by = ?)", legacy_event_id, org_id, org_id], 300) { + |site| y << site.govt_redacted_to_csv_row.to_s + } + + Legacy::LegacySite.find_in_batches_claimed_reported(["(legacy_event_id = ?) AND ((NOT claimed_by = ?) OR (NOT reported_by = ?))", legacy_event_id, org_id, org_id], 300) { + |site| y << site.govt_redacted_to_csv_row.to_s + } + + end + end end diff --git a/app/models/legacy/legacy_site.rb b/app/models/legacy/legacy_site.rb index 358b7666..5149b69a 100644 --- a/app/models/legacy/legacy_site.rb +++ b/app/models/legacy/legacy_site.rb @@ -403,6 +403,44 @@ def redacted_to_csv_row ] ) end + + def govt_redacted_to_csv_row + CSV::Row.new( + [ + :event, + :case_number, + :address, + :city, + :county, + :state, + :zip_code, + :latitude, + :longitude, + :reported_by, + :claimed_by, + :request_date, + :updated_at, + :status, + :work_type + ],[ + legacy_event.name, + case_number, + address, + city, + county, + state, + zip_code, + latitude, + longitude, + reporting_org.try(:name), + legacy_organization.try(:name), + request_date, + updated_at, + status, + work_type + ] + ) + end def format_details blacklist = [ From a170445dd15309f68f78b2cbd85a3cb396e003d9 Mon Sep 17 00:00:00 2001 From: Tyler Sanders Date: Fri, 27 Dec 2019 16:53:55 +0000 Subject: [PATCH 02/11] Stub report views --- app/views/layouts/menus/_worker_dashboard_menu.html.erb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/views/layouts/menus/_worker_dashboard_menu.html.erb b/app/views/layouts/menus/_worker_dashboard_menu.html.erb index 9a7b9ad7..0b6dfcb7 100644 --- a/app/views/layouts/menus/_worker_dashboard_menu.html.erb +++ b/app/views/layouts/menus/_worker_dashboard_menu.html.erb @@ -20,6 +20,11 @@ <% end %> <% end %> + <% if current_user %> + <% if current_user.legacy_organization.government || current_user.admin %> +
  • <%= nav_link 'Reports', reports_reports_dashboard_path %>
    • + <% end %> + <% end %>
  • Help
    • Policies From 623dad5d9b3168a3fd1e7570a7d13264d2655f25 Mon Sep 17 00:00:00 2001 From: Tyler Sanders Date: Sat, 28 Dec 2019 16:33:35 +0000 Subject: [PATCH 03/11] Stub view --- .gitignore | 1 + app/controllers/report/reports_controller.rb | 8 ++++ .../menus/_worker_dashboard_menu.html.erb | 2 +- app/views/report/reports/index.html.erb | 39 +++++++++++++++++++ config/routes.rb | 4 ++ 5 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 app/controllers/report/reports_controller.rb create mode 100644 app/views/report/reports/index.html.erb diff --git a/.gitignore b/.gitignore index 79e99128..86743ba5 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ Makefile /public/packs dev.dumpcoverage coverage/ +*.code-workspace diff --git a/app/controllers/report/reports_controller.rb b/app/controllers/report/reports_controller.rb new file mode 100644 index 00000000..129bf425 --- /dev/null +++ b/app/controllers/report/reports_controller.rb @@ -0,0 +1,8 @@ +class Report::ReportsController < ApplicationController + include ApplicationHelper + before_filter :check_user + + def index + + end +end \ No newline at end of file diff --git a/app/views/layouts/menus/_worker_dashboard_menu.html.erb b/app/views/layouts/menus/_worker_dashboard_menu.html.erb index 0b6dfcb7..831a4eda 100644 --- a/app/views/layouts/menus/_worker_dashboard_menu.html.erb +++ b/app/views/layouts/menus/_worker_dashboard_menu.html.erb @@ -22,7 +22,7 @@ <% end %> <% if current_user %> <% if current_user.legacy_organization.government || current_user.admin %> -
    • <%= nav_link 'Reports', reports_reports_dashboard_path %>
      • +
    • <%= nav_link 'Reports', report_reports_index_path %>
      • <% end %> <% end %>
    • Help diff --git a/app/views/report/reports/index.html.erb b/app/views/report/reports/index.html.erb new file mode 100644 index 00000000..7a8faec6 --- /dev/null +++ b/app/views/report/reports/index.html.erb @@ -0,0 +1,39 @@ +<% content_for :title do %> + Crisis Cleanup - Report Dashboard +<% end %> +<% content_for :subheader do %> +
      +
      +

      Crisis Cleanup Reports

      +
      +
      +<% end %> +<% content_for :main do %> +
      +
      +
      +
      +
      Standard Reports
      +
      +

      Download

      + CSV +

      Note: CSV does not include Damage Assessments (DAs). To convert a DA to a work order, edit the DA on the map and change the "Primary Help Needed" to something like "Flood."

      +
      +
      +
      +
      +
      +
      Premium Reports
      +
      +
      ...
      +
      ...
      +
      ...
      +
      + +
      +
      +
      +
      +
      +
      +<% end %> diff --git a/config/routes.rb b/config/routes.rb index 0ea2e5f0..8721be71 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -28,6 +28,10 @@ #get "/users/:id/edit" => 'users#edit' #get "/users/:id" => 'users#show' + namespace :report do + get "/report" => 'reports#index', as: "reports_index" + end + namespace :phone do get "/dashboard" => 'dashboard#index', as: "phone_dashboard" post "/dashboard" => 'dashboard#index', as: "phone_dashboard_update" From f7bf4b49134dda4a1718dc48b1ebb955d8cda6bd Mon Sep 17 00:00:00 2001 From: Tyler Sanders Date: Mon, 6 Jan 2020 21:58:47 -0600 Subject: [PATCH 04/11] Update tests for CSV generator job --- spec/jobs/csv_generator_job_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/jobs/csv_generator_job_spec.rb b/spec/jobs/csv_generator_job_spec.rb index f44f90dd..613b6438 100644 --- a/spec/jobs/csv_generator_job_spec.rb +++ b/spec/jobs/csv_generator_job_spec.rb @@ -19,7 +19,7 @@ allow_any_instance_of(S3Helper).to( receive(:upload_to_s3).with(expected_file_basename, 'somefile.txt', expected_path).and_return(nil) ) - CsvGeneratorJob.perform_now('generate_sites', 'TEST', 'somefile.txt', 'test-bucket') + CsvGeneratorJob.perform_now('generate_sites', 'TEST', 'somefile.txt', 'test-bucket', false) end it "will catch S3Helper exception" do @@ -30,7 +30,7 @@ allow_any_instance_of(S3Helper).to( receive(:upload_to_s3).with(expected_file_basename, 'somefile.txt', expected_path).and_raise('No S3 upload') ) - CsvGeneratorJob.perform_now('generate_sites', 'TEST', 'somefile.txt', 'test-bucket') + CsvGeneratorJob.perform_now('generate_sites', 'TEST', 'somefile.txt', 'test-bucket', false) end end From b2f60fbe729655a481167a1880aa75709308754c Mon Sep 17 00:00:00 2001 From: Braden Mars Date: Sun, 12 Jan 2020 22:10:36 -0600 Subject: [PATCH 05/11] feat: create reports card items --- app/assets/stylesheets/application.scss | 1 + app/assets/stylesheets/modules/_icons.scss | 8 +++ .../public_pages/_static_pages.scss | 53 +++++++++++++++++++ app/views/report/reports/_report_item.erb | 30 +++++++++++ app/views/report/reports/index.html.erb | 13 ++--- 5 files changed, 99 insertions(+), 6 deletions(-) create mode 100644 app/assets/stylesheets/modules/_icons.scss create mode 100644 app/views/report/reports/_report_item.erb diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f8d5dc7a..3f127174 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -6,6 +6,7 @@ @import "modules/color_blocks"; @import "modules/buttons"; @import "modules/nav_dropdown_mobile"; +@import "modules/icons"; .public { @import "public_pages/static_pages"; diff --git a/app/assets/stylesheets/modules/_icons.scss b/app/assets/stylesheets/modules/_icons.scss new file mode 100644 index 00000000..9ae88e2c --- /dev/null +++ b/app/assets/stylesheets/modules/_icons.scss @@ -0,0 +1,8 @@ +.icons8-pie-chart { + display: inline-block; + width: 16px; + height: 16px; + background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjBweCIgeT0iMHB4Igp3aWR0aD0iMTYiIGhlaWdodD0iMTYiCnZpZXdCb3g9IjAgMCA4MCA4MCIKc3R5bGU9IiBmaWxsOiMwMDAwMDA7Ij48cGF0aCBmaWxsPSIjYmFlMGJkIiBkPSJNNDAsNzcuNUMxOS4zMjIsNzcuNSwyLjUsNjAuNjc4LDIuNSw0MFMxOS4zMjIsMi41LDQwLDIuNVM3Ny41LDE5LjMyMiw3Ny41LDQwUzYwLjY3OCw3Ny41LDQwLDc3LjUgeiBNNDAsMjguNjQzYy02LjI2MiwwLTExLjM1Nyw1LjA5NS0xMS4zNTcsMTEuMzU3UzMzLjczOCw1MS4zNTcsNDAsNTEuMzU3UzUxLjM1Nyw0Ni4yNjMsNTEuMzU3LDQwUzQ2LjI2MiwyOC42NDMsNDAsMjguNjQzeiI+PC9wYXRoPjxwYXRoIGZpbGw9IiM1ZTljNzYiIGQ9Ik00MCwzYzIwLjQwMiwwLDM3LDE2LjU5OCwzNywzN1M2MC40MDIsNzcsNDAsNzdTMyw2MC40MDIsMyw0MFMxOS41OTgsMyw0MCwzIE00MCw1MS44NTcgYzYuNTM4LDAsMTEuODU3LTUuMzE5LDExLjg1Ny0xMS44NTdTNDYuNTM4LDI4LjE0Myw0MCwyOC4xNDNTMjguMTQzLDMzLjQ2MiwyOC4xNDMsNDBTMzMuNDYyLDUxLjg1Nyw0MCw1MS44NTcgTTQwLDIgQzE5LjAxMywyLDIsMTkuMDEzLDIsNDBzMTcuMDEzLDM4LDM4LDM4czM4LTE3LjAxMywzOC0zOFM2MC45ODcsMiw0MCwyTDQwLDJ6IE00MCw1MC44NTdjLTUuOTk2LDAtMTAuODU3LTQuODYxLTEwLjg1Ny0xMC44NTcgYzAtNS45OTYsNC44NjEtMTAuODU3LDEwLjg1Ny0xMC44NTdTNTAuODU3LDM0LjAwNCw1MC44NTcsNDBDNTAuODU3LDQ1Ljk5Niw0NS45OTYsNTAuODU3LDQwLDUwLjg1N0w0MCw1MC44NTd6Ij48L3BhdGg+PHBhdGggZmlsbD0iI2JhZTBiZCIgZD0iTTQwLDc3LjVDMTkuMzIyLDc3LjUsMi41LDYwLjY3OCwyLjUsNDBTMTkuMzIyLDIuNSw0MCwyLjVTNzcuNSwxOS4zMjIsNzcuNSw0MFM2MC42NzgsNzcuNSw0MCw3Ny41IHogTTQwLDI5LjVjLTUuNzksMC0xMC41LDQuNzEtMTAuNSwxMC41UzM0LjIxLDUwLjUsNDAsNTAuNVM1MC41LDQ1Ljc5LDUwLjUsNDBTNDUuNzksMjkuNSw0MCwyOS41eiI+PC9wYXRoPjxwYXRoIGZpbGw9IiM1ZTljNzYiIGQ9Ik00MCwzYzIwLjQwMiwwLDM3LDE2LjU5OCwzNywzN1M2MC40MDIsNzcsNDAsNzdTMyw2MC40MDIsMyw0MFMxOS41OTgsMyw0MCwzIE00MCw1MSBjNi4wNjUsMCwxMS00LjkzNSwxMS0xMXMtNC45MzUtMTEtMTEtMTFzLTExLDQuOTM1LTExLDExUzMzLjkzNSw1MSw0MCw1MSBNNDAsMkMxOS4wMTMsMiwyLDE5LjAxMywyLDQwczE3LjAxMywzOCwzOCwzOCBzMzgtMTcuMDEzLDM4LTM4UzYwLjk4NywyLDQwLDJMNDAsMnogTTQwLDUwYy01LjUyMywwLTEwLTQuNDc3LTEwLTEwYzAtNS41MjMsNC40NzctMTAsMTAtMTBzMTAsNC40NzcsMTAsMTAgQzUwLDQ1LjUyMyw0NS41MjMsNTAsNDAsNTBMNDAsNTB6Ij48L3BhdGg+PGc+PHBhdGggZmlsbD0iIzhiYjdmMCIgZD0iTTQ3Ljc3LDQ3LjA2M2MxLjc2NC0xLjkzNywyLjczLTQuNDI2LDIuNzMtNy4wNjNjMC0xLjI2NC0wLjIzMy0yLjUxLTAuNjk1LTMuNzE0bDI2LjcwNC00Ljc0NiBjMC4wNSwwLjE4MSwwLjA5OSwwLjM2MiwwLjEzOSwwLjU0OGwwLjEzMSwwLjYxN2MwLjIxMSwxLjA3MiwwLjM3NywyLjE1NywwLjQ5MiwzLjIyNWwwLjA1NCwwLjYwNCBDNzcuNDQzLDM3LjgyMSw3Ny41LDM4Ljk1NSw3Ny41LDQwYzAsMS4yOC0wLjA2NSwyLjU3LTAuMTk0LDMuODM0Yy0wLjg1LDguMzctNC41NTEsMTYuMjc5LTEwLjQzOCwyMi4zMjZMNDcuNzcsNDcuMDYzeiI+PC9wYXRoPjxwYXRoIGZpbGw9IiM0ZTdhYjUiIGQ9Ik03Ni4xNCwzMi4xMTNjMC4wMDYsMC4wMjYsMC4wMTIsMC4wNTIsMC4wMTgsMC4wNzlsMC4wMzksMC4xOCBjMC4wMzEsMC4xNDMsMC4wNjIsMC4yODYsMC4wOTEsMC40MjljMC4yMDgsMS4wNTYsMC4zNzIsMi4xMjcsMC40ODYsMy4xODNjMC4wMTMsMC4xMjIsMC4wMjQsMC4yNDUsMC4wMzQsMC4zNjlsMC4wMiwwLjIyNyBDNzYuOTQzLDM3Ljg0OCw3NywzOC45NjcsNzcsNDBjMCwxLjI2My0wLjA2NCwyLjUzNi0wLjE5MSwzLjc4NGMtMC44MjIsOC4wOTEtNC4zNDQsMTUuNzQ0LTkuOTQ5LDIxLjY2Mkw0OC40NTQsNDcuMDQgQzUwLjEwMiw0NS4wNjcsNTEsNDIuNjAyLDUxLDQwYzAtMS4xMjctMC4xNzctMi4yNDEtMC41MjgtMy4zMjRMNzYuMTQsMzIuMTEzIE03Ni44NzUsMzAuOTY3bC0yNy43NzEsNC45MzYgQzQ5LjY2OCwzNy4xNTYsNTAsMzguNTM2LDUwLDQwYzAsMi43NjEtMS4xMTksNS4yNjEtMi45MjksNy4wNzFMNjYuODcsNjYuODdjNi4wMTctNi4wMTcsMTAuMDI2LTE0LjA0MywxMC45MzQtMjIuOTg1IEM3Ny45MzQsNDIuNjA4LDc4LDQxLjMxMiw3OCw0MGMwLTEuMTg2LTAuMDcxLTIuMzU0LTAuMTc3LTMuNTEyYy0wLjAxOS0wLjIwNC0wLjAzMy0wLjQwOS0wLjA1NS0wLjYxMSBjLTAuMTE5LTEuMTA1LTAuMjg3LTIuMTk1LTAuNDk5LTMuMjY5Yy0wLjA0MS0wLjIwOS0wLjA4OC0wLjQxNy0wLjEzMy0wLjYyNUM3Ny4wNjIsMzEuNjM5LDc2Ljk1OCwzMS4zMDcsNzYuODc1LDMwLjk2NyBMNzYuODc1LDMwLjk2N3oiPjwvcGF0aD48L2c+PGc+PHBhdGggZmlsbD0iI2ZmYzQ5YyIgZD0iTTUwLjQ4OCwzOS41Yy0wLjI1NC01LjM5My00LjU5NS05LjczNC05Ljk4OC05Ljk4OFYyLjUwM0M2MC43ODIsMi43Nyw3Ny4yMzEsMTkuMjE4LDc3LjQ5NywzOS41IEg1MC40ODh6Ij48L3BhdGg+PHBhdGggZmlsbD0iI2ExNmE0YSIgZD0iTTQxLDMuMDEzQzYwLjYwOCwzLjUzNyw3Ni40NjMsMTkuMzkyLDc2Ljk4NywzOUg1MC45NTVjLTAuNDc3LTUuMjctNC42ODUtOS40NzgtOS45NTUtOS45NTVWMy4wMTMgTTQwLDJ2MjhjNS41MjMsMCwxMCw0LjQ3NywxMCwxMGgyOEM3OCwxOS4wMTMsNjAuOTg3LDIsNDAsMkw0MCwyeiI+PC9wYXRoPjwvZz48L3N2Zz4=") + 50% 50% no-repeat; + background-size: 100%; +} diff --git a/app/assets/stylesheets/public_pages/_static_pages.scss b/app/assets/stylesheets/public_pages/_static_pages.scss index 77c2eb9c..471166d3 100644 --- a/app/assets/stylesheets/public_pages/_static_pages.scss +++ b/app/assets/stylesheets/public_pages/_static_pages.scss @@ -218,6 +218,59 @@ } } +// Reports Page +.reports { + &-item { + display: inline-block; + float: none !important; + background-color: white; + border-radius: 10px; + padding: 0.75rem; + margin: 1rem; + border: 1px solid #d8d8d8; + + h5 { + text-align: center; + } + } + + &--image { + display: flex; + align-items: center; + justify-content: center; + .icon { + &-pie-chart { + @extend .icons8-pie-chart; + width: 160px; + height: 160px; + } + } + } + + &--details { + .details { + display: flex; + flex-direction: column; + padding: 0.25rem 2rem 0.25rem 2rem; + p { + padding-left: 0.75rem; + margin-bottom: 0; + } + } + } + + &--actions { + display: flex; + flex-direction: column; + align-items: center; + padding-top: 1rem; + + .action { + padding-top: 0.25rem; + } + } +} + // Media Queries @media only screen and (min-width: 1280px) { diff --git a/app/views/report/reports/_report_item.erb b/app/views/report/reports/_report_item.erb new file mode 100644 index 00000000..b8d9a737 --- /dev/null +++ b/app/views/report/reports/_report_item.erb @@ -0,0 +1,30 @@ +
      +
      Teammates Invited and Active
      + +
      +
      +
      + +
      +
      +

      Type(s):

      +

      Numbers that link to a table report showing details; Stacked Line or Bar Chart

      +
      + +
      +

      Variables:

      +

      X: Days. Y: Number of worksites. On Y axis, a stacked running total of open versus closed claimed worksites.

      +
      + +
      + + +
      +
      + Preview Sample +
      +
      + Download +
      +
      +
      diff --git a/app/views/report/reports/index.html.erb b/app/views/report/reports/index.html.erb index 7a8faec6..f0bb35e0 100644 --- a/app/views/report/reports/index.html.erb +++ b/app/views/report/reports/index.html.erb @@ -24,13 +24,14 @@
      Premium Reports
      -
      -
      ...
      -
      ...
      -
      ...
      -
      -
      +
      + + <%= render 'report_item' %> + <%= render 'report_item' %> + <%= render 'report_item' %> + +
      From b2048c0c938ed80e8455583ab238a99d84c9b96a Mon Sep 17 00:00:00 2001 From: Braden Mars Date: Sun, 12 Jan 2020 22:17:11 -0600 Subject: [PATCH 06/11] fix: reports container child positioning --- app/assets/stylesheets/public_pages/_static_pages.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/public_pages/_static_pages.scss b/app/assets/stylesheets/public_pages/_static_pages.scss index 471166d3..dddebdfc 100644 --- a/app/assets/stylesheets/public_pages/_static_pages.scss +++ b/app/assets/stylesheets/public_pages/_static_pages.scss @@ -220,6 +220,10 @@ // Reports Page .reports { + display: flex; + flex-wrap: wrap; + justify-content: center; + &-item { display: inline-block; float: none !important; From d390f73996fe42f3ef76a3f2a385c083b27ffc15 Mon Sep 17 00:00:00 2001 From: Braden Mars Date: Sun, 12 Jan 2020 23:20:31 -0600 Subject: [PATCH 07/11] feat: add bar chart icon, adjust styles --- app/assets/stylesheets/modules/_icons.scss | 9 ++++++++ .../public_pages/_static_pages.scss | 21 ++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/modules/_icons.scss b/app/assets/stylesheets/modules/_icons.scss index 9ae88e2c..f7285363 100644 --- a/app/assets/stylesheets/modules/_icons.scss +++ b/app/assets/stylesheets/modules/_icons.scss @@ -6,3 +6,12 @@ 50% 50% no-repeat; background-size: 100%; } + +.icons8-bar-chart { + display: inline-block; + width: 16px; + height: 16px; + background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjBweCIgeT0iMHB4Igp3aWR0aD0iMTYiIGhlaWdodD0iMTYiCnZpZXdCb3g9IjAgMCAxNzIgMTcyIgpzdHlsZT0iIGZpbGw6IzAwMDAwMDsiPjxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIHN0cm9rZS1saW5lY2FwPSJidXR0IiBzdHJva2UtbGluZWpvaW49Im1pdGVyIiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIHN0cm9rZS1kYXNoYXJyYXk9IiIgc3Ryb2tlLWRhc2hvZmZzZXQ9IjAiIGZvbnQtZmFtaWx5PSJub25lIiBmb250LXdlaWdodD0ibm9uZSIgZm9udC1zaXplPSJub25lIiB0ZXh0LWFuY2hvcj0ibm9uZSIgc3R5bGU9Im1peC1ibGVuZC1tb2RlOiBub3JtYWwiPjxwYXRoIGQ9Ik0wLDE3MnYtMTcyaDE3MnYxNzJ6IiBmaWxsPSJub25lIj48L3BhdGg+PGc+PHBhdGggZD0iTTE3Ljg0NSw2My4yMWwtMS4yOSwtMS43MmwyNi4yMywtMjEuOTNsMzAuMSwxNy4ybDI1LjgsLTMwLjFsMzAuMSwxNy4ybDI1LjE1NSwtMjkuNDU1bDEuNzIsMS4yOWwtMjYuNDQ1LDMwLjc0NWwtMzAuMSwtMTcuMmwtMjUuOCwzMC4xbC0zMC4xLC0xNy4yeiIgZmlsbD0iIzRlN2FiNSI+PC9wYXRoPjxwYXRoIGQ9Ik0xNy4yLDU0LjgyNWMtNC4xNTU5NCwwIC03LjUyNSwzLjM2OTA2IC03LjUyNSw3LjUyNWMwLDQuMTU1OTQgMy4zNjkwNiw3LjUyNSA3LjUyNSw3LjUyNWM0LjE1NTk0LDAgNy41MjUsLTMuMzY5MDYgNy41MjUsLTcuNTI1YzAsLTQuMTU1OTQgLTMuMzY5MDYsLTcuNTI1IC03LjUyNSwtNy41MjV6IiBmaWxsPSIjOGJiN2YwIj48L3BhdGg+PHBhdGggZD0iTTE3LjIsNTUuOWMzLjY1NSwwIDYuNDUsMi43OTUgNi40NSw2LjQ1YzAsMy42NTUgLTIuNzk1LDYuNDUgLTYuNDUsNi40NWMtMy42NTUsMCAtNi40NSwtMi43OTUgLTYuNDUsLTYuNDVjMCwtMy42NTUgMi43OTUsLTYuNDUgNi40NSwtNi40NU0xNy4yLDUzLjc1Yy00LjczLDAgLTguNiwzLjg3IC04LjYsOC42YzAsNC43MyAzLjg3LDguNiA4LjYsOC42YzQuNzMsMCA4LjYsLTMuODcgOC42LC04LjZjMCwtNC43MyAtMy44NywtOC42IC04LjYsLTguNnoiIGZpbGw9IiM0ZTdhYjUiPjwvcGF0aD48cGF0aCBkPSJNNDMsMzMuMzI1Yy00LjE1NTk0LDAgLTcuNTI1LDMuMzY5MDYgLTcuNTI1LDcuNTI1YzAsNC4xNTU5NCAzLjM2OTA2LDcuNTI1IDcuNTI1LDcuNTI1YzQuMTU1OTQsMCA3LjUyNSwtMy4zNjkwNiA3LjUyNSwtNy41MjVjMCwtNC4xNTU5NCAtMy4zNjkwNiwtNy41MjUgLTcuNTI1LC03LjUyNXoiIGZpbGw9IiM4YmI3ZjAiPjwvcGF0aD48cGF0aCBkPSJNNDMsMzQuNGMzLjY1NSwwIDYuNDUsMi43OTUgNi40NSw2LjQ1YzAsMy42NTUgLTIuNzk1LDYuNDUgLTYuNDUsNi40NWMtMy42NTUsMCAtNi40NSwtMi43OTUgLTYuNDUsLTYuNDVjMCwtMy42NTUgMi43OTUsLTYuNDUgNi40NSwtNi40NU00MywzMi4yNWMtNC43MywwIC04LjYsMy44NyAtOC42LDguNmMwLDQuNzMgMy44Nyw4LjYgOC42LDguNmM0LjczLDAgOC42LC0zLjg3IDguNiwtOC42YzAsLTQuNzMgLTMuODcsLTguNiAtOC42LC04LjZ6IiBmaWxsPSIjNGU3YWI1Ij48L3BhdGg+PHBhdGggZD0iTTczLjEsNTAuNTI1Yy00LjE1NTk0LDAgLTcuNTI1LDMuMzY5MDYgLTcuNTI1LDcuNTI1YzAsNC4xNTU5NCAzLjM2OTA2LDcuNTI1IDcuNTI1LDcuNTI1YzQuMTU1OTQsMCA3LjUyNSwtMy4zNjkwNiA3LjUyNSwtNy41MjVjMCwtNC4xNTU5NCAtMy4zNjkwNiwtNy41MjUgLTcuNTI1LC03LjUyNXoiIGZpbGw9IiM4YmI3ZjAiPjwvcGF0aD48cGF0aCBkPSJNNzMuMSw1MS42YzMuNjU1LDAgNi40NSwyLjc5NSA2LjQ1LDYuNDVjMCwzLjY1NSAtMi43OTUsNi40NSAtNi40NSw2LjQ1Yy0zLjY1NSwwIC02LjQ1LC0yLjc5NSAtNi40NSwtNi40NWMwLC0zLjY1NSAyLjc5NSwtNi40NSA2LjQ1LC02LjQ1TTczLjEsNDkuNDVjLTQuNzMsMCAtOC42LDMuODcgLTguNiw4LjZjMCw0LjczIDMuODcsOC42IDguNiw4LjZjNC43MywwIDguNiwtMy44NyA4LjYsLTguNmMwLC00LjczIC0zLjg3LC04LjYgLTguNiwtOC42eiIgZmlsbD0iIzRlN2FiNSI+PC9wYXRoPjxwYXRoIGQ9Ik05OC45LDIwLjQyNWMtNC4xNTU5NCwwIC03LjUyNSwzLjM2OTA2IC03LjUyNSw3LjUyNWMwLDQuMTU1OTQgMy4zNjkwNiw3LjUyNSA3LjUyNSw3LjUyNWM0LjE1NTk0LDAgNy41MjUsLTMuMzY5MDYgNy41MjUsLTcuNTI1YzAsLTQuMTU1OTQgLTMuMzY5MDYsLTcuNTI1IC03LjUyNSwtNy41MjV6IiBmaWxsPSIjOGJiN2YwIj48L3BhdGg+PHBhdGggZD0iTTk4LjksMjEuNWMzLjY1NSwwIDYuNDUsMi43OTUgNi40NSw2LjQ1YzAsMy42NTUgLTIuNzk1LDYuNDUgLTYuNDUsNi40NWMtMy42NTUsMCAtNi40NSwtMi43OTUgLTYuNDUsLTYuNDVjMCwtMy42NTUgMi43OTUsLTYuNDUgNi40NSwtNi40NU05OC45LDE5LjM1Yy00LjczLDAgLTguNiwzLjg3IC04LjYsOC42YzAsNC43MyAzLjg3LDguNiA4LjYsOC42YzQuNzMsMCA4LjYsLTMuODcgOC42LC04LjZjMCwtNC43MyAtMy44NywtOC42IC04LjYsLTguNnoiIGZpbGw9IiM0ZTdhYjUiPjwvcGF0aD48cGF0aCBkPSJNMTI5LDM3LjYyNWMtNC4xNTU5NCwwIC03LjUyNSwzLjM2OTA2IC03LjUyNSw3LjUyNWMwLDQuMTU1OTQgMy4zNjkwNiw3LjUyNSA3LjUyNSw3LjUyNWM0LjE1NTk0LDAgNy41MjUsLTMuMzY5MDYgNy41MjUsLTcuNTI1YzAsLTQuMTU1OTQgLTMuMzY5MDYsLTcuNTI1IC03LjUyNSwtNy41MjV6IiBmaWxsPSIjOGJiN2YwIj48L3BhdGg+PHBhdGggZD0iTTEyOSwzOC43YzMuNjU1LDAgNi40NSwyLjc5NSA2LjQ1LDYuNDVjMCwzLjY1NSAtMi43OTUsNi40NSAtNi40NSw2LjQ1Yy0zLjY1NSwwIC02LjQ1LC0yLjc5NSAtNi40NSwtNi40NWMwLC0zLjY1NSAyLjc5NSwtNi40NSA2LjQ1LC02LjQ1TTEyOSwzNi41NWMtNC43MywwIC04LjYsMy44NyAtOC42LDguNmMwLDQuNzMgMy44Nyw4LjYgOC42LDguNmM0LjczLDAgOC42LC0zLjg3IDguNiwtOC42YzAsLTQuNzMgLTMuODcsLTguNiAtOC42LC04LjZ6IiBmaWxsPSIjNGU3YWI1Ij48L3BhdGg+PHBhdGggZD0iTTE1NC44LDcuNTI1Yy00LjE1NTk0LDAgLTcuNTI1LDMuMzY5MDYgLTcuNTI1LDcuNTI1YzAsNC4xNTU5NCAzLjM2OTA2LDcuNTI1IDcuNTI1LDcuNTI1YzQuMTU1OTQsMCA3LjUyNSwtMy4zNjkwNiA3LjUyNSwtNy41MjVjMCwtNC4xNTU5NCAtMy4zNjkwNiwtNy41MjUgLTcuNTI1LC03LjUyNXoiIGZpbGw9IiM4YmI3ZjAiPjwvcGF0aD48cGF0aCBkPSJNMTU0LjgsOC42YzMuNjU1LDAgNi40NSwyLjc5NSA2LjQ1LDYuNDVjMCwzLjY1NSAtMi43OTUsNi40NSAtNi40NSw2LjQ1Yy0zLjY1NSwwIC02LjQ1LC0yLjc5NSAtNi40NSwtNi40NWMwLC0zLjY1NSAyLjc5NSwtNi40NSA2LjQ1LC02LjQ1TTE1NC44LDYuNDVjLTQuNzMsMCAtOC42LDMuODcgLTguNiw4LjZjMCw0LjczIDMuODcsOC42IDguNiw4LjZjNC43MywwIDguNiwtMy44NyA4LjYsLTguNmMwLC00LjczIC0zLjg3LC04LjYgLTguNiwtOC42eiIgZmlsbD0iIzRlN2FiNSI+PC9wYXRoPjxnPjxwYXRoIGQ9Ik0xNDIuOTc1LDYzLjQyNWgxOS4zNXYxMDEuMDVoLTE5LjM1eiIgZmlsbD0iIzAwOGNiYSI+PC9wYXRoPjxwYXRoIGQ9Ik0xNjEuMjUsNjQuNXY5OC45aC0xNy4ydi05OC45aDE3LjJNMTYzLjQsNjIuMzVoLTIxLjV2MTAzLjJoMjEuNXYtMTAzLjJ6IiBmaWxsPSIjMWQ3M2RlIj48L3BhdGg+PC9nPjxnPjxwYXRoIGQ9Ik05MS4zNzUsODQuOTI1aDE5LjM1djc5LjU1aC0xOS4zNXoiIGZpbGw9IiMwMDhjYmEiPjwvcGF0aD48cGF0aCBkPSJNMTA5LjY1LDg2djc3LjRoLTE3LjJ2LTc3LjRoMTcuMk0xMTEuOCw4My44NWgtMjEuNXY4MS43aDIxLjV2LTgxLjd6IiBmaWxsPSIjMWQ3M2RlIj48L3BhdGg+PC9nPjxnPjxwYXRoIGQ9Ik02NS41NzUsMTE1LjAyNWgxOS4zNXY0OS40NWgtMTkuMzV6IiBmaWxsPSIjMDA4Y2JhIj48L3BhdGg+PHBhdGggZD0iTTgzLjg1LDExNi4xdjQ3LjNoLTE3LjJ2LTQ3LjNoMTcuMk04NiwxMTMuOTVoLTIxLjV2NTEuNmgyMS41di01MS42eiIgZmlsbD0iIzFkNzNkZSI+PC9wYXRoPjwvZz48Zz48cGF0aCBkPSJNMzkuNzc1LDEwMi4xMjVoMTkuMzV2NjIuMzVoLTE5LjM1eiIgZmlsbD0iIzAwOGNiYSI+PC9wYXRoPjxwYXRoIGQ9Ik01OC4wNSwxMDMuMnY2MC4yaC0xNy4ydi02MC4yaDE3LjJNNjAuMiwxMDEuMDVoLTIxLjV2NjQuNWgyMS41di02NC41eiIgZmlsbD0iIzFkNzNkZSI+PC9wYXRoPjwvZz48Zz48cGF0aCBkPSJNMTMuOTc1LDEyMy42MjVoMTkuMzV2NDAuODVoLTE5LjM1eiIgZmlsbD0iIzAwOGNiYSI+PC9wYXRoPjxwYXRoIGQ9Ik0zMi4yNSwxMjQuN3YzOC43aC0xNy4ydi0zOC43aDE3LjJNMzQuNCwxMjIuNTVoLTIxLjV2NDNoMjEuNXYtNDN6IiBmaWxsPSIjMWQ3M2RlIj48L3BhdGg+PC9nPjxnPjxwYXRoIGQ9Ik0xMTcuMTc1LDk3LjgyNWgxOS4zNXY2Ni42NWgtMTkuMzV6IiBmaWxsPSIjMDA4Y2JhIj48L3BhdGg+PHBhdGggZD0iTTEzNS40NSw5OC45djY0LjVoLTE3LjJ2LTY0LjVoMTcuMk0xMzcuNiw5Ni43NWgtMjEuNXY2OC44aDIxLjV2LTY4Ljh6IiBmaWxsPSIjMWQ3M2RlIj48L3BhdGg+PC9nPjwvZz48L2c+PC9zdmc+") + 50% 50% no-repeat; + background-size: 100%; +} diff --git a/app/assets/stylesheets/public_pages/_static_pages.scss b/app/assets/stylesheets/public_pages/_static_pages.scss index dddebdfc..d9079831 100644 --- a/app/assets/stylesheets/public_pages/_static_pages.scss +++ b/app/assets/stylesheets/public_pages/_static_pages.scss @@ -224,6 +224,15 @@ flex-wrap: wrap; justify-content: center; + &--container { + display: flex; + flex-direction: column; + align-items: stretch; + height: 100%; + justify-content: space-around; + padding: 0.25rem 2rem 0.25rem 2rem; + } + &-item { display: inline-block; float: none !important; @@ -245,8 +254,13 @@ .icon { &-pie-chart { @extend .icons8-pie-chart; - width: 160px; - height: 160px; + width: 120px; + height: 120px; + } + &-bar-chart { + @extend .icons8-bar-chart; + width: 120px; + height: 120px; } } } @@ -255,7 +269,8 @@ .details { display: flex; flex-direction: column; - padding: 0.25rem 2rem 0.25rem 2rem; + padding-top: 0.25rem; + padding-bottom: 0.25rem; p { padding-left: 0.75rem; margin-bottom: 0; From 0760bcc1586f258228c4dbbba9dde3dbb054e7eb Mon Sep 17 00:00:00 2001 From: Braden Mars Date: Sun, 12 Jan 2020 23:21:18 -0600 Subject: [PATCH 08/11] feat: define reports list in controller, render all --- app/controllers/report/reports_controller.rb | 53 +++++++++++++++++++- app/views/report/reports/_report_item.erb | 42 +++++++++------- app/views/report/reports/index.html.erb | 12 +++-- 3 files changed, 83 insertions(+), 24 deletions(-) diff --git a/app/controllers/report/reports_controller.rb b/app/controllers/report/reports_controller.rb index 129bf425..b02db132 100644 --- a/app/controllers/report/reports_controller.rb +++ b/app/controllers/report/reports_controller.rb @@ -3,6 +3,55 @@ class Report::ReportsController < ApplicationController before_filter :check_user def index - + @reports = [ + { + title: 'Teammates Invited & Active', + types: 'Numbers that link to a table report showing details; Stacked Line or Bar Chart', + variables: 'X: Days. Y: Number of people. On Y axis, bottom section is a running total number of activated invitations, top section is total unactivated invitations.', + icon: 'icon-bar-chart' + }, + { + title: 'Claimed, Open, Closed Worksites', + types: 'Numbers that link to a table report showing details; Stacked Line or Bar Chart', + variables: 'X: Days. Y: Number of worksites. On Y axis, a stacked running total of open versus closed claimed worksites.', + icon: 'icon-bar-chart' + }, + { + title: 'Est. Commercial Value of Services', + types: 'N/A', + variables: 'X: Days. Y: Dollars. On Y axis, a stacked running', + icon: 'icon-pie-chart' + }, + { + title: 'Average Wait Time to Completion', + types: 'Pie Chart with same variables as the line stacked bar/line chart.', + variables: 'Number of work sites, and number of days waiting (e.g. 0-3, 4-7, 8-14, etc.)', + icon: 'icon-pie-chart' + }, + { + title: 'Longest Wait Time to Completion', + types: 'Pie Chart', + variables: 'Number of work sites, and number of days waiting (e.g. 0-3, 4-7, 8-14, etc.)', + icon: 'icon-pie-chart' + }, + { + title: 'Shortest Wait Time to Completion', + types: 'Pie Chart', + variables: 'Number of work sites, and number of days waiting (e.g. 0-3, 4-7, 8-14, etc.)', + icon: 'icon-pie-chart' + }, + { + title: 'Number of Open (unassigned) worksites claimed for more than 6 days', + types: 'Numbers that link to a table report showing details; Stacked Line or Bar Chart', + variables: 'N/A', + icon: 'icon-bar-chart' + }, + { + title: 'Detailed Work Logs with Volunteer Hours', + types: 'Type(s): Sortable Table/ CSV; line or bar chart', + variables: 'A row for each volunteer check in/check out, location of check in, time checked in, duration of service, etc.', + icon: 'icon-bar-chart' + } + ] end -end \ No newline at end of file +end diff --git a/app/views/report/reports/_report_item.erb b/app/views/report/reports/_report_item.erb index b8d9a737..86362130 100644 --- a/app/views/report/reports/_report_item.erb +++ b/app/views/report/reports/_report_item.erb @@ -1,30 +1,34 @@ -
      -
      Teammates Invited and Active
      +
      +
      -
      -
      -
      +
      <%= title %>
      -
      -
      -

      Type(s):

      -

      Numbers that link to a table report showing details; Stacked Line or Bar Chart

      +
      +
      -
      -

      Variables:

      -

      X: Days. Y: Number of worksites. On Y axis, a stacked running total of open versus closed claimed worksites.

      +
      +
      +

      Type(s):

      +

      <%= types %>

      +
      + +
      +

      Variables:

      +

      <%= variables %>

      +
      -
      +
      +
      + Preview Sample +
      -
      -
      - Preview Sample -
      -
      - Download +
      + Download +
      +
      diff --git a/app/views/report/reports/index.html.erb b/app/views/report/reports/index.html.erb index f0bb35e0..2604203f 100644 --- a/app/views/report/reports/index.html.erb +++ b/app/views/report/reports/index.html.erb @@ -27,9 +27,15 @@
      - <%= render 'report_item' %> - <%= render 'report_item' %> - <%= render 'report_item' %> + <% @reports.each do |r| %> + <%= render 'report_item', + title: r[:title], + icon: r[:icon], + types: r[:types], + variables: r[:variables] + %> + <% end %> +
      From fe6377b9b3bbe267e0f02a9456b82161f688f5b2 Mon Sep 17 00:00:00 2001 From: Braden Mars Date: Mon, 13 Jan 2020 00:42:45 -0600 Subject: [PATCH 09/11] fix: move modal styles to modal component --- app/javascript/components/modal.vue | 106 +++++++++++++++++----- app/views/worker/dashboard/index.html.erb | 67 -------------- 2 files changed, 83 insertions(+), 90 deletions(-) diff --git a/app/javascript/components/modal.vue b/app/javascript/components/modal.vue index 527eca1c..bac2ae8a 100644 --- a/app/javascript/components/modal.vue +++ b/app/javascript/components/modal.vue @@ -1,30 +1,90 @@ \ No newline at end of file +export default { + name: "modal" +}; + + + diff --git a/app/views/worker/dashboard/index.html.erb b/app/views/worker/dashboard/index.html.erb index 9125e264..cb2253b0 100644 --- a/app/views/worker/dashboard/index.html.erb +++ b/app/views/worker/dashboard/index.html.erb @@ -10,73 +10,6 @@ <% content_for :main do %> - -
      From df4eb46ed38c6d14680b6d58e5d728a4aef0696a Mon Sep 17 00:00:00 2001 From: Braden Mars Date: Mon, 13 Jan 2020 01:01:00 -0600 Subject: [PATCH 10/11] feat: display modal on download click --- app/controllers/report/reports_controller.rb | 6 ++++- app/javascript/components/modal.vue | 5 ++-- app/javascript/packs/application.js | 3 ++- app/javascript/report.js | 27 ++++++++++++++++++++ app/views/report/reports/_modal.erb | 7 +++++ app/views/report/reports/_report_item.erb | 2 +- app/views/report/reports/index.html.erb | 11 +++++--- 7 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 app/javascript/report.js create mode 100644 app/views/report/reports/_modal.erb diff --git a/app/controllers/report/reports_controller.rb b/app/controllers/report/reports_controller.rb index b02db132..d28c8234 100644 --- a/app/controllers/report/reports_controller.rb +++ b/app/controllers/report/reports_controller.rb @@ -1,9 +1,13 @@ class Report::ReportsController < ApplicationController include ApplicationHelper before_filter :check_user + helper_method :reports def index - @reports = [ + end + + def reports + return [ { title: 'Teammates Invited & Active', types: 'Numbers that link to a table report showing details; Stacked Line or Bar Chart', diff --git a/app/javascript/components/modal.vue b/app/javascript/components/modal.vue index bac2ae8a..88006d29 100644 --- a/app/javascript/components/modal.vue +++ b/app/javascript/components/modal.vue @@ -41,7 +41,8 @@ export default { } .modal-container { - width: 300px; + min-width: 300px; + max-width: 40rem; margin: 0px auto; padding: 20px 30px; background-color: #fff; @@ -58,7 +59,7 @@ export default { .modal-body { margin: 10px 0; - /*margin-bottom: 40px;*/ + display: inline-block; } .modal-default-button { diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 4aa77cd1..c0cc43a7 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -16,6 +16,7 @@ Raven.config('https://10c81ccdb4ca40d39a1fafa02154e6c7@sentry.io/212434').addPlu Vue.use(VueResource); import 'dashboard' +import 'report' import 'history' import 'datatable' import 'worksite' @@ -40,4 +41,4 @@ import 'legacy/admin/legacy_organization_form'; import 'legacy/static_pages/index'; import 'legacy/static_pages/public_map'; -import 'call' \ No newline at end of file +import 'call' diff --git a/app/javascript/report.js b/app/javascript/report.js new file mode 100644 index 00000000..87c4c851 --- /dev/null +++ b/app/javascript/report.js @@ -0,0 +1,27 @@ +import Vue from "vue"; +import SiteIcon from "./components/dashboard/SiteIcon.vue"; +import SiteStatusDropdown from "./components/dashboard/SiteStatusDropdown"; +import modal from "./components/modal"; + +if (document.getElementById("reports-panel")) { + new Vue({ + el: "#reports-panel", + propsData: {}, + components: { + modal, + SiteStatusDropdown, + SiteIcon + }, + data: { + showModal: false + }, + methods: { + fireModal() { + this.showModal = true; + }, + closeModal() { + this.showModal = false; + } + } + }); +} diff --git a/app/views/report/reports/_modal.erb b/app/views/report/reports/_modal.erb new file mode 100644 index 00000000..c363e139 --- /dev/null +++ b/app/views/report/reports/_modal.erb @@ -0,0 +1,7 @@ + +
      Download Report
      +
      +

      Your state government does not have a premium account. Please have someone from the state contact help@crisiscleanup.org to get a premium account.

      + +
      +       diff --git a/app/views/report/reports/_report_item.erb b/app/views/report/reports/_report_item.erb index 86362130..887bb7ab 100644 --- a/app/views/report/reports/_report_item.erb +++ b/app/views/report/reports/_report_item.erb @@ -26,7 +26,7 @@
      - Download + Download
      diff --git a/app/views/report/reports/index.html.erb b/app/views/report/reports/index.html.erb index 2604203f..71df3f2b 100644 --- a/app/views/report/reports/index.html.erb +++ b/app/views/report/reports/index.html.erb @@ -8,7 +8,9 @@
      <% end %> + <% content_for :main do %> +
      @@ -24,20 +26,21 @@
      Premium Reports
      -
      +
      - <% @reports.each do |r| %> + <% reports.each do |r| %> <%= render 'report_item', title: r[:title], icon: r[:icon], types: r[:types], - variables: r[:variables] + variables: r[:variables], %> <% end %> +
      + <%= render 'modal' %> -
      From 6ab916954afbecfc2e91ec835bc1e3e283fc9f85 Mon Sep 17 00:00:00 2001 From: Braden Mars Date: Mon, 13 Jan 2020 01:55:44 -0600 Subject: [PATCH 11/11] feat: alert admins on download request --- app/controllers/report/reports_controller.rb | 8 +++++ app/javascript/report.js | 19 ++++++++++-- app/mailers/admin_mailer.rb | 9 ++++++ .../send_download_report_alert.html.erb | 31 +++++++++++++++++++ app/views/report/reports/_report_item.erb | 2 +- app/views/report/reports/index.html.erb | 3 +- config/routes.rb | 1 + 7 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 app/views/admin_mailer/send_download_report_alert.html.erb diff --git a/app/controllers/report/reports_controller.rb b/app/controllers/report/reports_controller.rb index d28c8234..9bb9c71b 100644 --- a/app/controllers/report/reports_controller.rb +++ b/app/controllers/report/reports_controller.rb @@ -3,6 +3,13 @@ class Report::ReportsController < ApplicationController before_filter :check_user helper_method :reports + def download_alert + report_title = params["report_title"] + user = current_user + org = user.legacy_organization + AdminMailer.send_download_report_alert(user, org, report_title).deliver_now + end + def index end @@ -58,4 +65,5 @@ def reports } ] end + end diff --git a/app/javascript/report.js b/app/javascript/report.js index 87c4c851..4491a564 100644 --- a/app/javascript/report.js +++ b/app/javascript/report.js @@ -6,21 +6,34 @@ import modal from "./components/modal"; if (document.getElementById("reports-panel")) { new Vue({ el: "#reports-panel", - propsData: {}, + propsData: { + reportTitle: null + }, components: { modal, SiteStatusDropdown, SiteIcon }, data: { - showModal: false + showModal: false, + reportTitle: null }, methods: { - fireModal() { + fireModal(reportTitle) { + this.reportTitle = reportTitle; this.showModal = true; }, closeModal() { this.showModal = false; + this.$http.post( + "/report/report/download_alert", + JSON.stringify({ + report_title: this.reportTitle + }), + { + headers: { "content-type": "application/json" } + } + ); } } }); diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb index 1bcb6304..e20b2671 100644 --- a/app/mailers/admin_mailer.rb +++ b/app/mailers/admin_mailer.rb @@ -20,4 +20,13 @@ def send_user_registration_alert(user, org) mail(to: @user.email, subject: "#{@user.name} has registered for Crisis Cleanup with #{@name}") end # TODO - do we need comment alerts? also an in-app mail or alert system, ala social network messages + + def send_download_report_alert(user, org, report_title) + @user = user + @org = org + @report_title = report_title + + mail(to: @user.email, subject: "#{@org.name} requested to download a report.") + end + end diff --git a/app/views/admin_mailer/send_download_report_alert.html.erb b/app/views/admin_mailer/send_download_report_alert.html.erb new file mode 100644 index 00000000..3df03d13 --- /dev/null +++ b/app/views/admin_mailer/send_download_report_alert.html.erb @@ -0,0 +1,31 @@ + + + + + + +

      Dear Crisis Cleanup Administrator,

      +

      The following group has requested to download a report.

      +

      Organization name: <%= @org.name %>
      + Organization Website: <%= link_to @org.url, @org.url %>
      + Incident: <%= @org.legacy_events.last.name %>
      + Working in: <%= @org.where_are_you_working %>
      + Report Requested: <%= @report_title %>
      +

      +

      Contacts:

      + <% @org.legacy_contacts.each do |contact| %> +

      + <%= contact.display_name %> + <% if contact.title %> + , <%= contact.title %> + <% end %> + <% if contact.phone %> +
      Phone: <%= contact.phone %> + <% end %> + <% if contact.email %> +
      Email: <%= contact.email %> + <% end %> +

      + <% end %> + + diff --git a/app/views/report/reports/_report_item.erb b/app/views/report/reports/_report_item.erb index 887bb7ab..5a6478b1 100644 --- a/app/views/report/reports/_report_item.erb +++ b/app/views/report/reports/_report_item.erb @@ -26,7 +26,7 @@
      - Download + Download
      diff --git a/app/views/report/reports/index.html.erb b/app/views/report/reports/index.html.erb index 71df3f2b..4b6c5943 100644 --- a/app/views/report/reports/index.html.erb +++ b/app/views/report/reports/index.html.erb @@ -34,9 +34,10 @@ title: r[:title], icon: r[:icon], types: r[:types], - variables: r[:variables], + variables: r[:variables] %> <% end %> +
      <%= render 'modal' %> diff --git a/config/routes.rb b/config/routes.rb index 58df6139..4b2316bf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -30,6 +30,7 @@ namespace :report do get "/report" => 'reports#index', as: "reports_index" + post "/report/download_alert" => 'reports#download_alert', as: "reports_download_alert" end namespace :phone do