master #172

mpeltriaux · 2022-06-02T08:52:18+02:00

mpeltriaux commented

2022-06-02 08:52:18 +02:00

Update Docker

mpeltriaux added 35 commits 2022-06-02 08:52:18 +02:00

#138 Map client to views eb3d58ed19

* adds netgis map client to all detail and report views
* adds netgis map client to new object forms
* WIP: needs functionality server-client

#138 WIP bdb9f74aca

* minor changes for dev purposes

Merge branch 'master' into 138_New_map_client 3075ca8fec

#138 WIP First draft d9ec0226fe

* adds first working draft of netgis map client

#138 WIP NETGIS Map client eeccba3968

* adds functionality for address search widget
    * drops default proxy.php (replaced by own python call)
* reduces maxZoom in config.json

#138 WIP Improvements 8d34580090

* 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)

#138 WIP Validity 5e65156b54

* 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

#138 config.json d332be2971

* adds some layers and reorganizes config.json for NETGIS client

Visual enhancement for custom JS tree widget 18789c231d

* adds proper css behaviour for collapsed icon
* adds minor js comments

WIP: JS Tree improvements a5d24e6db5

* 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

WIP: JS Tree 5fe27e02ec

* simplifies js for single-select radio tree

JS Tree enhancement eb763a94fb

* extends compensation state forms to match the new logic
* adds minor changes for tests

Merge pull request 'js_tree_element_improvement' (#161 ) from js_tree_element_improvement into master 21d1fabeec

Reviewed-on: SGD-Nord/konova#161

#160 Parcel number to parcel table 3535aba30f

* 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

#160 Parcel calc fix 0b4b664265

* 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

#138 WIP update 6fd3c4c179

* implements new build for netgis map client

Merge pull request '160_Number_of_parcels' (#162 ) from 160_Number_of_parcels into master 8b6dbdff8a

Reviewed-on: SGD-Nord/konova#162

#164 Retranslating 526178ce56

* retranslates Bestandskraftdatum

Merge pull request '#164 Retranslating' (#165 ) from 164_Retranslate_binding_on_date into master 1f998ebf76

Reviewed-on: SGD-Nord/konova#165

#138 Netgis map client 42592c5bdf

* updates netgis map client to most recent version
* removes trigger delay on clicking events
* adds further customization options to config.json

#138 Configuration extended 714d888326

* adds more layers and subfolders to the layer tree
* changes colours for tools

Merge branch 'master' into 138_New_map_client c0595760ab

# Conflicts:
#	konova/models/geometry.py
#	konova/urls.py
#	locale/de/LC_MESSAGES/django.mo
#	locale/de/LC_MESSAGES/django.po

Merge pull request '138_New_map_client' (#166 ) from 138_New_map_client into master 56f58284f9

Reviewed-on: SGD-Nord/konova#166

#138 Bugfix 5c21932511

* fixes bug where empty geometry would have lead to exception during is_valid check on SimpleGeomForm

Merge pull request '#138 Bugfix' (#167 ) from 138_New_map_client into master 528f2145a4

Reviewed-on: SGD-Nord/konova#167

#163 Checked icons improvement c1aa14f6ba

* 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

Merge pull request '#163 Checked icons improvement' (#168 ) from 163_Checked_workflow_improvements into master b790921e42

Reviewed-on: SGD-Nord/konova#168

#169 Admin on teams 170e5798ec

* 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

#169 Team delete-restore 5de3f4c24e

* 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

#169 Team delete-restore 4ec8e1ae07

* adds tests for user app

#169 Team delete-restore c911276cb4

* removes unused code snippets

Merge pull request '169_Unknown_admin_on_teams' (#170 ) from 169_Unknown_admin_on_teams into master 8b6c8dc1aa

Reviewed-on: SGD-Nord/konova#170

HOTFIX: Team sharing 2e68d7bbcb

* 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)

#158 is_pik added b0f6d83277

* 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

Merge pull request '158_PIK' (#171 ) from 158_PIK into master 5cf4dbf2a4