Commit Graph

845 Commits

Author SHA1 Message Date
16107f93f6 Merge pull request '#180 Shared data users hidden' (#181) from 180_Visibility_of_contact_data into master
Reviewed-on: SGD-Nord/konova#181
2022-06-27 14:31:30 +02:00
d669adf54f #180 Shared data users hidden
* implements hidden visibility of shared users on non-shared entries
2022-06-27 14:31:09 +02:00
589a7aec60 Merge pull request '177_Minor_enhancements' (#178) from 177_Minor_enhancements into master
Reviewed-on: SGD-Nord/konova#178
2022-06-22 11:53:43 +02:00
3f3ae4e31b # 177 Impressum link
* adds impressum link to footer
2022-06-21 14:27:32 +02:00
1bbede0d12 # 177 Overview layout enhancement
* enhances layout title section layout on overview template
2022-06-21 14:25:50 +02:00
0801b3f6ab # 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
2022-06-21 14:19:10 +02:00
44ad156595 # 177 Timespanreport helptext for deductions
* adds help text for recorded deduction section
2022-06-21 14:11:01 +02:00
5c95bc7d85 # 177 Timespanreport column order
* rearranges the column order so 'Total' will always be the first column
2022-06-21 14:02:49 +02:00
3b045fea8e # 177 Report help texts
* adds report form field help texts
* adds translations
2022-06-21 13:54:41 +02:00
6e5237ab88 Merge pull request '# 175 Report law calculation bugfix' (#176) from 175_Report_law_calculation_wrong into master
Reviewed-on: SGD-Nord/konova#176
2022-06-15 17:46:49 +02:00
f19ad5f639 # 175 Report law calculation bugfix
* fixes bug where amount of used laws in intervention forms would not be calculated properly
2022-06-15 17:44:43 +02:00
766e3c8d37 Merge pull request 'master' (#174) from master into Docker
Reviewed-on: SGD-Nord/konova#174
2022-06-02 09:38:06 +02:00
f6dcb6c6db Merge pull request 'Konova Code fix' (#173) from konova_code_migration into master
Reviewed-on: SGD-Nord/konova#173
2022-06-02 09:37:36 +02:00
e90625c8b5 Merge pull request 'master' (#172) from master into Docker
Reviewed-on: SGD-Nord/konova#172
2022-06-02 08:53:32 +02:00
7bacbecdec 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
2022-05-31 16:53:13 +02:00
58ce00a5a6 Merge pull request '158_PIK' (#171) from 158_PIK into master
Reviewed-on: SGD-Nord/konova#171
2022-05-31 13:41:54 +02:00
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