aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet
diff options
context:
space:
mode:
Diffstat (limited to 'perllib/FixMyStreet')
-rw-r--r--perllib/FixMyStreet/App/Controller/Location.pm16
-rw-r--r--perllib/FixMyStreet/App/Controller/Report/New.pm4
-rw-r--r--perllib/FixMyStreet/Cobrand/Angus.pm127
-rw-r--r--perllib/FixMyStreet/Cobrand/Default.pm4
-rw-r--r--perllib/FixMyStreet/Cobrand/FixMyStreet.pm8
-rw-r--r--perllib/FixMyStreet/Cobrand/Greenwich.pm5
-rw-r--r--perllib/FixMyStreet/Cobrand/Oxfordshire.pm4
-rw-r--r--perllib/FixMyStreet/DB/Result/Problem.pm2
-rw-r--r--perllib/FixMyStreet/Map/Zurich.pm2
-rw-r--r--perllib/FixMyStreet/SendReport/Angus.pm170
-rw-r--r--perllib/FixMyStreet/SendReport/EastHants.pm4
-rw-r--r--perllib/FixMyStreet/TestMech.pm2
12 files changed, 313 insertions, 35 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Location.pm b/perllib/FixMyStreet/App/Controller/Location.pm
index 6def423ce..c457c8fce 100644
--- a/perllib/FixMyStreet/App/Controller/Location.pm
+++ b/perllib/FixMyStreet/App/Controller/Location.pm
@@ -134,22 +134,6 @@ sub check_location : Private {
return 1;
}
-=head2 country_message
-
-Displays the country_message template, used for displaying a message to
-people using the site from outside the host country.
-
-=cut
-
-sub country_message : Path('/country_message') : Args(0) {
- my ( $self, $c ) = @_;
-
- # we do not want to cache this as we always want to check if displaying this
- # is the right thing to do.
- $c->res->header( 'Cache_Control' => 'max-age=0' );
- $c->stash->{template} = 'front/international_banner.html';
-}
-
# Utility function for if someone (rarely) enters a grid reference
sub gridref_to_latlon {
my ( $a, $b, $num ) = @_;
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 66dc20a3a..f9762662c 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -655,8 +655,10 @@ sub setup_categories_and_bodies : Private {
$category_extras{ $contact->category } = $metas
if scalar @$metas;
+ my $body_send_method = $bodies{$contact->body_id}->send_method || '';
$c->stash->{unresponsive}{$contact->category} = $contact->body_id
- if $contact->email =~ /^REFUSED$/i;
+ if !$c->stash->{unresponsive}{ALL} &&
+ ($contact->email =~ /^REFUSED$/i || $body_send_method eq 'Refused');
$non_public_categories{ $contact->category } = 1 if $contact->non_public;
}
diff --git a/perllib/FixMyStreet/Cobrand/Angus.pm b/perllib/FixMyStreet/Cobrand/Angus.pm
new file mode 100644
index 000000000..23d0d2c58
--- /dev/null
+++ b/perllib/FixMyStreet/Cobrand/Angus.pm
@@ -0,0 +1,127 @@
+package FixMyStreet::Cobrand::Angus;
+use parent 'FixMyStreet::Cobrand::UKCouncils';
+
+use strict;
+use warnings;
+
+sub council_id { return 2550; }
+sub council_area { return 'Angus'; }
+sub council_name { return 'Angus Council'; }
+sub council_url { return 'angus'; }
+
+sub base_url {
+ return FixMyStreet->config('BASE_URL') if FixMyStreet->config('STAGING_SITE');
+ return 'https://fix.angus.gov.uk';
+}
+
+sub enter_postcode_text {
+ my ($self) = @_;
+ return 'Enter an Angus postcode, or street name and area';
+}
+
+sub example_places {
+ return ( 'DD8 3AP', "Canmore Street" );
+}
+
+sub default_show_name { 0 }
+
+sub disambiguate_location {
+ my $self = shift;
+ my $string = shift;
+
+ return {
+ %{ $self->SUPER::disambiguate_location() },
+ town => 'Angus',
+ centre => '56.7240845983561,-2.91774391131183',
+ span => '0.525195055746977,0.985870680170788',
+ bounds => [ 56.4616875530489, -3.40703662677109, 56.9868826087959, -2.4211659466003 ],
+ };
+}
+
+sub pin_colour {
+ my ( $self, $p, $context ) = @_;
+ return 'grey' if $p->state eq 'not responsible';
+ return 'green' if $p->is_fixed || $p->is_closed;
+ return 'red' if $p->state eq 'confirmed';
+ return 'yellow';
+}
+
+sub contact_email {
+ my $self = shift;
+ return join( '@', 'accessline', 'angus.gov.uk' );
+}
+
+=head2 temp_email_to_update, temp_update_contacts
+
+Temporary helper routines to update the extra for potholes (temporary setup
+hack, cargo-culted from Harrogate, may in future be superseded either by
+Open311/integration or a better mechanism for manually creating rich contacts).
+
+Can run with a script or command line like:
+
+ bin/cron-wrapper perl -MFixMyStreet::App -MFixMyStreet::Cobrand::Angus -e \
+ 'FixMyStreet::Cobrand::Angus->new({c => FixMyStreet::App->new})->temp_update_contacts'
+
+=cut
+
+sub temp_update_contacts {
+ my $self = shift;
+
+ my $contact_rs = $self->{c}->model('DB::Contact');
+
+ my $_update = sub {
+ my ($category, $field, $category_details) = @_;
+ # NB: we're accepting just 1 field, but supply as array [ $field ]
+
+ my $contact = $contact_rs->find_or_create(
+ {
+ body_id => $self->council_id,
+ category => $category,
+ %{ $category_details || {} },
+ },
+ {
+ key => 'contacts_body_id_category_idx'
+ }
+ );
+
+ my %default = (
+ variable => 'true',
+ order => '1',
+ required => 'no',
+ datatype => 'string',
+ datatype_description => 'a string',
+ );
+
+ if ($field->{datatype} || '' eq 'boolean') {
+ my $description = $field->{description};
+ %default = (
+ %default,
+ datatype => 'singlevaluelist',
+ datatype_description => 'Yes or No',
+ values => { value => [
+ { key => ['No'], name => ['No'] },
+ { key => ['Yes'], name => ['Yes'] },
+ ] },
+ );
+ }
+
+ $contact->update({
+ # XXX: we're just setting extra with the expected layout,
+ # this could be encapsulated more nicely
+ extra => { _fields => [ { %default, %$field } ] },
+ confirmed => 1,
+ deleted => 0,
+ editor => 'automated script',
+ whenedited => \'NOW()',
+ note => 'Edited by script as per requirements Jan 2016',
+ });
+ };
+
+ $_update->( 'Street lighting', {
+ code => 'column_id',
+ description => 'Lamp post number',
+ });
+
+}
+
+1;
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index b3b830f06..c76ee0f7d 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -936,10 +936,6 @@ sub updates_as_hashref {
return {};
}
-sub get_country_for_ip_address {
- return 0;
-}
-
sub jurisdiction_id_example {
my $self = shift;
return $self->moniker;
diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index 159f2f5db..99fe6da15 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -1,6 +1,5 @@
package FixMyStreet::Cobrand::FixMyStreet;
use base 'FixMyStreet::Cobrand::UK';
-use mySociety::Gaze;
use constant COUNCIL_ID_BROMLEY => 2482;
@@ -52,13 +51,6 @@ sub extra_contact_validation {
return %errors;
}
-sub get_country_for_ip_address {
- my $self = shift;
- my $ip = shift;
-
- return mySociety::Gaze::get_country_from_ip($ip);
-}
-
sub report_form_extras {
( { name => 'gender', required => 0 }, { name => 'variant', required => 0 } )
}
diff --git a/perllib/FixMyStreet/Cobrand/Greenwich.pm b/perllib/FixMyStreet/Cobrand/Greenwich.pm
index 7535a34bf..d23e62138 100644
--- a/perllib/FixMyStreet/Cobrand/Greenwich.pm
+++ b/perllib/FixMyStreet/Cobrand/Greenwich.pm
@@ -9,6 +9,11 @@ sub council_area { return 'Greenwich'; }
sub council_name { return 'Royal Borough of Greenwich'; }
sub council_url { return 'greenwich'; }
+sub base_url {
+ return FixMyStreet->config('BASE_URL') if FixMyStreet->config('STAGING_SITE');
+ return 'https://fix.royalgreenwich.gov.uk';
+}
+
sub example_places {
return ( 'SE18 6HQ', "Woolwich Road" );
}
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index c78ae5e09..543dd431a 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -52,6 +52,8 @@ sub default_show_name { 0 }
Returns the number of working days that are expected to elapse
between the problem being reported and it being responded to by
the council/body.
+If the value 'emergency' is returned, a different template block
+is triggered that has custom wording.
=cut
@@ -79,7 +81,7 @@ sub problem_response_days {
return 10 if $p->category eq 'Road traffic signs';
return 10 if $p->category eq 'Roads/highways';
return 10 if $p->category eq 'Skips and scaffolding';
- return 10 if $p->category eq 'Street lighting';
+ return 'emergency' if $p->category eq 'Street lighting';
return 10 if $p->category eq 'Traffic lights'; # phone if urgent
return 10 if $p->category eq 'Traffic';
return 10 if $p->category eq 'Trees';
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 2a90d0bec..705c6d284 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -654,7 +654,7 @@ sub response_templates {
# Note: this only makes sense when called on a problem that has been sent!
sub can_display_external_id {
my $self = shift;
- if ($self->external_id && $self->send_method_used && $self->bodies_str =~ /2237/) {
+ if ($self->external_id && $self->send_method_used && $self->bodies_str =~ /(2237|2550)/) {
return 1;
}
return 0;
diff --git a/perllib/FixMyStreet/Map/Zurich.pm b/perllib/FixMyStreet/Map/Zurich.pm
index 3e198f820..4c597c30b 100644
--- a/perllib/FixMyStreet/Map/Zurich.pm
+++ b/perllib/FixMyStreet/Map/Zurich.pm
@@ -57,7 +57,7 @@ sub map_tiles {
sub base_tile_url {
# use the new 512px maps as used by Javascript
- return 'http://www.gis.stadt-zuerich.ch/maps/rest/services/tiled/LuftbildHybrid/MapServer/WMTS/tile/1.0.0/tiled_LuftbildHybrid/default/default028mm';
+ return '//www.gis.stadt-zuerich.ch/maps/rest/services/tiled/LuftbildHybrid/MapServer/WMTS/tile/1.0.0/tiled_LuftbildHybrid/default/default028mm';
}
sub copyright {
diff --git a/perllib/FixMyStreet/SendReport/Angus.pm b/perllib/FixMyStreet/SendReport/Angus.pm
new file mode 100644
index 000000000..15441cc1f
--- /dev/null
+++ b/perllib/FixMyStreet/SendReport/Angus.pm
@@ -0,0 +1,170 @@
+package FixMyStreet::SendReport::Angus;
+
+use Moo;
+
+BEGIN { extends 'FixMyStreet::SendReport'; }
+
+use Try::Tiny;
+use Encode;
+use XML::Simple;
+use mySociety::Web qw(ent);
+
+sub get_auth_token {
+ my ($self, $authxml) = @_;
+
+ my $xml = new XML::Simple;
+ my $obj;
+
+ eval {
+ $obj = $xml->parse_string( $authxml );
+ };
+
+ my $success = $obj->{success};
+ $success =~ s/^\s+|\s+$//g if defined $success;
+ my $token = $obj->{AuthenticateResult};
+ $token =~ s/^\s+|\s+$//g if defined $token;
+
+ if (defined $success && $success eq 'True' && defined $token) {
+ return $token;
+ } else {
+ $self->error("Couldn't authenticate against Angus endpoint.");
+ }
+}
+
+sub get_external_id {
+ my ($self, $resultxml) = @_;
+
+ my $xml = new XML::Simple;
+ my $obj;
+
+ eval {
+ $obj = $xml->parse_string( $resultxml );
+ };
+
+ my $success = $obj->{success};
+ $success =~ s/^\s+|\s+$//g if defined $success;
+ my $external_id = $obj->{CreateRequestResult}->{RequestId};
+
+ if (defined $success && $success eq 'True' && defined $external_id) {
+ return $external_id;
+ } else {
+ $self->error("Couldn't find external id in response from Angus endpoint.");
+ return undef;
+ }
+}
+
+sub crm_request_type {
+ my ($self, $row, $h) = @_;
+ return 'StLight'; # TODO: Set this according to report category
+}
+
+sub jadu_form_fields {
+ my ($self, $row, $h) = @_;
+ my $xml = XML::Simple->new(
+ NoAttr=> 1,
+ KeepRoot => 1,
+ SuppressEmpty => 0,
+ );
+ my $metas = $row->get_extra_fields();
+ my %extras;
+ foreach my $field (@$metas) {
+ $extras{$field->{name}} = $field->{value};
+ }
+ my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker($row->cobrand)->new();
+ my $output = $xml->XMLout({
+ formfields => {
+ formfield => [
+ {
+ name => 'RequestTitle',
+ value => $h->{title}
+ },
+ {
+ name => 'RequestDetails',
+ value => $h->{detail}
+ },
+ {
+ name => 'ReporterName',
+ value => $h->{name}
+ },
+ {
+ name => 'ReporterEmail',
+ value => $h->{email}
+ },
+ {
+ name => 'ReporterAnonymity',
+ value => $row->anonymous ? 'True' : 'False'
+ },
+ {
+ name => 'ReportedDateTime',
+ value => $h->{confirmed}
+ },
+ {
+ name => 'ColumnId',
+ value => $extras{'column_id'} || ''
+ },
+ {
+ name => 'ReportId',
+ value => $h->{id}
+ },
+ {
+ name => 'ReportedNorthing',
+ value => $h->{northing}
+ },
+ {
+ name => 'ReportedEasting',
+ value => $h->{easting}
+ },
+ {
+ name => 'Imageurl1',
+ value => $row->photos->[0] ? ($cobrand->base_url . $row->photos->[0]->{url_full}) : ''
+ },
+ {
+ name => 'Imageurl2',
+ value => $row->photos->[1] ? ($cobrand->base_url . $row->photos->[1]->{url_full}) : ''
+ },
+ {
+ name => 'Imageurl3',
+ value => $row->photos->[2] ? ($cobrand->base_url . $row->photos->[2]->{url_full}) : ''
+ }
+ ]
+ }
+ });
+ # The endpoint crashes if the JADUFormFields string has whitespace between XML elements, so strip it out...
+ $output =~ s/>[\s\n]+</></g;
+ return $output;
+}
+
+sub send {
+ my ( $self, $row, $h ) = @_;
+
+ # FIXME: should not recreate this each time
+ my $angus_service;
+
+ require Integrations::AngusSOAP;
+
+ my $return = 1;
+ $angus_service ||= Integrations::AngusSOAP->on_fault(sub { my($soap, $res) = @_; die ref $res ? $res->faultstring : $soap->transport->status, "\n"; });
+ try {
+ my $authresult = $angus_service->AuthenticateJADU();
+ my $authtoken = $self->get_auth_token( $authresult );
+ # authenticationtoken, CallerId, CallerAddressId, DeliveryId, DeliveryAddressId, CRMRequestType, JADUXFormRef, PaymentRef, JADUFormFields
+ my $result = $angus_service->CreateServiceRequest(
+ $authtoken, '1', '1', '1', '1', $self->crm_request_type($row, $h),
+ 'FMS', '', $self->jadu_form_fields($row, $h)
+ );
+ my $external_id = $self->get_external_id( $result );
+ if ( $external_id ) {
+ $row->external_id( $external_id );
+ $row->send_method_used('Angus');
+ $return = 0;
+ }
+ } catch {
+ my $e = $_;
+ print "Caught an error: $e\n";
+ $self->error( "Error sending to Angus: $e" );
+ };
+ $self->success( !$return );
+ return $return;
+}
+
+1;
diff --git a/perllib/FixMyStreet/SendReport/EastHants.pm b/perllib/FixMyStreet/SendReport/EastHants.pm
index 3eb8ffcfa..cc302b8b3 100644
--- a/perllib/FixMyStreet/SendReport/EastHants.pm
+++ b/perllib/FixMyStreet/SendReport/EastHants.pm
@@ -35,12 +35,12 @@ sub send {
# FIXME: should not recreate this each time
my $eh_service;
- require EastHantsWSDL;
+ require Integrations::EastHantsWSDL;
$h->{category} = 'Customer Services' if $h->{category} eq 'Other';
$h->{message} = construct_message( %$h );
my $return = 1;
- $eh_service ||= EastHantsWSDL->on_fault(sub { my($soap, $res) = @_; die ref $res ? $res->faultstring : $soap->transport->status, "\n"; });
+ $eh_service ||= Integrations::EastHantsWSDL->on_fault(sub { my($soap, $res) = @_; die ref $res ? $res->faultstring : $soap->transport->status, "\n"; });
try {
# ServiceName, RemoteCreatedBy, Salutation, FirstName, Name, Email, Telephone, HouseNoName, Street, Town, County, Country, Postcode, Comments, FurtherInfo, ImageURL
my $message = ent(encode_utf8($h->{message}));
diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm
index f3ee7787b..2ad820d1f 100644
--- a/perllib/FixMyStreet/TestMech.pm
+++ b/perllib/FixMyStreet/TestMech.pm
@@ -423,7 +423,7 @@ sub extract_problem_list {
my $mech = shift;
my $result = scraper {
- process 'ul.item-list--reports li a h4', 'problems[]', 'TEXT';
+ process 'ul.item-list--reports li a h3', 'problems[]', 'TEXT';
}->scrape( $mech->response );
return $result->{ problems } || [];
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 16:30:35 +0000