Commit Graph

360 Commits

Author SHA1 Message Date
8c47c8ae35 Merge branch 'Docker' into master 2022-07-13 11:02:57 +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
72b779de98 # 177 Impressum link
* adds impressum link to footer
2022-06-21 14:27:32 +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
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
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
c911276cb4 #169 Team delete-restore
* removes unused code snippets
2022-05-31 09:47:32 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
05c8d6e520 Merge pull request 'master' (#134) from master into Docker
Reviewed-on: SGD-Nord/konova#134
2022-03-04 13:33:35 +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
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
c34011d45f #125 Edit form titles
* changes form titles for all new EditForms
2022-02-21 09:04:46 +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
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
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
3878b5dbdb WIP: #101 Team sharing form
* adds form for sharing via team
2022-02-17 15:07:25 +01:00
75c70ff8dc #101 Team settings
* adds first implementation for team managing
2022-02-17 13:13:32 +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
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
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
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
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
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
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
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
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
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
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
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
0bd2e5ffef # Migrations
initial migrations commit
2022-02-02 08:46:08 +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
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
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