Commit Graph

601 Commits (ac49f983ee799070e3f00603eb74fd9e776f275d)
 

Author SHA1 Message Date
mpeltriaux ac49f983ee #185 Parcel loading on public reports
* fixes bug where unauthorized clients would not load a geometries parcel view properly
* minor general templates enhancements
2 years ago
mpeltriaux a955e9f564 Revert "Merge branch 'Docker' into master"
This reverts commit 8c47c8ae35, reversing
changes made to 2206565673.

Undos accidental remote merge
2 years ago
mpeltriaux 8c47c8ae35 Merge branch 'Docker' into master 2 years ago
mpeltriaux 2206565673 Merge pull request 'geometry_srid_migration' (#183) from geometry_srid_migration into master
Reviewed-on: SGD-Nord/konova#183
2 years ago
mpeltriaux 72e5599395 Test update
* updates tests for SRID migration
2 years ago
mpeltriaux 85a4563123 Geometry Model geom SRID migration
* adds two new migrations for transforming existing geometries into the default SRID
2 years ago
mpeltriaux fc3c0c4beb Merge pull request '#180 Shared data users hidden' (#181) from 180_Visibility_of_contact_data into master
Reviewed-on: SGD-Nord/konova#181
2 years ago
mpeltriaux 053612a924 #180 Shared data users hidden
* implements hidden visibility of shared users on non-shared entries
2 years ago
mpeltriaux 10c86af314 Merge pull request '177_Minor_enhancements' (#178) from 177_Minor_enhancements into master
Reviewed-on: SGD-Nord/konova#178
2 years ago
mpeltriaux 72b779de98 # 177 Impressum link
* adds impressum link to footer
2 years ago
mpeltriaux e4528dc5ef # 177 Overview layout enhancement
* enhances layout title section layout on overview template
2 years ago
mpeltriaux 83039e63ce # 177 Timespanreport and Excel download
* fixes bug on excel download
* adds new order of columns to excel template for report download
* enhances subtitle for old data entries on timespanreport template
2 years ago
mpeltriaux 2d3299cffa # 177 Timespanreport helptext for deductions
* adds help text for recorded deduction section
2 years ago
mpeltriaux 30d8a3c6e5 # 177 Timespanreport column order
* rearranges the column order so 'Total' will always be the first column
2 years ago
mpeltriaux 8245cf5bbb # 177 Report help texts
* adds report form field help texts
* adds translations
2 years ago
mpeltriaux 3fe80680a0 Merge pull request '# 175 Report law calculation bugfix' (#176) from 175_Report_law_calculation_wrong into master
Reviewed-on: SGD-Nord/konova#176
2 years ago
mpeltriaux 6c99a5b4e6 # 175 Report law calculation bugfix
* fixes bug where amount of used laws in intervention forms would not be calculated properly
2 years ago
mpeltriaux d7c9c77b7b Merge pull request 'master' (#174) from master into Docker
Reviewed-on: SGD-Nord/konova#174
2 years ago
mpeltriaux b273afdea3 Merge pull request 'Konova Code fix' (#173) from konova_code_migration into master
Reviewed-on: SGD-Nord/konova#173
2 years ago
mpeltriaux e513db9da5 Merge pull request 'master' (#172) from master into Docker
Reviewed-on: SGD-Nord/konova#172
2 years ago
mpeltriaux b0a15d9d1c Konova Code fix
* adds command sync_codelist
    * provides updating of all codes to the newest version (id)
    * must be run once on staging, can be dropped afterwards since the root for the problem has been resolved on the codelist management application
2 years ago
mpeltriaux 5cf4dbf2a4 Merge pull request '158_PIK' (#171) from 158_PIK into master
Reviewed-on: SGD-Nord/konova#171
2 years ago
mpeltriaux b0f6d83277 #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
2 years ago
mpeltriaux 2e68d7bbcb 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)
2 years ago
mpeltriaux 8b6c8dc1aa Merge pull request '169_Unknown_admin_on_teams' (#170) from 169_Unknown_admin_on_teams into master
Reviewed-on: SGD-Nord/konova#170
2 years ago
mpeltriaux c911276cb4 #169 Team delete-restore
* removes unused code snippets
2 years ago
mpeltriaux 4ec8e1ae07 #169 Team delete-restore
* adds tests for user app
2 years ago
mpeltriaux 5de3f4c24e #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
2 years ago
mpeltriaux 170e5798ec #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
2 years ago
mpeltriaux b790921e42 Merge pull request '#163 Checked icons improvement' (#168) from 163_Checked_workflow_improvements into master
Reviewed-on: SGD-Nord/konova#168
2 years ago
mpeltriaux c1aa14f6ba #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
2 years ago
mpeltriaux 528f2145a4 Merge pull request '#138 Bugfix' (#167) from 138_New_map_client into master
Reviewed-on: SGD-Nord/konova#167
2 years ago
mpeltriaux 5c21932511 #138 Bugfix
* fixes bug where empty geometry would have lead to exception during is_valid check on SimpleGeomForm
2 years ago
mpeltriaux 56f58284f9 Merge pull request '138_New_map_client' (#166) from 138_New_map_client into master
Reviewed-on: SGD-Nord/konova#166
2 years ago
mpeltriaux 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
2 years ago
mpeltriaux 714d888326 #138 Configuration extended
* adds more layers and subfolders to the layer tree
* changes colours for tools
2 years ago
mpeltriaux 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
2 years ago
mpeltriaux 1f998ebf76 Merge pull request '#164 Retranslating' (#165) from 164_Retranslate_binding_on_date into master
Reviewed-on: SGD-Nord/konova#165
2 years ago
mpeltriaux 526178ce56 #164 Retranslating
* retranslates Bestandskraftdatum
2 years ago
mpeltriaux 8b6dbdff8a Merge pull request '160_Number_of_parcels' (#162) from 160_Number_of_parcels into master
Reviewed-on: SGD-Nord/konova#162
2 years ago
mpeltriaux 6fd3c4c179 #138 WIP update
* implements new build for netgis map client
2 years ago
mpeltriaux 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
2 years ago
mpeltriaux 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
2 years ago
mpeltriaux 21d1fabeec Merge pull request 'js_tree_element_improvement' (#161) from js_tree_element_improvement into master
Reviewed-on: SGD-Nord/konova#161
2 years ago
mpeltriaux eb763a94fb JS Tree enhancement
* extends compensation state forms to match the new logic
* adds minor changes for tests
2 years ago
mpeltriaux 5fe27e02ec WIP: JS Tree
* simplifies js for single-select radio tree
2 years ago
mpeltriaux 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
2 years ago
mpeltriaux 18789c231d Visual enhancement for custom JS tree widget
* adds proper css behaviour for collapsed icon
* adds minor js comments
2 years ago
mpeltriaux bec9c967b9 Merge pull request 'Update docker' (#159) from master into Docker
Reviewed-on: SGD-Nord/konova#159
2 years ago
mpeltriaux a7b8752119 Merge pull request 'Docker_worker_enhance' (#155) from Docker_worker_enhance into Docker
Reviewed-on: SGD-Nord/konova#155
2 years ago