| Commit message (Collapse) | Author | Age | Lines |
|
|
|
|
|
|
|
| |
The 'public response' to a problem was being omitted from the email sent to the
user when the problem is closed, because the email was sent before the report's
'extra' field was updated with the response body text.
This commit sets the public response on the problem before sending the email.
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
See mysociety/FixMyStreet-Commercial#690
I understand redirection to summary page was introduced at ZWN's request,
to make it easy to
process reports and then quickly move onto the next one.
However, during testing now, Tobias has mentioned this is a) slowing
things down and b) confusing because it's not obvious that the report
has been saved.
I've tried to address (b) by adding the "Aktualisiert!" message when
you are redirected.
Also, for (a) I've removed the redirection from a few cases, and
disabled it for superuser. If need be, I can remove redirection from
more (or all) cases.
Fix Official answer/Reply to user
- hide label for status update on state change
- correct wording on button for closure (single wording)
- correct wording on label for user reply (either "Official answer" or "Reply to user" as appropriate)
- Make sure the official response texts are shown for edit/static as appropriate, and test.
- javascript improvements
- honour public status update for Extern/Wunsch too
- don't show public message for Wunsch
- Ignore all other fields when rotating photos.
(See mysociety/FixMyStreet-Commercial#718)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Requirements:
=============
1: DM to be able to mark a problem as Wish, Extern, Not contactable,
Hidden, Jurisdiction unknown
2: SDM to be able to mark a problem as Not contactable.
3: DM to be able to add information to such a problem, and trigger
emails to external agencies, and to user, closing the problem at the
same time.
4: Closed reports must be categorized as Wish/Extern/NC/Hidden/JU for
statistical reporting
5: Non-closed reports must appear as open, to allow DM to see them in
the list, similar to what is currently done for Ruckmeldung Ausstehend
(Feedback outstanding).
5b: however "Hidden" problems must be immediately hidden from public
view.
Proposal:
=========
a) Requirement 1 will be carried out in exactly the same way by
DM. e.g. Category dropdown select
b) Requirement 2 will be carried out in exactly the same way by SDM.
e.g. "Not contactable" button
c) BUT, for a), c), the category will be diverted to "Ruckmeldung
Ausstehend" (Feedback outstanding), and metadata will be saved with the
appropriate closure type.
d) NOTE: this means the report will still be visible to public as "In
bearbeitung" (Except for Hidden reports, as per 5b)
e) The extra fields will be presented on the "Ruckmeldung Ausstehend"
page, just as defined in the PDF, depending on the metadata. e.g.
- Wish: Zustaendige Stelle + Message
- Extern: External body + Message2
- Not contactable: (no extra info)
- Hidden: (no extra info)
- Jurisdiction unknown: (no extra info)
f) When the DM publishes the answer (e.g. "Antwort Veroeffentlichen"
button), the state will normally change to Fixed. BUT in the new cases,
the metadata saved in step c) will be checked, and the report will
change state to Wish/Extern/Not contactable/Hidden/Jurisdiction unknown,
as appropriate. The report will now be visible/hidden as previously
discussed depending on the new state.
g) If the report is edited again (in /admin/report_edit) it will be in
the relevant state, and any extra fields will be visible as per e).
Those fields may be updated.
Alternatively, the state may be changed, possibly triggering a) again,
and clearing any metadata.
- Fix javascript interactions 690
- show new statuses in summary
- fix photos on SDM page
- fix Planned => Planned+metadata transition
- stop "assignation .select" js affecting templates
- fix redirection for Extern and generally
See mysociety/FixMyStreet-Commercial#672, mysociety/FixMyStreet-Commercial#690
|
|
|
|
|
|
|
| |
- submit-external-wish.txt includes a link with report's coordinates, template values are interpolated
Conflicts:
perllib/FixMyStreet/SendReport/Zurich.pm
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
See mysociety/FixMyStreet-Commercial#690
- external_message for Extern/Wunsch states
- as per PDF mockups, the "public response" field is now editable
from more states, namely:
- Ruckmeldung ausstehend
- Extern
- Zustandigkeit unbekannt
- Wunsch
- Nicht kontaktierbar
- Unsichtbar
- test fixes
NB: slight hack to reorder Zurich report_display tests
As these remove 'investigating' from hidden_states, these break
tests for default cobrand (the FMS::App code expects to be called
once on request start, not multiple times within one test)
- Not contactable button
and tests for this and the similar `send_back` functionality
(previously untested).
NB: Unsure why we need to specify form_number=2 just for these submits,
but test won't find the buttons otherwise.
- Make sure SDMs' "time_spent" figure is recorded.
(See mysociety/FixMyStreet-Commercial#718)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Mechanism is general, but current implementation only used
for Zurich.
- Zurich: Record time_spent field mysociety/FixMyStreet-Commercial#676
- template changes (including jQuery spinner)
- backend changes to save data are made:
- in log_edit, if supplied
- and time on category change (and arbitrary actions)
- Add update_admin_log to all paths for DM, ensuring that it gets called,
while resetting the `time_spent` parameter, to make sure that
there is never a duplicate record created.
- Also quell warning about using DateTime values in query.
- Also add (seemingly unrelated) parens to stop misparsing of OK line in
questionnaire test now that DT::Format::Pg is used in Zurich cobrand
See mysociety/FixMyStreet-Commercial#676
|
|
|
|
| |
See mysociety/FixMyStreet-Commercial#675
|
|
|
|
| |
Required by Zurich for mysociety/FixMyStreet-Commercial#675
|
|
|
|
|
|
|
|
|
|
|
| |
- Save 'photo_required' value in Contact->extra from admin edit form
- Enforce per-category photo requirement on new reports
A new step has been added to the photo upload process that
ensures a photo is present if any of the categories chosen for
the report require it.
If the photo is missing an error is displayed to the user in the
same manner as if the photo upload was invalid.
- Add test of mandatory photo categories
|
|
|
|
|
|
|
|
| |
For Zurich, see mysociety/FixMyStreet-Commercial#664.
This commit includes a new PhotoSet class (NB: called Model:: though not
really a model), should handle binary data (e.g. old style photos in
database), fileids (40-char hash), and Catalyst::Upload objects.
|
|
|
|
|
|
|
| |
Admin CR4 https://github.com/mysociety/FixMyStreet-Commercial/issues/673
seems like admin_pages should be able to generate the menu, but
this change also needs template change.
|
| |
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
Treat an update left during a questionnaire the same as one left on a
report page, ie. pass it through cleanup_text. This will also make sure
updates left that are wholly whitespace are errored, or replaced with
the default text.
|
|/
|
|
| |
Fixes #1210.
|
|\ |
|
| |
| |
| |
| |
| | |
It’s best if Zurich keeps the old text, so now they have their
own overrides for those template files.
|
|/
|
|
| |
Fixes #1104.
|
|
|
|
| |
SW1A 1AA has moved, who'd have thought.
|
|
|
|
|
|
| |
If a cobrand has a body restriction, then a report without any body
won't be shown on it, so we need to make sure links to the report (in
email alerts and RSS) are to the base URL, not the cobrand.
|
|
|
|
|
|
|
| |
Make dashboard work properly in two-tier councils, showing reports sent
to both. Create an index on the array of the bodies_str column to speed
up performance, and use that throughout the code replacing all LIKE
scans. This also enables a simplifying tidy of the restriction code.
|
| |
|
|
|
|
|
| |
This override is not used anywhere, it dates from a very old long-gone
test script, and causes issues with database query planning.
|
|\ |
|
| |
| |
| |
| |
| | |
Also move some UK-specific code in the same function.
The specific code is still tested in report_new.t.
|
| | |
|
|/ |
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add a special category email address used to show an unresponsive
message and page when trying to report in that category. Add a "Refused"
send method for setting a whole body to be unresponsive and show the
message immediately, not on category selection.
Factor out category template, and put at top where needed.
|
|/ |
|
|
|
|
|
|
|
| |
Restrict email_sign_in token to one day, unused confirmation tokens to
one month. Used tokens will redirect to the created thing but not log
in; don't log in with alert links (unsubscribe link never expires, reply
link will still show "reopen" tickbox).
|
| |
|
| |
|
|
|
|
| |
To allow visible/hidden states to be manipulated at runtime.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Original Report description
- Amended Report description (unsure what this is)
- Media URL (currently one picture, in the future 1-3 pictures)
- Interface used (see open311)
- Requested datetime (see open311) (seems to be same as
created)
- Agency sent datetime (see open311)
- Updated datetime (see open311)
- Council-Response
- title
as per https://github.com/mysociety/FixMyStreet-Commercial/issues/678
|
|
|
|
|
|
|
|
|
| |
Historically, the extra field has been used in two different ways by
different cobrands, both as a list (e.g. Open311 category fields) and a
hash (e.g. the Zurich cobrand).
This commit consolidates usage, adding an API to make use of the field
easier and always returning a hash for the code to use. Fixes #1018.
|
|
|
|
|
| |
This is now handled by normal bodies in the admin. In order to remove
references in send_reports, tidy up (unused) EmptyHomes code a bit.
|
| |
|
| |
|
|
|
|
| |
Fixes #1011.
|
| |
|
|
|
|
|
| |
Rather than redirecting to the report if they're already logged in.
Fixes #1003.
|
| |
|
|
|
|
|
|
|
| |
This includes MapIt postcode lookups, geocoding, query parameters, tile
clicks. Stringifying truncates them to six decimal places, which means
we no longer need any "short" versions anywhere, and the JSON response
will always uses a decimal point regardless of locale.
|
| |
|
| |
|