Commit Graph

969 Commits

Author SHA1 Message Date
fdd2082171 # Docker 2022-01-13 17:22:29 +01:00
231b0e9477 # Docker 2022-01-13 15:42:07 +01:00
c12444cdae Merge remote-tracking branch 'origin/Docker' into Docker
# Conflicts:
#	docker-compose.yml
2022-01-13 14:07:54 +01:00
273d47c7b5 # Docker persistent storage
* adds named volume to docker-compose.yml to keep files uploaded on /konova_uploaded_files even on image rebuild
2022-01-13 14:07:18 +01:00
924ce17ad5 # Docker
* minor adjustments
2022-01-13 09:29:38 +01:00
77855b40ee # Docker Production
* adds further settings to create a production-ready docker configuration
2022-01-13 09:29:38 +01:00
670a81c3f5 # Docker
* adds docker related configurations
* directly working configuration provided
2022-01-13 09:29:38 +01:00
4e22321e4c Merge pull request '#67 Parcel error fix' (#69) from 67_Parcel_fetcher_error into master
Reviewed-on: SGD-Nord/konova#69
2022-01-13 09:28:14 +01:00
3a5168a05c #67 Parcel error fix
* adds workaround in case of received WFS exception -> routine waits 1 second and tries to rerun for another time. If this does fail as well, the routine will end without a result
* adds mailto shortcut to contact button in footer for a quick fix
2022-01-13 09:27:35 +01:00
b0c0308558 Merge pull request '#53 Remove buttons' (#68) from 53_Remove_Import-Export into master
Reviewed-on: SGD-Nord/konova#68
2022-01-13 09:00:05 +01:00
815ab8e6cf #53 Remove buttons
* removes (non-functional) buttons in frontend
2022-01-13 08:59:36 +01:00
b614d00bb0 Merge pull request '# 62 404 and 500' (#66) from 62_custom_404_500 into master
Reviewed-on: SGD-Nord/konova#66
2022-01-12 16:46:52 +01:00
a9962b4d20 # 62 404 and 500
* adds custom 404 and 500 error handling views
* adds/updates translations
2022-01-12 16:45:55 +01:00
6342044ff9 Merge pull request '63_Email' (#65) from 63_Email into master
Reviewed-on: SGD-Nord/konova#65
2022-01-12 16:04:42 +01:00
1de3792d98 # 63 Mail data checked
* adds mail sending if shared data is checked
* adds/updates translations
2022-01-12 15:48:47 +01:00
dcc4e2fdc8 # 63 UserNotificationEnum changes
* drops NOTIFY_ON_REGISTERED_DATA_EDITED in favor of NOTIFY_ON_SHARED_DATA_CHECKED
* adds/updates translations
2022-01-12 15:38:57 +01:00
5295c08d99 # 63 Mail data deleted
* adds mail sending if shared data is deleted
* adds/updates translations
* refactors recording mails into separate email template folder email/recording
2022-01-12 15:31:25 +01:00
d7a9f72c3e # 63 Mail recording/unrecording
* adds mail sending in case of unrecording and recording of data
* adds/updates translations
2022-01-12 15:09:52 +01:00
eb54443aca # 63 Mail celery
* moves mail sending to celery worker using shared_task in konova/tasks.py
* adds mail sending for shared access given
* adds UserNotification settings checks for mail sending
* adds/updates translations
2022-01-12 14:51:50 +01:00
82778d1fec # 63 Mail background sending
* moves mail sending to background using celery
2022-01-12 14:27:39 +01:00
3531997080 # 63 Mail shared access revoked
* adds mail support for revoking shared access
* adds/updates translations
2022-01-12 14:17:12 +01:00
ef65869c7c # 63 Refactoring
* refactors django User model to custom User model to provide further attributes and methods directly on the user model
2022-01-12 12:56:22 +01:00
31b3428146 Merge pull request '61_Extend_filter' (#64) from 61_Extend_filter into master
Reviewed-on: SGD-Nord/konova#64
2022-01-12 10:20:19 +01:00
b96dcd373a # 61 EcoAccount Filter
* adds specialized SelectionTableFilter for EcoAccount (and EMA) which only provides filtering by conservation office
2022-01-12 10:15:57 +01:00
07b079d1b6 # 61 General table enhancements
* enhances rendering of tables
* enhances rendering of filter section
* reorganizes table filter codes into konova/filters/ folder and splits into mixins and table_filters
2022-01-12 10:11:47 +01:00
59a541397e # 61 Filter code enhancement
* reorganizes code
2022-01-12 09:23:22 +01:00
0cb65ae720 # 61 Filter offices frontend/backend
* adds filters for registration and conservation offices
* adds SelectionTableFilter as new holder for these types of filter components
2022-01-12 08:56:49 +01:00
4631f27878 # 61 Filter frontend
* adds filtering for file number
* updates translations
2022-01-11 17:29:36 +01:00
972405a720 # 61 Filter frontend
* finished filter frontend
2022-01-11 16:32:33 +01:00
d8607d9ade # 61 Filter backend
* refactors XYTableFilter classes to hold query_filter and checkbox_filter which are separate instances of django_filter.FilterSets
* improves render ability for frontend
2022-01-11 15:19:16 +01:00
f92ec7fde7 # 61 Filter frontend
* optimizes minor parts of table-filter initialization and queryset passing
2022-01-11 14:28:34 +01:00
a4966751b7 # 61 Filter backend
* refactors table filters by introducing AbstractTableFilter, GeoReferencedTableFilterMixin, ShareableTableFilterMixin and RecordableTableFilterMixin
* adds full filter functionality
* refactors TableFilter inheritances for all objects
2022-01-11 12:56:27 +01:00
43ea3f4364 # Docker
* minor adjustments
2022-01-11 08:32:04 +01:00
6a6b7f1f9f # Docker Production
* adds further settings to create a production-ready docker configuration
2022-01-10 15:27:19 +01:00
16a5f0c5d4 # Docker
* adds docker related configurations
* directly working configuration provided
2022-01-10 13:52:40 +01:00
ddb13abe2e Merge pull request '#57 Deduction shortcut remove' (#60) from 57_Deduction_shortcut into master
Reviewed-on: SGD-Nord/konova#60
2022-01-07 15:42:21 +01:00
498f0a9bbc #57 Deduction shortcut remove
* removes deduction shortcut
* adds missing quality checks on intervention deduction accounts validity
* fixes error if checked intervention shall be checked again
* adds/updates translations
2022-01-07 15:41:40 +01:00
f1e293977e Merge pull request '#54 Grouped autocomplete' (#59) from 54_Improve_autocomplete_selection into master
Reviewed-on: SGD-Nord/konova#59
2022-01-07 13:54:44 +01:00
6ae10dd872 #54 Grouped autocomplete
* refactors default autocomplete into grouped autocompletes, if parents exist for grouping
* updates requirement for django-autocomplete-light due to an issue with an attribute in pip's default version 3.8.2. More info here: https://github.com/yourlabs/django-autocomplete-light/issues/1278
2022-01-07 13:50:37 +01:00
ea4dc636c8 Merge pull request '#55 Celery parcel updating' (#58) from 55_Parcel_calculation_to_background into master
Reviewed-on: SGD-Nord/konova#58
2022-01-06 15:04:09 +01:00
a282d8dfaf #55 Celery parcel updating
* adds celery to project
* adds celery background task for updating parcels
* adds parcel calculation to creating of new geometries as well
* tests outstanding!!!
2022-01-06 12:08:38 +01:00
193995c625 Merge pull request '49_Parcel_calculation' (#56) from 49_Parcel_calculation into master
Reviewed-on: SGD-Nord/konova#56
2022-01-05 15:27:48 +01:00
7caf768709 #49 Annual report improve
* improves the filtering of annual report timespan on a date base instead of timestamp base
2022-01-05 15:26:16 +01:00
a09fdae58c #49 Parcels on report
* adds parcel displaying on public reports
* fixes bug in EMA where autocomplete js would not load for modal forms
* fixes bug where BaseContext cached data from last request and reused it, if not overwritten
2022-01-05 14:41:32 +01:00
49859d17d2 #49 Frontend rendering
* adds rendering for detail view
* adds new includable html snippet for parcel rendering
* refactors generic includables in konova/ app into konova/templates/includes/...
* fixes bug where parcels have been reused from the database due to wrong model structure
* adds get_underlying_parcels() for Geometry model
* adds get_underlying_parcels() for GeoReferencedMixin models
* fixes bug where missing geometry would lead to an error during geometry conflict check
* removes unused wfs attribute from AbstractWFSFetcher
* adds/updates translations
2022-01-05 14:13:26 +01:00
b43beffc6b #49 Update all parcels command
* adds update_all_parcels command which can be used e.g. with cronjob once a month to update all parcels and districts
2022-01-04 16:50:55 +01:00
ecb67809da #49 Extends sanitize db command
* extends sanitize db command to remove unrelated parcels and district from the database
* fixes bug where single parcel wfs match would lead to unexpected behaviour
* adds admin interface for parcels and districts
* adds updating of parcels in case of SimpleGeomForm saving
2022-01-04 16:25:17 +01:00
632fb0f48a #49 Calculation implementation
* implements update routine for Geometry model
* reorganizes fields of Parcel and District
* adds tests
* simplifies usage of ParcelWFSFetcher
2022-01-04 15:59:53 +01:00
b5cf18ac7d #49 Parcels and Districts
* refactors WFS fetching to proper POST handling
* adds authentication support to WFS handling
* reduces dummy geometry for tests to a small area to reduce test network traffic overhead
2022-01-04 13:03:21 +01:00
46e237f0e2 #49 Parcels and Districts
* fixes bug in GeometryConflict conflict checking
* WIP: introduces new konova/utils/wfs/spatial holding SpatialWFSFetcher, which can be fed any geometry and it returns found features
* WIP: adds tests for wfs fetching
* updates requirements.txt
2021-12-17 17:30:12 +01:00