diff options
7 files changed, 0 insertions, 91 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm index cf36effc7..845536bb1 100644 --- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm +++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm @@ -89,52 +89,6 @@ sub lookup_by_ref { return 0; } -=head2 problem_response_days - -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 - -sub problem_response_days { - my $self = shift; - my $p = shift; - - # Temporary, see https://github.com/mysociety/fixmystreetforcouncils/issues/291 - return 0; - - return 10 if $p->category eq 'Bridges'; - return 10 if $p->category eq 'Carriageway Defect'; # phone if urgent - return 10 if $p->category eq 'Debris/Spillage'; - return 10 if $p->category eq 'Drainage'; - return 10 if $p->category eq 'Fences'; - return 10 if $p->category eq 'Flyposting'; - return 10 if $p->category eq 'Footpaths/ Rights of way (usually not tarmac)'; - return 10 if $p->category eq 'Gully and Catchpits'; - return 10 if $p->category eq 'Ice/Snow'; # phone if urgent - return 10 if $p->category eq 'Manhole'; - return 10 if $p->category eq 'Mud and Debris'; # phone if urgent - return 10 if $p->category eq 'Oil Spillage'; # phone if urgent - return 10 if $p->category eq 'Pavements'; - return 10 if $p->category eq 'Pothole'; # phone if urgent - return 10 if $p->category eq 'Property Damage'; - return 10 if $p->category eq 'Public rights of way'; - return 10 if $p->category eq 'Road Marking'; - 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 'Traffic lights'; # phone if urgent - return 10 if $p->category eq 'Traffic'; - return 10 if $p->category eq 'Trees'; - return 10 if $p->category eq 'Utilities'; - return 10 if $p->category eq 'Vegetation'; - - return 0; -} - sub reports_ordering { return 'created-desc'; } diff --git a/templates/email/oxfordshire/_problem-confirm_extra.html b/templates/email/oxfordshire/_problem-confirm_extra.html deleted file mode 100644 index 5e22be6b9..000000000 --- a/templates/email/oxfordshire/_problem-confirm_extra.html +++ /dev/null @@ -1,14 +0,0 @@ -[% IF c.cobrand.problem_response_days(report) == 'emergency' %] - <p> - Thank you for contacting Oxfordshire County Council [% report.category %], unfortunately we are currently only available to respond to emergency situations which may have an impact on the health and safety of members of the public, these will be dealt with within a 24 hour period.<br /> - Reported faults will continue to be registered on our management system and these will be tackled in coming months. - </p> -[% ELSIF c.cobrand.problem_response_days(report) > 0 %] - <p> - Problems in the - [% report.category %] - category are generally responded to within - [% c.cobrand.problem_response_days(report) %] - working days. - </p> -[% END %] diff --git a/templates/email/oxfordshire/_problem-confirm_extra.txt b/templates/email/oxfordshire/_problem-confirm_extra.txt deleted file mode 100644 index eb9ccfd12..000000000 --- a/templates/email/oxfordshire/_problem-confirm_extra.txt +++ /dev/null @@ -1,12 +0,0 @@ -[% IF c.cobrand.problem_response_days(report) == 'emergency' %] -Thank you for contacting Oxfordshire County Council [% report.category %], -unfortunately we are currently only available to respond to emergency -situations which may have an impact on the health and safety of members -of the public, these will be dealt with within a 24 hour period. - -Reported faults will continue to be registered on our management -system and these will be tackled in coming months. -[% ELSIF c.cobrand.problem_response_days(report) > 0 %] -Problems in the [% report.category %] category are generally responded -to within [% c.cobrand.problem_response_days(report) %] working days. -[% END %] diff --git a/templates/web/oxfordshire/_email_sent_extra.html b/templates/web/oxfordshire/_email_sent_extra.html deleted file mode 100644 index f01c2d5fb..000000000 --- a/templates/web/oxfordshire/_email_sent_extra.html +++ /dev/null @@ -1,2 +0,0 @@ -[% DEFAULT problem = report %] -[% IF problem %][% INCLUDE '_response_time.html' %][% END %] diff --git a/templates/web/oxfordshire/_response_time.html b/templates/web/oxfordshire/_response_time.html deleted file mode 100644 index c3cb5fdfa..000000000 --- a/templates/web/oxfordshire/_response_time.html +++ /dev/null @@ -1,14 +0,0 @@ -[% IF c.cobrand.problem_response_days(problem) == 'emergency' %] - <p> - Thank you for contacting Oxfordshire County Council [% problem.category %], unfortunately we are currently only available to respond to emergency situations which may have an impact on the health and safety of members of the public, these will be dealt with within a 24 hour period.<br /> - Reported faults will continue to be registered on our management system and these will be tackled in coming months. - </p> -[% ELSIF c.cobrand.problem_response_days(problem) > 0 %] - <p> - Problems in the - [% problem.category %] - category are generally responded to within - [% c.cobrand.problem_response_days(problem) %] - working days. - </p> -[% END %] diff --git a/templates/web/oxfordshire/report/_council_sent_info.html b/templates/web/oxfordshire/report/_council_sent_info.html index 4e534c517..8b742cb2e 100644 --- a/templates/web/oxfordshire/report/_council_sent_info.html +++ b/templates/web/oxfordshire/report/_council_sent_info.html @@ -9,7 +9,5 @@ </h3> [% END %] - [% INCLUDE '_response_time.html' %] - </div> [% END %] diff --git a/templates/web/oxfordshire/tokens/_extras_confirm.html b/templates/web/oxfordshire/tokens/_extras_confirm.html deleted file mode 100644 index 5fdcd3bfd..000000000 --- a/templates/web/oxfordshire/tokens/_extras_confirm.html +++ /dev/null @@ -1 +0,0 @@ -[% INCLUDE '_response_time.html' problem=report %] |