Commit Graph

929 Commits

Author SHA1 Message Date
be885306c5 #158 is_pik added
* adds model and form mixin for PIK
* integrates mixins for compensation, ema and ecoaccount
* adds migration files
* extends API
* extends API test data
* adds is_xy fields to compensation, ema and ecoaccount reports
* adds is_pik information to detail views
* adds/updates translations
2022-05-31 13:33:44 +02:00
8b67df7617 HOTFIX: Team sharing
* fixes bug where entries would show up on index views as they would be shared (are shared but using a 'deleted' Team, which still exists on the db)
2022-05-31 12:58:35 +02:00
ab9af7ae2f Merge pull request '169_Unknown_admin_on_teams' (#170) from 169_Unknown_admin_on_teams into master
Reviewed-on: SGD-Nord/konova#170
2022-05-31 09:48:33 +02:00
f085caac5d #169 Team delete-restore
* removes unused code snippets
2022-05-31 09:47:32 +02:00
7f8d900c10 #169 Team delete-restore
* adds tests for user app
2022-05-31 09:10:44 +02:00
e7031d0bc2 #169 Team delete-restore
* adds restorable delete functionality to Team model
* refactors minor code model parts by introducing DeletableObjectMixin
* only non-deleted Teams can be chosen for sharing
* deleted Teams can be restored using the proper function on the backend admin
* deleted Teams do not provide
* adds migration
2022-05-30 15:38:16 +02:00
8aa3fbd97a #169 Admin on teams
* adds admin column on team index view
* refactors Team model, so multiple members can become admins
* adds team migration for switch from fkey->m2m structure
* renames 'Group' to 'Permission' on user index view to avoid confusion between 'Groups' and Teams
* adds new autocomplete route for team-admin selection based on already selected members of the TeamForm
2022-05-30 14:35:31 +02:00
eb3b9eb5c1 Merge pull request '#163 Checked icons improvement' (#168) from 163_Checked_workflow_improvements into master
Reviewed-on: SGD-Nord/konova#168
2022-05-30 10:38:48 +02:00
1e86a1ce5e #163 Checked icons improvement
* adds a second star icon on currently unchecked but previously checked entries
   --> can be detected easier for another check run
* simplifies some related code parts
* moves some translation string into message_templates.py
* enables session timeout after 60 minutes
* improves comment card layout sizing
* adds/updates translations
2022-05-30 10:26:34 +02:00
fbab67f897 Merge pull request '#138 Bugfix' (#167) from 138_New_map_client into master
Reviewed-on: SGD-Nord/konova#167
2022-05-27 15:02:05 +02:00
59c5072619 #138 Bugfix
* fixes bug where empty geometry would have lead to exception during is_valid check on SimpleGeomForm
2022-05-27 15:01:43 +02:00
51525d79f5 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
4f482595c6 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
57aa39a670 #138 Configuration extended
* adds more layers and subfolders to the layer tree
* changes colours for tools
2022-05-25 09:11:54 +02:00
2f4301d09f #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
fec43e1bed 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
9f32c2fdd9 #164 Retranslating
* retranslates Bestandskraftdatum
2022-05-23 15:36:28 +02:00
b310349c1a 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
946f3af77c #138 WIP update
* implements new build for netgis map client
2022-05-12 13:22:46 +02:00
e73b7633a3 #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
d1dc61cbd7 #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
3ba3785ef1 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
71afdd8b36 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
a334fff54d WIP: JS Tree
* simplifies js for single-select radio tree
2022-05-11 08:41:37 +02:00
b65dae5b95 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
bb399571b1 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
90e76bc8f5 Merge pull request 'Update docker' (#159) from master into Docker
Reviewed-on: SGD-Nord/konova#159
2022-05-09 14:03:12 +02:00
5e84dfc4ae 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
92211445e7 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
73c61e96f5 #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
615eb65534 Docker enhancement
* optimizes image build dependency
* increases gunicorn default number of workers
2022-04-26 10:09:58 +02:00
bcde400096 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
aa02dbab96 WIP: Docker enhancement
* reduce containers into a single one, holding nginx + celery + redis all at once
2022-04-25 16:07:38 +02:00
339f074681 HOTFIX: API
* hardens atom_id input to be integer or string compatible
2022-04-25 13:47:07 +02:00
989d256521 HOTFIX: EGON sending via API
* adds EGON message triggering on API payment changes
2022-04-25 13:28:51 +02:00
623c29f827 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
eb975cd3c5 #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
5a8765f638 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
9c2bdcdacf #151 Parcel table infinite scroll
* refactors button for further loading to infinite scroll
* adds code documentation
2022-04-21 14:36:55 +02:00
48e3e84b4c #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
db884baa09 #138 config.json
* adds some layers and reorganizes config.json for NETGIS client
2022-04-20 14:32:28 +02:00
253b509122 #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
c60afb0391 #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
49c14a67b6 #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
d13c3e8094 #138 WIP First draft
* adds first working draft of netgis map client
2022-04-19 17:22:06 +02:00
c6e784e6d4 Merge branch 'master' into 138_New_map_client 2022-04-19 14:08:20 +02:00
940aa38154 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
887a3552b4 #140 Tests
* adds workflow tests for major datatypes
2022-04-19 14:04:20 +02:00
3b36193566 #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
090f6faa4e #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