Commit Graph

618 Commits

Author SHA1 Message Date
56f58284f9 Merge pull request '138_New_map_client' (#166) from 138_New_map_client into master
Reviewed-on: SGD-Nord/konova#166
2022-05-27 08:27:08 +02:00
c0595760ab Merge branch 'master' into 138_New_map_client
# Conflicts:
#	konova/models/geometry.py
#	konova/urls.py
#	locale/de/LC_MESSAGES/django.mo
#	locale/de/LC_MESSAGES/django.po
2022-05-25 09:22:15 +02:00
714d888326 #138 Configuration extended
* adds more layers and subfolders to the layer tree
* changes colours for tools
2022-05-25 09:11:54 +02:00
42592c5bdf #138 Netgis map client
* updates netgis map client to most recent version
* removes trigger delay on clicking events
* adds further customization options to config.json
2022-05-23 16:02:28 +02:00
1f998ebf76 Merge pull request '#164 Retranslating' (#165) from 164_Retranslate_binding_on_date into master
Reviewed-on: SGD-Nord/konova#165
2022-05-23 15:36:58 +02:00
526178ce56 #164 Retranslating
* retranslates Bestandskraftdatum
2022-05-23 15:36:28 +02:00
8b6dbdff8a Merge pull request '160_Number_of_parcels' (#162) from 160_Number_of_parcels into master
Reviewed-on: SGD-Nord/konova#162
2022-05-19 09:12:46 +02:00
6fd3c4c179 #138 WIP update
* implements new build for netgis map client
2022-05-12 13:22:46 +02:00
0b4b664265 #160 Parcel calc fix
* fixes minor bug where invalid geometry (self intersecting) could not be used properly as input for WFS parcel intersection calculation
    * future enhancements regarding map client will make sure invalid geometries can not be added in the first place
2022-05-11 16:03:53 +02:00
3535aba30f #160 Parcel number to parcel table
* adds number of all underlying parcels into parcel table
* reworks minor code parts of parcel related logic
* fixes bug where under certain circumstances a parcel would have been added twice to a geometry
* removes unused parcel fetching on intervention detail view
2022-05-11 15:52:29 +02:00
21d1fabeec Merge pull request 'js_tree_element_improvement' (#161) from js_tree_element_improvement into master
Reviewed-on: SGD-Nord/konova#161
2022-05-11 13:17:20 +02:00
eb763a94fb JS Tree enhancement
* extends compensation state forms to match the new logic
* adds minor changes for tests
2022-05-11 10:16:34 +02:00
5fe27e02ec WIP: JS Tree
* simplifies js for single-select radio tree
2022-05-11 08:41:37 +02:00
a5d24e6db5 WIP: JS Tree improvements
* adds optional short_name rendering for selectable codes
* refactors autocomplete field for compensation state into custom js tree widget
* adds single select (radio) alternative to tree widget templates
2022-05-10 16:41:46 +02:00
18789c231d Visual enhancement for custom JS tree widget
* adds proper css behaviour for collapsed icon
* adds minor js comments
2022-05-10 15:07:21 +02:00
bec9c967b9 Merge pull request 'Update docker' (#159) from master into Docker
Reviewed-on: SGD-Nord/konova#159
2022-05-09 14:03:12 +02:00
a7b8752119 Merge pull request 'Docker_worker_enhance' (#155) from Docker_worker_enhance into Docker
Reviewed-on: SGD-Nord/konova#155
2022-05-09 11:05:33 +02:00
2c2075fe4a Merge pull request '#156 Parcel WFS as geojson' (#157) from 156_Parcel_WFS_as_geojson into master
Reviewed-on: SGD-Nord/konova#157
2022-04-27 12:18:47 +02:00
c9c918bae1 #156 Parcel WFS as geojson
* refactors fetching of parcels via wfs from xml to json for easier and faster processing
2022-04-27 12:12:56 +02:00
7027e0c02b Docker enhancement
* optimizes image build dependency
* increases gunicorn default number of workers
2022-04-26 10:09:58 +02:00
80de57a087 WIP: Docker enhancement
* reduces all needed containers into a single one
* simplifies initial startup command by adding docker-entrypoint.sh
2022-04-26 08:55:07 +02:00
7d29dddd22 WIP: Docker enhancement
* reduce containers into a single one, holding nginx + celery + redis all at once
2022-04-25 16:07:38 +02:00
f93e2b8463 HOTFIX: API
* hardens atom_id input to be integer or string compatible
2022-04-25 13:47:07 +02:00
377428a699 HOTFIX: EGON sending via API
* adds EGON message triggering on API payment changes
2022-04-25 13:28:51 +02:00
db05dbaf82 Merge pull request '#149 Send on changes' (#154) from 149_EGON_sending into master
Reviewed-on: SGD-Nord/konova#154
2022-04-25 11:17:34 +02:00
854382dc9a #149 Send on changes
* changes trigger for sending data to EGON: on each new payment, edited payment or deleted payment action, the data will be sent to EGON instead only once on "recording"
2022-04-25 11:16:51 +02:00
428f534c0d Merge pull request '151_Parcel_table_infinite_scroll' (#153) from 151_Parcel_table_infinite_scroll into master
Reviewed-on: SGD-Nord/konova#153
2022-04-21 14:37:38 +02:00
376a32182b #151 Parcel table infinite scroll
* refactors button for further loading to infinite scroll
* adds code documentation
2022-04-21 14:36:55 +02:00
2dff3cfce3 #151 Dynamic parcel table
* refactors parcel table into a dynamic table, which does not show all content at once but rather supports pagination and a button which triggers loading of more content
* adds translation
2022-04-21 14:19:35 +02:00
d332be2971 #138 config.json
* adds some layers and reorganizes config.json for NETGIS client
2022-04-20 14:32:28 +02:00
5e65156b54 #138 WIP Validity
* adds geometry validity checks for SimpleGeomForm is_valid()
    * shows validity problems on the form if a feature is invalid
* optimizes merging of different features into one MultiPolygon
* further enhances tests
* adds as_feature_collection() method on Geometry model for converting geom MultiPolygon attribute into FeatureCollection json holding each polygon as an own feature -> makes each polygon selectable in new netgis map client
2022-04-20 13:52:52 +02:00
8d34580090 #138 WIP Improvements
* adds geom back writing to form field in case of invalid geometry, so the invalid geometry will be shown again
* updates tests
* fixes bug where race condition of celery workers could lead to duplicates in parcels (needs migration)
2022-04-20 11:55:03 +02:00
eeccba3968 #138 WIP NETGIS Map client
* adds functionality for address search widget
    * drops default proxy.php (replaced by own python call)
* reduces maxZoom in config.json
2022-04-20 09:23:24 +02:00
d9ec0226fe #138 WIP First draft
* adds first working draft of netgis map client
2022-04-19 17:22:06 +02:00
3075ca8fec Merge branch 'master' into 138_New_map_client 2022-04-19 14:08:20 +02:00
1ea4cb7297 Merge pull request '140_Improve_check-record_reset' (#152) from 140_Improve_check-record_reset into master
Reviewed-on: SGD-Nord/konova#152
2022-04-19 14:06:42 +02:00
5f1f2a933e #140 Tests
* adds workflow tests for major datatypes
2022-04-19 14:04:20 +02:00
a9555f7bda #140 Enhancements
* fixes InterventionAutocomplete bug, where team-shared entries would not pop up as valid option
* fixes bug where form opening for new compensation without direct intervention link resulted in 404
* adds intervention-recorded check on deduction forms: Form is invalid if intervention is currently recorded and therefore blocked for any editing
* extends basic check_for_recorded_instance() method to let some forms pass, e.g. deduction related forms on ecoaccounts which only have a reason to be rendered IF the entry is recorded
* adds/updates translations
2022-04-19 13:37:29 +02:00
a1c9966d02 #140 Block edit on recorded
* adds new modal form content template recorded_no_edit.html
* adds modal content change, such that no data can be edited on any form as long as the entry is recorded -> instead, users are informed on the form, that the recording state prohibits editing
* adds translations
2022-04-19 09:43:36 +02:00
12df2e7110 Merge pull request '146_Minor_improvements' (#150) from 146_Minor_improvements into master
Reviewed-on: SGD-Nord/konova#150
2022-04-14 14:13:14 +02:00
dd0b3c0680 #146 Record-unshare with default
* adds automatic unsharing with default-only users if entry is recorded
2022-04-14 08:37:43 +02:00
e029f8c61e #146 Team leave
* adds button and functionality for leaving a team
   * if the admin leaves the team, another user will be chosen as new admin automatically
* improves Team (django) admin backend
   * better control over user adding-removing
   * only added team members are selectable as admin
2022-04-13 15:52:41 +02:00
25d2b806ab #146 Clickable QR codes
* refactors QR codes on report views to be clickable as well (even supported through saved pdf)
2022-04-13 14:57:05 +02:00
23b6130907 #146 Share with fix
* fixes bug where editable icon on overview table would not glow if user has only team based shared access
2022-04-13 14:18:32 +02:00
8282509e2d #146 (Parcel) table
* set default rpp for overview tables from 5 to 10
* improves loading speed of parcel table
2022-04-13 14:07:01 +02:00
d3d4fac7d3 #146 Admins and update_all_parcels.py
* extends admin backend
    * adds found_in_codelists to KonovaCodeAdmin to see where a KonovaCode can be found in
    * improves rendering of after_states and before_states for all AbstractCompensationAdmins
    * adds geometry_id to all major datatype admin backends
    * adds st_area like calculation to geometry admin backend
* update_all_parcels
    * orders geometries by size (small to big) to process smaller geometries first and bigger later
    * adds more output to command for a better overview of what is just going on
2022-04-13 11:42:04 +02:00
4fc1ca9eed Merge pull request 'master' (#147) from master into Docker
Reviewed-on: SGD-Nord/konova#147
2022-04-13 08:48:19 +02:00
75bae95db7 Merge pull request '#144 Report improved' (#145) from 144_Improve_report into master
Reviewed-on: SGD-Nord/konova#145
2022-04-12 10:46:06 +02:00
e85a2294d9 #144 Report improved
* fixes bug in egon_export.py where missing payment date would result in non writing of gml
* fixes bug in egon_export.py which occured due to extension of parcel data fetching
* updates unavailable.html report content, such that users will understand why a recorded entry might not be visible, yet
2022-04-12 10:33:03 +02:00
157655a085 Merge pull request '#142 Localized date improved' (#143) from 142_Localized_date_format into master
Reviewed-on: SGD-Nord/konova#143
2022-04-12 09:06:05 +02:00