diff options
Diffstat (limited to 'perllib/FixMyStreet')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Admin.pm | 9 | ||||
| -rwxr-xr-x | perllib/FixMyStreet/App/Controller/JS.pm | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report.pm | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/New.pm | 31 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Default.pm | 53 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/SeeSomething.pm | 148 | ||||
| -rw-r--r-- | perllib/FixMyStreet/DB/Result/Problem.pm | 6 | ||||
| -rw-r--r-- | perllib/FixMyStreet/DB/ResultSet/Problem.pm | 43 |
8 files changed, 285 insertions, 9 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 4999d16f2..7a2790b31 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -33,6 +33,11 @@ sub begin : Private { my ( $self, $c ) = @_; $c->uri_disposition('relative'); + + if ( $c->cobrand->moniker eq 'seesomething' ) { + $c->detach( '/auth/redirect' ) unless $c->user_exists; + $c->detach( '/auth/redirect' ) unless $c->user->from_council; + } } sub summary : Path( 'summary' ) : Args(0) { @@ -927,6 +932,10 @@ sub stats : Path('stats') : Args(0) { $c->forward('set_up_council_details'); + if ( $c->cobrand->moniker eq 'seesomething' ) { + return $c->cobrand->admin_stats(); + } + if ( $c->req->param('getcounts') ) { my ( $start_date, $end_date, @errors ); diff --git a/perllib/FixMyStreet/App/Controller/JS.pm b/perllib/FixMyStreet/App/Controller/JS.pm index ae2f06605..d7847af75 100755 --- a/perllib/FixMyStreet/App/Controller/JS.pm +++ b/perllib/FixMyStreet/App/Controller/JS.pm @@ -24,6 +24,8 @@ sub validation_strings : LocalRegex('^validation_strings\.(.*?)\.js$') : Args(0) $c->res->content_type( 'application/javascript' ); } +sub validation_rules : Path('validation_rules.js') : Args(0) { } + __PACKAGE__->meta->make_immutable; 1; diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index a7e1e8a3a..ef966a8a8 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -95,7 +95,7 @@ sub load_problem_or_display_error : Private { if ( !$c->user || $c->user->id != $problem->user->id ) { $c->detach( '/page_error_403_access_denied', - [ _('That report cannot be viewed on FixMyStreet.') ] # + [ sprintf(_('That report cannot be viewed on %s.'), $c->cobrand->site_title) ] # ); } } diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 31c184733..9194f5318 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -194,6 +194,7 @@ sub report_form_ajax : Path('ajax') : Args(0) { councils_text => $councils_text, category => $category, extra_name_info => $extra_name_info, + categories => $c->stash->{category_options}, } ); @@ -712,6 +713,14 @@ sub process_user : Private { my $user_title = Utils::trim_text( $params{fms_extra_title} ); + if ( $c->cobrand->allow_anonymous_reports ) { + my $anon_details = $c->cobrand->anonymous_account; + + for my $key ( qw( email name ) ) { + $params{ $key } ||= $anon_details->{ $key }; + } + } + # The user is already signed in if ( $c->user_exists ) { my $user = $c->user->obj; @@ -776,6 +785,7 @@ sub process_report : Private { 'detail_offensive', 'may_show_name', # 'category', # + 'subcategory', # 'partial', # 'service', # ); @@ -808,6 +818,8 @@ sub process_report : Private { # set these straight from the params $report->category( _ $params{category} ) if $params{category}; + $report->subcategory( $params{subcategory} ); + my $areas = $c->stash->{all_areas}; $report->areas( ',' . join( ',', sort keys %$areas ) . ',' ); @@ -925,11 +937,7 @@ sub check_for_errors : Private { # let the model check for errors $c->stash->{field_errors} ||= {}; - my %field_errors = ( - %{ $c->stash->{field_errors} }, - %{ $c->stash->{report}->user->check_for_errors }, - %{ $c->stash->{report}->check_for_errors }, - ); + my %field_errors = $c->cobrand->report_check_for_errors( $c ); # Zurich, we don't care about title or name # There is no title, and name is optional @@ -974,7 +982,14 @@ sub save_user_and_report : Private { my $report = $c->stash->{report}; # Save or update the user if appropriate - if ( !$report->user->in_storage ) { + if ( $c->cobrand->never_confirm_reports ) { + if ( $report->user->in_storage() ) { + $report->user->update(); + } else { + $report->user->insert(); + } + $report->confirm(); + } elsif ( !$report->user->in_storage ) { # User does not exist. # Store changes in token for when token is validated. $c->stash->{token_data} = { @@ -1100,6 +1115,10 @@ sub redirect_or_confirm_creation : Private { if ( $c->cobrand->moniker eq 'fixmybarangay' && $c->user->from_council && $c->stash->{external_source_id}) { $report_uri = $c->uri_for( '/report', $report->id, undef, { external_source_id => $c->stash->{external_source_id} } ); + } elsif ( $c->cobrand->never_confirm_reports && $report->non_public ) { + $c->log->info( 'cobrand was set to always confirm reports and report was non public, success page showed'); + $c->stash->{template} = 'report_created.html'; + return 1; } else { $report_uri = $c->cobrand->base_url_for_report( $report ) . $report->url; } diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index efa455637..1f3b4d4bb 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -145,6 +145,14 @@ Can be specified in template. sub enter_postcode_text { } +=head2 site_title + +The name of the site + +=cut + +sub site_title { return 'FixMyStreet'; } + =head2 set_lang_and_domain my $set_lang = $cobrand->set_lang_and_domain( $lang, $unicode, $dir ) @@ -750,5 +758,50 @@ sub default_show_name { 1; } +=head2 report_check_for_errors + +Perform validation for new reports. Takes Catalyst context object as an argument + +=cut + +sub report_check_for_errors { + my $self = shift; + my $c = shift; + + return ( + %{ $c->stash->{field_errors} }, + %{ $c->stash->{report}->user->check_for_errors }, + %{ $c->stash->{report}->check_for_errors }, + ); +} + +sub report_sent_confirmation_email { 0; } + +=head2 never_confirm_reports + +If true then we never send an email to confirm a report + +=cut + +sub never_confirm_reports { 0; } + +=head2 allow_anonymous_reports + +If true then can have reports that are truely anonymous - i.e with no email or name. You +need to also put details in the anonymous_account function too. + +=cut + +sub allow_anonymous_reports { 0; } + +=head2 anonymous_account + +Details to use for anonymous reports. This should return a hashref with an email and +a name key + +=cut + +sub anonymous_account { undef; } + 1; diff --git a/perllib/FixMyStreet/Cobrand/SeeSomething.pm b/perllib/FixMyStreet/Cobrand/SeeSomething.pm new file mode 100644 index 000000000..e445ff435 --- /dev/null +++ b/perllib/FixMyStreet/Cobrand/SeeSomething.pm @@ -0,0 +1,148 @@ +package FixMyStreet::Cobrand::SeeSomething; +use parent 'FixMyStreet::Cobrand::UKCouncils'; + +use strict; +use warnings; + +sub council_id { return [ 2520, 2522, 2514, 2546, 2519, 2538, 2535 ]; } +sub council_area { return 'West Midlands'; } +sub council_name { return 'See Something Say Something'; } +sub council_url { return 'seesomething'; } +sub area_types { [ 'MTD' ] } +sub site_title { return 'See Something, Say Something'; } + + +sub site_restriction { + my $self = shift; + return { council => { IN => $self->council_id } }; +} + +sub problems_clause { + my $self = shift; + return { council => { IN => $self->council_id } }; +} + +sub path_to_web_templates { + my $self = shift; + return [ + FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify, + FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify + ]; +} + +sub council_check { + my ( $self, $params, $context ) = @_; + + my $councils = $params->{all_councils}; + my $council_match = grep { $councils->{$_} } @{ $self->council_id }; + + if ($council_match) { + return 1; + } + + return ( 0, "That location is not covered by See Something, Say Something" ); +} + +sub disambiguate_location { + my $self = shift; + my $string = shift; + + my $town = 'West Midlands'; + + return { + %{ $self->SUPER::disambiguate_location() }, + town => $town, + centre => '52.4803101685267,-2.2708272758854', + span => '1.4002794815887,2.06340043925997', + bounds => [ 51.8259444771676, -3.23554082684068, 53.2262239587563, -1.17214038758071 ], + }; +} + +sub example_places { + return ( 'WS1 4NH', 'Austin Drive, Coventry' ); +} + +sub send_questionnaires { + return 0; +} + +sub ask_ever_reported { + return 0; +} + +sub report_sent_confirmation_email { 1; } + +sub report_check_for_errors { return (); } + +sub never_confirm_reports { 1; } + +sub allow_anonymous_reports { 1; } + +sub anonymous_account { return { name => 'anon user', email => 'anon@example.com' }; } + +sub admin_pages { + my $self = shift; + + return { + 'stats' => ['Reports', 0], + }; +}; + +sub admin_stats { + my $self = shift; + my $c = $self->{c}; + + my %filters = (); + + my %councils = + map { + $c->stash->{council_details}->{$_}->{name} =~ s/(?:Borough|City) Council//; + $_ => $c->stash->{council_details}->{$_} + } + @{ $self->council_id }; + + $c->stash->{council_details} = \%councils; + + if ( !$c->user_exists || !grep { $_ == $c->user->from_council } @{ $self->council_id } ) { + $c->detach( '/page_error_404_not_found' ); + } + + if ( $c->req->param('category') ) { + $filters{category} = $c->req->param('category'); + $c->stash->{category} = $c->req->param('category'); + } + + if ( $c->req->param('subcategory') ) { + $filters{subcategory} = $c->req->param('subcategory'); + $c->stash->{subcategory} = $c->req->param('subcategory'); + } + + if ( $c->req->param('service') ) { + $filters{service} = { -ilike => $c->req->param('service') }; + $c->stash->{service} = $c->req->param('service'); + } + + my $page = $c->req->params->{p} || 1; + + my $p = $c->model('DB::Problem')->search( + { + confirmed => { not => undef }, + %filters + }, + { + columns => [ qw( + service category subcategory council confirmed + ) ], + order_by => { -desc=> [ 'confirmed' ] }, + rows => 20, + } + )->page( $page ); + + $c->stash->{reports} = $p; + $c->stash->{pager} = $p->pager; + + return 1; +} + +1; + diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index dbfe8e9c8..dd09ad3c2 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -100,6 +100,8 @@ __PACKAGE__->add_columns( { data_type => "text", is_nullable => 1 }, "interest_count", { data_type => "integer", is_nullable => 1 }, + "subcategory", + { data_type => "text", is_nullable => 1 }, ); __PACKAGE__->set_primary_key("id"); __PACKAGE__->has_many( @@ -122,8 +124,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-08-31 10:25:34 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mudIAiLAUdmK8gGWIPiq6g +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-12-03 17:48:10 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xN/RB8Vx50CwyOeBjvJezQ # Add fake relationship to stored procedure table __PACKAGE__->has_one( diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm index aa123496e..faed3b8ac 100644 --- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm +++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm @@ -288,6 +288,16 @@ sub send_reports { $h{closest_address} = $cobrand->find_closest( $h{latitude}, $h{longitude}, $row ); } + if ( $cobrand->allow_anonymous_reports && + $row->user->email eq $cobrand->anonymous_account->{'email'} + ) { + $h{anonymous_report} = 1; + $h{user_details} = _('This report was submitted anonymously'); + } else { + $h{user_details} = sprintf(_('Name: %s'), $row->name) . "\n\n"; + $h{user_details} .= sprintf(_('Email: %s'), $row->user->email) . "\n\n"; + } + my %reporters = (); my ( $sender_count ); if ($site eq 'emptyhomes') { @@ -336,6 +346,10 @@ sub send_reports { $h{category_line} = sprintf(_("Category: %s"), $h{category}) . "\n\n"; } + if ( $row->subcategory ) { + $h{subcategory_line} = sprintf(_("Subcategory: %s"), $row->subcategory) . "\n\n"; + } + $h{councils_name} = join(_(' and '), @dear); if ($h{category} eq _('Other')) { $h{multiple} = @dear>1 ? "[ " . _("This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system.") . " ]\n\n" @@ -420,6 +434,9 @@ sub send_reports { whensent => \'ms_current_timestamp()', lastupdate => \'ms_current_timestamp()', } ); + if ( $cobrand->report_sent_confirmation_email && !$h{anonymous_report}) { + _send_report_sent_email( $row, \%h, $nomail ); + } } else { my @errors; for my $sender ( keys %reporters ) { @@ -465,4 +482,30 @@ sub send_reports { } } +sub _send_report_sent_email { + my $row = shift; + my $h = shift; + my $nomail = shift; + + my $template = 'confirm_report_sent.txt'; + my $template_path = FixMyStreet->path_to( "templates", "email", $row->cobrand, $row->lang, $template )->stringify; + $template_path = FixMyStreet->path_to( "templates", "email", $row->cobrand, $template )->stringify + unless -e $template_path; + $template_path = FixMyStreet->path_to( "templates", "email", "default", $template )->stringify + unless -e $template_path; + $template = Utils::read_file( $template_path ); + + my $result = FixMyStreet::App->send_email_cron( + { + _template_ => $template, + _parameters_ => $h, + To => $row->user->email, + From => mySociety::Config::get('CONTACT_EMAIL'), + }, + mySociety::Config::get('CONTACT_EMAIL'), + [ $row->user->email ], + $nomail + ); +} + 1; |