IT-Naturschutz/konova
7
1
Fork 0
Code Issues 6 Pull Requests 1 Actions Projects Releases 28 Wiki Activity
610 Commits 4 Branches 28 Tags 26 MiB
b2f29a3651
Commit Graph

610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mpeltriaux
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
mpeltriaux
45e9ff9539 Fix 
* adds more detailed situation check on check_for_recorded_instance()
 2022-08-10 09:28:43 +02:00
mpeltriaux
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
mpeltriaux
049305c32e Minor changes 
* updates translation
 2022-08-10 09:03:24 +02:00
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
8c47c8ae35 Merge branch 'Docker' into master 2022-07-13 11:02:57 +02:00
mpeltriaux
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
mpeltriaux
72e5599395 Test update 
* updates tests for SRID migration
 2022-07-13 10:53:45 +02:00
mpeltriaux
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
mpeltriaux
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
mpeltriaux
053612a924 #180 Shared data users hidden 
* implements hidden visibility of shared users on non-shared entries
 2022-06-27 14:31:09 +02:00
mpeltriaux
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
mpeltriaux
72b779de98 # 177 Impressum link 
* adds impressum link to footer
 2022-06-21 14:27:32 +02:00
mpeltriaux
e4528dc5ef # 177 Overview layout enhancement 
* enhances layout title section layout on overview template
 2022-06-21 14:25:50 +02:00
mpeltriaux
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
mpeltriaux
2d3299cffa # 177 Timespanreport helptext for deductions 
* adds help text for recorded deduction section
 2022-06-21 14:11:01 +02:00
mpeltriaux
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
mpeltriaux
8245cf5bbb # 177 Report help texts 
* adds report form field help texts
* adds translations
 2022-06-21 13:54:41 +02:00
mpeltriaux
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
mpeltriaux
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
mpeltriaux
d7c9c77b7b Merge pull request 'master' (#174) from master into Docker 
Reviewed-on: SGD-Nord/konova#174
 2022-06-02 09:38:06 +02:00
mpeltriaux
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
mpeltriaux
e513db9da5 Merge pull request 'master' (#172) from master into Docker 
Reviewed-on: SGD-Nord/konova#172
 2022-06-02 08:53:32 +02:00
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
c911276cb4 #169 Team delete-restore 
* removes unused code snippets
 2022-05-31 09:47:32 +02:00
mpeltriaux
4ec8e1ae07 #169 Team delete-restore 
* adds tests for user app
 2022-05-31 09:10:44 +02:00
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
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
mpeltriaux
526178ce56 #164 Retranslating 
* retranslates Bestandskraftdatum
 2022-05-23 15:36:28 +02:00
mpeltriaux
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
mpeltriaux
6fd3c4c179 #138 WIP update 
* implements new build for netgis map client
 2022-05-12 13:22:46 +02:00