Compare commits

...

955 Commits

Author SHA1 Message Date
9a5ebb88a9 Merge branch 'netgis_map_client_update' of https://git.naturschutz.rlp.de/SGD-Nord/konova into netgis_map_client_update
# Conflicts:
#	templates/map/client/config.json
2024-12-11 09:57:06 +01:00
274f6460de # Netgis map client
* improves config.json based on new functions of netgis map client
2024-12-11 09:41:24 +01:00
a3a616dffe # Improvement
* adds catch for undecodeable proxied content
2024-11-21 15:08:38 +01:00
86698bd289 # Netgis client update
* integrates newest netgis map client
* generalizes map proxy response handling
2024-11-21 13:46:35 +01:00
5059b763d7 # WIP: Integration netgis client
* adds adjustments for integration of newest netgis client version (81fa3bef48)
2024-11-02 13:06:32 +01:00
5fb9afa7bd # Netgis map update
* implements newest version of netgis map client
2024-10-30 14:09:10 +01:00
439a211e01 Merge pull request '439_Wartungskommando_Nachverschneidung' (#446) from 439_Wartungskommando_Nachverschneidung into master
Reviewed-on: #446
2024-10-26 10:24:50 +02:00
eb528de48b # Drop atomic transaction
* drops atomic transaction processing on Parcel.make_unique
2024-10-26 10:24:10 +02:00
f39d99b2fd # Parcel recalculation optimization
* enhances workflow for parcel recalculation
2024-10-26 10:17:09 +02:00
85235386ec Merge pull request '# Parcel duplicate repair' (#444) from 439_Wartungskommando_Nachverschneidung into master
Reviewed-on: #444
2024-10-26 09:48:32 +02:00
7820dec3d1 # Parcel duplicate repair
* adds mechanic to repair parcels in case of unwanted parcel duplicates
* optimizes filtering of geometries for parcel recalculation
2024-10-26 09:47:27 +02:00
de93092a52 Merge pull request '# Wartungskommando Optimization' (#442) from 439_Wartungskommando_Nachverschneidung into master
Reviewed-on: #442
2024-10-25 19:27:02 +02:00
8ef11c681e # Wartungskommando Optimization
* extends filtering for recalculatable geometries to records without started calculation at any point (parcel_update_start is null)
* catches exceptions on geometries which could not be recalculated properly, adds them to output for further analysis
* simplifies complexity factor calculation
2024-10-25 19:19:08 +02:00
e6eb9abd36 Merge pull request '# 439 Wartungskommando Nachverschneidung' (#440) from 439_Wartungskommando_Nachverschneidung into master
Reviewed-on: #440
2024-10-25 14:24:18 +02:00
9de9d5007c # 439 Wartungskommando Nachverschneidung
* refactors command update_all_parcels into recalculate_parcels
* fixes bug in command generate_report
2024-10-25 14:23:21 +02:00
45441cc44d Merge pull request 'missing_migrations' (#437) from missing_migrations into master
Reviewed-on: #437
2024-08-26 18:57:10 +02:00
3ac9081205 Merge branch 'refs/heads/master' into missing_migrations 2024-08-26 18:53:11 +02:00
b265aab4cf # Migrations
* adds missing migrations
* renames variables shadowing in-builts
2024-08-26 18:51:58 +02:00
e47eda385d Merge pull request '# User filtering' (#435) from 433_Filter_by_user into master
Reviewed-on: #435
2024-08-19 11:42:18 +02:00
fd7ed40c91 # User filtering
* adds query filter to search for logged users on entries
2024-08-19 11:38:09 +02:00
c004e1c6da Merge pull request '432_Unreadable_payments' (#434) from 432_Unreadable_payments into master
Reviewed-on: #434
2024-08-19 10:26:40 +02:00
e9f9420f0f # Codelist migration optimization
* adds boolean to de-/activate migration logic inside of 0002_migrate_975_to_288.py
2024-08-19 10:23:05 +02:00
4e56f47b47 # Variable refactoring
* renames variable `has_access` into `is_entry_shared` for better understanding in various places (mostly html related)
2024-08-19 09:44:45 +02:00
b622f986b1 # Censor payments
* censor payments if entry is not shared with user
* updates translations
2024-08-19 09:39:58 +02:00
dc718e911b Merge pull request '# Hotfix' (#430) from 427_Integration_of_codelist_288 into master
Reviewed-on: #430
2024-08-07 12:07:04 +02:00
ac6d133797 # Hotfix
* fixes requirements dependency
2024-08-07 12:06:27 +02:00
67fe06315b Merge pull request '427_Integration_of_codelist_288' (#428) from 427_Integration_of_codelist_288 into master
Reviewed-on: #428
2024-08-07 12:01:46 +02:00
e5284cd660 # Requirements update
* updates some packages in requirements.txt
2024-08-07 09:17:20 +02:00
81663db65c # Migration list 975->288
* adds migration for app codelist to migrate existing biotope type details codes from list 975 to 288 depending on their atomID
* improves rendering of action and biotope type details on frontend for KOM, OEK and EMA
* refactors KonovaCode str() rendering
2024-08-07 09:12:38 +02:00
762d25a87e # Codelist 288
* introduces 288 to codelist/settings.py
* refactors usage from 975 to 288
* enhances rendering of codelist names depending on which name exists (short vs long)
2024-08-06 15:39:01 +02:00
2761d2a19c Merge pull request '# Bugfix' (#425) from 424_Archived_codes_selectable into master
Reviewed-on: #425
2024-08-06 14:28:16 +02:00
a8eef6e793 # Bugfix
* fixes bug where archived codes has been selectable due to recursive building of child-parent hierarchy
2024-08-06 14:27:38 +02:00
2cb77e89fe Merge pull request '# Dependency fix' (#422) from 419_Dependency_upgrade into master
Reviewed-on: #422
2024-07-10 09:30:14 +02:00
ff266d5c54 # Dependency fix
* fixes dependency mismatch between requests 2.32.3 and kombu (requires < 2.32.0)
2024-07-10 09:29:54 +02:00
730d29bcef Merge pull request '# Dependency update' (#420) from 419_Dependency_upgrade into master
Reviewed-on: #420
2024-07-10 09:26:35 +02:00
e57e3ed598 # Dependency update
* updates dependencies due to important version changes
2024-07-10 09:26:18 +02:00
f88f9d06fa Merge pull request '# Readonly map' (#417) from map_client_update_08-07-2024 into master
Reviewed-on: #417
2024-07-08 18:44:00 +02:00
7eb440f841 # Readonly map
* fixes bug where readonly mode of map client was not readonly at all
2024-07-08 06:59:15 +02:00
134afae038 Merge pull request '# .env fix' (#415) from env_fix into master
Reviewed-on: #415
2024-07-05 10:51:25 +02:00
dc754c0363 # .env fix
* adds celery setting to .env.sample
2024-07-05 10:50:25 +02:00
801c9078e9 Merge pull request '# Requirements update' (#413) from fix_sso into master
Reviewed-on: #413
2024-07-04 11:42:05 +02:00
c282443a6d # Requirements update
* due to existing migrations, django-simple-sso needs to be added as a dependency as well as itsdangerous (dependency of django-simple-sso)
    * however, there is no active usage of any of these packages anymore
2024-07-04 11:39:17 +02:00
af0afec77d Merge pull request 'env' (#411) from env into master
Reviewed-on: #411
2024-07-04 08:36:04 +02:00
44c11fd89b Merge pull request '407_Drop_django-simple-sso' (#410) from 407_Drop_django-simple-sso into master
Reviewed-on: #410
2024-07-04 07:58:15 +02:00
d86bbb0ab0 # Geopackage import configuration
* corrects config for geopackage import support
2024-07-04 07:44:08 +02:00
ec4b5f76fe Merge pull request '# Send-to-EGON cmd' (#408) from sending_to_egon_cmd into master
Reviewed-on: #408
2024-06-18 11:49:35 +02:00
eaea0eb512 # Send-to-EGON cmd
* adds new custom command send_to_egon for performing EGON sending on a list of intervention ids
2024-06-18 11:48:56 +02:00
8a67033e0d # Updates sso
* adds env usage for sso settings
2024-06-14 13:04:25 +02:00
6e35dc7de6 Merge branch 'refs/heads/407_Drop_django-simple-sso' into env
# Conflicts:
#	konova/sub_settings/sso_settings.py
#	requirements.txt
2024-06-14 13:02:33 +02:00
9b29474e46 # Requirements update
* updates requirements.txt
* drops django-simple-sso from codebase and requirements.txt
2024-06-14 13:00:09 +02:00
da545cc8ec # Requirements update
* updates requirements.txt
* drops debug-toolbar
2024-06-14 07:42:17 +02:00
2365ede672 Merge pull request '# Comment card' (#406) from comment_card_improvement into master
Reviewed-on: #406
2024-05-21 14:43:49 +02:00
898a56db8a # Comment card
* adds proper line break rendering in comment card
2024-05-21 14:42:49 +02:00
8b1cf24bdd Merge pull request '# 404 Extend API' (#405) from 404_Extend_API_shared_acces into master
Reviewed-on: #405
2024-05-21 11:55:20 +02:00
5ef840f172 # 404 Extend API
* extends API shared record access with team based sharing
2024-05-21 11:54:06 +02:00
9e762584dc Merge pull request '# OAuth fix' (#402) from oauth_https_fix into master
Reviewed-on: #402
2024-05-17 10:59:02 +02:00
d1790feda8 # OAuth fix
* fixes bug in deployment environment due to http/s usage in url
2024-05-17 10:56:33 +02:00
decf0dc522 Merge pull request '# Fix' (#400) from oauth_https_fix into master
Reviewed-on: #400
2024-05-17 07:54:02 +02:00
67de6be975 # Fix
* fixes bug where oauth requests did not use https in dockered deployment environment
2024-05-17 07:49:46 +02:00
32bfec3683 Merge pull request '# Hotfix' (#398) from 395_OAuth2_refactoring into master
Reviewed-on: #398
2024-05-16 17:37:38 +02:00
d31f997a58 # Hotfix
* changes randomly created code verifier into static one to avoid authentication conflicts on multi process deployment (where each process generates an own verifier...)
2024-05-16 17:37:19 +02:00
d0e812ae70 Merge pull request '395_OAuth2_refactoring' (#396) from 395_OAuth2_refactoring into master
Reviewed-on: #396
2024-05-16 15:19:19 +02:00
8feb24e70f # OAuth Propagation
* adds user propagation without django-simple-sso
2024-05-10 10:40:19 +02:00
5bd0a161ff # OAuth migrations
* adds migrations for storing OAuthToken
* adds OAuthToken model
* adds OAuthToken admin
* adds user migration for Fkey relation to OAuthToken
2024-04-30 14:56:48 +02:00
be373e2b14 # OAuth refactoring code
* refactors code
2024-04-29 12:27:07 +02:00
3b38f227ec # OAuth requirements
* updates requirements.txt
2024-04-29 12:14:15 +02:00
b00dd5bcc8 # WIP: OAuth draft implementation
* first working client implementation of oauth workflow for logging in users
2024-04-29 12:07:06 +02:00
9d4a9bd122 Merge pull request 'requirements_update' (#394) from requirements_update into master
Reviewed-on: SGD-Nord/konova#394
2024-04-12 08:08:00 +02:00
34d53b0bc6 # Itsdangerous update
* adds itsdangerous package update
2024-04-12 07:51:18 +02:00
d4edb00a12 # Requirements update
* updates requirements.txt
2024-04-12 07:51:17 +02:00
5c8b2ac1f8 # Env
* updates env.sample
2024-04-03 13:45:52 +02:00
cf050a92ef # Environment
* refactors settings into env usage
* adds proxy usage for schneider parcel fetching (using public web address instead of internal ip address)
2024-04-03 13:45:08 +02:00
03edb74023 # Admin backends
* disables certain admin backends
* adds proper ordering to server message admin overview
2024-04-03 08:29:19 +02:00
feee8b74ed # Admin button
* adds button for easier admin backend access
2024-04-03 08:26:00 +02:00
e542872fef # JSON Decode error catch
* adds error catching on wfs parcel resolving
2024-03-15 09:10:06 +01:00
61046a27c5 Merge remote-tracking branch 'origin/master' 2024-03-12 10:32:17 +01:00
52b1750281 # Message rendering
* adds icons to message danger, info and success rendering
2024-03-12 10:32:05 +01:00
aa97a663b4 # Requirements
* updates requirements.txt
2024-03-11 08:12:21 +01:00
5a71ad7187 HOTFIX
* fixes bug where rectangular geometry results in an error during geometry complexity calculation
2024-02-29 18:37:53 +01:00
a57d609420 HOTFIX
* downgrades package qrcode from 7.4.2 to 7.3.1. Further details can be found in https://github.com/lincolnloop/python-qrcode/issues/353
2024-02-22 18:18:24 +01:00
a71fc435e0 # HOTFIX
* drops need for authentication for calculated parcels of an entry (reports are publicly available -> does not need auth!)
2024-02-21 18:31:43 +01:00
7681a7a05f Merge pull request '# 382 - Redirect as 404' (#386) from 382_Custom_response_for_Validation_Error into master
Reviewed-on: SGD-Nord/konova#386
2024-02-16 10:16:05 +01:00
ba83993abf # 382 - Redirect as 404
* extends 404 template (user should check the URL)
* introduces new decorator "uuid_required" which performs a check on a given 'uuid' or 'id' parameter
    * throws a Http404 exception --> redirect to 404 template instead of 500 error template
2024-02-16 10:13:43 +01:00
5b157254b4 Merge pull request 'geom_parcel_improvements' (#384) from geom_parcel_improvements into master
Reviewed-on: SGD-Nord/konova#384
2024-02-16 08:44:38 +01:00
69a8139601 # Fixes
* drops unused methods
* fixes typos
* updates comments
* drops unused model attribute
2024-02-16 08:41:03 +01:00
590a510880 # CONN_MAX_AGE
* dropping conn_max_age due to problems with usage in gunicorn
2024-02-16 08:23:14 +01:00
689a2d6acb # Typo
* fixes typo
2024-02-16 08:14:42 +01:00
4f02bf1da2 # Renaming
* renames a method and fixes doc string
2024-02-16 08:13:10 +01:00
6945b17117 # Optimizations and fixes
* drops identifier handling on all edit-forms (identifier editing has been disabled on the frontend for a while now)
* updates test cases
* updates form caption for checking and recording action (less intimidating)
* optimizes district column width
* fixes bug on frontend parcel fetching on detail view
* adds extended tooltip for title column on index tables
* retraslates 'Law' to 'Rechtsgrundlage'
2024-02-08 07:31:19 +01:00
d639a4e530 # Geom parcel performance improvement
* refactors parcel calculating, resulting in 1.3-1.6x better performance
* optimizes parcel fetching view
2024-01-17 11:22:21 +01:00
523e338b1b # WIP: Performance boost parcel calculation
* improves handling of parcel calculation (speed up by ~30%)
* ToDo: Clean up code
2024-01-16 07:57:29 +01:00
5922d5ce06 # Issue #381
* adds another validity check to SimpleGeomForm (is_size_valid) to make sure the area of the entered geometry is somehow rational (>= 1m²)
* optimizes performance of django command sanitize_db
* extends Geometry model with two new attributes, holding timestamps when a parcel calculation has been started and ended
* finally drops unused update_parcel_wfs in favor of update_parcels in Geometry model
* refactors update_parcel method
* adds geometry buffer fallback in schneider/fetcher.py to avoid emptying of geometries when parcels shall be fetched
* finally removes utils/wfs/spatial.py
* extends GeomParcelsView according to #381
* updates translations
* removes redundant psycopg2-binary requirement
2024-01-09 13:11:04 +01:00
4d215288b3 Merge pull request 'django_5' (#378) from django_5 into master
Reviewed-on: SGD-Nord/konova#378
2024-01-05 09:37:18 +01:00
425bbd5f0a Django5
* updates requirements.txt
2024-01-05 09:34:18 +01:00
1746382aef Netgis map client fix
* fixes performance issue on drawing when WFS is activated
2023-12-28 15:12:06 +01:00
e231bc6dbf Django5
* updates requirements
* adds Django5 related migration and setting (DEFAULT_AUTO_FIELD)
2023-12-19 08:54:42 +01:00
5d052fee41 Merge pull request 'EGON document fix' (#374) from 373_EGON_document into master
Reviewed-on: SGD-Nord/konova#374
2023-12-13 13:37:23 +01:00
547aa30763 EGON document fix
* fixes bug where documents have not been serialized properly into a single xml list
2023-12-13 13:34:46 +01:00
96d2b5aa6c Merge pull request '# Django 4 migrations' (#371) from django_4_migrations into master
Reviewed-on: SGD-Nord/konova#371
2023-12-12 07:34:40 +01:00
c4c560d11c Merge pull request '368_Mail_linking' (#370) from 368_Mail_linking into master
Reviewed-on: SGD-Nord/konova#370
2023-12-11 13:42:51 +01:00
8cdea88756 Mail links
* adds direct object links into mail templates
* refactors transferring app-model identification data from fore- to background (celery) properly
2023-12-11 13:40:32 +01:00
11bbf7d9ec Municipal calculation to background
* moves municipal names fetching from fore- to background for mail sending
2023-12-11 12:12:19 +01:00
08467e5619 Object mailing restructred
* restructures object info mail sending
2023-12-11 12:06:33 +01:00
fd7a82e569 Merge pull request 'Custom exception reporter' (#369) from custom_exception_reporter into master
Reviewed-on: SGD-Nord/konova#369
2023-12-11 11:22:12 +01:00
d94767a05a Custom exception reporter
* adds custom exception_reporter.py
2023-12-11 09:40:17 +01:00
7a4c1ca530 HOTFIX netgis client
* fixes bug where imported geometries would not be editable
2023-12-07 06:43:11 +01:00
0b131ec15a Hotfix map client edit errors 2023-12-05 07:28:57 +01:00
9870c28967 # Hotfix netgis client
* adds import functionality as it was
* fixes bug where z-index values have been too high
2023-12-05 06:54:55 +01:00
29a55c9427 # Django 4 migrations
* migrations created because of switch to Django4
2023-11-30 13:04:33 +01:00
cf1f42551d Merge pull request 'django_4' (#363) from django_4 into master
Reviewed-on: SGD-Nord/konova#363
2023-11-30 12:40:54 +01:00
b9c9310f21 Merge pull request 'Hotfix: EcoAccount serializable' (#361) from 360_EcoAccount_not_serializable into django_4
Reviewed-on: SGD-Nord/konova#361
2023-11-29 12:22:42 +01:00
a0823814c5 Hotfix: EcoAccount serializable
* fixes bug where EcoAccount model was not serializable due to changes in newer DAL version due to Django4
2023-11-29 12:21:37 +01:00
fb67e42078 # CSRF_TRUSTED_ORIGINS
* new in Django4: setting CSRF_TRUSTED_ORIGINS needs to be set to schema+host for new CSRF security handling
2023-11-28 12:59:40 +01:00
691292c325 HOTFIX
* fixes z-index overlapping of netgis map client toolbar and modal forms
2023-11-27 12:51:39 +01:00
2bcac86249 Fix for testing 2023-11-21 14:03:38 +01:00
98a6f19a16 Merge pull request 'master' (#357) from master into django_4
Reviewed-on: SGD-Nord/konova#357
2023-11-21 13:38:18 +01:00
ebe5ced710 Merge pull request 'django_4_map_update' (#356) from django_4_map_update into django_4
Reviewed-on: SGD-Nord/konova#356
2023-11-21 13:35:35 +01:00
e4a94c6635 Map update 2023-11-21 13:22:58 +01:00
daee3e71b3 Map update 2023-11-21 12:53:27 +01:00
0dd60f8b40 Map update 2023-11-21 09:01:59 +01:00
c7958d1ebf HOTFIX
* fixes bug on saving eco account with missing deductable surface value
2023-11-07 16:23:57 +01:00
bdc1c226e9 # Netgis HOTFIX
* fixes bug where map client would not parse config.json properly resulting in failed client start
2023-10-30 09:40:35 +01:00
0f173c4802 HOTFIX
* corrects behaviour of lanis link generation for EIV and KOM
2023-10-26 07:26:38 +02:00
599764ef38 HOTFIX
* fixes bug where detail view of KOM could not be opened anymore
2023-10-26 07:22:09 +02:00
11f2ad5617 Merge pull request '# 349 LANIS link improvements' (#350) from 349_LANIS_link into master
Reviewed-on: SGD-Nord/konova#350
2023-10-25 10:09:39 +02:00
274d7b8b6f # 349 LANIS link improvements
* replaces 'dumb' link template with LANIS mapinterface support
* adds fallback default LANIS link
2023-10-25 10:04:56 +02:00
02e8cfc76d # Map client update
* updates netgis map client to newest pre-release
2023-10-16 13:27:27 +02:00
2a9e57e633 Django 4.2
* updates Django to 4.x and other packages (if possible) to latest versions
* Attention: Requires postgresql >= 12.0
* updates code fragments to match requirements of newer package versions
2023-10-12 09:57:05 +02:00
ffae18ebc4 Merge pull request 'test' (#347) from test into master
Reviewed-on: SGD-Nord/konova#347
2023-09-15 13:12:40 +02:00
5f45db6716 # Bugfix Payment date invalid
* fixes a bug where validation check of payment 'due' has not been triggered properly
2023-09-13 14:40:22 +02:00
d9046eb2b9 Unit test user app
* adds unit test for User model and forms
* refactors functions from user_checks.py into User class and drops user_checks.py
2023-09-13 09:49:40 +02:00
21db8227f8 # Unit test user
* adds unit test for team creating and editing of user app
2023-09-12 11:49:12 +02:00
1773463e86 # Unit tests for konova geometry
* adds further unit tests for konova app geometry model
2023-09-12 09:16:10 +02:00
e443c5f8be # Unit test konova app
* adds unit test for konova app models
* drops unused/unnecessary code fragments
* updates translation
2023-09-08 12:47:50 +02:00
42cb138276 Unit test konova base forms
* adds unit test for resubmission modal form
2023-09-07 11:07:17 +02:00
b09ad302b5 Unit test intervention/konova
* adds unit test for intervention app
* adds unit test for konova app
2023-09-07 10:48:11 +02:00
e22c9132e1 Unit tests ema
* adds unit tests for ema forms
2023-09-05 11:24:29 +02:00
963dd57cb2 Unit tests intervention
* adds tests for share and revocation forms
2023-08-31 12:17:28 +02:00
2fa8783fd9 Deduction validity checking
* fixes behaviour of related deduction checks on intervention checking
2023-08-31 11:31:33 +02:00
3fa76063d0 Eco account unit tests
* adds eco account unit tests
* adds validity check to eco account form to check on existing deductions and potential conflict with reduced deductable surface
* improves geojson handling on SimpleGeomForm
* adds/updates translation
2023-08-30 16:20:06 +02:00
5684b9b6d9 Unit test compensation models
* adds unit tests for compensation models
* removes duplicated unit tests
2023-08-30 10:37:16 +02:00
e9086cbbcd Merge branch 'master' into test
# Conflicts:
#	locale/de/LC_MESSAGES/django.mo
#	locale/de/LC_MESSAGES/django.po
2023-08-30 09:12:02 +02:00
1437d16092 Merge pull request '345_Other_deadline_with_comment' (#346) from 345_Other_deadline_with_comment into master
Reviewed-on: SGD-Nord/konova#346
2023-08-29 14:07:04 +02:00
44db3ea03e # Deadline form logic
* adds logic to NewDeadlineModalForm to invalidate 'other' deadline types without comment (as explanation for 'other')
2023-08-29 14:06:11 +02:00
9615497a61 #345 Fix
* adds is_valid check for NewDeadlineModalForm to implement #345
2023-08-29 10:55:03 +02:00
9035b07801 Merge pull request '# 342 Fix' (#343) from 342_Rounding_error_on_db_SUM into master
Reviewed-on: SGD-Nord/konova#343
2023-08-25 09:41:55 +02:00
ad2f4c12f8 # 342 Fix
* fixes bug where rounding error on aggregated db SUM() would occur
* simplifies code base
2023-08-25 09:13:46 +02:00
a2b44a9c45 Unit test intervention forms
* adds unit test for new/edit intervention forms
* improves code base for generating new identifiers
2023-08-24 11:47:40 +02:00
21c7889551 Unit test EMA model
* adds unit test for EMA model
2023-08-24 10:59:32 +02:00
0f757a5de1 Unit test compensation states
* adds unit test for adding/editing/removing compensation states
2023-08-22 10:54:20 +02:00
1d3b576b51 Unit test for compensation forms
* adds unit tests for adding and editing deadline
2023-08-21 10:33:05 +02:00
643abcf841 Unit test for compensation forms
* adds compensation action forms unit tests
2023-08-21 10:10:23 +02:00
564ae4d5db Tests on analysis and compensation
* enhances tests for analysis and compensation app
2023-08-17 12:59:50 +02:00
9476713911 Unit test api
* adds unit test for APIUserToken
* enhances handling of token fetching for API
2023-08-17 10:44:58 +02:00
d9cf9669f0 Unit test analysis
* adds unit test for creating report
* fixes bug where new (>2018) eco accounts have not been fetched correctly from the  db
* adds enhancements in the frontend
* improves test data setup
2023-08-17 10:12:05 +02:00
345b266422 Class based views
* refactors method based views for parcel fetching, home and logout to class based
2023-08-15 11:29:38 +02:00
60b6968436 Merge pull request 'Error on map client search' (#340) from 338_Error_on_map_client_search into master
Reviewed-on: SGD-Nord/konova#340
2023-07-10 11:47:12 +02:00
b11217e41f Error on map client search
* adds info for user if address search content could not be parsed properly due to external errors
2023-07-10 10:23:04 +02:00
d361767471 Merge pull request 'Geometry simplification' (#339) from 337_Simplify_large_geometries into master
Reviewed-on: SGD-Nord/konova#339
2023-07-10 10:07:49 +02:00
a571c28027 Geometry simplification
* simplifies geometries on SimpleGeomForm if threshold GEOM_MAX_VERTICES has been exceeded
    * geometry is iteratively simplified to find a proper tolerance value which satisfies the GEOM_MAX_VERTICES threshold
2023-06-28 14:21:26 +02:00
4d96afae1d Merge pull request '# Improves form date checking' (#335) from 334_nrealistic_dates into master
Reviewed-on: SGD-Nord/konova#335
2023-05-17 14:39:50 +02:00
9544e27baf # Improves form date checking
* adds validator to make sure no dates like `01.01.1` can be accepted. All dates must be somewhat later than 01.01.1950
2023-05-17 14:08:57 +02:00
c604de0f32 Merge pull request '# Fixes bug' (#332) from 331_Deductions_of_unshared_interventions_not_changeable into master
Reviewed-on: SGD-Nord/konova#332
2023-05-16 14:10:59 +02:00
204cbe2a78 # Fixes bug
* fixes bug described in #331
2023-05-16 12:11:13 +02:00
4987d0b90d Merge pull request '#328 Fix' (#329) from 328_Removing_of_migrated_revocations_fails into master
Reviewed-on: SGD-Nord/konova#329
2023-04-26 11:29:43 +02:00
a49c44ab44 #328 Fix
* fixes bug described in #328
2023-04-26 11:28:46 +02:00
57b734f1c2 Merge pull request '#325 Fix' (#326) from 325_Error_on_ecoaccount_recording into master
Reviewed-on: SGD-Nord/konova#326
2023-04-19 15:23:15 +02:00
56ddf7ddfa #325 Fix
* fixes bug described in #325
2023-04-19 15:22:52 +02:00
028efb3023 Merge pull request '# Implements #332' (#323) from 332_Drop_deductions_of_deleted_intervention into master
Reviewed-on: SGD-Nord/konova#323
2023-03-30 15:11:43 +02:00
8a84df0fcd Simplification
* simplifies fetching of intervention's deductions
2023-03-30 15:11:19 +02:00
3eff97b6dd # Implements #332
* extends intervention's mark_as_deleted() functionality to drop related deductions and free reserved deductable surface from the related eco accounts
2023-03-30 15:08:42 +02:00
a2a7b00db5 Merge pull request 'Adds scale line to map client' (#320) from scale_line_map_client into master
Reviewed-on: SGD-Nord/konova#320
2023-03-28 13:52:32 +02:00
6ce6834acd Adds scale line to map client 2023-03-28 13:51:28 +02:00
0a3a9b2480 Merge pull request 'Server Messages unpublish' (#319) from improve_unpublish_dependency_news into master
Reviewed-on: SGD-Nord/konova#319
2023-03-24 07:35:57 +01:00
16e72c3372 Server Messages unpublish
* changes unpublish_on to optional value
* simplifies fetching of server message news
2023-03-24 07:34:50 +01:00
e4a2a0f64e Merge pull request 'HOTFIX' (#317) from fix_public_report into master
Reviewed-on: SGD-Nord/konova#317
2023-03-24 07:14:13 +01:00
76a90e655a HOTFIX
* fixes bug where float numbers could not be used as input for e.g. buffer radius
    * supports
2023-03-24 07:13:15 +01:00
5664213959 Merge pull request '#314 Public report for old entries' (#315) from 314_Public_report_on_old_entries into master
Reviewed-on: SGD-Nord/konova#315
2023-03-22 09:00:01 +01:00
7356c10f34 #314 Public report for old entries
* enables public access to reports for unrecorded old entries if their binding_date < 16.06.2018
2023-03-22 08:54:23 +01:00
7e847cf8cb Merge pull request 'netgis_client_update' (#312) from netgis_client_update into master
Reviewed-on: SGD-Nord/konova#312
2023-03-16 08:14:16 +01:00
c421399788 HOTFIX
* fixes bug where float numbers could not be used as input for e.g. buffer radius
    * supports up to two digits
2023-03-16 08:12:51 +01:00
b0d068e8a6 Netgis client update
* adds bugfixes and improvements
    - point / line auto buffer key input change buffer
    - pass default buffer values from config
    - update area label while vertex editing
    - auto buffer remove source geoms when done
    - toggle cut tool off when done
    - toggle delete tool off when done
    - allow panning while vertex editing (middle mouse button)
2023-03-13 08:06:24 +01:00
5fb4f61683 Merge pull request '# 308 To share info message' (#310) from 308_To_share_info_message into master
Reviewed-on: SGD-Nord/konova#310
2023-03-13 06:55:46 +01:00
5c23f7a3de Merge pull request 'POST form error fix' (#309) from increase_data_upload_memory_size into master
Reviewed-on: SGD-Nord/konova#309
2023-03-13 06:55:27 +01:00
457244d11b POST form error fix
* increases threshold for max upload memory size from 2.5MB to 5MB
2023-03-13 06:54:32 +01:00
9673886f93 # 308 To share info message
* adds needs-to-be-shared info message on entries which are only shared with the current user
2023-03-07 07:17:08 +01:00
e2b0120f93 Merge pull request '# Bugfix' (#306) from fix_multipolygon_features_mapclient into master
Reviewed-on: SGD-Nord/konova#306
2023-02-23 15:34:34 +01:00
d6af6ebf45 # Bugfix
* fixes bug where multipolygon behaved in mapclient as single polygon, making e.g. deleting of single polygons impossible without removing everything
2023-02-23 14:56:49 +01:00
5551a513e9 HOTFIX
* fixes bug where quality checker for compensations would not check properly for state surface sums
2023-02-23 12:02:50 +01:00
e600b78c74 HOTFIX
* fixes bug where quality checker for compensations would not check properly for state surface sums
2023-02-23 10:44:44 +01:00
a90106b390 Merge pull request '284_285_API_changes' (#296) from 284_285_API_changes into master
Reviewed-on: SGD-Nord/konova#296
2023-02-23 10:20:56 +01:00
bc9c22949d Merge pull request '299_Performance_tweaks' (#302) from 299_Performance_tweaks into master
Reviewed-on: SGD-Nord/konova#302
2023-02-23 10:19:55 +01:00
ede2591cb0 Merge pull request '#300 Extend mail templates' (#301) from 300_Extend_mail_template into master
Reviewed-on: SGD-Nord/konova#301
2023-02-23 10:18:32 +01:00
f3075412eb #300 Extend mail templates
* extends all relevant mail templates such that municipals of an entry will be shown in the mail
2023-02-23 10:17:45 +01:00
8e95e980a3 # Reduces db access
* reduces number of queries performed on detail views of intervention, compensation and eco_account
* renders deductable_rest of eco account beneath progressbar on eco account index view
    * clarifies ordering logic of related column
2023-02-22 10:53:25 +01:00
073c39a970 # Improves home_view()
* improves db fetching performance of landing page by ~75%
2023-02-22 10:02:56 +01:00
acee9daab8 # Improves filter_show_all()
* improves performance for filter_show_all() in ShareableTableFilterMixin and CheckboxCompensationTableFilter by ~40%
2023-02-22 09:44:35 +01:00
35c7836b5c # Improve is_shared_with()
* improves central is_shared_with() method of ShareableObjectMixin to run ~30% faster
2023-02-22 09:19:22 +01:00
89c83f8a55 Merge pull request 'recorded_quality_check' (#297) from recorded_quality_check into master
Reviewed-on: SGD-Nord/konova#297
2023-02-21 08:06:36 +01:00
1438cf4e89 Deployment preparation
* adds unrecording to invalid entries
* reduces quality check runs on entries of interest (compensations)
2023-02-21 08:03:56 +01:00
676b8e1e54 Specific quality check for recorded entries
* adds a new command specifically for recorded entries
2023-02-17 08:03:10 +01:00
78868be772 Merge pull request 'netgis_client_update' (#294) from netgis_client_update into master
Reviewed-on: SGD-Nord/konova#294
2023-02-13 14:41:06 +01:00
4bd2a4c1c5 # Disables buggy client functions
* disables auto-buffering of new points and lines
* improves rendering of surface size
2023-02-13 12:00:19 +01:00
b5160ed918 # Zoom level for parcel wfs 2023-02-13 11:24:24 +01:00
c5d073b06b Merge branch 'map_client_parcel_wfs_proxy' into netgis_client_update 2023-02-13 11:17:45 +01:00
4052105e1d # Server proxy for client parcel wfs
* refactors map_proxy.py
* adds proxy support for parcel wfs
2023-02-13 10:55:58 +01:00
51db1b2f5d # Server proxy for client parcel wfs
* refactors map_proxy.py
* adds proxy support for parcel wfs
2023-02-13 09:58:56 +01:00
b9d1c18511 Netgis Client update 2023-02-13 09:03:09 +01:00
9b3dba9eab Merge pull request '#290 Egon exporter file name' (#291) from 290_EGON_Exporter_file_name into master
Reviewed-on: SGD-Nord/konova#291
2023-02-06 15:01:29 +01:00
c13216761e #290 Egon exporter file name
* replace user given file name with file based file name for egon export handling
2023-02-06 15:00:34 +01:00
6f2b45b62d Merge pull request 'Bugfix' (#289) from fix_shared_users_on_comps into master
Reviewed-on: SGD-Nord/konova#289
2023-02-02 16:34:47 +01:00
3390593bff Bugfix
* fixes rendering of shared users counter on unshared compensation entries
2023-02-02 16:34:09 +01:00
f005e5ccca Quality Check Command enhancement
* adds fix for dealing with __proxy__ instances
2023-02-01 14:17:05 +01:00
6d0ccda792 Merge pull request 'Quality Check Command' (#286) from command_quality_check into master
Reviewed-on: SGD-Nord/konova#286
2023-02-01 14:09:15 +01:00
8c6f394f5b Quality Check Command
* adds new command 'quality_check' which performs the quality checker on certain entries, which can be filtered using '--identifier-like' and/or '--title-like' parameters
    * results are shown in terminal
2023-02-01 14:08:39 +01:00
2e5345e522 #285 Drop atom_id from API
* refactors code usage from atom_id to id inside of api app
2023-02-01 08:08:52 +01:00
2950487f9c #284 Empty API data
* adds proper message for certain data parsing in case of an error
2023-02-01 07:03:54 +01:00
af21fa3daa # WIP: Netgis Client Update 2023-01-31 16:26:59 +01:00
9c8286a5d1 Merge pull request 'Empty value egon fix' (#282) from empty_egon_fix into master
Reviewed-on: SGD-Nord/konova#282
2022-12-22 07:55:38 +01:00
02acceb34e Merge pull request '#280 Schneider capability' (#281) from 280_Schneider_capability into master
Reviewed-on: SGD-Nord/konova#281
2022-12-22 07:42:39 +01:00
a786023e75 Empty value egon fix
* adds support for missing values so that EGON can properly handle these entries
2022-12-22 07:25:55 +01:00
5008bdaaf0 HOTFIX: Migrated revocation
* adds handling for error raising if migrated revocation document missing, due to no existing document at all
2022-12-14 16:36:21 +01:00
235063c8c3 #280 Schneider capability
* refactors update_parcels() method in Geometry model to work on Schneider
* old WFS based logic still exists as update_parcels_wfs() in Geometry model to have a fallback. Can be deleted in the future
2022-12-14 12:18:18 +01:00
87b2e79389 Merge pull request '#277 Deleted entries accessible' (#278) from 277_Deleted_entries_accessible into master
Reviewed-on: SGD-Nord/konova#278
2022-12-13 09:16:16 +01:00
aba91db152 #277 Deleted entries accessible
* fixes bug where deleted entries could be accessed if detail page would be called directly
2022-12-13 09:15:22 +01:00
260aa55b09 Merge pull request 'EGON Export fixes' (#275) from egon_export_fixes into master
Reviewed-on: SGD-Nord/konova#275
2022-12-13 06:50:09 +01:00
c3c1e472e8 EGON Export fixes
* replaces missing value 'None' with empty string ''
2022-12-13 06:49:03 +01:00
66f7341cb5 Merge pull request 'Public report enhancements' (#274) from enhancements_report_template into master
Reviewed-on: SGD-Nord/konova#274
2022-12-12 13:12:31 +01:00
f26b26d1a1 Public report enhancements
* adds toggling of scrollable box table views
* deactivates scrolling for public report view (so all entries can be seen if page is printed)
2022-12-12 13:09:17 +01:00
7585551beb Merge pull request '#271 Identifier non editable' (#272) from 271_Identifier_non-editable into master
Reviewed-on: SGD-Nord/konova#272
2022-12-09 13:02:11 +01:00
c4174b5b36 #271 Identifier non editable
* sets the identifier form field as readonly
* extends help text
* updates translations
2022-12-09 12:43:49 +01:00
e6be063e9e Merge pull request 'configurable_label_input_ratio' (#269) from configurable_label_input_ratio into master
Reviewed-on: SGD-Nord/konova#269
2022-12-08 10:16:23 +01:00
a06b960435 #268 Filter multiple parcelgroups
* adds filter support for multiple parcelgroup and district names, separated by ','
2022-12-08 10:14:39 +01:00
0901bb8d76 Template enhancements
* adds configurable label-input ratio setting for forms and specializes for RemoveModalForm
* enhances form body html structure for better UX and usage of label-input ratio
2022-12-08 09:48:01 +01:00
ad20f5a73c Merge pull request 'Minor_issues' (#267) from Minor_issues into master
Reviewed-on: SGD-Nord/konova#267
2022-12-07 07:04:48 +01:00
e2e91a4df9 #255 Filter by created user
* adds new checkbox filter for all major data types wich shows only entries, where the performing user has been the initial creator of
* adds help texts for checkbox filters
* adds translations
2022-12-06 08:30:43 +01:00
cdda43615a #262 Public report missing entry placeholder
* adds empty value rendering on public intervention report
2022-12-06 07:22:11 +01:00
52ee8690eb #257 Missing geometry message red
* changes message colour from blue to red (indicating 'blocking' message)
* only renders message on read_only form e.g. on detail view
2022-12-06 07:19:39 +01:00
e4305ad9e7 Hotfix: Resubmission mail
* fixes resubmission mail recipient
2022-12-05 06:55:35 +01:00
821141f2a8 Merge pull request 'egon_sending_on_edit' (#263) from egon_sending_on_edit into master
Reviewed-on: SGD-Nord/konova#263
2022-12-05 06:09:59 +01:00
6e85c6ea91 Egon sending
* adds sending to EGON (again) when Intervention is recorded
2022-12-05 06:06:52 +01:00
e26fc7fae1 Fixing broken document migration
* adds changes to document migration to correctly migrate documents
2022-12-02 12:57:18 +01:00
f7b01f4fc4 Merge pull request 'EGON GML Payment date' (#260) from fix_egon_payment_date into master
Reviewed-on: SGD-Nord/konova#260
2022-12-02 06:43:05 +01:00
c3350bb9bc EGON GML Payment date
* fixes bug where missing payment date would result in no egon message sent
2022-12-01 15:35:45 +01:00
2689e73d3a Merge pull request 'Fixes resubmission handling' (#258) from resubmission_fix into master
Reviewed-on: SGD-Nord/konova#258
2022-12-01 14:01:08 +01:00
7fda62cbf3 Fixes resubmission handling
* resubmissions have not been deleted after sending mails
2022-12-01 13:57:04 +01:00
40df3a30d8 Hotfix
* fixes bug where None-geometry entry (instead of empty geometry) would not be expected on parcel fetching
2022-11-30 07:06:44 +01:00
1798765af5 Revert "File number public reports"
This reverts commit 913c42e7e8.
2022-11-28 13:50:31 +01:00
c3b277e6a5 Merge pull request 'File number public reports' (#252) from remove_file_numbers_public_report into master
Reviewed-on: SGD-Nord/konova#252
2022-11-28 07:28:52 +01:00
913c42e7e8 File number public reports
* removes file numbers from public reports
2022-11-28 07:28:09 +01:00
f58da45a11 Merge pull request '222_Annual_reports' (#251) from 222_Annual_reports into master
Reviewed-on: SGD-Nord/konova#251
2022-11-25 09:18:04 +01:00
415089084e Command response dynamic
* adds a check whether the mail could be sent properly or not and changes the resulting response
2022-11-25 09:17:15 +01:00
e30f625497 Merge pull request '249_Last_modified_created' (#250) from 249_Last_modified_created into master
Reviewed-on: SGD-Nord/konova#250
2022-11-25 09:05:48 +01:00
aa13e60bc0 Tests
* extends test for new behaviour of newly created entries
2022-11-25 09:05:06 +01:00
bfbe1085b2 #249 Created as modified
* fills modified attribute on new entries with created value automatically
* adds default ordering by last modified on table overviews
2022-11-25 08:27:42 +01:00
7438cb34d1 Merge pull request 'hotfix_geometry_save_race_condition' (#246) from hotfix_geometry_save_race_condition into master
Reviewed-on: SGD-Nord/konova#246
2022-11-23 16:06:50 +01:00
79fd3ad29d API - Geometry empty
* removes mapping of empty geometry to None due to general switch to empty geometry usage
2022-11-23 16:05:27 +01:00
2ef643f4e0 Geometry race condition fix
* fixes race condition for geometry conflict and parcel calculation
* harmonizes empty geometries from None/MultiPolygonEmpty to MultiPolygonEmpty
2022-11-23 13:51:05 +01:00
67e79701cf Merge pull request '243_GDALException_on_null' (#244) from 243_GDALException_on_null into master
Reviewed-on: SGD-Nord/konova#244
2022-11-23 07:13:17 +01:00
a6a5bd5450 Further fixes
* fixes race condition on geometry conflict calculation if performed in background process
* simplifies access to smaller buffered geometry
* adds mapping of "qm"->"m2" for UnitChoice in API usage for backwards compatibility
2022-11-22 15:38:03 +01:00
5594250d59 #243 Feature without geometry
* fixes GDALException in case of provided feature (import) without geometry content
* modifies 500.html template to inform the user about the admins being informed automatically
2022-11-22 14:49:51 +01:00
d6e76f7a2a Hotfix
* adds missing migration
2022-11-18 16:22:24 +01:00
6833fc14cb Merge pull request 'Updates LANIS link' (#240) from lanis_link_fix into master
Reviewed-on: SGD-Nord/konova#240
2022-11-18 13:32:12 +01:00
0bc486502f Merge pull request '#238 Fix' (#239) from 238_Type_error_on_eco_account_edit into master
Reviewed-on: SGD-Nord/konova#239
2022-11-18 13:29:11 +01:00
689f3b6d28 Updates LANIS link
* changes LANIS link to new layer declaration
2022-11-18 13:28:13 +01:00
4138b056df #238 Fix
* adds casting from Decimal() to primitive float for proper calculation
2022-11-18 13:24:36 +01:00
c2fc210868 Merge pull request 'Egon Payment compatibility' (#237) from fix_egon_payment_sum into master
Reviewed-on: SGD-Nord/konova#237
2022-11-18 07:54:58 +01:00
2c493d33dc Egon Payment compatibility
* EGON expects the payment amount to be a localized string instead of float
    * adds transformation for this
2022-11-18 07:40:35 +01:00
0f08071ca6 Merge pull request 'fix_comp_action_units' (#235) from fix_comp_action_units into master
Reviewed-on: SGD-Nord/konova#235
2022-11-18 06:52:59 +01:00
a157891f9d Z-axis geometry upload fix
* adds clamping of 3D geometries to 2D geometries if uploaded using the map importer
* extends tests for payment-document linkage
* fixes bug in team-admin selection where autocomplete could not be resolved properly
2022-11-17 13:01:40 +01:00
0cefc0e0b8 Fix CompensationAction unit None
* adds correct declaration of unit (qm -> m2) for template rendering
* adds migration to transform existing qm units to m2
2022-11-17 10:13:22 +01:00
8197615546 Merge pull request 'post_release_fixes' (#233) from post_release_fixes into master
Reviewed-on: SGD-Nord/konova#233
2022-11-17 06:54:42 +01:00
d7b2e933ec #232 Payment document linkage
* adds error message on intervention view if a payment has been added but no document has been uploaded yet
* adds same check to quality checker, meaning no intervention can be recorded which has a payment but no document
* adds trigger for sending data to egon on uploading a document in case of an already existing payment
* adds translations
2022-11-16 16:11:42 +01:00
4e0ee7dc91 #230 Shared users not rendered on compensation
* fixes non rendering of shared users on shared data
2022-11-16 13:30:07 +01:00
83137f0e58 #229 Shared users mandatory on admin
* changes mandatory state of users and teams on admin backend to optional (as expected by the model)
* adds team selection to admin backend
2022-11-16 13:27:57 +01:00
266f2fcdf6 #228 Parcel filter
* changes parcel related filter fields from CharField to NumberField to avoid unexpected behaviour on non-numerical input
2022-11-16 13:18:52 +01:00
daae2609d2 #231 Report geometry
* should fix report geometry cast problem in cases where MultiPolygon(srid=4326) is taken as default
2022-11-16 12:20:16 +01:00
5c4b4dded3 Merge pull request 'Team mail fix' (#226) from 225_Team_mails_always_sent into master
Reviewed-on: SGD-Nord/konova#226
2022-11-14 07:23:15 +01:00
829c145749 Team mail fix
* filters team members by notification settings before sending team mails
2022-11-14 07:19:04 +01:00
1f7f9c8964 Command
* adds new 'generate_report' command
   * generates TimeSpanReports for given conservation offices
   * zips reports into archive
   * sents archive to ADMINS mails
2022-10-26 15:44:33 +02:00
9d0677e170 Bugfix
* fixes bug in excel report creation
* fixes order in laws of generated excel sheet
2022-10-26 10:35:15 +02:00
c9485bc8e0 Merge pull request 'minor_order_by_timestamp_improvement' (#223) from minor_order_by_timestamp_improvement into master
Reviewed-on: SGD-Nord/konova#223
2022-10-19 07:34:29 +02:00
048af01795 Landing page shared count fix
* fixes bug where count of shared entries on landing page would ignore team-shared entries
* restore prior editable column icon rendering
2022-10-19 07:24:00 +02:00
48aee04955 Missing geometry html improvement
* improves rendering of missing geometry icons on table
2022-10-14 08:07:33 +02:00
d95827770d Map client holes fix
* fixes bug where holes in stored geometries would not be rendered properly on initial loading the map client
    * drawback: multiple polygons are treated as a single feature on the map client. Not a real issue but maybe we can find a better solution to this
* quality of life: renders geometry area in m² on detail and report view
2022-10-14 08:02:08 +02:00
b57d52dc9f Table improvements
* enhances visualization of editable column on tables
    * simplifies code
* enhances visualization of parcel_group column on tables
* WIP: Ordering on intervention table is odd. Same results are being displayed on page 2. Needs further analysis and fixing!
2022-10-12 16:26:01 +02:00
90da686de3 New help page link
* changes the help link to match the new starter help page
2022-10-12 10:20:04 +02:00
68e8a0201f Map settings button removed
* removes map settings button, since there is no implementation and it is unclear, whether this will ever become a real feature
2022-10-12 10:18:57 +02:00
7ccb362968 New icon for missing geometry
* introduces "..." as new icon for missing geometry entries
    * moves former explanatory message into title attribute for mouse hover activation
2022-10-12 10:15:27 +02:00
67df63af0f Quality of Life improvements
* disables ordering of parcel_group ("Gemarkung") column on tables
    * ordering can not be done properly due to more complex nature of this column's content
* introduces "Keine Geometrie vorhanden" message instead of hour glass icon on entries where no geometry has been entered yet
* properly orders last_modified column by moving null values to the lower end of the ordering
2022-10-12 10:01:23 +02:00
7235110b7d Merge pull request '217_Prevent_recorded_deduction_deletion' (#220) from 217_Prevent_recorded_deduction_deletion into master
Reviewed-on: SGD-Nord/konova#220
2022-10-12 09:01:49 +02:00
587b828574 Test extension
* adds further checks on EcoAccount tests for proper updating of new deductable_rest attribute
2022-10-12 08:59:38 +02:00
96ee94583f Fixes account deletion with deductions
* adds a warning on removing an eco account if there are still deductions
    * this way a user needs to get rid of these deductions first
2022-10-11 16:47:16 +02:00
2129855068 Fix for recorded deduction
* fixes bug where deduction of a recorded intervention could be deleted from the eco account detail view
* improves check_for_recorded_instance() logic
* improves rendering of detail view on compensation-like objects to highlight missing data
2022-10-11 16:32:12 +02:00
8f2f3f348f Merge pull request 'fix_acc_sorting_availability' (#218) from fix_acc_sorting_availability into master
Reviewed-on: SGD-Nord/konova#218
2022-10-11 15:21:23 +02:00
68dfef18c5 Fixes EcoAccount availability ordering
* adds db based table ordering for EcoAccountTable
2022-10-11 15:20:11 +02:00
73f3887941 Hotfix for ordering of availability
* fixes error 500 in case of ordering by availability
2022-10-11 13:31:00 +02:00
974c4dbce5 Merge pull request 'Map client update' (#216) from map_tst into master
Reviewed-on: SGD-Nord/konova#216
2022-10-07 13:57:45 +02:00
d7655be7dc Map client update
* updates map client to most recent code
* fixes bug on as_feature_collection which led to problems on initial loading in map
2022-10-07 13:56:43 +02:00
f386fd5b4d Merge pull request 'Netgis client update' (#214) from map_client_update_05102022 into master
Reviewed-on: SGD-Nord/konova#214
2022-10-05 11:01:55 +02:00
4ae3758d20 Netgis client update
* fixes address search results placement in scrollable context
* fixes import issues for gml and geojson
* updates basic configuration for map layers
2022-10-05 11:01:11 +02:00
fd6143b304 Merge pull request '#208 API non existing atomID' (#212) from 208_API_non_existing_values into master
Reviewed-on: SGD-Nord/konova#212
2022-09-29 10:45:44 +02:00
109a45c564 #208 API non existing atomID
* handles error response for non existing atomID properly according to isse #208
2022-09-29 10:42:32 +02:00
cd914c880f Merge pull request 'Fix geometry conflict message' (#211) from hotfix_geom_conflict_msg_with_deleted_entry into master
Reviewed-on: SGD-Nord/konova#211
2022-09-29 10:30:06 +02:00
ab534556a2 Fix geometry conflict message
* fixes bug where geometry conflicts template message has been rendered despite having no active geometry conflict
    * happened in case of existing geometry conflicts related to an as deleted marked entry
2022-09-29 10:29:33 +02:00
71811ae156 Merge pull request 'API Celery parcel calculation fix' (#209) from map_client_update into master
Reviewed-on: SGD-Nord/konova#209
2022-09-28 12:28:08 +02:00
477b4508ba API Celery parcel calculation fix
* fixes bug where API stored data would not have parcels be calculated correctly
2022-09-28 12:24:06 +02:00
981b526e99 Merge pull request 'Bugfix Parcel calculation' (#206) from map_client_update into master
Reviewed-on: SGD-Nord/konova#206
2022-09-16 12:13:24 +02:00
167be0c24e Bugfix Parcel calculation
* fixes a bug where neighbouring parcels would be detected using Intersection operation as well
2022-09-16 12:09:25 +02:00
63ff4b372b Merge pull request '202 Geometry conflict checking to background' (#204) from 202_Geometry_conflict_checking_to_background into master
Reviewed-on: SGD-Nord/konova#204
2022-09-15 12:13:17 +02:00
2957a6aa60 202 Geometry conflict checking to background
* wraps check_for_conflicts() in celery based method
* fixes bug on InterventionEditForm where geometry's save() has been called twice
2022-09-15 12:12:35 +02:00
4b20802a6a Merge pull request 'map_client_update' (#203) from map_client_update into master
Reviewed-on: SGD-Nord/konova#203
2022-09-15 11:39:00 +02:00
60001089f4 Webfonts 2022-09-14 09:12:59 +02:00
c91caa72d6 Bugfix Webfonts Netgis Client 2022-09-14 09:10:20 +02:00
61cd1a697b NEtgis Client Bugfix
* fixes bug where initial geometry has not been rendered on client loading
* needs to be replaced asap by a proper bugfix from the original devs
2022-09-13 13:43:43 +02:00
a8b7cebc09 Netgis client update
* adds new version to sources
2022-09-12 13:12:59 +02:00
8f5a90dede Merge pull request 'Login required on modals' (#201) from modal_login_required into master
Reviewed-on: SGD-Nord/konova#201
2022-09-12 12:11:15 +02:00
f49bb74c38 Login required on modals
* adds new login_required_modal decorator
    * can be used before regular login_required decorator to return a proper session-timed-out message
2022-08-25 11:34:09 +02:00
07fb021049 Merge pull request '104_Class_based_views' (#200) from 104_Class_based_views into master
Reviewed-on: SGD-Nord/konova#200
2022-08-22 11:09:51 +02:00
fc19a4de52 Share views
* replaces function based share views with class based
* improves team-share autocomplete search
* renames internal share url names
2022-08-22 10:58:07 +02:00
09402611dc EcoAccount views
* splits compensation/views/eco_account.py (+700 lines) into separate files in new module
    * view files can now be found in /compensation/views/eco_account/...
2022-08-22 10:17:49 +02:00
e66c5369a7 CompensationAction views
* replaces function based action views with class based
2022-08-22 08:38:23 +02:00
75802c5f66 State views
* replaces function based state views with class based
2022-08-22 08:27:36 +02:00
59b77fe567 Ema Deadline views
* replaces ema deadline views with class based
2022-08-22 08:12:55 +02:00
9e6a9f4902 Deadline views
* replaces function based views for deadlines with class based views
2022-08-22 08:07:35 +02:00
a73046aa02 Document views
* replaces function based views for creating, editing, removing and fetching documents with class based views
    * implemented for all major data types
2022-08-22 07:52:22 +02:00
7b35591f5d Record class view
* adds AbstractRecordView to konova/views/record.py
    * implements for all major data types
2022-08-19 11:01:33 +02:00
ef3507f058 Resubmission class view
* adds AbstractResubmissionView to konova app
    * implemented for all major data types
    * replaces function based views
2022-08-19 10:47:59 +02:00
3c416fa264 Konova views
* splits konova/views.py into separate files in new module
    * view files can now be found in /konova/views/...
* introduces first class based view AbstractLogView
    * implemented for Ema, Intervention, Compensation and EcoAccount
2022-08-19 10:25:27 +02:00
d168ec47ce EcoAccount views
* splits compensation/views/eco_account.py (+700 lines) into separate files in new module
    * view files can now be found in /compensation/views/eco_account/...
2022-08-19 08:27:42 +02:00
8c3e8b596a Compensation views
* splits compensation/views/compensation.py (+700 lines) into separate files in new module
    * view files can now be found in /compensation/views/compensation/...
2022-08-19 08:12:32 +02:00
79840550cb EMA views
* splits ema/views.py (+700 lines) into separate files in new module
    * view files can now be found in /ema/views/...
2022-08-19 07:51:49 +02:00
55a69d45c3 Intervention views
* splits intervention/views.py (+700 lines) into separate files in new module
    * view files can now be found in /intervention/views/...
2022-08-19 07:34:09 +02:00
75777d65c6 Filters refactoring
* splits filters.py of compensation and ema app into separate files in new /filters module
* optimizes entry search for multi keyword input
2022-08-18 13:19:04 +02:00
87b1da8fdd Autocomplete refactoring
* refactors konova/autocompletes.py by splitting into individual files and moving them to fitting apps
     * autocomplete files now live in APPNAME/autocomplete/...
2022-08-18 11:25:06 +02:00
c07933a9bf Konova filter mixins
* refactors konova/mixins.py into individual files in konova/mixins/...
2022-08-18 10:45:15 +02:00
ca6770ec54 Tables refactoring
* splits compensation tables.py into individual files for compensation table and eco account table
2022-08-18 10:24:11 +02:00
05c1bf677c User forms
* refactors user/forms.py by splitting into modals package and regular forms
    * regular forms can now be found at user/forms/user.py and user/forms/team.py
    * modal forms can now be found at user/forms/modals/...
2022-08-18 10:17:09 +02:00
de8d79983d Intervention forms
* refactors intervention/forms and ../modalForms into individual files in separated packages
    * forms.py has been renamed into intervention.py, now can be found as intervention/forms/intervention.py
    * modalForms.py has been split into individual files living in modals package, can be found as intervention/forms/modals/...
2022-08-18 10:08:51 +02:00
1367fd2b5f Compensation forms refactoring
* splits compensation/forms.py and /modalForms.py into individual files inside new packages
    * general forms stay in new files in compensation/forms
    * modal forms stay in new files in compensation/forms/modals
2022-08-18 09:54:49 +02:00
180ee293ca Merge pull request '197_Resubmission' (#198) from 197_Resubmission into master
Reviewed-on: SGD-Nord/konova#198
2022-08-15 11:02:07 +02:00
0bf2051bdf Migrations + Cleanup
* adds needed migrations
* refactors forms.py (700+ lines) in main konova app
    * splits into forms/ and forms/modals and single class/topic-files for better maintainability and overview
* fixes bug in main konova app migration which could occur if a certain compensation migration did not run before
2022-08-15 10:50:01 +02:00
8a44681803 Command
* adds new command to be used with cron for periodic checkin of resubmissions
* updates translations
2022-08-15 10:02:07 +02:00
60867fdf39 Templates + Routes
* adds control button for Intervention, Compensation, Ema and EcoAccount for setting a resubmission on an entry
2022-08-15 09:38:51 +02:00
7e05d05d97 Model
* adds new model and mixin
* adds new functionality for Mailer class for sending resubmission mails
2022-08-15 08:08:15 +02:00
b2f29a3651 Merge pull request 'Fix' (#196) from 192_Deduction_modal_form_on_recorded_intervention into master
Reviewed-on: SGD-Nord/konova#196
2022-08-10 09:29:18 +02:00
45e9ff9539 Fix
* adds more detailed situation check on check_for_recorded_instance()
2022-08-10 09:28:43 +02:00
b5333baa86 Merge pull request '191_Deduction_change_notification' (#195) from 191_Deduction_change_notification into master
Reviewed-on: SGD-Nord/konova#195
2022-08-10 09:04:29 +02:00
049305c32e Minor changes
* updates translation
2022-08-10 09:03:24 +02:00
ff26019b6e Mail sending
* adds mail sending logic for new notification setting
* adds new templates for user and team based sending
* enhances all email template layout
* adds translations
2022-08-10 08:59:24 +02:00
4138481a1b New Notification
* adds new notification setting to user settings form
* adds translations
* adds initial creating of ENUM on setup command
2022-08-10 08:03:18 +02:00
00336c24b9 Merge pull request '#190 Mandatory finished deadline' (#194) from 190_Deadlines_mandatory into master
Reviewed-on: SGD-Nord/konova#194
2022-08-08 15:01:31 +02:00
538d8d1ed2 #190 Mandatory finished deadline
* adds template message to indicate a finished-deadline is mandatory
* adds finished deadline existance to quality check of compensation-like entries
* adds proper warning to quality check result
* extends tests
2022-08-08 14:57:36 +02:00
f717e650e6 Merge pull request '#185 Parcel loading on public reports' (#186) from 185_Parcels_loading_CORS_error into master
Reviewed-on: SGD-Nord/konova#186
2022-08-02 09:38:44 +02:00
ac49f983ee #185 Parcel loading on public reports
* fixes bug where unauthorized clients would not load a geometries parcel view properly
* minor general templates enhancements
2022-08-02 09:38:03 +02:00
a955e9f564 Revert "Merge branch 'Docker' into master"
This reverts commit 8c47c8ae35, reversing
changes made to 2206565673.

Undos accidental remote merge
2022-07-13 11:21:51 +02:00
8c47c8ae35 Merge branch 'Docker' into master 2022-07-13 11:02:57 +02:00
2206565673 Merge pull request 'geometry_srid_migration' (#183) from geometry_srid_migration into master
Reviewed-on: SGD-Nord/konova#183
2022-07-13 10:57:37 +02:00
72e5599395 Test update
* updates tests for SRID migration
2022-07-13 10:53:45 +02:00
85a4563123 Geometry Model geom SRID migration
* adds two new migrations for transforming existing geometries into the default SRID
2022-07-13 08:19:27 +02:00
fc3c0c4beb 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
053612a924 #180 Shared data users hidden
* implements hidden visibility of shared users on non-shared entries
2022-06-27 14:31:09 +02:00
10c86af314 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
72b779de98 # 177 Impressum link
* adds impressum link to footer
2022-06-21 14:27:32 +02:00
e4528dc5ef # 177 Overview layout enhancement
* enhances layout title section layout on overview template
2022-06-21 14:25:50 +02:00
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
2022-06-21 14:19:10 +02:00
2d3299cffa # 177 Timespanreport helptext for deductions
* adds help text for recorded deduction section
2022-06-21 14:11:01 +02:00
30d8a3c6e5 # 177 Timespanreport column order
* rearranges the column order so 'Total' will always be the first column
2022-06-21 14:02:49 +02:00
8245cf5bbb # 177 Report help texts
* adds report form field help texts
* adds translations
2022-06-21 13:54:41 +02:00
3fe80680a0 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
6c99a5b4e6 # 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
d7c9c77b7b Merge pull request 'master' (#174) from master into Docker
Reviewed-on: SGD-Nord/konova#174
2022-06-02 09:38:06 +02:00
b273afdea3 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
e513db9da5 Merge pull request 'master' (#172) from master into Docker
Reviewed-on: SGD-Nord/konova#172
2022-06-02 08:53:32 +02:00
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
2022-05-31 16:53:13 +02:00
5cf4dbf2a4 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
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
2022-05-31 13:33:44 +02:00
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)
2022-05-31 12:58:35 +02:00
8b6c8dc1aa 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
c911276cb4 #169 Team delete-restore
* removes unused code snippets
2022-05-31 09:47:32 +02:00
4ec8e1ae07 #169 Team delete-restore
* adds tests for user app
2022-05-31 09:10:44 +02:00
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
2022-05-30 15:38:16 +02:00
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
2022-05-30 14:35:31 +02:00
b790921e42 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
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
2022-05-30 10:26:34 +02:00
528f2145a4 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
5c21932511 #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
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
250189d895 #142 Localized date improved
* fixes bug where created timestamp has been displayed on modified attribute on detail views
* enhances localized date and datetime rendering
* reorders sub menus in user's profile hub
2022-04-12 09:05:33 +02:00
a22f52ddd4 Merge pull request '139_Improve_parcel_reference' (#141) from 139_Improve_parcel_reference into master
Reviewed-on: SGD-Nord/konova#141
2022-04-11 12:21:41 +02:00
e93ea72019 # 139 Doc update
* updates doc
2022-04-11 10:55:15 +02:00
6e76a3fdce #139 Parcel filter improved
* improves frontend filtering for district, municipal, ..., so keys can be used for a lookup as well
2022-04-11 10:51:15 +02:00
8af0e41e2d # 139 Parcel reference improved
* improves frontend layout to display more details on district, municipal and parce group
* improves ordering of parcels
* refactors parcel related models
* improves parcel fetching
* extends and simplifies sanitize_db parcel related code
2022-04-11 10:23:28 +02:00
bdb9f74aca #138 WIP
* minor changes for dev purposes
2022-04-11 08:02:48 +02:00
eb3d58ed19 #138 Map client to views
* adds netgis map client to all detail and report views
* adds netgis map client to new object forms
* WIP: needs functionality server-client
2022-04-04 12:27:45 +02:00
57e3287821 Merge pull request 'master' (#136) from master into Docker
Reviewed-on: SGD-Nord/konova#136
2022-03-21 12:21:50 +01:00
a052283319 Merge pull request '131_EGON_connection' (#135) from 131_EGON_connection into master
Reviewed-on: SGD-Nord/konova#135
2022-03-21 12:20:55 +01:00
bc53649ea8 #131 EGON export
* finishes egon compatible (tested) data export
* moves egon export into celery process
* adds export of data in case of intervention recording
* adds _RABBITMQ_ settings for intervention/settings.py
* adds new dependency for requirements.txt
2022-03-21 12:14:55 +01:00
f50f17d593 Docker worker enhancement
* drops docker worker process in favor of background celery worker on main process
* changes uploaded files folder into host-based folder
2022-03-09 14:03:50 +01:00
0269dfb392 #131 EGON exporter
* enhances EGON exporter code structure
2022-03-09 08:34:26 +01:00
18c2513863 #131 WIP: EGON exporter
* adds incomplete WIP implementation of an EGON exporter
2022-03-08 11:54:26 +01:00
05c8d6e520 Merge pull request 'master' (#134) from master into Docker
Reviewed-on: SGD-Nord/konova#134
2022-03-04 13:33:35 +01:00
caa840849e Merge pull request '129_Handler_code' (#133) from 129_Handler_code into master
Reviewed-on: SGD-Nord/konova#133
2022-03-04 13:23:11 +01:00
f4d0485019 # 129 Handler code renaming
* renames handler code list
* improves missing handler data rendering on detail view
2022-03-03 12:09:09 +01:00
f441ed94f5 # 129 Handler code
* adds handler code list usage to forms and models
* updates tests
* extends API for handler code handling
2022-03-03 12:05:22 +01:00
a80fa4c700 Merge pull request 'master' (#130) from master into Docker
Reviewed-on: SGD-Nord/konova#130
2022-02-25 13:07:59 +01:00
e715be3ca1 Merge pull request '121_Deferred_parcel_loading' (#128) from 121_Deferred_parcel_loading into master
Reviewed-on: SGD-Nord/konova#128
2022-02-21 15:57:38 +01:00
ab361ec2fd #121 Deferred parcels test
* adds test for htmx-parcel fetching
2022-02-21 15:53:09 +01:00
95255ff3ea #121 Fancy spatial reference
* visual enhancement for spatial reference rendering
2022-02-21 15:38:41 +01:00
6e3a6d53d1 #121 Deferred parcels
* improves filtering by gmrkng and krs
* implements deferred loading of parcels on spatial referenced data objects
* adds HTMX to project
* improves detail view layout (mainly interesting for smaller displays/mobile)
2022-02-21 15:18:15 +01:00
ae1e65768e Merge pull request '125_Form_titles_wrong' (#127) from 125_Form_titles_wrong into master
Reviewed-on: SGD-Nord/konova#127
2022-02-21 09:25:21 +01:00
d679acd863 # 126 Report change
* removes handler from report rendering
2022-02-21 09:19:24 +01:00
c34011d45f #125 Edit form titles
* changes form titles for all new EditForms
2022-02-21 09:04:46 +01:00
65179eaaab Merge pull request 'HOTFIX' (#124) from master into Docker
Reviewed-on: SGD-Nord/konova#124
2022-02-18 15:28:35 +01:00
f75acd318f HOTFIX
* fixes bug where new teams button would not open modal form
2022-02-18 15:28:15 +01:00
fdfb724109 Merge pull request 'master' (#123) from master into Docker
Reviewed-on: SGD-Nord/konova#123
2022-02-18 15:21:29 +01:00
87f1ca19fb Merge pull request '101_Team_based_sharing' (#122) from 101_Team_based_sharing into master
Reviewed-on: SGD-Nord/konova#122
2022-02-18 15:20:34 +01:00
963854652e #101 Team mails
* adds mail templates for shared data actions
* fixes bug where deleted compensations would be used for checking
2022-02-18 15:19:37 +01:00
50def040f2 #101 Datatype team migrations
* adds migration files for ShareableObject data models
2022-02-18 14:09:45 +01:00
87a93b9a7f #101 Team data view
* adds overview of shared teams on object detail view
* adds team data view if button is clicked
2022-02-18 14:07:44 +01:00
edcf7b3c78 #101 Team sharing tests
* adds tests for team sharing
* extends the API for team sharing support
* adds shared_teams property shortcut for ShareableObjectMixin
* adds full support for team-based sharing to all views and functions
* simplifies ShareModalForm
* adds/updates translations
2022-02-18 13:52:27 +01:00
e152dfd4d7 #101 Team sharing form
* adds team sharing field to share form
* splits sharing logic into user based and teams based
* adds TeamAdmin for admin backend
* adds validity check on Team name -> only unused names shall be valid
2022-02-18 11:02:40 +01:00
071bdea099 Merge branch 'master' into 101_Team_based_sharing 2022-02-18 09:27:00 +01:00
31f4369236 Missing migration
* adds a migration which has not been checked in from another branch
2022-02-18 09:26:29 +01:00
3878b5dbdb WIP: #101 Team sharing form
* adds form for sharing via team
2022-02-17 15:07:25 +01:00
9fec85b688 #101 Team enhancements
* visual enhancement for team index rendering
* adds validity check for admin-membership of a team
2022-02-17 13:44:32 +01:00
75c70ff8dc #101 Team settings
* adds first implementation for team managing
2022-02-17 13:13:32 +01:00
2339fcebd1 Merge pull request '#114 Unshared Account Deductions' (#120) from 114_Deduct_from_unshared_EcoAccount into master
Reviewed-on: SGD-Nord/konova#120
2022-02-16 12:35:44 +01:00
5ccb63d27b #114 Unshared Account Deductions
* enables deducting from unshared eco accounts
   * account must be recorded and not deleted, so users can use it for deductions
2022-02-16 12:35:19 +01:00
85f777f683 Merge pull request '118_API_update' (#119) from 118_API_update into master
Reviewed-on: SGD-Nord/konova#119
2022-02-16 11:39:16 +01:00
c7382f1e54 #118 API pagination
* adds pagination and related parameters to GET apis
* updates api GET test
2022-02-16 11:38:24 +01:00
0677cec709 #118 API ActionTypes
* adds support for multiple action_type entries on one CompensationAction
2022-02-16 09:44:56 +01:00
3c9eed894a Merge pull request '110_Biotope_codelists' (#117) from 110_Biotope_codelists into master
Reviewed-on: SGD-Nord/konova#117
2022-02-16 09:10:28 +01:00
8224f4c8c5 # 110 Biotope codes
* removes list 974 from update_codelist.py command
* adds migration for existing biotope states to be changed into proper list
2022-02-16 09:08:11 +01:00
aaea58217b Merge pull request 'master' (#116) from master into 110_Biotope_codelists
Reviewed-on: SGD-Nord/konova#116
2022-02-16 08:50:40 +01:00
b528c8ecce Merge pull request '112_Restructure_CompensationAction' (#115) from 112_Restructure_CompensationAction into master
Reviewed-on: SGD-Nord/konova#115
2022-02-16 08:32:06 +01:00
91185ef847 #112 Tree filter case insensitive search
* adds case insensitive search for TreeWidget
2022-02-16 08:31:18 +01:00
ed27d8d589 #112 Order enhancement
* enhances ordering for action details and biotope details
2022-02-16 08:26:24 +01:00
a160f3fe6c #112 Autocomplete enhancements
* enhances filtering for Autocomplete -> parent_parent will be searched for match as well
* adds rendering of parent_parent group for BiotopeAutocomplete
* enhances ordering of registration office autocomplete
2022-02-15 15:33:25 +01:00
1ea5b4fc39 # 112 Search input for TreeWidget
* adds search input field for js-filtering by input
2022-02-15 14:35:49 +01:00
6d5e2b8d15 #112 TreeWidget JS
* adds visual support on (de-)selecting checkboxes
* adds same support on initialization of checked checkboxes e.g. on edit forms
2022-02-15 13:23:15 +01:00
4be26fbc22 #112 CompensationAction explanation
* updates the help_text for action_type on NewActionModalForm to give a better explanation
2022-02-15 11:32:20 +01:00
c0de1ae28d #112 AbstractCompensation rendering enhancements
* minor changes to detail view rendering of EMA, Compensation and EcoAccount
2022-02-15 10:56:49 +01:00
95856c9ee9 #112 CompensationAction Tree
* implements generic HTML based and Django compatible TreeView
* enhances listing of CompensationActions on DetailView
2022-02-15 10:48:01 +01:00
d04d02380f WIP: #112 Restructure CompensationAction 2022-02-11 16:21:44 +01:00
cc4e4d650b Merge pull request 'master' (#113) from master into Docker
Reviewed-on: SGD-Nord/konova#113
2022-02-11 16:10:47 +01:00
62e452c625 WIP: CompensationAction using jstree 2022-02-11 14:13:42 +01:00
afb78fa670 #112 Migration enhance
* fixes bug in migration
* adds check to migration which raises error before data loss might happen
2022-02-11 08:43:21 +01:00
2b66189590 #112 WIP: Restructure CompensationAction
* changes action_type from ForeignKey into M2M
* adds migration
* changes form widget
* WIP: changes rendering on detail view of compensation
* TEST NOT CHECKED YET!
2022-02-10 14:45:00 +01:00
e7454e558d # 110 Biotope codelists
* adds codelist 654 to settings
* adds codelist to update_codelist command
2022-02-10 14:01:59 +01:00
1028c19f87 Translation update
* updates translations
2022-02-10 13:31:51 +01:00
a26ab9cc3a Merge pull request '86_User_suggestions_and_feedback' (#111) from 86_User_suggestions_and_feedback into master
Reviewed-on: SGD-Nord/konova#111
2022-02-10 13:31:55 +01:00
6fbdc3c1fb #86 Edit deadlines EcoAccount
* adds support for editing of deadlines in EcoAccount
* adds buttons and urls
2022-02-10 12:49:30 +01:00
afb0cabec4 #86 Edit deadline Compensation
* adds support for editing of deadlines
* adds buttons and urls
* adds w-10 as base css-class for all action columns
2022-02-10 12:42:41 +01:00
8d396c3e2b #86 Edit deadlines EMA
* adds support for editing of EMA deadlines
* adds buttons and urls
2022-02-10 12:33:22 +01:00
c88bbdabbc #86 Edit view tests
* extends view tests
2022-02-10 11:45:55 +01:00
792b4a4632 #86 Edit actions compensation
* adds support for editing of CompensationAction for compensation
* adds buttons and urls
2022-02-10 11:31:13 +01:00
b581d1c4ad #86 Edit actions EMA
* adds support for editing of CompensationAction
* adds buttons and urls for EMA
2022-02-10 11:24:20 +01:00
aa242e040a #86 Edit states EMA/EcoAccount
* adds support for editing of states for EMA and EcoAccount
* adds buttons and urls
2022-02-10 11:15:01 +01:00
0c261196a4 #86 Edit states compensation
* adds support for editing of states
* adds buttons and urls for compensation
2022-02-10 11:02:30 +01:00
fe842cb9bc #86 Edit document EcoAccount
* adds support for editing of documents
* adds buttons and urls for ecoaccount
2022-02-10 10:51:52 +01:00
3ded54b80f #86 Edit document Compensation
* adds support for editing of documents
* adds buttons and urls for compensation
* simplifies getter for all documents
2022-02-10 10:44:44 +01:00
4a777e4b01 #86 Edit document EMA
* adds buttons and urls for ema
2022-02-10 10:28:41 +01:00
c5534bcd55 #86 Edit document
* adds support for editing of documents
* adds buttons for intervention
2022-02-10 10:21:18 +01:00
1b5cda648e #86 Revocation edit
* adds support for revocation edit
    * revocation document files will be replaced on an edit
2022-02-09 16:02:28 +01:00
d106977c34 #86 Edit deductions
* adds support for editing deductions
* adds tests
* improves major base test logic
2022-02-09 14:49:56 +01:00
ce9143e4b2 #86 Edit payment
* adds button for payment editing
* adds new edit form payment editing
* adds tests for views and workflow
2022-02-09 10:29:34 +01:00
c5e3800c34 #86 District column simplification
* simplifies the fetching of districts for district column
2022-02-09 09:30:37 +01:00
aa338e5519 #86 Parcel-Geometry improvement
* improves the way parcel-geometry relations are stored on the DB
    * instead of a numerical sequence we switched to UUID, so no sequence will run out at anytime (new model: ParcelIntersection)
    * instead of dropping all M2M relations between parcel and geometry on each calculation, we keep the ones that still exist, drop the ones that do not exist and add new ones (if new ones exist)
2022-02-09 09:18:35 +01:00
a096b2a413 # 86 LANIS link fix
* simplifies creation of LANIS link by refactoring into super class
2022-02-08 17:14:23 +01:00
6ea66180d1 #86 Autocomplete enhancement
* adds support for title lookup on EcoAccounts
* adds support for title lookup on Interventions
* adds support for email lookup on User
2022-02-08 17:08:03 +01:00
402bc2d6f3 #86 Parcel district column for all
* adds parcel district column for all major data objects
* adds warning about intervention-revocation on index view of compensations
* adds warning about intervention-revocation on detail view of related compensations
2022-02-08 15:25:44 +01:00
5e79f16e1e #86 Revocation rendering if needed
* renders revocation warning on the index view if a revocation exists
2022-02-08 15:07:05 +01:00
23c04c8883 #86 Parcel districts instead of revocation
* drops revocation column in favour of a parcel district column
2022-02-08 14:51:53 +01:00
d5a3c70788 #86 Email enhancement
* adds object titles to email sending
2022-02-08 14:31:11 +01:00
02ccb78080 Remove form renaming
* renames new remove modal forms to match a more coherent style
2022-02-08 13:31:40 +01:00
07c6f19d5c Test enhancements
* adds more view tests to intervention tests
2022-02-08 13:27:42 +01:00
5ebb3f833a #86 Log detail enhancements
* restructures removing of related data into separate sub-delete forms for easier logic handling
2022-02-08 13:16:20 +01:00
43bc3517ff Further tests
* adds tests for intervention workflow
2022-02-08 12:07:49 +01:00
5eebd42c3c Further tests ecoaccount
* adds ecoaccount workflow tests
2022-02-08 11:58:43 +01:00
98df0f93c3 Further tests
* restructures compensation/tests into subtests for ecoaccount and compensation
* adds tests for ema workflow
* improved test data setup
2022-02-08 09:27:28 +01:00
7d3c3f030b # 86 Deadline removal log entry
* adds log entries if deadline is removed
2022-02-07 09:56:37 +01:00
7535f008b7 #86 Logs
* adds log detail support for compensation state and action
2022-02-04 16:56:08 +01:00
e5153ddf77 Merge pull request '# 108' (#109) from 108_Deleted_compensation_checked into master
Reviewed-on: SGD-Nord/konova#109
2022-02-04 16:00:20 +01:00
ee959809ad # 108
* fixes bug
2022-02-04 15:59:53 +01:00
3fcc438558 Revert "Revert accidental docker->master merge"
This reverts commit 49aba49406.
2022-02-04 15:17:08 +01:00
b453256916 Merge pull request '86_User_suggestions_and_feedback' (#106) from 86_User_suggestions_and_feedback into master
Reviewed-on: SGD-Nord/konova#106
2022-02-04 14:47:23 +01:00
49aba49406 Revert accidental docker->master merge 2022-02-04 14:24:31 +01:00
746daf14f6 Merge branch 'Docker' into master 2022-02-04 14:07:56 +01:00
bd92b8e895 Docker update 2022-02-04 14:00:18 +01:00
37ed627025 Merge branch 'master' into Docker
# Conflicts:
#	konova/settings.py
#	konova/sub_settings/django_settings.py
2022-02-04 13:59:30 +01:00
c7665a1aff # 86 Minor html/css tweaks
* improves minor things like display related breakpoints for certain html elements
* improves css for select2 for better group-result distinction
2022-02-04 13:55:50 +01:00
298a632cac # 86 More log details Documents
* adds more log details on adding/removing documents
* fixes bug in admin backend where restoring of non-compensation entries led to an error
* fixes bug where deleting of revocation without an attached file would lead to an error
2022-02-04 09:18:46 +01:00
0a6d5cf19b #86 Userlogs Compensation
* adds log details for adding/removing of compensations for intervention
* adds handy restore-deleted function for admin backend for alls BaseObject derivatives
* adds/updates translations
2022-02-03 15:29:22 +01:00
0e48ae6e4a #86 Userlogs Revocation
* reworks user logs for adding/removing revocations with more detail on log history
* enhances css to display neat shadow on select2-results
2022-02-03 12:10:23 +01:00
05b2f1b2cc CSS enhancement
* improves css on select2 width, which lead to strange viewport sizing on creation of new major datasets
2022-02-03 11:58:33 +01:00
b17b0b5144 # 86 Proper log detail
* adds support for payment adding/deleting to intervention log
* adds support for deduction adding/deleting to intervention/ecoaccount log
* improves code snippets
* drops add_deduction() methods for ecoaccount and intervention in favor of simpler creation in NewDeductionModalForm
* adds messages
* adds/updates translations
2022-02-02 15:16:25 +01:00
4563c222e9 # 86 HTML simplification
* simplifies rendering of detail attributes for CompensationState and CompensationAction -> takes up less space
2022-02-02 14:26:39 +01:00
4bff5f2548 # 86 Visual improvements
* moves message rendering directly below navigation menu for a more closed look
* reworks message rendering on before_states and after_states for all compensation related datatypes
* reworks layout of action column on all related data card tables
* resizes certain attribute layouts on related data card tables
* reworks layout of details on CompensationState and CompensationAction rendering from own column into subgrouped placement of main type info
* drops align-middle placement for all related data card table contents
2022-02-02 14:18:44 +01:00
edad33e662 # 86 Comment field length
* removes comment field length limit
* adds improvements for rendering large comments
2022-02-02 12:54:45 +01:00
1eecc5fa48 # 86 Viewport jump EcoAccount/EMA
* adds direct jump of viewport on related-data action (create/delete)
2022-02-02 11:26:02 +01:00
0248075479 # 86 Viewport jump Compensation
* adds direct jump of viewport on related-data action (create/delete)
* adds comment field to log.html as 'details'
2022-02-02 10:17:59 +01:00
6dbf87a8de # 86 Viewport jump Intervention
* adds direct jump of viewport on related-data action (create/delete)
2022-02-02 09:32:34 +01:00
0fb27f979f Merge pull request 'migrations' (#103) from migrations into master
Reviewed-on: SGD-Nord/konova#103
2022-02-02 09:01:51 +01:00
9013508df1 # Migrations
* adds migration support for detail fields on CompensationState and CompensationAction
2022-02-02 09:00:38 +01:00
0bd2e5ffef # Migrations
initial migrations commit
2022-02-02 08:46:08 +01:00
de3f96d4a8 Merge pull request '#99 Admin backend cleanup' (#102) from 99_Admin_backend_cleanup_and_convenience into master
Reviewed-on: SGD-Nord/konova#102
2022-02-02 08:22:00 +01:00
b0f3505972 #99 Admin backend cleanup
* removes admin backend views which are not important for production
* adds filtering functionalities on index views
* simplifies detail views on intervention, compensation, ecoaccount and ema
* adds autocomplete fields on detail views
* adds handy horizontal filter fields on detail views
2022-02-01 18:41:02 +01:00
c4c36d27a2 Merge pull request '93_Error_500_email' (#98) from 93_Error_500_email into master
Reviewed-on: SGD-Nord/konova#98
2022-01-31 15:26:28 +01:00
f9751d38db #93 Errors via mail
* configures server errors sending via mail
   * default for now is always 'ksp-servicestelle'
* includes improvements from #97
2022-01-31 15:24:26 +01:00
ff5d209895 #95 Split settings file
* splits konova/settings.py file into more separate setting files in konova/sub_settings/
2022-01-31 15:09:06 +01:00
c09ed3bb09 Merge pull request '88_biotope_codes' (#96) from 88_biotope_codes into master
Reviewed-on: SGD-Nord/konova#96
2022-01-31 14:07:33 +01:00
f6304d0b33 #88 Action/Biotope API extension
* extends the API to support serializing and deserializing of action_details and biotope_details
* renames biotope_extra_types into biotope_type_details on CompensationState model for convenience reasons and to match CompensationAction's action_type_details
2022-01-31 14:01:02 +01:00
73cf3fc503 #88 Action detail codes
* adds codelist 1035 for compensation action detail codes
* extends CompensationAction model
* extends NewActionForm
* extends detail view of compensation action related models
* add/updates translations
* adds autocomplete tests
2022-01-31 12:58:55 +01:00
e1865c7267 #88 Extra biotope codes templates
* extends the detail view templates for all compensation related models to render extra CompensationState details as well
* reduces number of landing page news from 4 to 3
* improves .card-text in favor of .scroll-150
* improves .card font size
2022-01-31 12:21:42 +01:00
95a17ed04f # 88 Extra biotope codes
* adds additional biotope konovaCodes to CompensationState model
* increases rpp for Autocompletion
* adds/updates translations
2022-01-31 11:26:24 +01:00
aade8ffb32 # 88 Additional biotope codes
* adds codelist 975 to project
* adds new form field for adding extra biotope information
2022-01-31 10:52:35 +01:00
e7bab1cbbb Merge pull request '# 89 Ecoaccount recorded state reset (fix)' (#94) from 89_Ecoaccount_recorded_state_reset into master
Reviewed-on: SGD-Nord/konova#94
2022-01-31 10:18:46 +01:00
1786bd965b # 89 Ecoaccount recorded state reset (fix)
* fixes bug where recorded state of eco account has been reset, if a deduction is created from the detail view of the ecoaccount itself
2022-01-31 10:14:46 +01:00
5c7aefb8a5 Merge pull request '# 71 Shortcut buttons enhanced' (#92) from 71_Shortcut_buttons_link into master
Reviewed-on: SGD-Nord/konova#92
2022-01-31 08:08:17 +01:00
37382fbee8 # 71 Shortcut buttons enhanced
* adds bootstrap class to prevent link style rendering
* reorganizes templates for home view into separate quickstart templates
2022-01-31 08:06:41 +01:00
9c9c9b7717 # HOTFIX
* fixes bug where errors occured once an email shall be sent. See issue #87 for details
2022-01-28 17:01:45 +01:00
5b7351e331 Merge branch 'master' into Docker
# Conflicts:
#	konova/sub_settings/django_settings.py
2022-01-28 16:41:21 +01:00
14a38b43de Merge pull request '31_API' (#90) from 31_API into master
Reviewed-on: SGD-Nord/konova#90
2022-01-28 16:38:10 +01:00
e0f7de37b6 #31 API further credential
* adds Kspuser as another expected header data to resolve the api user
* adds/updates translations
2022-01-28 16:35:25 +01:00
1b3adc396f #31 API Deductions Tests
* adds tests for deduction API
2022-01-28 16:21:23 +01:00
c32911755a #31 API Deductions
* adds intervention check state reset to all deduction-changing API routes
2022-01-28 15:55:00 +01:00
4c98949ba3 #31 API Deductions
* adds GET/POST/PUT/DELETE support for EcoAccountDeductions
2022-01-28 15:44:09 +01:00
a22a926199 #31 API PUT Tests
* adds tests for PUT method in api
2022-01-28 13:31:44 +01:00
bfefc43522 #31 API GET Tests
* adds tests for api GET method
* fixes bug where non existing geometry could not be serialized properly
2022-01-28 12:30:09 +01:00
27c1de2c53 #31 API protected visibility
* reworks most internal API methods for de/serializing from public to protected visibility
* moves test_api_sharing.py into /share subfolder of tests
2022-01-28 09:44:16 +01:00
3d446883c6 #31 API DELETE Tests
* adds tests for DELETE method of all major data types
2022-01-28 09:24:14 +01:00
e7dbea49cd #31 API DELETE
* adds support for DELETE method for all relevant objects
* improves get_obj_from_db functionality
* drops custom compensation logic for get_obj_from_db due to improvement of base method
2022-01-28 08:52:11 +01:00
5a7ea0b6c2 #31 API Tests
* adds creation tests with minimum data for intervention, compensation, ema and ecoaccount
* fixes bug where empty geometry would not be created properly using the API
* reworks key fetching from POST data, so inproperly stated keys will lead to an error for the API user, instead of silently working and use default data
* adds some logical checks for deductable_surface of eco account creation using api
* fixes bug that would have occured on creating compensations via api
2022-01-27 17:09:38 +01:00
07418a3ac3 #31 API Tests
* moves setupTestData in BaseAPITestCase class
2022-01-27 15:32:31 +01:00
8f40162974 #31 API Tests
* writes test for sharing using the API
* fixes bug on frontend form where an exception occured on generating a new API token if no token existed, yet
* adds permission constraint (default group) for using the api in general
* fixes default-group-only behaviour for sharing-API, so users can only add new users and not removing them, as long as they do not have any other group membership like registration or conservation office
* changes 'ksptoken' to 'Ksptoken' to match CGI standard for http header keys
2022-01-27 14:48:42 +01:00
b86202ba98 #31 API Token mail
* sends an email to the support address if a new token has been generated
2022-01-27 11:47:27 +01:00
b13e67e061 #31 API Frontend token generating
* adds frontend settings for users to create API tokens on their user settings
2022-01-27 11:37:38 +01:00
25cccee5d6 #31 API Share
* adds support for GET and PUT of sharing users for all data types (compensation is shared via intervention)
2022-01-26 09:16:37 +01:00
26f402fd3b #31 API WIP
* adds support for GET /check on intervention to run checks automatically via API
2022-01-25 09:29:14 +01:00
617d969a10 #31 API PUT/POST EcoAccount
* adds support for PUT and POST of EcoAccount API
2022-01-24 16:56:06 +01:00
89fb867ab2 #31 API PUT/POST Ema
* adds support for PUT and POST of Ema
* moves set_responsibility() and set_legal() from Intervention API Serializer into proper Mixins where they belong to
2022-01-24 16:43:37 +01:00
f461a8e38d #31 API Improvement
* adds support for returning all shared data
* adds documentation
2022-01-24 16:23:38 +01:00
d58ca3f324 #31 API PUT Compensation
* adds support for PUT compensation (Update)
* improves updating of related objects
* adds missing payment PUT support for intervention API
2022-01-24 15:56:02 +01:00
07331078c4 #31 API code cleaning
* splits large AbstractModelAPISerializer into different reusable Mixins to increase reusability of code for similar models
2022-01-24 15:20:23 +01:00
02e72e015f #31 API POST Compensation
* adds documentations
* adds check for valid deadline type
2022-01-24 15:04:20 +01:00
79acf63dbf #31 API POST Compensation
* adds initialize_objects to an abstractmethod of the super class to be implemented in subclasses
* differentiates error messages if intervention does not exist or is just not shared with the user
2022-01-24 14:51:50 +01:00
2fa2876090 #31 API POST Compensation
* adds support for POST of new compensations
* adds shared_users property to BaseObject and Compensation to simplify fetching of shared users (Compensation inherits from intervention)
* extends compensation admin index
* modifies compensation manager which led to invisibility of deleted entries in the admin backend
* fixes bug in sanitize_db.py where CREATED useractions would be removed if they are not found on any log but still are used on the .created attribute of the objects
2022-01-24 14:41:56 +01:00
314879a1fe #31 API basic implementation Cleanup
* cleans code
* reworks many code fragments into smaller methods and split into super class
2022-01-24 13:12:29 +01:00
b87389e07b #31 API POST/PUT Intervention
* splits code in smaller, reusable methods
* adds put method to view
* adds update_model_from_json() method
2022-01-24 13:04:39 +01:00
c8dfa7e21f #31 API POST Intervention
* adds check for deserializing of konova codes
2022-01-24 12:50:28 +01:00
d0f3fb9f61 #31 API POST Intervention
* adds support for proper POST of intervention
* makes /<id> optional (required for Post)
2022-01-24 12:17:17 +01:00
45ac5b68b9 #31 API basic implementation Refactor
* reorganizes code into proper api/utils/serializer subclasses to keep serialization logic away from regular view logic
2022-01-24 10:31:48 +01:00
8d400b4ffe #31 API basic implementation Cleanup
* cleans code
* reworks many code fragments into smaller methods and split into super class
2022-01-21 18:34:01 +01:00
870cc96a1a #31 API basic implementation Ema fetch
* adds API support for fetching EMA
2022-01-21 17:49:07 +01:00
4f6964b04a #31 API basic implementation EcoAccount fetch
* outsources json creation of modified_on an created_on to superclass
* adds API support for fetching ecoaccount data
2022-01-21 17:44:58 +01:00
897520f906 #31 API basic implementation Compensation
* adds compensation fetching for API v1
* refactors filter into predefined lookup dict of super class (needs to be customized on subclasses)
2022-01-21 17:32:31 +01:00
0c35e79d04 #31 API basic implementation Intervention fetch
* enhances intervention fetching and serialization
2022-01-21 16:29:59 +01:00
3938db1893 #31 API basic implementation Token Authentication
* adds token checking to AbstractModelAPIView
* adds user accessibility filtering for intervention API v1
* extends fetch_and_serialize() method to take a dict for db filtering instead of a single field and value
* organizes urlnames into supporting formats like "api:v1:intervention"
2022-01-21 16:15:16 +01:00
881da38538 #31 API basic implementation
* adds new app to project
* adds relation between User model and new APIUserToken model
* adds first implementation for GET of intervention
* adds basic code layout for future extension by having new versions
2022-01-21 15:26:08 +01:00
60fb22b6c7 Merge pull request 'master' (#85) from master into Docker
Reviewed-on: SGD-Nord/konova#85
2022-01-21 09:27:46 +01:00
b9d532aa81 Merge pull request '83_Publication_rework' (#84) from 83_Publication_rework into master
Reviewed-on: SGD-Nord/konova#84
2022-01-21 09:27:10 +01:00
ee6ac9e7c8 # 83 Publication rework
* adds fake-inherited is_ready_for_publish() method to compensation model (not derived from RecordableObjectMixin) to equalize usage of is_ready_for_publish() usage for all data types (compensation can be checked the same way as intervention, ecoaccount or ema)
2022-01-21 09:26:41 +01:00
fd3f9b95b9 # 83 Publication rework EcoAccount Compensation
* adds implementation for is_ready_for_publish() on compensation (uses intervention's implementation) and EcoAccount
2022-01-21 09:22:43 +01:00
e73b42db7b # 83 Publication rework EMA
* adds is_ready_for_publish implementation for EMA
2022-01-21 09:15:06 +01:00
b72426e20f # 83 Publication rework interventions
* adds abstract is_ready_for_publish method to PublishableObjectMixin which needs to be implemented in subclasses
* adds implementation for intervention model
* adds publishable check to rendering report view
* adds/updates translations
2022-01-21 09:02:56 +01:00
cf984e4abe Merge pull request 'master' (#82) from master into Docker
Reviewed-on: SGD-Nord/konova#82
2022-01-20 12:32:56 +01:00
1670bf37ab Merge pull request '70_Tab_title_too_long' (#81) from 70_Tab_title_too_long into master
Reviewed-on: SGD-Nord/konova#81
2022-01-20 12:31:49 +01:00
79b9be5637 # 70 Tab title rest
* adds tab titles for some other pages
* adds/updates translations
2022-01-20 12:31:20 +01:00
7a8cafcd77 # 70 Tab title EMA
* adds ema tab titles
* adds/updates translations
2022-01-20 12:26:22 +01:00
b9bec82876 # 70 Tab title eco-account
* adds tab titles for eco account
* adds/updates translations
2022-01-20 12:23:19 +01:00
014155b0a4 # 70 Tab title compensation
* adds tab titles for compensations
* adds/updates translations
* optimizes identifier generating, so that one-digit months will be converted into two digits
2022-01-20 12:19:08 +01:00
dc42278943 # 70 Tab titles interventions
* adds content related tab title
* adds/updates translations
2022-01-20 12:12:04 +01:00
951bbef480 # License update
* minor enhancement for online rendering
2022-01-20 10:00:12 +01:00
df84f7f660 Merge pull request '# 72 License' (#80) from 72_Licence into master
Reviewed-on: SGD-Nord/konova#80
2022-01-20 09:56:46 +01:00
028f8fd8f0 # 72 License
* adds license info de and en
2022-01-20 09:55:59 +01:00
14c42217c2 Merge pull request '# Bugfix parcel updating' (#79) from master into Docker
Reviewed-on: SGD-Nord/konova#79
2022-01-19 17:20:53 +01:00
a464ed9e3f # Bugfix parcel updating
* fixes bug where under certain circumstances the parcel updating would fail
2022-01-19 17:20:13 +01:00
b41b3af690 Merge pull request '# Hotfix' (#78) from master into Docker
Reviewed-on: SGD-Nord/konova#78
2022-01-19 14:15:35 +01:00
db9881d05f # Hotfix
* fixes bug where report creation would fail
2022-01-19 14:13:25 +01:00
d982c5c835 Merge pull request 'master' (#77) from master into Docker
Reviewed-on: SGD-Nord/konova#77
2022-01-19 13:21:31 +01:00
a179827a35 Merge pull request '#75 Propagate users' (#76) from 75_Propagate_users into master
Reviewed-on: SGD-Nord/konova#76
2022-01-19 13:18:49 +01:00
6c9d47cad0 #75 Propagate users
* extends KonovaSSOClient for providing support of propagated user data from sso-server. For longterm, we hope to have this feature directly on django-simple-sso. Further details can be found here: https://github.com/divio/django-simple-sso/issues/67
2022-01-19 13:17:55 +01:00
9ea47fcc83 # Docker readme
* fixes typo
* adds more info
2022-01-18 13:55:32 +01:00
44033c18fe # Docker
* optimizes configuration
* removes unused settings
* extends README.md with docker installation guid
2022-01-17 12:45:03 +01:00
4027629996 Merge branch 'master' into Docker 2022-01-14 14:19:34 +01:00
d0640a4098 # Bugfix
* fixes bug where background mail delivery did not start
2022-01-14 14:19:17 +01:00
5dae6a7b91 # Docker 2022-01-13 17:22:29 +01:00
850a3914fd # Docker 2022-01-13 15:42:07 +01:00
a2d5c4ddaa Merge remote-tracking branch 'origin/Docker' into Docker
# Conflicts:
#	docker-compose.yml
2022-01-13 14:07:54 +01:00
2118b42ecb # Docker persistent storage
* adds named volume to docker-compose.yml to keep files uploaded on /konova_uploaded_files even on image rebuild
2022-01-13 14:07:18 +01:00
0c2d39ba96 # Docker
* minor adjustments
2022-01-13 09:29:38 +01:00
9cb9308f85 # Docker Production
* adds further settings to create a production-ready docker configuration
2022-01-13 09:29:38 +01:00
d9577fe6a1 # Docker
* adds docker related configurations
* directly working configuration provided
2022-01-13 09:29:38 +01:00
1fc0fbbf0a Merge pull request '#67 Parcel error fix' (#69) from 67_Parcel_fetcher_error into master
Reviewed-on: SGD-Nord/konova#69
2022-01-13 09:28:14 +01:00
022d9d15a7 #67 Parcel error fix
* adds workaround in case of received WFS exception -> routine waits 1 second and tries to rerun for another time. If this does fail as well, the routine will end without a result
* adds mailto shortcut to contact button in footer for a quick fix
2022-01-13 09:27:35 +01:00
be7934f34a Merge pull request '#53 Remove buttons' (#68) from 53_Remove_Import-Export into master
Reviewed-on: SGD-Nord/konova#68
2022-01-13 09:00:05 +01:00
b34853089e #53 Remove buttons
* removes (non-functional) buttons in frontend
2022-01-13 08:59:36 +01:00
d08260a519 Merge pull request '# 62 404 and 500' (#66) from 62_custom_404_500 into master
Reviewed-on: SGD-Nord/konova#66
2022-01-12 16:46:52 +01:00
6f76b3a53d # 62 404 and 500
* adds custom 404 and 500 error handling views
* adds/updates translations
2022-01-12 16:45:55 +01:00
86aafcc5d4 Merge pull request '63_Email' (#65) from 63_Email into master
Reviewed-on: SGD-Nord/konova#65
2022-01-12 16:04:42 +01:00
795f64f20b # 63 Mail data checked
* adds mail sending if shared data is checked
* adds/updates translations
2022-01-12 15:48:47 +01:00
5ca4c7c777 # 63 UserNotificationEnum changes
* drops NOTIFY_ON_REGISTERED_DATA_EDITED in favor of NOTIFY_ON_SHARED_DATA_CHECKED
* adds/updates translations
2022-01-12 15:38:57 +01:00
7c5454a2c9 # 63 Mail data deleted
* adds mail sending if shared data is deleted
* adds/updates translations
* refactors recording mails into separate email template folder email/recording
2022-01-12 15:31:25 +01:00
157f05ead6 # 63 Mail recording/unrecording
* adds mail sending in case of unrecording and recording of data
* adds/updates translations
2022-01-12 15:09:52 +01:00
17dc3f7537 # 63 Mail celery
* moves mail sending to celery worker using shared_task in konova/tasks.py
* adds mail sending for shared access given
* adds UserNotification settings checks for mail sending
* adds/updates translations
2022-01-12 14:51:50 +01:00
dbf32f3138 # 63 Mail background sending
* moves mail sending to background using celery
2022-01-12 14:27:39 +01:00
9c4bab3800 # 63 Mail shared access revoked
* adds mail support for revoking shared access
* adds/updates translations
2022-01-12 14:17:12 +01:00
02970b19b4 # 63 Refactoring
* refactors django User model to custom User model to provide further attributes and methods directly on the user model
2022-01-12 12:56:22 +01:00
37fffd639f Merge pull request '61_Extend_filter' (#64) from 61_Extend_filter into master
Reviewed-on: SGD-Nord/konova#64
2022-01-12 10:20:19 +01:00
96f2e77972 # 61 EcoAccount Filter
* adds specialized SelectionTableFilter for EcoAccount (and EMA) which only provides filtering by conservation office
2022-01-12 10:15:57 +01:00
4c5e170b85 # 61 General table enhancements
* enhances rendering of tables
* enhances rendering of filter section
* reorganizes table filter codes into konova/filters/ folder and splits into mixins and table_filters
2022-01-12 10:11:47 +01:00
d57478ee09 # 61 Filter code enhancement
* reorganizes code
2022-01-12 09:23:22 +01:00
834fa8dbd4 # 61 Filter offices frontend/backend
* adds filters for registration and conservation offices
* adds SelectionTableFilter as new holder for these types of filter components
2022-01-12 08:56:49 +01:00
5bca8fc8f7 # 61 Filter frontend
* adds filtering for file number
* updates translations
2022-01-11 17:29:36 +01:00
5d5d8b1243 # 61 Filter frontend
* finished filter frontend
2022-01-11 16:32:33 +01:00
8a19d7239d # 61 Filter backend
* refactors XYTableFilter classes to hold query_filter and checkbox_filter which are separate instances of django_filter.FilterSets
* improves render ability for frontend
2022-01-11 15:19:16 +01:00
87f11a9914 # 61 Filter frontend
* optimizes minor parts of table-filter initialization and queryset passing
2022-01-11 14:28:34 +01:00
524b5c340f # 61 Filter backend
* refactors table filters by introducing AbstractTableFilter, GeoReferencedTableFilterMixin, ShareableTableFilterMixin and RecordableTableFilterMixin
* adds full filter functionality
* refactors TableFilter inheritances for all objects
2022-01-11 12:56:27 +01:00
2fdf6606b3 # Docker
* minor adjustments
2022-01-11 08:32:04 +01:00
7075d7074c # Docker Production
* adds further settings to create a production-ready docker configuration
2022-01-10 15:27:19 +01:00
c9b54cd4c5 # Docker
* adds docker related configurations
* directly working configuration provided
2022-01-10 13:52:40 +01:00
552559c118 Merge pull request '#57 Deduction shortcut remove' (#60) from 57_Deduction_shortcut into master
Reviewed-on: SGD-Nord/konova#60
2022-01-07 15:42:21 +01:00
e2fe85a4fb #57 Deduction shortcut remove
* removes deduction shortcut
* adds missing quality checks on intervention deduction accounts validity
* fixes error if checked intervention shall be checked again
* adds/updates translations
2022-01-07 15:41:40 +01:00
9fe054c681 Merge pull request '#54 Grouped autocomplete' (#59) from 54_Improve_autocomplete_selection into master
Reviewed-on: SGD-Nord/konova#59
2022-01-07 13:54:44 +01:00
d4d792754f #54 Grouped autocomplete
* refactors default autocomplete into grouped autocompletes, if parents exist for grouping
* updates requirement for django-autocomplete-light due to an issue with an attribute in pip's default version 3.8.2. More info here: https://github.com/yourlabs/django-autocomplete-light/issues/1278
2022-01-07 13:50:37 +01:00
f503abf5e6 Merge pull request '#55 Celery parcel updating' (#58) from 55_Parcel_calculation_to_background into master
Reviewed-on: SGD-Nord/konova#58
2022-01-06 15:04:09 +01:00
d6d15185ea #55 Celery parcel updating
* adds celery to project
* adds celery background task for updating parcels
* adds parcel calculation to creating of new geometries as well
* tests outstanding!!!
2022-01-06 12:08:38 +01:00
e618d454e2 Merge pull request '49_Parcel_calculation' (#56) from 49_Parcel_calculation into master
Reviewed-on: SGD-Nord/konova#56
2022-01-05 15:27:48 +01:00
527077cef3 #49 Annual report improve
* improves the filtering of annual report timespan on a date base instead of timestamp base
2022-01-05 15:26:16 +01:00
393f9a4d47 #49 Parcels on report
* adds parcel displaying on public reports
* fixes bug in EMA where autocomplete js would not load for modal forms
* fixes bug where BaseContext cached data from last request and reused it, if not overwritten
2022-01-05 14:41:32 +01:00
bf0de00b72 #49 Frontend rendering
* adds rendering for detail view
* adds new includable html snippet for parcel rendering
* refactors generic includables in konova/ app into konova/templates/includes/...
* fixes bug where parcels have been reused from the database due to wrong model structure
* adds get_underlying_parcels() for Geometry model
* adds get_underlying_parcels() for GeoReferencedMixin models
* fixes bug where missing geometry would lead to an error during geometry conflict check
* removes unused wfs attribute from AbstractWFSFetcher
* adds/updates translations
2022-01-05 14:13:26 +01:00
f0911b5eb6 #49 Update all parcels command
* adds update_all_parcels command which can be used e.g. with cronjob once a month to update all parcels and districts
2022-01-04 16:50:55 +01:00
6563e5e438 #49 Extends sanitize db command
* extends sanitize db command to remove unrelated parcels and district from the database
* fixes bug where single parcel wfs match would lead to unexpected behaviour
* adds admin interface for parcels and districts
* adds updating of parcels in case of SimpleGeomForm saving
2022-01-04 16:25:17 +01:00
2494ecc493 #49 Calculation implementation
* implements update routine for Geometry model
* reorganizes fields of Parcel and District
* adds tests
* simplifies usage of ParcelWFSFetcher
2022-01-04 15:59:53 +01:00
62030c4dcc #49 Parcels and Districts
* refactors WFS fetching to proper POST handling
* adds authentication support to WFS handling
* reduces dummy geometry for tests to a small area to reduce test network traffic overhead
2022-01-04 13:03:21 +01:00
440a4b04d5 #49 Parcels and Districts
* fixes bug in GeometryConflict conflict checking
* WIP: introduces new konova/utils/wfs/spatial holding SpatialWFSFetcher, which can be fed any geometry and it returns found features
* WIP: adds tests for wfs fetching
* updates requirements.txt
2021-12-17 17:30:12 +01:00
71f88f7218 #49 Parcels and Districts
* introduces new models: Parcel and District
2021-12-16 12:21:31 +01:00
44dbee0008 Merge pull request '50_Overlaying_geometries' (#52) from 50_Overlaying_geometries into master
Reviewed-on: SGD-Nord/konova#52
2021-12-16 10:02:47 +01:00
5df84bb7a1 #50 Overlaying geometries Tests
* adds test for geometry conflicts
* refactors rechecking of existing conflicts to avoid recursion in certain cases
* adds/updates translations
2021-12-16 09:58:59 +01:00
286ed609da #50 Overlaying geometries KOM + OEK
* removes unused messages
* adds geometry conflict message rendering for KOM and OEK
* removes unused methods in GeoReferencedMixin
* generalizes geometrical lookup for conflicts from overlaps to intersects
2021-12-15 15:10:35 +01:00
2bd94a7618 #50 Overlaying geometries
* refactors geometry field into GeoReferencedMixin, holding more handy methods and used in all models, formerly holding the geometry field
* refactors backend admin configuration, so modified, deleted and created are not editable in the backend which also skips loading of all possible choices
* fixes typo in sanitize_db command
* introduces GeometryConflict model, holding a link between two geometries, where one overlaps the other
* adds first (WIP) messages into detail views of ema and intervention for test purposes
2021-12-15 13:59:52 +01:00
0ec1744158 Merge pull request '48_Share_with_full_known_users' (#51) from 48_Share_with_full_known_users into master
Reviewed-on: SGD-Nord/konova#51
2021-12-15 09:35:53 +01:00
6b018e5495 #48 Tests finished
* finishes user autocomplete unit test
2021-12-15 09:34:40 +01:00
6b81e3efd8 #48 Tests
* adds tests (WIP)
2021-12-14 16:04:35 +01:00
22da2d4bbe #48 Changes autocomplete
* changes the autocomplete route for user retrieving from _istartswith to full qualified check
* extends the help text for form to inform about full qualified username needed
* updates translation
2021-12-14 13:55:08 +01:00
59d8608830 Merge pull request '46_MIME_Type_check_for_file_upload' (#47) from 46_MIME_Type_check_for_file_upload into master
Reviewed-on: SGD-Nord/konova#47
2021-12-09 13:21:00 +01:00
c93f16a598 #46 MIME Type check
* adds unit tests for new methods in konova/tests/test_documents.py
* refactors _accepted_mime_types of AbstractDocument into _valid_mime_types
2021-12-09 13:19:52 +01:00
c43b45a0e4 #46 MIME Type check
* adds file mime type check on NewDocumentForm
* adds file size check on NewDocumentForm
* adds is_xy_valid methods as classmethods on AbstractDocument
* adds translations for error messages
* updates help text on NewDocumentForm file field
2021-12-09 12:39:04 +01:00
3e606c2a49 Merge pull request '35_DB_sanity_command' (#44) from 35_DB_sanity_command into master
Reviewed-on: SGD-Nord/konova#44
2021-11-17 14:37:34 +01:00
6cb1a31aff Refactors triggering checked/recorded
* refactors BaseForm request/user initialization
* introduces mark_as_edited() method for compensation models
2021-11-17 14:33:05 +01:00
bd36ab5b6f #35 Sanity command
* refactors "toggling" of recorded/checked state
* introduces mark_as_edited() for RecordableObjectMixin
2021-11-17 12:09:49 +01:00
80e72c2146 #35 Sanity command
* adds sanity check for deadlines and geometries
2021-11-17 09:40:07 +01:00
22a97de195 #35 Sanity command
* improves performance
* adds sanity actions for compensation state and compensation action
2021-11-17 09:32:11 +01:00
8b73d03e7c #35 Sanity command
* adds new sanitize_db.py command (WIP)
2021-11-16 17:50:10 +01:00
3db2a156bb Merge pull request 'Refactoring' (#43) from Refactoring into master
Reviewed-on: SGD-Nord/konova#43
2021-11-16 14:24:11 +01:00
8e1c4446dd Refactoring
* moves add_state from compensation to AbstractCompensation
2021-11-16 13:45:05 +01:00
779065ec91 Refactoring
* adds simple getter methods for UserActionLogEntry
* replaces manual creation of UserActionLogEntry with new methods
2021-11-16 13:15:15 +01:00
71e4aa9a2f Refactoring
* moves updating of shared access users into ShareableObjectMixin
* renames ShareInterventionModalForm to ShareModalForm since it's used for EMA and eco accounts as well
2021-11-16 12:54:28 +01:00
6ad387daa3 Refactoring
* moves updating of shared access users into Intervention
2021-11-16 12:51:10 +01:00
d8f0db6bd6 Refactoring
* moves adding of deduction into Intervention and EcoAccount model
* hardens against circular import issues
2021-11-16 12:43:13 +01:00
9b531bc09e Refactoring
* moves adding of revocation into Intervention model
2021-11-16 12:26:50 +01:00
60a50b304a Refactoring
* drop SSO message sending for now from the logic
2021-11-16 11:57:06 +01:00
fd8ce4b2ec Refactoring
* create package from compensation/urls
* renames modules inside of compensation/urls and compensation/views
2021-11-16 09:02:44 +01:00
899bd28247 Refactoring
* create package from compensation/views
2021-11-16 08:58:15 +01:00
78945d648f Refactoring
* splits compensation/models.py into subpackage
* renames base objects by adding suffix Mixin
2021-11-16 08:29:18 +01:00
6f107ac7a1 Refactoring
* splits ema/models.py into subpackage
* splits konova/models.py into subpackage
* splits user/models.py into subpackage
2021-11-15 17:41:52 +01:00
d78afbfb5c Refactoring
* splits intervention/models.py into subpackage
2021-11-15 17:19:06 +01:00
bcffae4a95 Refactoring
* renames model ResponsibilityData into Responsibility
* renames model LegalData into Legal
* moves form->object saving logic into model
* refactors NewDocumentForm into special types for intervention, compensation, eco account and ema
*
2021-11-15 17:09:17 +01:00
0778277de4 Merge pull request '38_User_requests' (#42) from 38_User_requests into master
Reviewed-on: SGD-Nord/konova#42
2021-11-15 16:00:43 +01:00
ab8d5c9724 #38 User requests
* implements 5) "Add 'Maßnahmentyp' for KOMs "
    * prepares model and form fields as mixins for easy extension to eco accounts and emas (possibly in the future?)
2021-11-15 15:55:09 +01:00
2ca0ceade4 #38 User requests
* implements 4) "Comment fields should be of unlimited size"
2021-11-15 14:08:29 +01:00
7ed114a858 #38 User requests
* implements 3) "Extend sharing on direct adding of users"
2021-11-15 14:00:08 +01:00
36470f819c #38 User requests
* implements 2) "Multiple revocations for interventions"
2021-11-15 12:18:22 +01:00
e922b983dd #38 User requests
* implements 1) "Add titles to public reports, next to identifiers"
2021-11-15 11:05:39 +01:00
fdcae500b1 Merge pull request '39_Drop_fundings' (#41) from 39_Drop_fundings into master
Reviewed-on: SGD-Nord/konova#41
2021-11-15 10:55:57 +01:00
d72c29bd56 #39 Drop fundings
* removes fundings from all models
2021-11-15 10:55:15 +01:00
8d7947bbda #39 Drop fundings
* removes fundings from all models, except the EMA model for migration compatibility (some old data may have fundings data)
2021-11-15 09:59:01 +01:00
c1a251abc9 Merge pull request '19_Tests' (#40) from 19_Tests into master
Reviewed-on: SGD-Nord/konova#40
2021-11-15 09:48:11 +01:00
e59af1e437 #19 Tests
* restructures setup for workflow tests in interventions
2021-11-12 16:42:40 +01:00
037d3a8fee #19 Tests
* adds workflow edit testing for compensations
2021-11-12 16:05:26 +01:00
ea14a01f89 #19 Tests
* adds workflow testing for geometries on new creation of intervention and compensation
*
2021-11-12 14:54:33 +01:00
ce7033943f #19 Tests
* refactors sharing user setting by introducing share_with(user) and share_with_list(user_list) for BaseObject for a more self-explanatory sharing
2021-11-11 15:09:03 +01:00
50e134ba91 #19 Tests
* adds workflow tests for eco account deduction creation
2021-11-11 13:35:08 +01:00
667f378b74 #19 Tests
* adds workflow tests for compensation checking and recording
* improves related code
2021-11-11 13:13:05 +01:00
7d611a60d8 #19 Tests
* adds workflow tests for checkability and recordability for interventions
* fixes/improves code snippets detected by testing
2021-11-11 10:37:22 +01:00
bcee58700a #19 Tests
* adds workflow tests or deductions in InterventionWorkflowTestCase
* fixes bugs detected by testing
2021-11-10 15:36:18 +01:00
08d023092f #19 Tests
* adds new BaseWorkflowTestCase class for encapsulating
* adds new InterventionWorkflowTestCase class with first workflow tests
2021-11-10 14:08:16 +01:00
bbbaeab4c7 #19 Tests
* moves dummy data creation from BaseViewTestCase into BaseTestCase
2021-11-10 11:41:51 +01:00
6992484b7f Export codelist command
* adds a useful custom command which exports a specific selectable codelist into a csv file
2021-11-10 09:52:09 +01:00
2957035b5a #19 Tests
* adds EcoAccount tests
* fixes bugs found by testing
2021-11-10 09:11:24 +01:00
0fac17ad68 #19 Tests
* adds EMA test
2021-11-09 15:33:26 +01:00
c221d00c28 #19 Tests
* adds EMA tests
* extends compensation tests
* fixes bugs detected by testing
* restructured tests for performance boost
2021-11-09 13:06:22 +01:00
107cbeadee #19 Tests
* fixes bug where compensations still appeared on the public report despite being marked as deleted
* fixes bug where eco account could be deducted into a negative account balance
2021-10-28 17:21:07 +02:00
b5fc96c1cf #19 Tests
* adds tests for compensations (WIP)
* refactors some dummy data generating into base test class
* fixes bugs detected by testing
* adds important requirements.txt change for itsdangerous package (<1.0.0 for compatibility to django-simple-sso)
2021-10-27 14:44:49 +02:00
5213c717d9 #19 Tests
* refactors CheckableMixin and RecordableMixin into CheckableObject and RecordableObject
* adds ShareableObject for wrapping share related fields and functionality
* adds share functionality to EcoAccount and EMA, just like Intervention
2021-10-26 15:09:30 +02:00
bfe541f83e #19 Tests
* refactors test logic into base test classes
* adds tests for views in konova app
* fixes bugs/warnings detected by testing
2021-10-26 14:26:32 +02:00
2553eb2825 #19 Tests
* adds tests for views in intervention app
* fixes bugs detected by test writing
2021-10-26 11:38:34 +02:00
6e31dfc00d HOTFIX: Quality checks
* fixes bug due to missing evaluation of compensation validity
2021-10-26 07:56:26 +02:00
e2d2e0317c Merge pull request '36_Quality_checks' (#37) from 36_Quality_checks into master
Reviewed-on: SGD-Nord/konova#37
2021-10-26 07:50:37 +02:00
da23761f88 #36 Quality checks
* adds check on recording of intervention in case of invalid compensations
2021-10-26 07:47:53 +02:00
4a4c9ad049 #36 Quality checks
* adds unchecking/unrecording of interventions in case of post-check|post-record editing
2021-10-25 17:39:39 +02:00
1c3ab898cc #36 Quality checks
* refactors toggling of recorded status into RecordableMixin
2021-10-25 17:01:02 +02:00
26c1cee27e #36 Quality checks
* adds quality check logic for EcoAccount with EcoAccountQualityChecker
* adds/updates translations
* adds quality check logic for EMA with EmaQualityChecker
2021-10-25 14:36:58 +02:00
619f2110e4 #36 Quality checks
* adds quality check logic for Compensations with CompensationQUalityChecker
* adds compensation quality checking to checking routine of RunCheckModalForm.is_valid()
* adds/updates translations
2021-10-25 13:44:54 +02:00
4c7efdb800 #36 Quality checks
* moves geometry check logic to upper class
2021-10-25 13:21:27 +02:00
a5b1f68f62 #36 Quality checks
* adds AbstractQualityChecker as base for all quality checker instances
* adds InterventionQualityChecker, inheriting from AbstractQualityChecker
* adds functionality to InterventionQualityChecker
* adds/updates translations
2021-10-25 13:06:54 +02:00
e2409fdbde Merge pull request '#32 Disable file download' (#34) from 32_Disable_file_download into master
Reviewed-on: SGD-Nord/konova#34
2021-10-25 09:37:51 +02:00
af70303b32 #32 Disable file download
* refactors: attached files can only be downloaded by users with shared access
* adds hint on unshared data being unshared for compensation, ema, eco-account
* minor optical enhancement for user contact form
2021-10-25 08:51:06 +02:00
d47e840dbd Merge pull request '26_Annual_conservation_reports' (#33) from 26_Annual_conservation_reports into master
Reviewed-on: SGD-Nord/konova#33
2021-10-25 08:20:25 +02:00
6ca5b32945 #26 Annual conservation report
* adds LegalData to EcoAccount to provide registration_date support ("agreement date") for old-data report generating
* adds/updates translations
2021-10-22 13:32:05 +02:00
b69b9a607e #26 Annual conservation report
* enhancements for report2excel functionality
* improvements for report2html layout
+
2021-10-22 12:36:39 +02:00
37a684c7ab #26 Annual conservation report
* Adds download as excel sheet
* adds excel_report.xlsx as template for excel sheet download
* improves db access performance
2021-10-21 15:37:01 +02:00
4e89fd9678 #26 Annual conservation report
* Adds download as excel sheet
* improves db access performance
2021-10-21 14:58:54 +02:00
419a48cff1 #26 Annual conservation report
* adds first try for excel file downloading (WIP)
2021-10-20 15:25:08 +02:00
e22e390040 #26 Annual conservation reports
* enhances TimespanReportForm control rendering
* adds/updates translations
2021-10-20 13:41:32 +02:00
6b839b7f60 #26 Annual conservation reports
* adds index form for selecting timespan and office of interest
* adds timespan support for TimespanReport
* fixes naive datetime issues
* fixes missing error message css tag
* adds/updates translations
2021-10-20 13:23:35 +02:00
d5b6c7f098 Geometry fix
* removes geographic=True from Geometry model
2021-10-20 10:38:07 +02:00
9e7e5ee726 EcoAccount fixes
* adds deductable surface field into NewEcoAccountForm directly
* removes custom manager for LegalData and ResponsibilityData
2021-10-20 10:28:01 +02:00
b90a07ca2a #26 Annual conservation report
* WIP: EcoAccountReport
2021-10-19 16:06:19 +02:00
0e9a169d38 #26 Annual conservation report
* finishes intervention analysis report for cases before 16.06.2018 (LKompVzVo)
2021-10-19 14:22:41 +02:00
88c7f64901 #26 Annual conservation report
* finishes compensation analysis report
2021-10-19 13:34:33 +02:00
33de71d554 #26 Annual conservation report
* adds new templatetag default_if_zero in ksp_filters.py
* adds/updates translations
2021-10-19 09:13:20 +02:00
92155fb742 #26 Annual conservation report
* introduces new app 'analysis' for annual report generating and future features
* adds new templates (WIP)
* adds new routes (WIP)
2021-10-18 15:52:51 +02:00
2b06a439cf Merge pull request '25_Public_Reports' (#30) from 25_Public_Reports into master
Reviewed-on: SGD-Nord/konova#30
2021-10-15 09:27:05 +02:00
7631adc88f Translations
* adds/updates translations
2021-10-15 09:25:26 +02:00
85759a636a Database performance
* optimizes the db fetching for all index views and detail views
* introduces usage of managers.py in all necessary apps for wrapping basic fetch settings
* moves comment.html to comment_card.html under /konova/templates/konova/
* adds/updates translations
* fixes document typos
* drops comment rendering in public reports
* opens public reports in new tabs if button is clicked from the detail view
2021-10-14 14:12:33 +02:00
f5f08b979b #25 Public reports
* adds fully functional EMA report
* adds/updates translations
2021-10-14 08:49:32 +02:00
ce74d011f6 #25 Public reports
* prevents Actions column in tables from being rendered if there would be no buttons inside due to permission checking
* enhances amount of sql requests for detail view and report view
2021-10-14 08:21:51 +02:00
193ba4c658 #25 Public reports
* adds public report for compensations
* adds/updates translations
* prepares EMA and eco account reports
2021-10-13 17:35:11 +02:00
c4a205908a #25 Public reports
* adds/updates translation
2021-10-13 16:15:26 +02:00
ac17d953c6 #25 Public reports
* adds public report rendering for intervention model
* adds new routes for report
* adds new public_base.html and public_navbar.html
* adds lookup table for zoom levels for lanis link generating
* moves qr code generating into utils/generators.py
2021-10-13 14:03:34 +02:00
af0fe655b3 Intervention template adjustments
* renames intervention variable to obj to match other template style
* renames open routes to detail routes
2021-10-13 09:26:46 +02:00
83378f27c1 Merge pull request '17_Update_setup_command' (#29) from 17_Update_setup_command into master
Reviewed-on: SGD-Nord/konova#29
2021-10-13 09:11:20 +02:00
30f36060f3 #17 Update setup
* adds calling of update_codelist.py to setup.py
* removes unused data in setup_data.py
2021-10-13 09:10:48 +02:00
f50dccb30b #17 Update setup
* removes unused organisation app from project
* removes null=True parameters for M2M fields in models
2021-10-13 09:04:01 +02:00
0e7c378d4a Merge pull request '7_New_forms' (#28) from 7_New_forms into master
Reviewed-on: SGD-Nord/konova#28
2021-10-13 08:54:22 +02:00
mipel
7d46ebd2f4 #7 New Form
* adds minor __str__() improvement
* adds/updates translations
2021-10-13 08:50:26 +02:00
mipel
0e839f5e44 #7 New Form
* refactors/renames folders and files for generic template rendering
* removes unused choiceColumnForm.html
2021-10-06 16:15:40 +02:00
mipel
3842bcf0b1 #7 New Form
* adds NewEmaForm and EditEmaForm
* refactors ResponsibilityData related form fields into reusable mixin CompensationResponsibleFormMixin
   * used in NewEcoAccountForm and NewEmaForm for easier maintaining and reducing amount of code
* refactors templates /xy/new/view.html into /xy/form/view.html since the same template file is used for new and edit forms
2021-10-06 16:00:17 +02:00
mipel
1971cf5942 #7 New Form
* fixes bug where modified was not changed on an edit of compensation and ecoaccount
2021-10-06 13:40:38 +02:00
mipel
60f03591ef #7 New Form
* adds EditEcoAccountForm
* adds placeholders for some form fields
* changes comment card in detail view into rlp-grayish
* adds eco account detail view comment box
* removes unnecessary loading of dal scripts in view.html
* refactors generated identifier for data objects (10 digits to 6 uppercase letter-digit combination)
* improves generate_random_string() method by adding more options for generation of strings
* adds/updates translations
2021-10-06 13:10:10 +02:00
mipel
d84fe68120 #7 New Form
* adds NewEcoAccountForm
* refactors NewCompensationForm into AbstractCompensationForm so main fields can be reused again
* fixes template bug in account detail view where the amount of deductions has been displayed instead of the available rest
* refactors _generate_new_identifier() into generate_new_identifier()
* refactors get_available_rest() into returning both, the total and relative amount
* improves saving of SimpleGeometryForm()
* adds/updates translations
2021-10-05 16:35:24 +02:00
mipel
46e1a9af86 #7 New Form
* links edit button in detail view with edit functionality
* fixes minor comment rendering bug
* fixes bug where compensation changes won't save
2021-10-04 16:18:59 +02:00
mipel
d0aa125248 #7 New Form
* fixes bug where geometries have been created each time a SimpleGeomForm has been saved
2021-10-04 16:06:20 +02:00
mipel
3d31a13508 #7 New Form
* adds creation of new compensation directly from intervention detail view
* adds comment rendering on compensation detail view (WIP)
* adds shared_access_required decorator
* adds/updates translations
2021-10-04 13:23:14 +02:00
mipel
9cfb400bad #7 New Form
* adds NewCompensationForm content and functionality
* renames CODELIST_COMPENSATION_COMBINATION_ID into CODELIST_COMPENSATION_FUNDING_ID for more clarity
* reorganizes compensation forms into compensation/forms/forms.py and forms/modalForms.py
* adds new compensation html template in compensation/templates/compensation/new
* adds new default message template in message_templates.py: IDENTIFIER_REPLACED
* adds/updates translations
2021-10-04 09:55:59 +02:00
mipel
61b75be1a1 #7 New Form
* adds intervention comment to detail view
2021-09-29 15:48:25 +02:00
mipel
7841599650 #7 New Form
* extends KonovaCode filtering for parent objects matching given input
* renames data_form into form for easier template render support
* simplifies empty geometry form initialization
2021-09-29 14:49:17 +02:00
mipel
49a9d03471 #7 New Form
* extends KonovaCode filtering for parent objects matching given input
2021-09-29 11:44:07 +02:00
ea0a07890c #7 New forms
* introduces bootstrap class form-control for proper html form input rendering
* fixes bug where missing shared users for an entry resulted in a None exception
* adds GenerateInput with template in generate-content-input.html, which provides a generate button for fetching server-side content
* adds/updates translations
2021-09-27 13:57:56 +02:00
78ef1b79af #7 New forms
* removes unused OpenInterventionForm
2021-09-27 11:46:41 +02:00
877a1ca335 #7 New forms
* refactors large forms.py into forms/modalForms.py and forms/forms.py
* refactors custom input fields into intervention/inputs.py
2021-09-27 11:45:13 +02:00
e94dbbd3c8 #7 New forms
* fixes bug in case of unset dates for intervention
* adds missing template formater
* adds/updates translations
2021-09-27 11:12:40 +02:00
mipel
7ee28e526e #7 New Form
* adds functionality for EditInterventionForm (WIP)
2021-09-27 09:40:00 +02:00
72ed82ecd6 Full width fields
* refactors full width fields from BaseModalForm into BaseForm to have this nice little feature for regular forms as well!
2021-09-24 15:05:50 +02:00
8b1223e780 Requirements update
* adds important package itsdangerous and changes psycopg2-binary
2021-09-24 14:55:35 +02:00
mipel
9b728e5d10 #7 New forms WIP
* adds saving functionality for new intervention form
* refactors new identifier generating, so a pre-generated identifier from a new element form will be checked again before saving
* adds css fixes for disturbing input field:focus bugs
* adds missing csrf token to new collapsible form
* adds/updates translations
* introduces mark_as_deleted as only marking instead of using delete() which will really delete from the db
2021-09-23 15:05:17 +02:00
mipel
951477c58f #7 New forms WIP
* adds new collapsible styled form for new main data
* adds/updates translations
2021-09-21 14:32:10 +02:00
ce204fff2e Merge pull request '20_Multiple_laws' (#23) from 20_Multiple_laws into master
Reviewed-on: SGD-Nord/konova#23
2021-09-20 14:58:26 +02:00
mipel
89c75d471b #20 Multiple laws
* improves w-100 handling for ModalForms
* adds documentation strings
2021-09-20 14:13:59 +02:00
mipel
8a2bbb1fc2 #20 Multiple laws
* refactors law field from ForeignKey to ManyToManyField to support multiple laws being added to one LegalData object
* added funding data to EMA detail view
2021-09-20 13:33:07 +02:00
43075088de Merge pull request '13_EcoAccount_funding' (#22) from 13_EcoAccount_funding into master
Reviewed-on: SGD-Nord/konova#22
2021-09-20 13:16:15 +02:00
mipel
251f88526e #18 EcoAccount funding
* adds fundings field to AbstractCompensation model
* adds funded by to detail view templates of Compensation and EcoAccount
* adds/updates translations
2021-09-20 12:47:55 +02:00
mipel
a7970a1221 #18 EcoAccount funding
* adds constraint for setting the deductable_surface too low -> existing deductions would not be valid anymore
* adds/updates translations
2021-09-20 09:03:03 +02:00
mipel
4c045618e6 Eco Account deduction
* adds deductable_surface to EcoAccount model to provide an easy way to change the deductable amount from an account -> depends on external funding e.g. with AktionBlau or similar
* adds overview of deducted and deductable volume to detail view
* adds check to eco account model, so the deductable_surface can never be larger than the total amount of after_state surface sum
* adds german formating for python logic based number formating
* adds/updates translations
2021-09-17 13:33:51 +02:00
mipel
a828a1bba2 Minor settings reorganizing
* reorganizes some settings position in konova/settings.py
2021-09-17 11:10:36 +02:00
4f8d6e7036 Merge pull request '18_File_upload_in_certain_folders' (#21) from 18_File_upload_in_certain_folders into master
Reviewed-on: SGD-Nord/konova#21
2021-09-17 11:08:00 +02:00
mipel
416d11d1ee #18 File upload in certain folders
* adds try-except for removing folders in case of non existence or changed folder names on the hard drive
2021-09-17 09:43:03 +02:00
mipel
1edc1edc98 #18 File upload in certain folders
* removes document file folder if the last EmaDocument is removed from an Ema
2021-09-17 09:24:31 +02:00
mipel
e7b6b4dd8d #18 File upload in certain folders
* removes document file folder if the last EcoAccountDocument is removed from an eco account
2021-09-17 09:20:20 +02:00
mipel
799ce8d72c #18 File upload in certain folders
* removes document file folder if the last CompensationDocument is removed from a compensation
2021-09-17 09:16:55 +02:00
mipel
9dbea71af5 #18 File upload in certain folders
* removes 'revocation' folder if RevocationDocument is removed from an intervention and removes the whole intervention document folder as well, if no other documents for this intervention exist
* adds further documentation
* refactors getting of related documents into Intervention model
2021-09-17 09:05:43 +02:00
mipel
cd3eb8099d #18 File upload in certain folders
* removes folder if last InterventionDocument is removed from an intervention and no RevocationDocument exists as well
2021-09-16 09:12:32 +02:00
mipel
270f9ab7d2 #18 File upload in certain folders
* increases max_size for FileFields --> triggers when the file name will be automatically changed during upload
* adds Http404 Exception in case document file does not exist anymore on the hard drive
2021-09-01 16:40:36 +02:00
mipel
3c9d73533f #18 File upload in certain folders
* refactors documents and file upload to be distributed into different subfolders, depending on the type of document (InterventionDocument, RevocationDocument, ...)
* refactors Document model into AbstractDocument
* subclasses RevocationDocument, InterventionDocument, COmpensationDocument, EmaDocument and EcoAccountDocument from AbstractDocument to provide proper functionality for each
* adds new specialized routes for each new document type (opening, removing)
* drops generic get and remove routes for documents
2021-09-01 16:24:49 +02:00
8eb9d4f9ee Merge pull request '14_withdraw_to_deduct' (#16) from 14_withdraw_to_deduct into master
Reviewed-on: SGD-Nord/konova#16
2021-08-30 11:35:12 +02:00
mipel
d569be80b3 Withdraw to deduct
* refactors Models and attributes
2021-08-30 11:34:35 +02:00
mipel
cd5fb9cad6 Withdraw to deduct
* refactors all files and variable names
* WIP: Models and attributes
2021-08-30 11:29:15 +02:00
8a62f6c46b Merge pull request '5_compensation_conservation_office' (#15) from 5_compensation_conservation_office into master
Reviewed-on: SGD-Nord/konova#15
2021-08-30 09:46:19 +02:00
mipel
81cea4f045 [Compensation] Conservation office #5
* keeps responsible data in compensation model for potential future purposes
* refactors registration_office and conservation_office to map onto KonovaCodes instead of own Organization model
* adds str_as_office property-method to KonovaCode to provide an easy way of rendering template data
* adds missing highlighting in case of missing information about registration office and conservation office
* extends KonovaCode command update_codelist.py for CODELIST_PROCESS_TYPE_ID
* adds preselectors for konova codes in models of CompensationAction, Law and CompensationState
2021-08-27 15:16:05 +02:00
mipel
6b70ee8ba9 [Compensation] Conservation office #5
* keeps responsible data in compensation model for potential future purposes
* refactors registration_office and conservation_office to map onto KonovaCodes instead of own Organization model
* adds str_as_office property-method to KonovaCode to provide an easy way of rendering template data
* adds missing highlighting in case of missing information about registration office and conservation office
2021-08-27 09:44:23 +02:00
c1aea16fba Merge pull request '[EcoAccount] See recorded state of withdraw #6' (#12) from 6_recorded_state_of_withdraw into master
Reviewed-on: SGD-Nord/konova#12
2021-08-26 15:45:53 +02:00
mipel
280510d729 [EcoAccount] See recorded state of withdraw #6
* adds prefiltering of withdraws --> excludes withdraws of as deleted flagged interventions
* renders intervention-recorded icon into eco account withdraws details view
* fixes bug in case of document deleting which does not contain any files
* renames RecordForm into RecordModalForm for more clarity
2021-08-26 15:45:24 +02:00
c7fd0037bd Merge pull request '[Intervention] Revocations files optional #4' (#11) from 4_Revocations_files_optional into master
Reviewed-on: SGD-Nord/konova#11
2021-08-26 15:04:12 +02:00
mipel
415fe267d2 [Intervention] Revocations files optional #4
* makes revocation file upload optional
 * adds overview about revocations to intervention index
 * adds/updates translations
2021-08-26 15:02:34 +02:00
1f8440de57 Merge pull request '3_Payment_date_and_comment' (#10) from 3_Payment_date_and_comment into master
Reviewed-on: SGD-Nord/konova#10
2021-08-26 14:30:39 +02:00
mipel
6ce17dd480 Payment date and comment #3
* adds payment-comment relation in NewPaymentForm
 * drops transfer note form field (may not be used anyway) and replace it with comment
 * adds/updates translations
2021-08-26 14:30:05 +02:00
c2fdad1ab6 Merge pull request 'Konova Codelist enhancements' (#9) from master into 3_Payment_date_and_comment
Reviewed-on: SGD-Nord/konova#9
2021-08-26 13:20:25 +02:00
mipel
97571d4363 Konova Codelist enhancements
* adds proper boolean mapping to update_codelist
* differs between id and atom_id for KonovaCode since atomIds are not unique (could change in the future)
* adds is_selectable and is_archived to KonovaCode
* scales width of DAL form fields to 100% width
* adds table-responsive wrapping container for table forms to prevent unwanted rendering artifacts in case of table resizing due to long content
* adds autocomplete routes for law, registration offices and conservation offices
2021-08-26 12:45:48 +02:00
mipel
d33cf5ad4e Compensation app url reorganizing
* restructures urls into separate xy_urls files which are included inside of compensation/urls.py
* adds default ordering of Payment by .amount
2021-08-24 15:55:06 +02:00
mipel
24a6b7fd37 Konova code improvements
* improves rendering of codes as string (short names will be used if existing)
* reduces selectable konova codes to leafs (as discussed with experts)
* automatically resizes the width of modal form fields to w-100
* adds/updates translations
2021-08-24 14:50:51 +02:00
mipel
2469bde7ee Biotope code list
* integrates biotope code list to NewStateForm
* adds dal scripts automatically on compensation view
2021-08-24 09:37:59 +02:00
mipel
e9aea7bcc4 Compensation action code list
* integrates action code list to NewActionForm
2021-08-24 09:31:12 +02:00
mipel
41c9ed106c Codelist integration
* adds codelist app
* adds KonovaCodeList and KonovaCode model for fetching and storing OSIRIS Codelisten entries
* adds update_codelist command for updating and fetching codes
* adds autocomplete route for using codelists in forms
2021-08-23 18:30:02 +02:00
mipel
631b5d0ea6 EMA Filter
* refactors EmaTableFilter to inherit from EcoAccountFilter
* refactors messages for recording/unrecording of EMA
* adds/updates translations
2021-08-19 14:39:28 +02:00
mipel
5137572127 Identifier generating command
* adds a test command for calculating the collision rate for e.g. an intervention (Not important for production or anything)
2021-08-19 14:29:18 +02:00
mipel
2c3f6bbcd1 Detail view adjustments
* adds EMA and eco account conservation office data to detail views
* adds line break in header of detail views
* adds/updates translations
2021-08-19 14:04:44 +02:00
mipel
fd38ab8170 EMA and eco account
* adds EMA and eco account conservation office data to detail views
2021-08-19 14:00:36 +02:00
mipel
615b7bf5ea EMA
* fixes created timestamp in detail views where modified needs to be displayed
* adds fallback timestamp if data has not been edited, yet --> show created timestamp
* fixes bug where deleting of certain data didn't redirect to the index view
* adds quality_check() method for EMA, needed for recording
* adds all functions which are provided for compensations to EMA
* adds/updates translations
2021-08-19 13:44:06 +02:00
mipel
d1f43f8c64 EMA
* adds Ema model (basically Compensation inherited)
* adds index view for EMAs
* fixes drop-down link bug for menu 'More' in navbar
* refactors some more forms to use process_request()
* adds modified attribute to BaseResource for easy last_modified check
* adds setting of modified attribute in all places where UserAction.EDITED is added to log
* adds EMA_ACCOUNT_IDENTIFIER_LENGTH and EMA_ACCOUNT_IDENTIFIER_TEMPLATE to ema/settings.py
* adds EmaAdmin to ema/admin.py
* fixes wrong title in intervention detail view html for revocations
* adds support for subtitle variable to BaseTable and generic_index.html
* drops next_version attribute from models
* adds/updates translations
* adds default ordering for UserActionLogEntry
   * removes extra ordering in log modal rendering
2021-08-19 13:02:31 +02:00
mipel
03fe293cd8 Favicon
* adds favicon
2021-08-19 09:12:13 +02:00
mipel
198462b051 Modal forms
* adds new POST functionality in NewStateModalForm, which does not use the super classes process_request() method
* adds explaining comments on the is_ajax() call
* updates translations
2021-08-19 09:06:35 +02:00
mipel
7dbf4d5b91 Mobile optimization
* adds table-responsive class to BaseClass
* adds html meta attributes for proper small device rendering
2021-08-19 08:44:47 +02:00
mipel
c82ee8afbc Modal and other tweaks
* removes WIKI_URL, replaces with HELP_LINK since it was the same before as well
* refactors modal form processing (process_request())
   * modal form can now display errors directly inside the modal (as intended by the devs)
   * modals now properly support the GET-POST workflow that is intended by the devs. More information here: https://github.com/trco/django-bootstrap-modal-forms/issues/183
* Improves label-field linking in generic_table_form_body.html
* removes isDeleteForm attribute from modal_form_script.html
2021-08-17 15:27:49 +02:00
mipel
833483b810 SSO and messages
* adds message for checking of intervention
* refactors sso message sending to handle an iterable of users
* adds specific method for sending object checking related messages
* adds label support for modal form for more simple clicking of checkboxes
2021-08-17 10:32:54 +02:00
mipel
1a4a4a16c6 SSO and messages
* removes unused third party package from requirements.txt
* adds KonovaSSOClient as subclass of sso.Client for more control over login, e.g. which user data shall not be updated (found in konoa/sso/sso.py)
* adds Messenger class for communicating with SSO server (found in konova/utils/messenger.py)
2021-08-17 09:57:50 +02:00
mipel
74f71cfd1c Requirements
* updates requirements.txt
2021-08-17 08:51:20 +02:00
mipel
ddd6669bbf Translations
* adds/updates translations
2021-08-11 14:50:54 +02:00
mipel
244e300715 Identifier generating
* refactors identifier generating into BaseObject class
2021-08-11 14:31:24 +02:00
mipel
c8b6d001ef Minor enhancements
* refactors eco account rest surface calculation into designated method get_available_rest()
* refactors placeholder setter for BaseForm
* adds automatic eco account identifier generating on saving
* fixes ServerMessageImportance template tag
2021-08-11 14:17:43 +02:00
mipel
5f85f49636 Recording data
* adds dynamic icon for recording and unrecording of data
* adds record view to intervention and eco accounts
* adds quality_check() method for Intervention and EcoAccount class which holds logic for data quality checking
* adds UserAction "unrecorded"
2021-08-10 17:19:42 +02:00
mipel
bd2413d63c EcoAccount detail view
* adds record control button
* adds html markup for invalid withdraws (unrecorded account)
* adds constraint to is_valid() method of NewWithdrawForm for checking whether the selected account for a withdraw is recorded or not
* adds/updates translations
2021-08-10 14:15:42 +02:00
mipel
09d7cad8c8 LANIS Link
* adds LANIS link getter to Intervention, Compensation and EcoAccount for creating a usable link to LANIS
* adds/updates translations
2021-08-10 13:57:03 +02:00
mipel
766d38bcbf HTML improvements
* refactors initializing and rendering of a map view into map/geom_form.html, which leads to simple includes on the detail views instead of redundant html
* refactors django-autocomplete-light form media links and scripts into dal/scripts.html, which can be included on the header blocks of detail views to support form modals using dal easier without the need for form.media
* changes filter behaviour on eco account index: instead of hiding recorded accounts (like in interventions), the filter option there has been replaced with "Show only unrecorded" which can be used to hide all recorded ones
   * background: eco accounts shall be visible when recorded, since they can only be used for withdrawing if they are recorded. Hiding the recorded ones does not make any sense, just like in interventions
* updates some code documentation
* adds/updates translations
2021-08-10 13:12:15 +02:00
mipel
f8b3e5c8fd EcoAccount withdraws
* adds functionality for withdraws from eco accounts in detail view of interventions and eco account as well
* adds get_surface() method to AbstractCompensation class to provide a simple getter for a sql calculation
* adds get_surface_withdraws() method to EcoAccount class to provide a simple getter for a sql calculation
* renames some routes to match coherent rout naming
* adds logic check on NewWithdrawForm
* renames templates/table directory to templates/form, since there are form-table templates inside --> more clarity
* adds new autocomplete routes to konova/urls.py for Interventions and EcoAccounts
* adds/updates translations
* adds/updates template comments
* updates requirements.txt
2021-08-10 10:42:04 +02:00
mipel
58510eee50 EcoAccount template and logic
* adds eco-account own includes for simpler maintainability instead of refactoring to generic includes for compensation app and predefining urls and stuff on the backend
* adds before-state, after-state, actions, deadlines, documents and withdraws to eco account detail view
* adds hint for invalid withdraw in intervention detail view in case of deleted eco account
* adds/updates translations
2021-08-09 15:09:43 +02:00
mipel
abdc574ea2 EcoAccount detail
* adds detail view for eco account
* adds withdraw detail view to eco acount detail
* generalizes compensation/includes templates to be reusable for eco-accounts
* moves is_shared_with() check to class BaseObject
* adds/updates translations
2021-08-09 14:39:36 +02:00
mipel
93c02a72ca EcoAccount index
* renames eco_withdraws to withdraws
* adds EcoAccountTableFilter
* changes percentage withdraw to surface withdraw --> renames amount to surface
* updates EcoAccountTable
  * adds column for rendering rest of available account using a progress bar
* adds progressbar.html to konova/custom_widgets
* adds/updates translations
2021-08-09 14:16:54 +02:00
mipel
a7aeecde2e Restructure files
* reduce compensation/views.py file size by splitting into three sub view files in compensation/views/xy_views.py for compensation, eco-account and payment
* restructure urlpattern list by splitting into three smaller lists for a better overview and maintainability
2021-08-09 13:16:50 +02:00
mipel
5efa755188 Log
* adds modal_generic.html template for generic usage
* adds M2M field log to BaseObject
* adds show log button to controls.html
* adds logging on adding related objects
* adds render log table using generic modal
* adds tooltip to missing values in detail views
* adds/updates translations
2021-08-05 12:54:28 +02:00
mipel
f69d98460f Template improvement
* minor improvement
2021-08-04 15:55:40 +02:00
mipel
135f25d88b Intervention check
* adds functionality for check button
* adds highlighting of important data on detail view for intervention
* adds deleting logic to BaseObject model and BaseResource model
* adds RunCheckForm
* adds check_validity() method to Intervention class
* fixes wrong success msg for adding documents
* adds/updates translations
2021-08-04 15:19:06 +02:00
mipel
685f425e29 Document open fix
* fixes a bug in opening a document
2021-08-04 13:34:28 +02:00
mipel
8e1f679c2a Intervention revocation
* adds Revocation model to interventions/models.py
* adds revocations to interventions detail view
* fixes duplicated ids in html includes
* refactors controls for detail view into included template files (controls.html)
* reduces max length for payment transfer notes from 1000 to 200
* adds RevocationAdmin to intervention/admin.py
* adds new form for adding a Revocation to an intervention's legal_data
  * only one revocation per intervention possible
  * removes add button in case of an existing revocation
* adds revocation routes to intervention app
* renames document field in Document model into file for more clarity
* adds/updates translations
2021-08-04 13:32:35 +02:00
mipel
fd526b80b7 Compensation control
* removes CompensationControl model
* adds comment field to CompensationAction
* adds max length of 200 for comment fields in forms
* adds rendering of error messages in case of invalid form input
* adds/updates translations
2021-08-04 11:56:56 +02:00
mipel
2e3fdaad97 Translation fix
* fixes label and translation in a form
2021-08-04 11:02:26 +02:00
mipel
f666c3afa3 Compensation action
* adds compensation action to compensation detail view
* adds adding/removing logic for compensation action
* adds bootstrap style to select fields in forms
* refactors UnitEnum into UnitChoices using models.TextChoices (Django 3.x)
* adds translations
2021-08-04 10:44:02 +02:00
mipel
d773c3b3d4 Fixes and improvements
* fixes group check on detail views
* adds check for required fields in BaseForm for showing required field hint or not in template
2021-08-04 08:41:21 +02:00
mipel
cd5b2e264b Fixes and improvements
* moves diff_states message back to table top for direct presentation in compensation/detail/view.html
* removes diff_states rendering in deadline card in compensation/detail/view.html
* fixes before_state adding based on GET parameter
* refactors UserActionlogEntryEnum into a UserAction TextChoice (Django 3.x)
* adds ordering of compensation states depending on surface value
* refactors ServerMessageImportance from enum into TextChoice (Django 3.x)
* adds/updates translations
2021-08-03 17:22:41 +02:00
mipel
816600535a Compensation detail view
* adds compensation detail view (WIP)
* adds includes dir for related objects, similar to interventions
* adds functionality for
   * adding/removing before_states
   * adding/removing after_states
   * adding/removing deadlines
   * adding/removing documents
* refactors usage of BaseModalForm
   * holds now process_request() in base class for generic usage anywhere
* adds __str__() method for some models
* compensation__action is blank=True now
* renamed tooltips
* adds new routes for state/deadline/document handling inside of compensation/urls.py
* adds precalculation of before/after_states for detail view, so users will see directly if there are missing states
* removes unnecessary link for intervention detail payment
* adds missing tooltips for check and record icon on detail views
* refactors DeadlineTypeEnum into DeadlineType in konova/models.py, just as the django 3.x documentation suggests for model enumerations
* UuidModel id field is not editable anymore in the admin interface
* adds/updates translations
2021-08-03 13:13:01 +02:00
mipel
19f50baae4 Missing group message
* adds group checker decorator for adding a message informing about missing group privileges
2021-08-03 09:45:41 +02:00
mipel
715cf65538 Setup data
* removes auto-translating of setup data for database (keep english values in db and translate for templates)
2021-08-03 09:11:33 +02:00
mipel
f58650effa Default group required
* adds access checks depending on the current group confgiguration of a user
* removes buttons for adding/editing or removing data if default group is not set for a user
* removes buttons for adding/removing related data in unshared interventions
* removes shared-user setting from share menu of an intervention if user is not zb or ets
* renames has_access() from intervention Model into is_shared_with() for more clarity
* fixes bug in group check in_group() from utils.py
2021-08-02 16:23:29 +02:00
mipel
63b2d3ef66 Compensation enhancements
* compensations won't be listed in index table if related intervention has been deleted
* adds functionality for intervention remove button
* adds outcommented code
* adds configurable redirect_url for RemoveModalForm's process_request method
* adds translation
2021-08-02 15:39:33 +02:00
mipel
d203046666 Intervention detail view
* adds overview of shared with users
2021-08-02 14:56:08 +02:00
mipel
c72ff615ba User contact modal
* adds user/includes/contact_modal_button.html for calling contact data of a user
* adds user contact modal to intervention detail view
* adds translations
2021-08-02 14:10:57 +02:00
mipel
6e2ee15b93 Minor template enhancement 2021-08-02 13:29:33 +02:00
mipel
f113bad733 Created|Deleted refactoring
* refactors base attributes created and deleted into UserActionLogEntry foreign keys
* refactors all related queries and process logic
* fixes binding_on into binding_date in intervention/detail/view.html
* adds basic __str__ for some models
*
2021-08-02 11:52:20 +02:00
mipel
92cacd7aaa RemoveModalForm refactoring
* wraps generic request processing logic into RemoveModalForm
* adds delete action to intervention detail compensations.html
* fixes rendering of deleted compensations in intervention detail view
2021-08-02 10:53:34 +02:00
mipel
6a650d2021 Eco Accounts
* adds related eco account withdraw detail view to intervention detail view
* adds new route for removing withdraws using RemoveModalForm
* adds EcoAccountWithdraw model
* adds admin interfaces for EcoAccount and EcoAccountWithdraw
* adds message_templates.py to konova/utils for reusable messages
* splits related-documents.html and related-objects.html into separate templates for each related object type: compensations.html, documents.html, eco-account-withdraws.html and payments.html
* adds translations
2021-08-02 10:14:34 +02:00
mipel
52600c9a16 Share intervention settings
* extends share link form to share settings form
* adds list of users with access to the intervention
* adds logic for removing these users
* enhances translations
2021-07-30 15:23:46 +02:00
mipel
923f09d9f4 Typo
* fixes minor translation typ
2021-07-30 14:35:44 +02:00
mipel
5c16406873 Share url view
* adds modal for rendering the share url
* adds new custom_widget text-to-clipboard-input.html
  * provides a copy button for writing the text input's value into the client's clipboard
* adds translation
2021-07-30 14:34:36 +02:00
mipel
2f33e5fba9 Access url for interventions
* adds access_token as new attribute
* adds generating of access_token
* adds new form
* adds two new routes for sharing an intervention
* adds translation
* adds render_submit to BaseModalForm which triggers rendering the modal footer
2021-07-30 13:30:42 +02:00
b7ab9f6f55 Merge pull request 'user_action_log_introduction' (#2) from user_action_log_introduction into master
Reviewed-on: SGD-Nord/konova#2
2021-07-30 12:22:02 +02:00
mipel
e9f25e50ac Compensation model refactoring
* splits Intervention model into main components
   * Compensation (main object)
   * ResponsibilityData (holds organizations and handler) - same as used for intervention
   * This way data can be extended more easily in the future
* refactors deadlines
2021-07-30 12:20:23 +02:00
mipel
e327f03893 Intervention model refactoring
* splits Intervention model into three main components
   * Intervention (main object)
   * LegalData (holds legal dates, laws, etc.)
   * ResponsibilityData (holds organizations and handler)
   * This way data can be extended more easily in the future
* refactors admin.py and usages in templates
* introduces UuidModel as a base class for BaseResource
2021-07-30 09:30:33 +02:00
mipel
5858a5fdf9 Compensation users refactoring
* moves accessibility of compensations completely into related intervention.users set
  * this way the visibility for a compensation can not differ from the one of the 'parent' intervention
2021-07-29 16:10:56 +02:00
mipel
4647be958b Intervention model refactoring
* adds UserActionLogEntry model to user/models.py
  * wraps user and timestamp info
  * can be extended for more information in the future
* refactors all filtering and accessing on values
2021-07-29 15:49:19 +02:00
mipel
287e0b4068 Compensation index view
* adds filters and table optimizations for compensation index rendering
* fixes recorded_by/checked_by confusion in intervention table
2021-07-29 10:51:14 +02:00
mipel
c76a061740 Template improvements
* refactors templates/table.html into templates/generic_index.html
* adds DummyFilterInput as do-not-render-widget
* hardens combination of q filter and other filters on index view rendering
2021-07-28 09:53:14 +02:00
mipel
1d77eb293e Harden search filter
* hardens search filter against whitespaces
* renames 'Show all' filter to 'Show unshared' for clarification
* adds translation
2021-07-28 08:54:48 +02:00
mipel
d919eee3b4 Dashboard dynamic content
* replaces static dummy values with database values
* renames 'Your own' into 'Shared with you' for clarification
* adds translation
2021-07-28 08:50:53 +02:00
mipel
09fad6a2de Document upload fix
* fixes some minor issues with the document upload
2021-07-26 15:34:30 +02:00
mipel
1ff02c30a6 Document upload
* adds document upload form
* refactors modal form templates into form classes
* adds document upload route to intervention routes of urls.py
2021-07-26 15:16:16 +02:00
mipel
1d4be22da5 Template restructuring
* splits large templates into smaller includes
* removes localized form input for payments
* refactors Document removing using the generic remove form
2021-07-26 14:35:19 +02:00
mipel
2889b10e0d Payments add modal form
* adds help texts to add payment form
* adds removing button for payments
* refactors user fetching into BaseForm
* adds generic RemoveModalForm which is intended to be used for every modal form which shall remove something
* adds translations
* removes unused html
* prepares payment amount field to be able to process german inputs like '1.000,50' which is not the international default
2021-07-26 11:29:05 +02:00
mipel
23afe2654e Payments add modal form
* adds modal form for adding payments
* generalizes generic_table_form.html for table-form-like usage in modal_form.html
* adds css enhancements for focused input fields
* adds BaseModalForm as specification to BaseForm, which inherits the BSModalForm class as well
* adds translations
2021-07-26 10:23:09 +02:00
mipel
8885f81770 Documents removing
* adds generic modal rendering using package django-bootstrap-modal-forms
* adds document file removing from hard drive
* adds translations
2021-07-23 18:27:53 +02:00
mipel
47ec30919c Documents removing
* adds document removing button
* adds translation
* adds Document admin
2021-07-23 16:04:58 +02:00
mipel
a0c0a0f074 Documents
* add get document route
* add missing attributes to intervention detail view
2021-07-23 15:35:05 +02:00
mipel
13a15e4f56 Compensation routes
* improves compensation routes
2021-07-23 15:23:54 +02:00
mipel
b962e22c04 Intervention relations enhancements
* refactors model relation to compensation and payment by applying 1-n instead of n-n
2021-07-23 09:36:43 +02:00
mipel
eaa9c43afe Intervention Detail View
* adds hint for empty map in case of missing geometry
* adds empty geometry workaround, so openlayers is rendered without digitalization tools
* adds translations
2021-07-22 16:06:13 +02:00
mipel
a304f8d42e Intervention Detail View
* adds related object overview in detail view
* adds comment field to payment model for 'Verwendungszweck'
* simplifies intervention urls
* adds translations
2021-07-22 14:58:58 +02:00
mipel
4d651aec24 Intervention Detail View
* adds (WIP) detail view for interventions
* renames typo in conservations_file_number to conservation_file_number
* adds simple has_access check for intervention objects for given users
* renames occurences of "Registered" to "Recorded" (verzeichnen)
* adds an informing message for detail view of intervention objects which are not editable for a user
* adds GeometryAdmin
* adds fallback DEFAULT_SRID for Geometry model
* adds translations
2021-07-22 13:19:14 +02:00
mipel
0c1fa72556 Table filters
* adds table filtering for InterventionTable
* adds default ordering
* moves user-access filtering from view to InterventionTableFiler
* adds generic render_icn method for BaseTable (for usage with fontawesome5)
* adds translations
* improves table.html template
2021-07-22 10:00:59 +02:00
mipel
f88b206756 Help link
* adds help link
2021-07-22 08:40:26 +02:00
mipel
67f415c2e3 Intervention tables and model adjustments
* adds user access relation to certain models
* adds pagination to tables
* adds checked_on/_by attributes to intervention model
* adds custom column rendering for checked and registered columns
* adds first simple index filtering of default interventions for user
* adds translations
2021-07-21 15:40:34 +02:00
mipel
8f0db2ae3e Linkage improvement
* adds linking to submenus
* adds PaymentAdmin
* adds Meta class inheritance for tables
2021-07-21 14:17:18 +02:00
mipel
ee6984de00 Translations
* adds some translations
2021-07-21 13:47:10 +02:00
mipel
c07a0d730d Html enhancements
* adds some bootstrap enhancements for responsiveness
2021-07-21 13:27:35 +02:00
mipel
90262d663f Readme
* adds README.md
2021-07-21 09:45:15 +02:00
mipel
fc6f9cfbcd Index table enhancement
* minor changes
2021-07-20 17:10:49 +02:00
mipel
bfdd5665b7 Renaming models
* minor renaming
2021-07-20 17:04:07 +02:00
mipel
6ac0556601 Default bootstrap tables
* adds basic bootstrap classes to BaseTable model
2021-07-20 14:23:16 +02:00
mipel
596d61f667 Default bootstrap tables
* refactors old table index template into bootstrap-fontawesome generic table
2021-07-20 14:05:44 +02:00
mipel
c72a7faa3d Translations
* re-enable translations for groups
2021-07-20 13:20:33 +02:00
mipel
0d18dfd609 Minor css enhancements
* minor changes for <a> tags
* centers link for older news in card
2021-07-09 08:25:06 +02:00
mipel
044085bf55 Translations
* adds translations
2021-07-09 08:20:02 +02:00
mipel
39c1d9eb12 Group access constraints
* adds new decorators for all three important groups
* reorganize some default group settings for setup_data.py
2021-07-09 08:18:37 +02:00
mipel
50d98b2a83 Updates generic_table_form.html
* updates generic template
2021-07-09 07:46:20 +02:00
mipel
903a22973f User menu
* adds user notifications and management
2021-07-08 17:23:06 +02:00
mipel
f0a33b360d User menu
* starts user menu implementation
2021-07-08 11:07:33 +02:00
mipel
b1ea9aa1e2 Dashboard
* finishes work on dashboard
2021-07-07 15:50:20 +02:00
mipel
7cbcdc62ae Dashboard
* finishes work on dashboard
2021-07-07 13:46:33 +02:00
mipel
3277896ff1 News app
* adds news app for future implementations
2021-07-06 08:53:08 +02:00
mipel
7968d7d355 Landing page
* started to implement a landing page
* started news implementation
2021-07-05 14:49:32 +02:00
mipel
f654826003 Navbar improved 2021-07-02 15:21:53 +02:00
mipel
c3e1e3e669 Navbar improved 2021-07-02 15:08:51 +02:00
mipel
905e29c8f8 Navbar improved 2021-07-02 14:59:37 +02:00
mipel
8fd09abda6 Simple footer finished 2021-07-02 13:46:06 +02:00
mipel
b63cb3c493 Simple navbar finished 2021-07-02 13:12:38 +02:00
mipel
629bf4230e Simple navbar implemented 2021-07-02 11:38:44 +02:00
mipel
cd4327deba Permission rethinking
* No detailed permissions due to django constraints on model-based permissions
* instead: logic controlled permission by group membership
* adds translations
2021-07-02 10:10:03 +02:00
mipel
d086bb9465 Permission rethinking
* No detailed permissions due to django constraints on model-based permissions
* instead: logic controlled permission by group membership
* adds translations
2021-07-02 10:08:00 +02:00
mipel
c2a066fc71 Permission rethinking
* No detailed permissions due to django constraints on model-based permissions
* instead: logic controlled permission by group membership
* adds translations
2021-07-02 09:45:45 +02:00
mipel
fa5387e814 Permission rethinking
* No detailed permissions due to django constraints on model-based permissions
* instead: logic controlled permission by group membership
* adds translations
2021-07-02 09:34:39 +02:00
mipel
980d57958b Permission rethinking
* No detailed permissions due to django constraints on model-based permissions
* instead: logic controlled permission by group membership
* adds translations
2021-07-02 09:31:09 +02:00
mipel
32370a0a7e Permission rethinking
* No detailed permissions due to django constraints on model-based permissions
* instead: logic controlled permission by group membership
* adds translations
2021-07-02 09:30:50 +02:00
mipel
206d34afbb Permission values
* adds raw permission values for all groups
2021-07-02 08:37:50 +02:00
mipel
2757f1b9c1 Permission values
* adds raw permission values for all groups
2021-07-02 07:34:34 +02:00
mipel
75f983f7a7 Refactoring to konova 2021-07-01 15:08:22 +02:00
mipel
4084373e2b Refactoring to konova 2021-07-01 14:38:57 +02:00
mipel
a5e8bcfa8c Initial 2021-07-01 13:36:07 +02:00

View File

@ -31,7 +31,7 @@
"map": "map":
{ {
"projection": "EPSG:25832", "projection": "EPSG:25832",
"center_lonlat": [ 7.0, 51.0 ], "center_lonlat": [ 7.0, 50.0 ],
"zoom": 12, "zoom": 12,
"min_zoom": 5, "min_zoom": 5,
"max_zoom": 24, "max_zoom": 24,
@ -41,21 +41,18 @@
"folders": "folders":
[ [
{ "id": "bg", "title": "Hintergrund", "parent": null , "radio": true}, { "id": "bg", "title": "Hintergrund", "parent": null , "radio": true},
{ "id": "alkis", "title": "ALKIS Liegenschaften", "parent": null }, { "id": "alkis", "parent": null, "title": "ALKIS Liegenschaften" },
{ "id": "verwaltung", "title": "Verwaltungsgrenzen", "parent": null }, { "id": "verwaltung", "parent": null, "title": "Verwaltungsgrenzen" },
{ "id": "fachdaten", "title": "Geofachdaten", "parent": null }, { "id": "fachdaten", "parent": null, "title": "Geofachdaten" },
{ "id": "ksp", "title": "Kompensationsverzeichnis", "parent": "fachdaten" }, { "id": "ksp", "parent": "fachdaten", "title": "Kompensationsverzeichnis"},
{ "id": "kom", "title": "Kompensationen", "parent": "ksp" }, { "id": "schutzgebiet", "parent": "fachdaten", "title": "Schutzgebiete"},
{ "id": "eiv", "title": "Eingriffe", "parent": "ksp" }, { "id": "nationalpark", "parent": "schutzgebiet", "title": "Nationalparke"},
{ "id": "oek", "title": "Ökokonten", "parent": "ksp" }, { "id": "naturraum", "parent": "schutzgebiet", "title": "Naturräume" },
{ "id": "ema", "title": "EMA", "parent": "ksp" }, { "id": "kom", "parent": "ksp", "title": "Kompensationen" },
{ "id": "mae", "title": "MAE", "parent": "ksp" }, { "id": "eiv", "parent": "ksp", "title": "Eingriffe" },
{ "id": "schutzgebiet", "title": "Schutzgebiete", "parent": "fachdaten" }, { "id": "oek", "parent": "ksp", "title": "Ökokonten" },
{ "id": "nationalpark", "title": "Nationalparke", "parent": "schutzgebiet" }, { "id": "ema", "parent": "ksp", "title": "EMA" },
{ "id": "naturraum", "title": "Naturräume", "parent": "schutzgebiet" }, { "id": "mae", "parent": "ksp", "title": "MAE" }
{ "id": "dtk", "title": "Topographisch (DTK5)", "parent": "bg" },
{ "id": "basemap", "title": "BaseMap", "parent": "bg" },
{ "id": "webatlas", "title": "Webatlas", "parent": "bg" }
], ],
"layers": "layers":
[ [
@ -95,13 +92,13 @@
{ "id": "vg", "folder": "verwaltung", "type": "WMS", "title": "Verbandsgemeinden", "url": "http://geo5.service24.rlp.de/wms/verwaltungsgrenzen_rp.fcgi?", "name": "Verbandsgemeinden" }, { "id": "vg", "folder": "verwaltung", "type": "WMS", "title": "Verbandsgemeinden", "url": "http://geo5.service24.rlp.de/wms/verwaltungsgrenzen_rp.fcgi?", "name": "Verbandsgemeinden" },
{ "id": "gmd", "folder": "verwaltung", "type": "WMS", "title": "Gemeinden", "url": "http://geo5.service24.rlp.de/wms/verwaltungsgrenzen_rp.fcgi?", "name": "Gemeinden" }, { "id": "gmd", "folder": "verwaltung", "type": "WMS", "title": "Gemeinden", "url": "http://geo5.service24.rlp.de/wms/verwaltungsgrenzen_rp.fcgi?", "name": "Gemeinden" },
{ "id": "webatlas_farbe", "folder": "webatlas", "type": "WMS", "order": -1, "title": "farbig", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_WebAtlasRP/MapServer/WmsServer?", "name": "RP_WebAtlasRP", "active": true}, { "id": "webatlas_farbe", "folder": "bg", "type": "WMS", "order": -1, "title": "WebatlasRP farbig", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_WebAtlasRP/MapServer/WmsServer?", "name": "RP_WebAtlasRP", "active": true},
{ "id": "webatlas_grau", "folder": "webatlas", "type": "WMS", "title": "grau", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_ETRS_Gt/MapServer/WmsServer?", "name": "0", "active": false }, { "id": "webatlas_grau", "folder": "bg", "type": "WMS", "order": -1, "title": "WebatlasRP grau", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_ETRS_Gt/MapServer/WmsServer?", "name": "0", "active": false },
{ "id": "luftbilder", "folder": "bg", "type": "WMS", "title": "Luftbilder", "attribution": "LVermGeo", "url": "http://geo4.service24.rlp.de/wms/dop_basis.fcgi?", "name": "rp_dop", "active": false }, { "id": "luftbilder", "folder": "bg", "type": "WMS", "order": -1, "title": "Luftbilder", "attribution": "LVermGeo", "url": "http://geo4.service24.rlp.de/wms/dop_basis.fcgi?", "name": "rp_dop", "active": false },
{ "id": "basemap_farbe", "folder": "basemap", "type": "WMS", "title": "farbig", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_basemapde?", "name": "de_basemapde_web_raster_farbe", "active": false }, { "id": "basemap_farbe", "folder": "bg", "type": "WMS", "order": -1, "title": "BasemapDE farbig", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_basemapde?", "name": "de_basemapde_web_raster_farbe", "active": false },
{ "id": "basemap_grau", "folder": "basemap", "type": "WMS", "title": "grau", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_basemapde?", "name": "de_basemapde_web_raster_grau", "active": false }, { "id": "basemap_grau", "folder": "bg", "type": "WMS", "order": -1, "title": "BasemapDE grau", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_basemapde?", "name": "de_basemapde_web_raster_grau", "active": false },
{ "id": "dtk_farbe", "folder": "dtk", "type": "WMS", "title": "farbig", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/dtk5_rp.fcgi?", "name": "rp_dtk5", "active": false }, { "id": "dtk_farbe", "folder": "bg", "type": "WMS", "order": -1, "title": "DTK5 farbig", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/dtk5_rp.fcgi?", "name": "rp_dtk5", "active": false },
{ "id": "dtk_grau", "folder": "dtk", "type": "WMS", "title": "grau", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/dtk5_rp.fcgi?", "name": "rp_dtk5_grau", "active": false } { "id": "dtk_grau", "folder": "bg", "type": "WMS", "order": -1, "title": "DTK5 grau", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/dtk5_rp.fcgi?", "name": "rp_dtk5_grau", "active": false }
], ],
"layertree": "layertree":
{ {
@ -226,8 +223,8 @@
"snapping": "snapping":
{ {
"show": true, "show": true,
"active": false, "active": true,
"tolerance": 10 "tolerance": 35
}, },
"bounds_message": "Ausserhalb des erlaubten Bereichs!", "bounds_message": "Ausserhalb des erlaubten Bereichs!",
"show_bounds": true "show_bounds": true