Commit Graph

818 Commits

Author SHA1 Message Date
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