Commit Graph

766 Commits

Author SHA1 Message Date
ea7a53eb4f 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
5550b8aa67 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
a6f7e605e6 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
8bce8b8e75 Command
* adds new command to be used with cron for periodic checkin of resubmissions
* updates translations
2022-08-15 10:02:07 +02:00
4f02e8ee1b 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
117a4437fe Model
* adds new model and mixin
* adds new functionality for Mailer class for sending resubmission mails
2022-08-15 08:08:15 +02:00
f9c23a8f29 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
a5f0d7f8c6 Fix
* adds more detailed situation check on check_for_recorded_instance()
2022-08-10 09:28:43 +02:00
982d9f1930 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
9840c8fa8f Minor changes
* updates translation
2022-08-10 09:03:24 +02:00
890911c2dc 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
3d10e84852 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
05145673e1 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
fd4c9b0e5e #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
23f0567aef 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
70555ee5a3 #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
1c38acea25 Revert "Merge branch 'Docker' into master"
This reverts commit cf282c937f, reversing
changes made to ee9834c0da.

Undos accidental remote merge
2022-07-13 11:21:51 +02:00
cf282c937f Merge branch 'Docker' into master 2022-07-13 11:02:57 +02:00
ee9834c0da 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
dacfbd0504 Test update
* updates tests for SRID migration
2022-07-13 10:53:45 +02:00
0e7859e538 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
16107f93f6 Merge pull request '#180 Shared data users hidden' (#181) from 180_Visibility_of_contact_data into master
Reviewed-on: SGD-Nord/konova#181
2022-06-27 14:31:30 +02:00
d669adf54f #180 Shared data users hidden
* implements hidden visibility of shared users on non-shared entries
2022-06-27 14:31:09 +02:00
589a7aec60 Merge pull request '177_Minor_enhancements' (#178) from 177_Minor_enhancements into master
Reviewed-on: SGD-Nord/konova#178
2022-06-22 11:53:43 +02:00
3f3ae4e31b # 177 Impressum link
* adds impressum link to footer
2022-06-21 14:27:32 +02:00
1bbede0d12 # 177 Overview layout enhancement
* enhances layout title section layout on overview template
2022-06-21 14:25:50 +02:00
0801b3f6ab # 177 Timespanreport and Excel download
* fixes bug on excel download
* adds new order of columns to excel template for report download
* enhances subtitle for old data entries on timespanreport template
2022-06-21 14:19:10 +02:00
44ad156595 # 177 Timespanreport helptext for deductions
* adds help text for recorded deduction section
2022-06-21 14:11:01 +02:00
5c95bc7d85 # 177 Timespanreport column order
* rearranges the column order so 'Total' will always be the first column
2022-06-21 14:02:49 +02:00
3b045fea8e # 177 Report help texts
* adds report form field help texts
* adds translations
2022-06-21 13:54:41 +02:00
6e5237ab88 Merge pull request '# 175 Report law calculation bugfix' (#176) from 175_Report_law_calculation_wrong into master
Reviewed-on: SGD-Nord/konova#176
2022-06-15 17:46:49 +02:00
f19ad5f639 # 175 Report law calculation bugfix
* fixes bug where amount of used laws in intervention forms would not be calculated properly
2022-06-15 17:44:43 +02:00
766e3c8d37 Merge pull request 'master' (#174) from master into Docker
Reviewed-on: SGD-Nord/konova#174
2022-06-02 09:38:06 +02:00
f6dcb6c6db Merge pull request 'Konova Code fix' (#173) from konova_code_migration into master
Reviewed-on: SGD-Nord/konova#173
2022-06-02 09:37:36 +02:00
e90625c8b5 Merge pull request 'master' (#172) from master into Docker
Reviewed-on: SGD-Nord/konova#172
2022-06-02 08:53:32 +02:00
7bacbecdec Konova Code fix
* adds command sync_codelist
    * provides updating of all codes to the newest version (id)
    * must be run once on staging, can be dropped afterwards since the root for the problem has been resolved on the codelist management application
2022-05-31 16:53:13 +02:00
58ce00a5a6 Merge pull request '158_PIK' (#171) from 158_PIK into master
Reviewed-on: SGD-Nord/konova#171
2022-05-31 13:41:54 +02:00
be885306c5 #158 is_pik added
* adds model and form mixin for PIK
* integrates mixins for compensation, ema and ecoaccount
* adds migration files
* extends API
* extends API test data
* adds is_xy fields to compensation, ema and ecoaccount reports
* adds is_pik information to detail views
* adds/updates translations
2022-05-31 13:33:44 +02:00
8b67df7617 HOTFIX: Team sharing
* fixes bug where entries would show up on index views as they would be shared (are shared but using a 'deleted' Team, which still exists on the db)
2022-05-31 12:58:35 +02:00
ab9af7ae2f Merge pull request '169_Unknown_admin_on_teams' (#170) from 169_Unknown_admin_on_teams into master
Reviewed-on: SGD-Nord/konova#170
2022-05-31 09:48:33 +02:00
f085caac5d #169 Team delete-restore
* removes unused code snippets
2022-05-31 09:47:32 +02:00
7f8d900c10 #169 Team delete-restore
* adds tests for user app
2022-05-31 09:10:44 +02:00
e7031d0bc2 #169 Team delete-restore
* adds restorable delete functionality to Team model
* refactors minor code model parts by introducing DeletableObjectMixin
* only non-deleted Teams can be chosen for sharing
* deleted Teams can be restored using the proper function on the backend admin
* deleted Teams do not provide
* adds migration
2022-05-30 15:38:16 +02:00
8aa3fbd97a #169 Admin on teams
* adds admin column on team index view
* refactors Team model, so multiple members can become admins
* adds team migration for switch from fkey->m2m structure
* renames 'Group' to 'Permission' on user index view to avoid confusion between 'Groups' and Teams
* adds new autocomplete route for team-admin selection based on already selected members of the TeamForm
2022-05-30 14:35:31 +02:00
eb3b9eb5c1 Merge pull request '#163 Checked icons improvement' (#168) from 163_Checked_workflow_improvements into master
Reviewed-on: SGD-Nord/konova#168
2022-05-30 10:38:48 +02:00
1e86a1ce5e #163 Checked icons improvement
* adds a second star icon on currently unchecked but previously checked entries
   --> can be detected easier for another check run
* simplifies some related code parts
* moves some translation string into message_templates.py
* enables session timeout after 60 minutes
* improves comment card layout sizing
* adds/updates translations
2022-05-30 10:26:34 +02:00
fbab67f897 Merge pull request '#138 Bugfix' (#167) from 138_New_map_client into master
Reviewed-on: SGD-Nord/konova#167
2022-05-27 15:02:05 +02:00
59c5072619 #138 Bugfix
* fixes bug where empty geometry would have lead to exception during is_valid check on SimpleGeomForm
2022-05-27 15:01:43 +02:00
51525d79f5 Merge pull request '138_New_map_client' (#166) from 138_New_map_client into master
Reviewed-on: SGD-Nord/konova#166
2022-05-27 08:27:08 +02:00
4f482595c6 Merge branch 'master' into 138_New_map_client
# Conflicts:
#	konova/models/geometry.py
#	konova/urls.py
#	locale/de/LC_MESSAGES/django.mo
#	locale/de/LC_MESSAGES/django.po
2022-05-25 09:22:15 +02:00