aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * | [Zurich] Tweaks to redirectHakim Cassimally2015-10-06-65/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | [Zurich] additional closure statuses workHakim Cassimally2015-10-06-175/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | [Zurich] Refactory admin note styling so it can be used in print modeZarino Zappia2015-10-06-46/+46
| | | | | | | | | | | | See mysociety/FixMyStreet-Commercial#677
| * | [Zurich] Hide form elements from report admin print outputZarino Zappia2015-10-06-12/+14
| | | | | | | | | | | | See mysociety/FixMyStreet-Commercial#677
| * | [Zurich] improve admin view density for small screensZarino Zappia2015-10-06-108/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See mysociety/FixMyStreet-Commercial#674, mysociety/FixMyStreet-Commercial#673 - two-column layout on admin map pages - tightening up admin button sizes and optional labels - stack admin notes vertically, to avoid overflowing table layout - improve display of zurich admin notes and answers - only print admin note headings if there are notes - slightly shorter textareas in admin UI - simplify display of non-editable problem info, as per customer’s suggestion
| * | [Zurich] Updated email templatesMatthew Somerville2015-10-06-94/+50
| | | | | | | | | | | | | | | | | | | | | - submit-external-wish.txt includes a link with report's coordinates, template values are interpolated Conflicts: perllib/FixMyStreet/SendReport/Zurich.pm
| * | [Zurich] admin workflow changes available statesHakim Cassimally2015-10-06-279/+558
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | [Zurich] new status flagsHakim Cassimally2015-10-06-26/+41
| | | | | | | | | | | | | | | | | | | | | Have moved the generation of banner text from the template into problem_as_hashref See mysociety/FixMyStreet-Commercial#672
| * | [Zurich] prevent invalid bodies_strHakim Cassimally2015-10-06-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | See issue in mysociety/FixMyStreet-Commercial#663 with problems not appearing in the "Erfasst" filter. It looks like Zurich requires a single id in the `bodies_str` (like '4'), and may rely on the configuration of bodies/contacts in database to be perfect to avoid them becoming something like '4|47,48'.
| * | [Zurich] Display problem extras on report edit page for DM & superuserDave Arter2015-10-06-0/+9
| | | | | | | | | | | | Part of mysociety/FixMyStreet-Commercial#663
| * | Add "time spent" admin logging.Hakim Cassimally2015-10-06-9/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | [Zurich] Response templates for report admin.Hakim Cassimally2015-10-06-11/+300
| | | | | | | | | | | | | | | | | | | | | This provides a ResponseTemplate model that an admin/staff user can choose from when responding to problems. For mysociety/FixMyStreet-Commercial#671.
| * | [Zurich] Attach images to external bodyHakim Cassimally2015-10-06-2/+130
| | | | | | | | | | | | See mysociety/FixMyStreet-Commercial#675
| * | Allow attachment of emails in email_sendHakim Cassimally2015-10-06-11/+285
| | | | | | | | | | | | Required by Zurich for mysociety/FixMyStreet-Commercial#675
| * | Fix handling From/To header in new Email::Simple.Matthew Somerville2015-10-06-32/+18
| | | | | | | | | | | | | | | | | | | | | Newer versions of Email::Simple (2.104+) treat arrayrefs in headers by fetching the first item only in scalar context. Our snapshot installs 2.102, so this shouldn't be an issue, but we might as well bypass Email::Simple for those headers.
| * | [Zurich] Make stats export media column blank if no photo.Hakim Cassimally2015-10-06-1/+4
| | |
| * | Improvements to bin/geocodeHakim Cassimally2015-10-06-9/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix behaviour of ALLOWED_COBRANDS checking - ... inferring cobrand if only one is allowed - new --use-cache option (defaulting to false) - better diagnostics - Can be manually uncommented and tested against bin/geocode script. See mysociety/FixMyStreet-Commercial#710
| * | [Zurich] reduce number of pins on /reportsHakim Cassimally2015-10-06-0/+2
| | | | | | | | | | | | | | | For mobile, but should be done via same mechanism. See mysociety/FixMyStreet-Commercial#670
| * | [Zurich] FAQ text updateHakim Cassimally2015-10-06-71/+39
| | | | | | | | | | | | | | | | | | As per email from Tobias 21st April See mysociety/FixMyStreet-Commercial#704, mysociety/FixMyStreet-Commercial#666
| * | [Zurich] 'photo required' functionalityDave Arter2015-10-06-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | Add support for multiple photos per report.Hakim Cassimally2015-10-06-166/+567
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | [Zurich] Make phone number mandatoryHakim Cassimally2015-10-06-1/+1
| | |
| * | [Zurich] Provide a setup-contacts command.Hakim Cassimally2015-10-06-0/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for Zurich (and generic data), progressing mysociety/FixMyStreet-Commercial/issues/663, to provide a way for body/contact config to be consistent across dev/staging/live. Run like so: bin/setup-contacts zurich e.g. with the lower-case sigil describing the cobrand to run setup-contacts for.
| * | [Zurich] Improve report print stylesZarino Zappia2015-10-06-8/+59
| | | | | | | | | | | | - also remove 10px gap from left hand side of logo on screen
| * | [Zurich] Use new map tiles up to 1:250Dave Arter2015-10-06-32/+164
| | | | | | | | | | | | | | | - Refactor map tile size into a constant - Update map tiles to use new Zurich WMTS server directly instead of Apache proxy
| * | [Zurich] Vary confirmation email wording if address is confirmedHakim Cassimally2015-10-06-1/+13
| | | | | | | | | | | | See mysociety/FixMyStreet-Commercial#669
| * | [Zurich] Add clearer instructions to photo upload.Hakim Cassimally2015-10-06-1/+4
| | | | | | | | | | | | | | | To improve photo quality. See mysociety/FixMyStreet-Commercial#666
| * | [Zurich] all admin users can see statsHakim Cassimally2015-10-06-4/+5
|/ / | | | | | | | | | | | | 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.
* / Fix questionnaire image sizing in Firefox.Matthew Somerville2015-10-05-2/+2
|/ | | | | | | | | | | | A 100% max-width img within an inline-block within a fixed width wrapper behaves differently in Firefox to other browsers; other browsers use the width of the fixed width wrapper, whereas Firefox uses the width set for the img. Given an identically set-up div, all the browsers use the width of the div rather than the fixed width wrapper, so Firefox appears to be behaving more consistently. The easiest solution is to change the inline-block to display: block, as the inline-block is alone within a floated fixed width div. Fixes #1243.
* Exclude deleted categories from the all reports page filtersSteven Day2015-10-01-1/+24
|
* Don't set whole background style in issue-list cssSteven Day2015-10-01-6/+6
| | | | | | | | | | | | The use of the background shorthand was causing cobrands which override this to have unexpected styling issues because it only set a colour, not the other background properties. This commit makes it more specific to just use background-color. Also fixes a case in Greenwich's css where this was being overriden in a similar way to just use background-color as well. Fixes #1238
* Include base link in navigation on admin pages.Matthew Somerville2015-10-01-10/+19
| | | | This helps if the admin is being proxied. Fixes #1206.
* [fixmycommunity.ug] Ignore external files.Matthew Somerville2015-09-29-0/+2
|
* Allow underscore in cobrand name/data in database.Matthew Somerville2015-09-29-6/+35
|
* Add new high-res default OpenGraph image.Zarino Zappia2015-09-29-4/+5
| | | | Fixes #1184.
* Merge remote-tracking branch 'origin/blank-questionnaire-text'Matthew Somerville2015-09-28-0/+12
|\
| * Process update left as part of questionnaire.Matthew Somerville2015-09-28-0/+12
| | | | | | | | | | | | | | 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.
* | Merge branch '1205-hardcoded-site-name'Matthew Somerville2015-09-28-197/+96
|\ \
| * | A slightly better translation string on alert pageMatthew Somerville2015-09-28-116/+16
| | | | | | | | | | | | Fixes #348. Also combine base/fixmystreet _list.html templates in one.
| * | Remove remaining hardcoded site name from strings.Matthew Somerville2015-09-28-83/+82
| | | | | | | | | | | | Add a site_name template parameter available to all templates.
* | | Send altered confirmation email if not being sent.Matthew Somerville2015-09-28-2/+46
|/ / | | | | | | Fixes #1210.
* / Streamline navigation menu CSS.Matthew Somerville2015-09-28-355/+263
|/ | | | | Reduce need for specificity. Also fix some bugs in Harrogate base menu display, and couple of other cobrand tweaks.
* Make sure Vagrantfile checks out git submodules.Matthew Somerville2015-09-24-0/+11
| | | | Fixes #1197. Thanks to Dave Arter for helping out with this.
* Merge remote-tracking branch 'mysociety/1164-up-to-date-maintenance'Matthew Somerville2015-09-22-21/+90
|\
| * Bring down page up to date, and work via proxy.Matthew Somerville2015-09-21-21/+90
| | | | | | | | Fixes #1164.
* | Merge remote-tracking branch 'mysociety/838-giant-map-icon'Matthew Somerville2015-09-22-0/+1
|\ \
| * | Add missing background-size to retina image.Matthew Somerville2015-09-22-0/+1
| |/ | | | | | | Fixes #838.
* | Merge remote-tracking branch 'mysociety/1093-physical-address'Matthew Somerville2015-09-22-0/+21
|\ \
| * | Add physical address and more opt out instructionsMatthew Somerville2015-09-21-0/+21
| |/ | | | | | | Fixes #1093.
* | Merge remote-tracking branch 'mysociety/1077-recursive-path'Matthew Somerville2015-09-22-0/+3
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 05:17:47 +0000