aboutsummaryrefslogtreecommitdiffstats
path: root/t/cobrand
Commit message (Collapse)AuthorAgeLines
* [Zurich] Set report's public response before sending email to userDave Arter2015-10-06-2/+36
| | | | | | | | 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.
* [Zurich] Test that external message is visible for certain statesDave Arter2015-10-06-6/+6
|
* [Zurich] Override MAP_TYPE in tests where appropriateDave Arter2015-10-06-0/+20
|
* [Zurich] Tweaks to redirectHakim Cassimally2015-10-06-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-96/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Updated email templatesMatthew Somerville2015-10-06-14/+3
| | | | | | | - 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-110/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* Add "time spent" admin logging.Hakim Cassimally2015-10-06-2/+20
| | | | | | | | | | | | | | | | | | | | | 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] Attach images to external bodyHakim Cassimally2015-10-06-1/+103
| | | | See mysociety/FixMyStreet-Commercial#675
* [Zurich] 'photo required' functionalityDave Arter2015-10-06-0/+36
| | | | | | | | | | | - 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-3/+15
| | | | | | | | 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] all admin users can see statsHakim Cassimally2015-10-06-2/+2
| | | | | | | 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.
* Simplify/consolidate body restriction db code.Matthew Somerville2015-08-19-9/+8
| | | | | | | 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.
* Remove ms_current_timestamp() override function.Matthew Somerville2015-08-13-1/+1
| | | | | This override is not used anywhere, it dates from a very old long-gone test script, and causes issues with database query planning.
* [Oxfordshire] Add status/category filtering to map pagesDave Arter2015-07-23-0/+50
|
* [Zurich] add columns to stats exportHakim Cassimally2015-03-31-1/+1
| | | | | | | | | | | | | | | - 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
* Add Extra role to ease use of {extra} field.Hakim Cassimally2015-03-20-3/+26
| | | | | | | | | 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.
* [fixmystreet.com] Remove special Report-It code.Matthew Somerville2015-03-13-2/+1
|
* Factor out test contact creation to function.Matthew Somerville2015-03-13-30/+8
|
* Make sure all co-ordinates are stringified.Matthew Somerville2015-02-13-0/+23
| | | | | | | 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.
* Add tests for admin message, cobrand email alert.Matthew Somerville2015-01-20-1/+22
|
* By default, use area-based alerts.Matthew Somerville2014-12-12-37/+33
| | | | | | | | | The body-based alert only works if the body ID matches the MapIt ID. This fixes #959. Further work needs to be done to enable proper body-based alerts that work properly in all circumstances. Consequently, factor out fixed body IDs from many tests. Also fix a couple of tests not overriding geocoder correctly.
* Fix encoding of signature in emails.Matthew Somerville2014-12-10-0/+103
| | | | | This text was being imported encoded, which led to double-encoding when used in templates. Fixes #960 and #961.
* [Warwickshire] cobrand workDave Arter2014-10-16-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First Warwickshire styling - imported WCC's header and footer files - Use Warwickshire colours for page elements - Include FMS elements in header - Use correct Warwickshire colours on map - Use full-screen map on desktop. - Improve display of homepage elements - Ensure correct classes are added to body tag - Make sure site header has correct height on front page - Tidy-up of unused header content and wrappers - Improve display of map - Position map beneath other elements Improve map display - Take some CSS from Warwickshire styles to ensure its applied - Fix container widths on map page - Make sure map wrapper is the correct width - Add style overrides to match Warwickshire.gov.uk - Ensure map controls are visible Nav and mobile styling - Make sure sticky sidebar nav is usable - Improve mobile front page - Ensure map is full-screen on mobile - Improve front page display on mobile - Fix map display on desktop - Fix Warwickshire and FMS nav on mobile - Add viewport meta tag for mobile devices - Tighten up vertical spacing on front page - Fix header height on tablet size screens - Set pan/zoom position in CSS, not JS Styling tweaks - correct styling of nav for wider screens (previous hidden by media query) - Add draft Warwickshire FAQ - Fixes https://github.com/mysociety/FixMyStreet-Commercial/issues/611 - Warwickshire. remove all reports link as requested. - see https://github.com/mysociety/FixMyStreet-Commercial/issues/609 - Update WCC footer - see https://github.com/mysociety/FixMyStreet-Commercial/issues/597 Bring WCC css locally, and override - Override for https://github.com/mysociety/FixMyStreet-Commercial/issues/612 - favicon https://github.com/mysociety/FixMyStreet-Commercial/issues/616 - update contact details - custom FAQ - fix padding on mobile https://github.com/mysociety/FixMyStreet-Commercial/issues/617
* UK. Generic problems_clause for two-tier councilsHakim Cassimally2014-10-10-0/+28
| | | | | | Replace copy-pasted problems_cause declarations in Hart, Oxfordshire, and East Sussex with a generic override in UKCouncils.pm (as a bonus also overrides Stevenage)
* [SeeSomething] fix and test for stats contentHakim Cassimally2014-07-31-1/+50
|
* Replace from_council with from_body in SeeSomething cobrandSteven Day2014-07-31-0/+39
| | | | | | | | | | | | | | | | | | | | | | 'from_council' was renamed to 'from_body' and turned into a relationship in b2aa34b Feb 2013, and the seesomething code was missed. Though the FMS::DB::Result::User object would (correctly) throw an error if an invalid method is called, *Catalyst* idea of a user object wraps this in a Catalyst::Authentication::Store::DBIx::Class which uses AUTOLOAD to delegate methods and swallows the error. e.g. this code always returns false, hence the code path is never run. (I think this is a bug and have opened: https://rt.cpan.org/Ticket/Display.html?id=97640 ) Added test case and (hopefully) corrected template, will need a check against site running copy with recent data to check that nothing looks squiffy. We also had to change the %council_details stash, which was based on the old code, not sure if suggested fix matches original intent, but looks plausible. (As discussed with @dracos @stevenday this is slightly repeated, and should arguably use ->{bodies} but that's a possible future FIXME)
* Removal old Southampton/Reading/Lichfield cobrands.Matthew Somerville2014-07-29-1/+1
|
* Fix test of postcode that has moved ever so slightly.Matthew Somerville2014-05-30-5/+5
|
* Add MAPIT_GENERATION variable, to pin whitelist.Matthew Somerville2014-05-16-1/+3
| | | | | | Otherwise, when MapIt Global is updated, the 'point' lookup, as it only returns the current generation by default, might no longer return the areas present in the whitelist.
* Add some overrides to zurich tests to stop failureStruan Donald2014-04-08-0/+4
| | | | Make sure mapit_id_whitelist set for tests that submit
* [Hart] basic Hart cobrandingHakim Cassimally2014-03-05-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally copied from template of Bromley code, substituting logo, council ID, geolocation data, and renaming .scss variables etc. (NB: this was a bad idea. As per notes/cobranding.txt, should have started with less copying of files, as this required more cleanup. Bromley's code has some particularities, like smaller map, split First/Last name fields and so on. The current branch has been rebased to present a slightly idealised picture of the process.) (Includes contributions by @davea and @stevenday) * Some code cleanup and added is_two_tier * Add Hart-specific links to footer * Shift FMS nav out of the main header * Update styling to follow design more closely * Flip nav colours to better indicate links * Make header banner entire width of the page * Stretch footer bg to entire width of page * Add top-level nav links * Correct header height on mobile * Correct wording of top menu item * Remove FMS logo from top of page * Shift top level nav to correct position * Invert media query so IE8 displays header properly * hide folding triangle, as makes no sense on this cobrand * Some more renaming of Bromley to Hart * Treat Hart the same as Bromley in the JS * Whitespace/formatting fixes * Basic test for cobrand * Javascript #map_box fixes * Make sure #map_box is not in desk-only * ensure there is only single map (one .wrapper only) * colour tweaks * Fix example places (postcode, spelling) * Basic FAQ text * Set Zoom level 3 * CSS/HTML/JS tweaks removing Bromley customizations * Switch templates to put navigation in footer, as FMS.com does * remaining HTML/CSS changes for large map * replace favicon * move site-logo scss to one place * make small logo transparent
* Fix test breakageHakim Cassimally2013-12-23-6/+23
| | | | for Zurich tests, count how many reports already exist as a baseline.
* [Zurich] don't hardcode division ID in cleanup()Hakim Cassimally2013-12-23-8/+9
|
* [Zurich] admin template to respect closed_overdueHakim Cassimally2013-12-20-1/+5
| | | | | | | | | | | | | This value is now cached, but the template calls the function, calculating it anew, so for old reports (closed within SLA) the problem_row.html template showed these as overdue. Instead, we point the template at a function which first checks the cached value. (Attempting to roll this functionality into the .overdue() method itself caused a fair amount of collateral test breakage, and it seems safest to extract the caching function for now.) Closes https://github.com/mysociety/FixMyStreet-Commercial/issues/462
* [Zurich] stats export include 'hidden'Hakim Cassimally2013-12-17-11/+19
| | | | | | | | | | See https://github.com/mysociety/FixMyStreet-Commercial/issues/461 Again, we just need to substitute the %params line (which elides hidden reports) for the less restrictive %date_params. This commit includes very basic tests for the previously untested ?export=1 functionality.
* [Zurich] testing - create superuser earlierHakim Cassimally2013-12-10-2/+7
| | | | So that tests pass on clean dataset such as travis...
* [Zurich] also allow hidden reports for closed_overdueHakim Cassimally2013-12-10-2/+2
|
* [Zurich] fix moderated statistics to include hiddenHakim Cassimally2013-12-10-53/+127
| | | | | | As per comments after testing mysociety/FixMyStreet-Commercial#459, the business logic of the actual state changes is fine, but the stats do also then need to include hidden records.
* [Zurich] log admin changesHakim Cassimally2013-12-09-0/+10
| | | | | To allow us to infer additional stats changes requirements such as in mysociety/FixMyStreet-Commercial#459 better in future.
* [Zurich] move mech test into override_config stanzaHakim Cassimally2013-12-09-2/+2
| | | | | This was causing previous test failures when config != Zurich, due to expected logic not getting triggered.
* [Zurich] test factor out cleanup() routineHakim Cassimally2013-12-09-4/+9
|
* [Zurich] test /admin/statsHakim Cassimally2013-12-09-0/+39
| | | | | | | First test that this page is only available to superuser. Then test that the moderated and fixed stats are doing something that is (hopefully) the spec in mysociety/FixMyStreet-Commercial#459
* [Zurich] test moderated_overdueHakim Cassimally2013-12-09-0/+43
| | | | | | - is set to 0 on state change within time-limit - is set to 1 on state change after time-limit - only marks overdue on first time
* If only one cobrand given, always use it.Matthew Somerville2013-11-07-31/+72
| | | | | | | | | If the ALLOWED_COBRANDS configuration variable only contains one entry (and also work if it's a string rather than a list), always use that cobrand, no matter what the hostname is. The example Vagrantfile no longer needs the configuration changes at all.
* More accurate config overriding for Zurich.Matthew Somerville2013-10-24-2/+6
|
* Fix test suite to run regardless of config setup.Matthew Somerville2013-10-24-119/+195
|
* [Zurich] Remove phone number requirement for mobile app reportsChris Mytton2013-10-21-0/+23
| | | | | | | | | | | | | | | | | The phone number was made mandatory in #541. To make this change compatible with older versions of the mobile app I've had to drop server side validation of the phone number for requests that come in from mobile apps. To determine if it's a mobile request I'm checking the 'service' parameter in the request, which is only set in requests from the mobile apps [1]. The phone validation will still happen client side for the newer versions of the app, and the web app will continue to work with the server side validations. [1] https://github.com/mysociety/zurich_mobile/blob/1fec2bc21dad9326819105cdbf5d47183e7503ba/www/js/models.js#L75
* Fix Bromley use of 'no further action'.Matthew Somerville2013-09-25-0/+45
| | | | | If SET isn't given, the line means [% foo = ('bar' IF baz) %] rather than [% ([SET] foo = 'bar') IF baz %].
* [Zurich] Default to not sending rejected emailsChris Mytton2013-09-20-1/+1
| | | | Closes mysociety/FixMyStreet-Commercial#410
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 15:59:56 +0000