Commit Graph

764 Commits

Author SHA1 Message Date
4f5c172449 Merge branch 'master' into 132_Old_entries
# Conflicts:
#	konova/models/geometry.py
2022-11-24 06:59:05 +01:00
7438cb34d1 Merge pull request 'hotfix_geometry_save_race_condition' (#246) from hotfix_geometry_save_race_condition into master
Reviewed-on: SGD-Nord/konova#246
2022-11-23 16:06:50 +01:00
79fd3ad29d API - Geometry empty
* removes mapping of empty geometry to None due to general switch to empty geometry usage
2022-11-23 16:05:27 +01:00
2ef643f4e0 Geometry race condition fix
* fixes race condition for geometry conflict and parcel calculation
* harmonizes empty geometries from None/MultiPolygonEmpty to MultiPolygonEmpty
2022-11-23 13:51:05 +01:00
67e79701cf Merge pull request '243_GDALException_on_null' (#244) from 243_GDALException_on_null into master
Reviewed-on: SGD-Nord/konova#244
2022-11-23 07:13:17 +01:00
a6a5bd5450 Further fixes
* fixes race condition on geometry conflict calculation if performed in background process
* simplifies access to smaller buffered geometry
* adds mapping of "qm"->"m2" for UnitChoice in API usage for backwards compatibility
2022-11-22 15:38:03 +01:00
5594250d59 #243 Feature without geometry
* fixes GDALException in case of provided feature (import) without geometry content
* modifies 500.html template to inform the user about the admins being informed automatically
2022-11-22 14:49:51 +01:00
d6e76f7a2a Hotfix
* adds missing migration
2022-11-18 16:22:24 +01:00
6833fc14cb Merge pull request 'Updates LANIS link' (#240) from lanis_link_fix into master
Reviewed-on: SGD-Nord/konova#240
2022-11-18 13:32:12 +01:00
0bc486502f Merge pull request '#238 Fix' (#239) from 238_Type_error_on_eco_account_edit into master
Reviewed-on: SGD-Nord/konova#239
2022-11-18 13:29:11 +01:00
689f3b6d28 Updates LANIS link
* changes LANIS link to new layer declaration
2022-11-18 13:28:13 +01:00
4138b056df #238 Fix
* adds casting from Decimal() to primitive float for proper calculation
2022-11-18 13:24:36 +01:00
022e4a580b Fixing broken document migration
* adds changes to document migration to correctly migrate documents
2022-11-18 12:41:46 +01:00
c7c6eef2e5 Merge branch 'master' into 132_Old_entries 2022-11-18 08:00:08 +01:00
c2fc210868 Merge pull request 'Egon Payment compatibility' (#237) from fix_egon_payment_sum into master
Reviewed-on: SGD-Nord/konova#237
2022-11-18 07:54:58 +01:00
a633663e9d Docker removal
* remove docker from migration branch for dev purposes
2022-11-18 07:50:43 +01:00
26affafffa Merge remote-tracking branch 'origin/132_Old_entries' into 132_Old_entries 2022-11-18 07:46:24 +01:00
ed3b820bfd Merge branch 'master' into 132_Old_entries
# Conflicts:
#	compensation/models/action.py
2022-11-18 07:45:15 +01:00
07d968e1bb Merge remote-tracking branch 'origin/132_Old_entries' into 132_Old_entries 2022-11-18 07:42:53 +01:00
ef1d1610ac Merge branch 'master' into 132_Old_entries
# Conflicts:
#	compensation/models/action.py
2022-11-18 07:42:26 +01:00
2c493d33dc Egon Payment compatibility
* EGON expects the payment amount to be a localized string instead of float
    * adds transformation for this
2022-11-18 07:40:35 +01:00
0f08071ca6 Merge pull request 'fix_comp_action_units' (#235) from fix_comp_action_units into master
Reviewed-on: SGD-Nord/konova#235
2022-11-18 06:52:59 +01:00
a157891f9d Z-axis geometry upload fix
* adds clamping of 3D geometries to 2D geometries if uploaded using the map importer
* extends tests for payment-document linkage
* fixes bug in team-admin selection where autocomplete could not be resolved properly
2022-11-17 13:01:40 +01:00
0cefc0e0b8 Fix CompensationAction unit None
* adds correct declaration of unit (qm -> m2) for template rendering
* adds migration to transform existing qm units to m2
2022-11-17 10:13:22 +01:00
8197615546 Merge pull request 'post_release_fixes' (#233) from post_release_fixes into master
Reviewed-on: SGD-Nord/konova#233
2022-11-17 06:54:42 +01:00
d7b2e933ec #232 Payment document linkage
* adds error message on intervention view if a payment has been added but no document has been uploaded yet
* adds same check to quality checker, meaning no intervention can be recorded which has a payment but no document
* adds trigger for sending data to egon on uploading a document in case of an already existing payment
* adds translations
2022-11-16 16:11:42 +01:00
4e0ee7dc91 #230 Shared users not rendered on compensation
* fixes non rendering of shared users on shared data
2022-11-16 13:30:07 +01:00
83137f0e58 #229 Shared users mandatory on admin
* changes mandatory state of users and teams on admin backend to optional (as expected by the model)
* adds team selection to admin backend
2022-11-16 13:27:57 +01:00
266f2fcdf6 #228 Parcel filter
* changes parcel related filter fields from CharField to NumberField to avoid unexpected behaviour on non-numerical input
2022-11-16 13:18:52 +01:00
daae2609d2 #231 Report geometry
* should fix report geometry cast problem in cases where MultiPolygon(srid=4326) is taken as default
2022-11-16 12:20:16 +01:00
5c4b4dded3 Merge pull request 'Team mail fix' (#226) from 225_Team_mails_always_sent into master
Reviewed-on: SGD-Nord/konova#226
2022-11-14 07:23:15 +01:00
829c145749 Team mail fix
* filters team members by notification settings before sending team mails
2022-11-14 07:19:04 +01:00
d38ad50403 CompensationState invalid code fix
* fixes bug which occurs for non existing code
2022-11-11 11:24:49 +01:00
d0bf728013 ZeroDivisionError fix
* fixes bug in eco account migration
2022-11-11 11:18:25 +01:00
7194382a29 Merge branch 'Docker' into 132_Old_entries
# Conflicts:
#	requirements.txt
2022-11-11 10:01:01 +01:00
3fc581b173 Migration EGON
* moves payment migrating out of atomic transaction migration
* adds egon sending to payment migration
2022-10-28 11:04:24 +02:00
3ca837836e Merge branch 'master' into 132_Old_entries 2022-10-20 11:02:10 +02:00
a33a420765 Geometry calculation fix
* fixes bug where geometry parcels could not be calculated properly due to small buffering of points and lines
* fixes bug where race condition would prevent proper parcel calculation
* adds migrater specifically for migration recording of interventions after all data has been migrated
2022-10-20 10:54:25 +02:00
bc331cfaf8 Merge pull request 'master' (#224) from master into Docker
Reviewed-on: SGD-Nord/konova#224
2022-10-19 07:35:31 +02:00
c9485bc8e0 Merge pull request 'minor_order_by_timestamp_improvement' (#223) from minor_order_by_timestamp_improvement into master
Reviewed-on: SGD-Nord/konova#223
2022-10-19 07:34:29 +02:00
048af01795 Landing page shared count fix
* fixes bug where count of shared entries on landing page would ignore team-shared entries
* restore prior editable column icon rendering
2022-10-19 07:24:00 +02:00
48aee04955 Missing geometry html improvement
* improves rendering of missing geometry icons on table
2022-10-14 08:07:33 +02:00
d95827770d Map client holes fix
* fixes bug where holes in stored geometries would not be rendered properly on initial loading the map client
    * drawback: multiple polygons are treated as a single feature on the map client. Not a real issue but maybe we can find a better solution to this
* quality of life: renders geometry area in m² on detail and report view
2022-10-14 08:02:08 +02:00
eb2aa5cf2c Deductable rest calculation
* enables new deductable_rest calculation for eco account migration
2022-10-14 06:56:13 +02:00
0bd6892583 Merge branch 'master' into 132_Old_entries
# Conflicts:
#	codelist/models.py
#	compensation/forms/forms.py
#	konova/autocompletes.py
#	konova/models/geometry.py
#	konova/urls.py
#	konova/utils/wfs/spatial.py
2022-10-13 07:02:41 +02:00
b57d52dc9f Table improvements
* enhances visualization of editable column on tables
    * simplifies code
* enhances visualization of parcel_group column on tables
* WIP: Ordering on intervention table is odd. Same results are being displayed on page 2. Needs further analysis and fixing!
2022-10-12 16:26:01 +02:00
90da686de3 New help page link
* changes the help link to match the new starter help page
2022-10-12 10:20:04 +02:00
68e8a0201f Map settings button removed
* removes map settings button, since there is no implementation and it is unclear, whether this will ever become a real feature
2022-10-12 10:18:57 +02:00
7ccb362968 New icon for missing geometry
* introduces "..." as new icon for missing geometry entries
    * moves former explanatory message into title attribute for mouse hover activation
2022-10-12 10:15:27 +02:00
67df63af0f Quality of Life improvements
* disables ordering of parcel_group ("Gemarkung") column on tables
    * ordering can not be done properly due to more complex nature of this column's content
* introduces "Keine Geometrie vorhanden" message instead of hour glass icon on entries where no geometry has been entered yet
* properly orders last_modified column by moving null values to the lower end of the ordering
2022-10-12 10:01:23 +02:00