+ These are map markers from the Disaster Connect app + that have unresolved needs. +
++ As an admin, you have the ability to mark these needs as resolved. Once a need is marked as + resolved, it will remain hidden from public view and this screen as well. +
+ +| + <% fields.map(&:titleize).each do |header| %> + | <%= header %> | + <% end %> ++ |
|---|---|---|
| <%= link_to 'Show', connect_unresolved_marker_path(row) %> | + <% fields.each do |field| %> +<%= row[field] %> | + <% end %> ++ <%= link_to 'Resolve', connect_unresolved_marker_path(row), + method: :patch, + title: "Mark this need as resolved", + class: "button button-outline" %> + | +
<%= JSON.pretty_generate @unresolved_marker.as_json %><%= notice %>
<%= alert %>
diff --git a/config/connect_categories.yml b/config/connect_categories.yml index 4bbe2c6..d2b9ab7 100644 --- a/config/connect_categories.yml +++ b/config/connect_categories.yml @@ -1,167 +1,118 @@ default: &default categories: - - labor: - - muck: - - trash: - - clean: - - shop: - - laundry: - - cook: - - sit: - - medical: - - equipment: - - construction: - - power_tools: - - tools: - - water_pump: - - protective_gear: - - generator: - - dehumidifier: - - appliances: - - supplies: - - construction: - - home_repair: - - cleaning_supplies: - - household_items: - - personal_care: - - baby_and_child_care: - - clothes: - - medicine: - - furniture: - - fuel: - - transportation: - - pickup_truck: - - bus_or_van: - - tow_truck: - - boat_motor: - - boat_no_motor: - - car: - - housing: - - family: - - individual: - - pets: - - food: - - ready_to_eat: - - baby_formula: - - drinking_water: - - canned_food: - - dry_foods: - - basic_staples: + - flour: + - 5kg: + - 10kg: + - rice: + - 1kg: + - 2kg: + - 5kg: + - lentil: + - 500g: + - 1kg: + - 2kg: + - 5kg: + - oil: + - 500ml: + - 1L: + - 2L: + - sugar: + - 1kg: + - 2kg: + - 5kg: + - tea_leaves: + - 250g: + - 500g: + - 1kg: + - potato: + - 1kg: + - 2kg: + - 5kg: + - onion: + - 1kg: + - 2kg: + - 5kg: + - milk_powder: + - 200g: + - 500g: + - soap: + - 1qty: + - 2qty: + - 5qty: + - salt: + - 1kg: + - 2kg: + - chilli_powder: + - 200g: + - turmeric: + - 200g: + - coriander_powder: + - 200g: + - garam_masala: + - 200g: icons: - # Category keys that need icons will have their - # corresponding icon key listed here - labor: user-md - equipment: wrench - supplies: shopping-basket - transportation: car - housing: bed - food: cutlery + categories: cutlery en: - categories: I need help with - labor: Labor - muck: Mucking - trash: Hauling Heavy Trash - clean: Cleaning - shop: Shopping - laundry: Laundry - cook: Cooking - sit: Baby Sitting - medical: Healthcare - home_repair: Home Repair - electrician: Electrical Issues - legal: Legal Issues - pest_control: Pest or Animal Control - counselor: Counseling - equipment: Equipment - construction: Construction - power_tools: Power Tools - tools: Tools - water_pump: Water Pumps - protective_gear: Protective Gear - generator: Generators - dehumidifier: Dehumidifiers - appliances: Appliances - other_equipment: Other Equipment - supplies: Supplies - cleaning_supplies: Cleaning Supplies - household_items: Household Items - personal_care: Personal Care - baby_and_child_care: Baby & Child Care - clothes: Clothes - medicine: Medicine - furniture: Furniture - fuel: Fuel - transportation: Transportation - pickup_truck: Pickup Truck - bus_or_van: Bus or Van - tow_truck: Tow Truck - boat_motor: Boat (motor) - boat_no_motor: Boat (no motor) - car: Car - housing: Housing - family: Family Housing - individual: Individual Housing - pets: Pet Housing - food: Food - ready_to_eat: Ready to Eat Food - baby_formula: Baby Formula - drinking_water: Drinking Water - canned_food: Canned Food - dry_foods: Dry Foods - basic_staples: Basic Staples - es: - categories: Necesito ayuda con - labor: Labor - muck: Limpieza - trash: Retirar escombros/basura - clean: Limpiar - shop: Comprar - laundry: Lavar - cook: Cocinar - sit: Cuidar niños - medical: Ayuda medica - home_repair: Reparaciones - electrician: Problemas electricos - legal: Problemas legales - pest_control: Control de animales/pestes - counselor: Terapia - equipment: Equipo - construction: Construccion - power_tools: Herramientas electricas - tools: Herramientas - water_pump: Bomba de agua - protective_gear: Equipo de protección - generator: Generadores - dehumidifier: Deshumidificadores - appliances: Aparatos del hogar - other_equipment: Equipo en general - supplies: Suministros - cleaning_supplies: Suministros de limpieza - household_items: Articulos del hogar - personal_care: Cuidado personal - baby_and_child_care: Cuidado de niños/bebes - clothes: Ropa - medicine: Medicina - furniture: Muebles - fuel: Combustible - transportation: Transportacion - pickup_truck: Camioneta - bus_or_van: Camion - tow_truck: Remolque - boat_motor: Barco (motor) - boat_no_motor: Barco (sin motor) - car: Coche - housing: Hospedaje - family: Hospedaje familiar - individual: Hospedaje individual - pets: Hospedaje para mascotas - food: Alimento - ready_to_eat: Alimentos rapidos - baby_formula: Alimentos para bebe - drinking_water: Agua potable - canned_food: Comida enlatada - dry_foods: Comida seca - basic_staples: Comida basica + categories: Groceries needed + 10kg: 10 kg + 1kg: 1 kg + 1L: 1 L + 1qty: 1 qty + 200g: 200 g + 250g: 250 g + 2kg: 2 kg + 2L: 2 L + 2qty: 2 qty + 500g: 500 g + 500ml: 500 ml + 5kg: 5 kg + 5qty: 5 qty + chilli_powder: Red chilli powder + coriander_powder: Dhaniya (Coriander) powder + flour: Wheat flour + garam_masala: Garam masala + lentil: Lentil + milk_powder: Milk powder + oil: Edible oil + onion: Onion + potato: Potato + rice: Rice + salt: Salt + soap: Soap + sugar: Sugar + tea_leaves: Tea leaves + turmeric: Turmeric + hi: + # These keys need to be translated into Hindi + categories: किराने का सामान की जरूरत + 10kg: 10 किग्रा + 1kg: 1 किग्रा + 1L: 1 ली + 1qty: 1 मात्रा + 200g: 200 ग्रा + 250g: 250 ग्रा + 2kg: 2 किग्रा + 2L: 2 ली + 2qty: 2 मात्रा + 500g: 500 ग्रा + 500ml: 500 मिली + 5kg: 5 किग्रा + 5qty: 5 मात्रा + chilli_powder: लाल मिर्च + coriander_powder: धनिया पाउडर + flour: आटा + garam_masala: गरम मसाला + lentil: दाल + milk_powder: दूध पाउडर + oil: खाद्य तेल + onion: प्याज + potato: आलू + rice: चावल + salt: नमक + soap: साबुन + sugar: शक्कर + tea_leaves: चाय पत्ती + turmeric: हल्दी development: <<: *default diff --git a/config/routes.rb b/config/routes.rb index dfad7b7..9b0c792 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -21,6 +21,7 @@ resources :amazon_products, except: [:new, :create, :destroy] namespace :connect do resources :flagged_markers, only: [:index, :show, :update, :destroy] + resources :unresolved_markers, only: [:index, :show, :update] end root to: "splash#index" diff --git a/test/controllers/connect/unresolved_markers_controller_test.rb b/test/controllers/connect/unresolved_markers_controller_test.rb new file mode 100644 index 0000000..76a4ab7 --- /dev/null +++ b/test/controllers/connect/unresolved_markers_controller_test.rb @@ -0,0 +1,33 @@ +require 'test_helper' + +class UnresolvedMarkersControllerTest < ActionDispatch::IntegrationTest + include Devise::Test::IntegrationHelpers + + fixtures :all + + test "only admins can access index" do + get connect_unresolved_markers_path + assert_redirected_to root_path + sign_in users(:admin) + get connect_unresolved_markers_path + assert_response :success + end + + test "only admins can access show" do + get connect_unresolved_marker_path(connect_markers(:need)) + assert_redirected_to root_path + sign_in users(:admin) + get connect_unresolved_marker_path(connect_markers(:need)) + assert_response :success + end + + test "Can resolve a marker" do + sign_in users(:admin) + marker = connect_markers(:need) + refute(marker.resolved?) + patch connect_unresolved_marker_path(marker) + assert_redirected_to connect_unresolved_markers_path + marker.reload + assert(marker.resolved?) + end +end diff --git a/test/models/connect/marker_test.rb b/test/models/connect/marker_test.rb index 6b6a31e..164b16d 100644 --- a/test/models/connect/marker_test.rb +++ b/test/models/connect/marker_test.rb @@ -97,6 +97,14 @@ def setup assert Connect::Marker.by_type(@marker.marker_type).all? { |m| m.marker_type == @marker.marker_type } end + test 'scope by haves' do + assert Connect::Marker.haves.all? { |m| m.marker_type == 'have' } + end + + test 'scope by needs' do + assert Connect::Marker.needs.all? { |m| m.marker_type == 'need' } + end + test 'scope resolved' do assert Connect::Marker.resolved.all? { |m| m.resolved } end