aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | | Display ‘pick an option’ placeholder for report extra dropdownsDave Arter2018-03-14-2/+5
| | |
* | | Prevent override of mobile nav visited links.Matthew Somerville2018-03-14-0/+3
| | |
* | | Fix broken map when logging to /report/new with active asset layersDave Arter2018-03-14-36/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event handlers for category changing were being added too early, before fixmystreet.map had been created. For cobrands with category grouping enabled this was causing a crash in the JS because the grouping code emits a category change event during its setup (which runs between fixmystreet.assets.add and .assets.init). This commit adds the event handlers for each layer during fixmystreet.assets.init - at point at which fixmystreet.map has been set up. Also extracts the code for initing each layer into its own function for clarity.
* | | Allow searching for user reports if you have the user_edit permissionDave Arter2018-03-14-3/+13
| | | | | | | | | | | | | | | This allows users (e.g. customer service staff) to search for a user's reports in the admin without being able to edit them.
* | | Preserve category extra values when form fields are reloadedDave Arter2018-03-14-0/+4
|/ / | | | | | | | | This commit re-sets the values of any form inputs when the category extra elements are reloaded, e.g. when the category is changed.
* | Merge branch 'issues/commercial/987-zurich-csv-updates'Matthew Somerville2018-03-14-929/+756
|\ \
| * | [Zurich] Switch to more modern database states.Matthew Somerville2018-03-07-295/+263
| | | | | | | | | | | | | | | | | | | | | The Zurich code was written a long time ago, and used overriding so that e.g. the hard-coded 'investigating' state referred to Wunsch (wish). Now that states are stored in the database, we can create ones specially for Zurich and use them instead. Hooray!
| * | [Zurich] Fix display of deleted categories in admin.Matthew Somerville2018-03-07-5/+5
| | |
| * | [Zurich] Let SDM view awaiting reports.Matthew Somerville2018-03-07-10/+21
| | |
| * | [Zurich] Make wish state publicly visible.Matthew Somerville2018-03-07-20/+18
| | |
| * | [Zurich] Add abbreviation option to contacts.Matthew Somerville2018-03-06-8/+25
| | |
| * | Add a way to store extra cobrand data on contacts.Matthew Somerville2018-03-06-0/+10
| | |
| * | Remove category_options_copy.Matthew Somerville2018-03-06-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | This variable existed to keep a copy of the categories before it was overwritten by report_edit_location (if a bad location was provided) calling the variable setup functions again. But really, the function shouldn't be overwriting the stash, it's only testing the lookup and so should restore the stash at its end.
| * | [Zurich] Factor two admin category forms together.Matthew Somerville2018-03-06-28/+18
| | |
| * | [Zurich] Add fixture script.Matthew Somerville2018-03-06-441/+254
| | | | | | | | | | | | Remove old unused setup-contacts code, superceded by fixtures.
| * | [Zurich] Admin stats/CSV per category.Matthew Somerville2018-03-06-22/+49
| | | | | | | | | | | | Adapt look of default dashboard filtering.
| * | [Zurich] Include user email/phone/name in CSV export.Matthew Somerville2018-03-05-2/+7
| | |
| * | [Zurich] Refactor to use same CSV generation code.Matthew Somerville2018-03-05-111/+93
| | |
* | | Merge branch 'js-event-handling'Matthew Somerville2018-03-14-79/+80
|\ \ \
| * | | Update some tight JS coupling to use events.Matthew Somerville2018-03-13-72/+72
| | | | | | | | | | | | | | | | Remove 'hooks' functions, and Split out USRN handling to its own object.
| * | | Minor refactor of assets object.Matthew Somerville2018-03-13-7/+8
| | |/ | |/|
* | | Merge branch 'warks-email-archive'Matthew Somerville2018-03-14-20/+66
|\ \ \ | |/ / |/| |
| * | [Warwickshire] Add archive script data.Matthew Somerville2018-03-14-20/+66
| | | | | | | | | | | | Add an update with each report closure.
* | | Show default start date on dashboard.Matthew Somerville2018-03-13-24/+12
|/ / | | | | | | This makes it clearer what is being shown.
* | Revert using a Devel::Cover::Report::Codecov fork.Matthew Somerville2018-03-12-1/+1
| | | | | | | | | | Our fork was merged upstream. This reverts commit 77d4d709.
* | Autofocus on 2FA input field.Matthew Somerville2018-03-12-1/+1
| |
* | Monitor whole conf directory in dev serverMatthew Somerville2018-03-07-1/+1
|/ | | | | When running on a Mac, the dev server only watches changes to directories, not files.
* Merge branch 'issues/commercial/974-closed-report-incorrectly-reopened'Matthew Somerville2018-03-02-4/+8
|\
| * [Zurich] Do not reopen closed reports by mistake.Matthew Somerville2018-03-02-4/+6
| | | | | | | | | | The code for moving a report to the intermediary state was running even if the report was in a closed state and had not been changed.
* | Merge branch 'issues/commercial/1007-zurich-planned-hidden-reports'Matthew Somerville2018-03-02-59/+47
|\ \
| * | [Zurich] Fix admin nav display on map pages.Matthew Somerville2018-03-02-21/+1
| | | | | | | | | | | | Plus remove some now-unneeded CSS.
| * | Fix post-edit issues on admin report edit page.Matthew Somerville2018-03-02-34/+37
| | | | | | | | | | | | | | | If you rotated a photo, updates and the category list weren't loaded. If you changed a report's state, the map pin colour was derived from the old state.
| * | [Zurich] Remove unneeded 'deleted' body indicator.Matthew Somerville2018-03-02-0/+4
| | |
| * | [Zurich] Show to-be-hidden reports until confirmedMatthew Somerville2018-03-02-4/+5
| |/
* / Edge-to-edge email content on narrow screensZarino Zappia2018-03-01-31/+46
|/ | | | | | | | | | | | | | | | | | | | The 5px cellpadding on the wrapper table was resulting in 15px of white space either side of emails when viewed on narrow screens. Which, on a window that could be as narrow as 320px, is a lot of wasted space! We only wanted the 15px of horizontal padding to be removed from the sides of the "main" content, leaving the top and bottom "hints" with some padding so that their text doesn’t crash up against the edge of the window on narrow screens. The easiest way to achieve this was to split the top and bottom "hints" out into their own slightly wider tables, with built-in cell padding. To make things simpler, the min- and max-widths are now stored in variables, and the changes also meant we could simplify the media queries controlling mobile breakpoints in modern email clients. Fixes #1928.
* Update translations from Transifex.Matthew Somerville2018-03-01-1275/+931
| | | | Looks like sq was missed due to incorrect last-modified date.
* Merge branch 'email-previewing'Matthew Somerville2018-03-01-113/+299
|\
| * Add development email previewer.Matthew Somerville2018-03-01-11/+201
| |
| * Use `report` more in email templates.Matthew Somerville2018-02-27-102/+98
| |
* | [UK] Properly align Dashboard bar chart value labelsZarino Zappia2018-03-01-2/+4
| |
* | [UK] Linebreak long Y-axis labels on Dashboard bar chartZarino Zappia2018-03-01-5/+24
| | | | | | | | | | | | | | | | | | Y-axis labels in the Dashboard ranking tables now break onto multiple lines if they are more than 4 words long. /web/vendor/chart.min.js showing as modified because we updated it to include a recent fix to label alignment on vertical scales: https://github.com/mysociety/Chart.js/commit/4130c31
* | Increase size of sub map linksZarino Zappia2018-03-01-10/+11
|/ | | | | | | | The tiny buttons could prove hard to trigger, especially on touchscreen devices, and with large screens now more commonplace, there’s no reason not to give them a few more pixels. One of a number of enhancements suggested in #1462.
* [UK] Improve Open311 update Bromley-only check.Matthew Somerville2018-02-23-2/+3
| | | | | The addition of e.g. questionnaire_id to an update's extra field means this check has to be more nuanced.
* [fixmystreet.com] Remove unused flex class.Matthew Somerville2018-02-23-15/+0
|
* Preserve category selection when using group UIDave Arter2018-02-22-3/+6
| | | | | | | | | | | | | When using grouped categories on the new report form, the selected category was being lost when dragging the pin or clicking elsewhere on the map. This was causing the asset layers to be hidden as well as the report extra input to be lost. I'd assumed that cloning an <option> element that was selected and adding it to the parent <select> would set the value of that <select> correctly, but that doesn't seem to be the case. Instead, this commit explicitly sets the <select>'s value after appending a selected <option> element.
* Allow invalid MapServer6 GML to be parsedDave Arter2018-02-22-0/+21
|
* Show hidden report extra fields on inspector formDave Arter2018-02-22-3/+3
|
* Preserve hidden fields’ values when saving inspector formDave Arter2018-02-22-1/+2
|
* Populate `usrn` field with USRN of clicked asset, if availableDave Arter2018-02-22-16/+105
| | | | | | | | | | | | | | | | | | | | | | | | Some cobrands require reports to include the USRN of the clicked road. This commit allows an asset layer to be added and designated as a 'USRN provider' by setting its `usrn_field` property when calling fixmystreet.assets.add. Initially this feature used OpenLayers' getFeatureFromEvent method, however that doesn't work if the layer isn't topmost. This is because it uses the clicked element in the DOM to determine which feature was clicked. This doesn't work if the layer you're trying to get the feature from wasn't actually the DOM element that was clicked. Instead, we add a new method, OpenLayers.Layer.Vector.getFeatureAtPoint method which takes a Point object and iterates through the features' geometries to find the matching point. To make things a little more user-friendly, if an asset isn't clicked directly we find the closest to the clicked point and use that for the USRN. To accomplish this, this commit factors out the ‘select nearest asset’ code into a new method OpenLayers.Layer.Vector.getNearestFeature, which takes a Point and a distance threshold and finds the nearest feature.
* Set asset layers’ z-indexes appropriately so they don’t cover the marker ↵Dave Arter2018-02-22-12/+19
| | | | layer
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 16:30:35 +0000