Include FixMyStreet ID in report metadata.

Historically we relied upon the URL for someone getting
the ID of a report, but this is harder on mobile.

Factor together all the _council_sent_info.html templates.

perllib/FixMyStreet/DB/Result/Problem.pm

@@ -919,12 +919,18 @@ sub defect_types {
     return $self->result_source->schema->resultset('DefectType')->for_bodies($self->bodies_str_ids, $self->category);
 }
 
-# returns true if the external id is the council's ref, i.e., useful to publish it
-# (by way of an example, the Open311 send method returns a useful reference when
-# it succeeds, so that is the ref we should show on the problem report page).
-#     Future: this is installation-dependent so maybe should be using the contact
-#             data to determine if the external id is public on a council-by-council basis.
-#     Note:   this only makes sense when called on a problem that has been sent!
+=head2 can_display_external_id
+
+Returns true if the external id is the council's ref, i.e., useful to publish
+it (by way of an example, the Open311 send method returns a useful reference
+when it succeeds, so that is the ref we should show on the problem report
+page).
+Future: this is installation-dependent so maybe should be using the contact
+data to determine if the external id is public on a council-by-council basis.
+Note: this only makes sense when called on a problem that has been sent!
+
+=cut
+
 sub can_display_external_id {
     my $self = shift;
     if ( $self->external_id && $self->to_body_named('Lincolnshire|Isle of Wight|East Sussex|Central Bedfordshire|Shropshire|Merton') ) {
@@ -939,7 +945,6 @@ sub duration_string {
     my $cobrand = $problem->result_source->schema->cobrand;
     my $body = $cobrand->call_hook( link_to_council_cobrand => $problem )
         || $problem->body(1);
-    my $handler = $cobrand->call_hook(get_body_handler_for_problem => $problem);
     return unless $problem->whensent;
     my $s = sprintf(_('Sent to %s %s later'), $body,
         Utils::prettify_duration($problem->whensent->epoch - $problem->confirmed->epoch, 'minute')

templates/web/base/report/_council_sent_info.html

@@ -1,17 +1,34 @@
+[% IF c.cobrand.moniker == 'hounslow' %]
+  [% SET can_display_external_id = problem.external_id AND c.user_exists AND c.user.belongs_to_body(problem.bodies_str) %]
+[% ELSE %]
+  [% SET can_display_external_id = problem.can_display_external_id %]
+[% END %]
 [% SET duration_clause = problem.duration_string %]
-[% IF duration_clause || problem.can_display_external_id %]
-    <p class="council_sent_info">
-    [%- IF problem.can_display_external_id %]
-        [%- IF duration_clause %]
-            [%- external_ref_clause = tprintf(loc('Council ref:&nbsp;%s'), problem.external_id) %]
+<p class="council_sent_info">
+    [% duration_clause %][% IF duration_clause %]. [% END %]
+    <strong>
+    [%- IF can_display_external_id %]
+        [%- IF c.cobrand.moniker == 'hounslow' %]
+            [%- tprintf('Reference:&nbsp;%s', problem.external_id) %].
+        [%- ELSIF c.cobrand.moniker == 'isleofwight' %]
+            [%- tprintf('Enquiry ref:&nbsp;%s', problem.external_id) %].
+        [%- ELSE %]
+            [%- tprintf(loc('Council ref:&nbsp;%s'), problem.external_id) %].
+        [%- END %]
+    [%- ELSE -%]
+        [%- IF c.cobrand.moniker == 'bathnes' OR c.cobrand.moniker == 'cheshireeast' OR c.cobrand.moniker == 'peterborough' %]
+            [%- tprintf(loc('Council ref:&nbsp;%s'), problem.id) %].
+        [%- ELSIF c.cobrand.moniker == 'bexley' %]
+            [%- tprintf('Report ref:&nbsp;%s', problem.id) %].
+        [%- ELSIF c.cobrand.moniker == 'tfl' %]
+            [%- tprintf('TfL ref:&nbsp;FMS%s', problem.id) %].
+        [%- ELSIF c.cobrand.moniker == 'northamptonshire' %]
+            [%- IF NOT c.cobrand.is_defect(problem) %]
+                [% tprintf(loc('ref:&nbsp;%s'), problem.id) %].
+            [%- END -%]
         [%- ELSE %]
-            [%- external_ref_clause = tprintf(loc('%s ref:&nbsp;%s'), problem.external_body, problem.external_id) %]
+            [%- tprintf(loc('FixMyStreet ref:&nbsp;%s'), problem.id) %].
         [%- END %]
     [%- END -%]
-    [% duration_clause %]
-    [%- IF external_ref_clause %]
-        [%- IF duration_clause %]. [% END %]
-        <strong>[% external_ref_clause %].</strong>
-    [%- END %]
-    </p>
-[% END %]
+    </strong>
+</p>