diff options
| -rw-r--r-- | perllib/FixMyStreet/DB/Result/Problem.pm | 4 | ||||
| -rw-r--r-- | perllib/FixMyStreet/SendReport/Open311.pm | 8 | ||||
| -rw-r--r-- | perllib/Open311.pm | 16 | ||||
| -rw-r--r-- | t/open311.t | 2 |
4 files changed, 18 insertions, 12 deletions
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index feca81d43..dbfe8e9c8 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -582,7 +582,7 @@ sub body { sub can_display_external_id { my $self = shift; if ($self->external_id && $self->send_method_used && - ($self->send_method_used eq 'barnet' || $self->cobrand eq 'oxfordshire')) { + ($self->send_method_used eq 'barnet' || $self->council =~ /2237/)) { return 1; } return 0; @@ -602,7 +602,7 @@ sub processed_summary_string { my ( $problem, $c ) = @_; my ($duration_clause, $external_ref_clause); if ($problem->whensent) { - $duration_clause = $problem->duration_string($c) + $duration_clause = $problem->duration_string($c); } if ($problem->can_display_external_id) { if ($duration_clause) { diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm index 4576ec383..259dc7202 100644 --- a/perllib/FixMyStreet/SendReport/Open311.pm +++ b/perllib/FixMyStreet/SendReport/Open311.pm @@ -37,7 +37,7 @@ sub send { my $send_notpinpointed = 0; my $use_service_as_deviceid = 0; - my $basic_desc = 0; + my $extended_desc = 1; # Extra bromley fields if ( $row->council =~ /2482/ ) { @@ -67,7 +67,7 @@ sub send { push @$extra, { name => 'last_name', value => $lastname }; } - $basic_desc = 1; + $extended_desc = 0; } # extra Oxfordshire fields: send nearest street, postcode, northing and easting, and the FMS id @@ -92,6 +92,8 @@ sub send { push @$extra, { name => 'easting', value => $h->{easting} }; } $row->extra( $extra ); + + $extended_desc = 'oxfordshire'; } # FIXME: we've already looked this up before @@ -108,7 +110,7 @@ sub send { always_send_latlong => $always_send_latlong, send_notpinpointed => $send_notpinpointed, use_service_as_deviceid => $use_service_as_deviceid, - basic_description => $basic_desc, + extended_description => $extended_desc, ); # non standard west berks end points diff --git a/perllib/Open311.pm b/perllib/Open311.pm index 52e17e99d..7a5493704 100644 --- a/perllib/Open311.pm +++ b/perllib/Open311.pm @@ -22,7 +22,7 @@ has success => ( is => 'rw', 'isa' => 'Bool', default => 0 ); has error => ( is => 'rw', 'isa' => 'Str', default => '' ); has always_send_latlong => ( is => 'ro', isa => 'Bool', default => 1 ); has send_notpinpointed => ( is => 'ro', isa => 'Bool', default => 0 ); -has basic_description => ( is => 'ro', isa => 'Bool', default => 0 ); +has extended_description => ( is => 'ro', isa => 'Str', default => 1 ); has use_service_as_deviceid => ( is => 'ro', isa => 'Bool', default => 0 ); has use_extended_updates => ( is => 'ro', isa => 'Bool', default => 0 ); @@ -95,12 +95,12 @@ sub _populate_service_request_params { my $service_code = shift; my $description; - if ( $self->basic_description ) { - $description = $problem->detail; - } else { + if ( $self->extended_description ) { $description = $self->_generate_service_request_description( $problem, $extra ); + } else { + $description = $problem->detail; } my ( $firstname, $lastname ) = ( $problem->user->name =~ /(\w+)\.?\s+(.+)/ ); @@ -168,8 +168,6 @@ sub _generate_service_request_description { my $extra = shift; my $description = <<EOT; -title: @{[$problem->title()]} - detail: @{[$problem->detail()]} url: $extra->{url} @@ -177,6 +175,12 @@ url: $extra->{url} Submitted via FixMyStreet EOT ; + if ($self->extended_description ne 'oxfordshire') { + $description = <<EOT . $description; +title: @{[$problem->title()]} + +EOT + } return $description; } diff --git a/t/open311.t b/t/open311.t index 2371c53bc..cbc8cf474 100644 --- a/t/open311.t +++ b/t/open311.t @@ -106,7 +106,7 @@ subtest 'posting service request with basic_description' => sub { $extra, $problem->category, '<?xml version="1.0" encoding="utf-8"?><service_requests><request><service_request_id>248</service_request_id></request></service_requests>', - { basic_description => 1 }, + { extended_description => 0 }, ); is $results->{ res }, 248, 'got request id'; |