Commit Graph

1908 Commits

Author SHA1 Message Date
7a760332fa 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
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
7091b3d707 #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
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
a58532322e 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
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
cf43a4351e #118 API pagination
* adds pagination and related parameters to GET apis
* updates api GET test
2022-02-16 11:38:24 +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
e65b7ec45c #118 API ActionTypes
* adds support for multiple action_type entries on one CompensationAction
2022-02-16 09:44:56 +01:00
0677cec709 #118 API ActionTypes
* adds support for multiple action_type entries on one CompensationAction
2022-02-16 09:44:56 +01:00
a1d3fafc61 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
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
767285112d # 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
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
b62113df8b 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
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
0658a2f6f1 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
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
117f0eaeb6 #112 Tree filter case insensitive search
* adds case insensitive search for TreeWidget
2022-02-16 08:31:18 +01:00
91185ef847 #112 Tree filter case insensitive search
* adds case insensitive search for TreeWidget
2022-02-16 08:31:18 +01:00
46ff1d2bc5 #112 Order enhancement
* enhances ordering for action details and biotope details
2022-02-16 08:26:24 +01:00
ed27d8d589 #112 Order enhancement
* enhances ordering for action details and biotope details
2022-02-16 08:26:24 +01:00
ec69556b1c #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
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
eb22dcf9b4 # 112 Search input for TreeWidget
* adds search input field for js-filtering by input
2022-02-15 14:35:49 +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
30d1e4033d #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
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
b34aa44d44 #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
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
f3a837a8a6 #112 AbstractCompensation rendering enhancements
* minor changes to detail view rendering of EMA, Compensation and EcoAccount
2022-02-15 10:56:49 +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
f36f219d2e #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
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
3df605376c WIP: #112 Restructure CompensationAction 2022-02-11 16:21:44 +01:00
d04d02380f WIP: #112 Restructure CompensationAction 2022-02-11 16:21:44 +01:00
2fcc41bf4a Merge pull request 'master' (#113) from master into Docker
Reviewed-on: SGD-Nord/konova#113
2022-02-11 16:10:47 +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
23790bca8d WIP: CompensationAction using jstree 2022-02-11 14:13:42 +01:00
62e452c625 WIP: CompensationAction using jstree 2022-02-11 14:13:42 +01:00
925d5f5070 #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
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
3814c2749a #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
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
d0991ea832 # 110 Biotope codelists
* adds codelist 654 to settings
* adds codelist to update_codelist command
2022-02-10 14:01:59 +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
68b8ff07e9 Translation update
* updates translations
2022-02-10 13:31:51 +01:00
f8dedc6df1 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
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