Commit Graph

193 Commits (2339fcebd1b9de35aa575e868d59555e4fef9543)

Author SHA1 Message Date
mpeltriaux b13e67e061 #31 API Frontend token generating
* adds frontend settings for users to create API tokens on their user settings
3 years ago
mpeltriaux 25cccee5d6 #31 API Share
* adds support for GET and PUT of sharing users for all data types (compensation is shared via intervention)
3 years ago
mpeltriaux 2fa2876090 #31 API POST Compensation
* adds support for POST of new compensations
* adds shared_users property to BaseObject and Compensation to simplify fetching of shared users (Compensation inherits from intervention)
* extends compensation admin index
* modifies compensation manager which led to invisibility of deleted entries in the admin backend
* fixes bug in sanitize_db.py where CREATED useractions would be removed if they are not found on any log but still are used on the .created attribute of the objects
3 years ago
mpeltriaux ee6ac9e7c8 # 83 Publication rework
* adds fake-inherited is_ready_for_publish() method to compensation model (not derived from RecordableObjectMixin) to equalize usage of is_ready_for_publish() usage for all data types (compensation can be checked the same way as intervention, ecoaccount or ema)
3 years ago
mpeltriaux fd3f9b95b9 # 83 Publication rework EcoAccount Compensation
* adds implementation for is_ready_for_publish() on compensation (uses intervention's implementation) and EcoAccount
3 years ago
mpeltriaux b9bec82876 # 70 Tab title eco-account
* adds tab titles for eco account
* adds/updates translations
3 years ago
mpeltriaux 014155b0a4 # 70 Tab title compensation
* adds tab titles for compensations
* adds/updates translations
* optimizes identifier generating, so that one-digit months will be converted into two digits
3 years ago
mpeltriaux 02970b19b4 # 63 Refactoring
* refactors django User model to custom User model to provide further attributes and methods directly on the user model
3 years ago
mpeltriaux 96f2e77972 # 61 EcoAccount Filter
* adds specialized SelectionTableFilter for EcoAccount (and EMA) which only provides filtering by conservation office
3 years ago
mpeltriaux 4c5e170b85 # 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
3 years ago
mpeltriaux d57478ee09 # 61 Filter code enhancement
* reorganizes code
3 years ago
mpeltriaux 834fa8dbd4 # 61 Filter offices frontend/backend
* adds filters for registration and conservation offices
* adds SelectionTableFilter as new holder for these types of filter components
3 years ago
mpeltriaux 5bca8fc8f7 # 61 Filter frontend
* adds filtering for file number
* updates translations
3 years ago
mpeltriaux 8a19d7239d # 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
3 years ago
mpeltriaux 87f11a9914 # 61 Filter frontend
* optimizes minor parts of table-filter initialization and queryset passing
3 years ago
mpeltriaux 524b5c340f # 61 Filter backend
* refactors table filters by introducing AbstractTableFilter, GeoReferencedTableFilterMixin, ShareableTableFilterMixin and RecordableTableFilterMixin
* adds full filter functionality
* refactors TableFilter inheritances for all objects
3 years ago
mpeltriaux e2fe85a4fb #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
3 years ago
mpeltriaux 393f9a4d47 #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
3 years ago
mpeltriaux bf0de00b72 #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
3 years ago
mpeltriaux 286ed609da #50 Overlaying geometries KOM + OEK
* removes unused messages
* adds geometry conflict message rendering for KOM and OEK
* removes unused methods in GeoReferencedMixin
* generalizes geometrical lookup for conflicts from overlaps to intersects
3 years ago
mpeltriaux 2bd94a7618 #50 Overlaying geometries
* refactors geometry field into GeoReferencedMixin, holding more handy methods and used in all models, formerly holding the geometry field
* refactors backend admin configuration, so modified, deleted and created are not editable in the backend which also skips loading of all possible choices
* fixes typo in sanitize_db command
* introduces GeometryConflict model, holding a link between two geometries, where one overlaps the other
* adds first (WIP) messages into detail views of ema and intervention for test purposes
3 years ago
mpeltriaux 6cb1a31aff Refactors triggering checked/recorded
* refactors BaseForm request/user initialization
* introduces mark_as_edited() method for compensation models
3 years ago
mpeltriaux bd36ab5b6f #35 Sanity command
* refactors "toggling" of recorded/checked state
* introduces mark_as_edited() for RecordableObjectMixin
3 years ago
mpeltriaux 8e1c4446dd Refactoring
* moves add_state from compensation to AbstractCompensation
3 years ago
mpeltriaux 779065ec91 Refactoring
* adds simple getter methods for UserActionLogEntry
* replaces manual creation of UserActionLogEntry with new methods
3 years ago
mpeltriaux 71e4aa9a2f Refactoring
* moves updating of shared access users into ShareableObjectMixin
* renames ShareInterventionModalForm to ShareModalForm since it's used for EMA and eco accounts as well
3 years ago
mpeltriaux d8f0db6bd6 Refactoring
* moves adding of deduction into Intervention and EcoAccount model
* hardens against circular import issues
3 years ago
mpeltriaux fd8ce4b2ec Refactoring
* create package from compensation/urls
* renames modules inside of compensation/urls and compensation/views
3 years ago
mpeltriaux 899bd28247 Refactoring
* create package from compensation/views
3 years ago
mpeltriaux 78945d648f Refactoring
* splits compensation/models.py into subpackage
* renames base objects by adding suffix Mixin
3 years ago
mpeltriaux bcffae4a95 Refactoring
* renames model ResponsibilityData into Responsibility
* renames model LegalData into Legal
* moves form->object saving logic into model
* refactors NewDocumentForm into special types for intervention, compensation, eco account and ema
*
3 years ago
mpeltriaux ab8d5c9724 #38 User requests
* implements 5) "Add 'Maßnahmentyp' for KOMs "
    * prepares model and form fields as mixins for easy extension to eco accounts and emas (possibly in the future?)
3 years ago
mpeltriaux 2ca0ceade4 #38 User requests
* implements 4) "Comment fields should be of unlimited size"
3 years ago
mpeltriaux e922b983dd #38 User requests
* implements 1) "Add titles to public reports, next to identifiers"
3 years ago
mpeltriaux d72c29bd56 #39 Drop fundings
* removes fundings from all models
3 years ago
mpeltriaux 8d7947bbda #39 Drop fundings
* removes fundings from all models, except the EMA model for migration compatibility (some old data may have fundings data)
3 years ago
mpeltriaux 037d3a8fee #19 Tests
* adds workflow edit testing for compensations
3 years ago
mpeltriaux ea14a01f89 #19 Tests
* adds workflow testing for geometries on new creation of intervention and compensation
*
3 years ago
mpeltriaux ce7033943f #19 Tests
* refactors sharing user setting by introducing share_with(user) and share_with_list(user_list) for BaseObject for a more self-explanatory sharing
3 years ago
mpeltriaux 50e134ba91 #19 Tests
* adds workflow tests for eco account deduction creation
3 years ago
mpeltriaux 667f378b74 #19 Tests
* adds workflow tests for compensation checking and recording
* improves related code
3 years ago
mpeltriaux bcee58700a #19 Tests
* adds workflow tests or deductions in InterventionWorkflowTestCase
* fixes bugs detected by testing
3 years ago
mpeltriaux 2957035b5a #19 Tests
* adds EcoAccount tests
* fixes bugs found by testing
3 years ago
mpeltriaux c221d00c28 #19 Tests
* adds EMA tests
* extends compensation tests
* fixes bugs detected by testing
* restructured tests for performance boost
3 years ago
mpeltriaux 107cbeadee #19 Tests
* fixes bug where compensations still appeared on the public report despite being marked as deleted
* fixes bug where eco account could be deducted into a negative account balance
3 years ago
mpeltriaux b5fc96c1cf #19 Tests
* adds tests for compensations (WIP)
* refactors some dummy data generating into base test class
* fixes bugs detected by testing
* adds important requirements.txt change for itsdangerous package (<1.0.0 for compatibility to django-simple-sso)
3 years ago
mpeltriaux 5213c717d9 #19 Tests
* refactors CheckableMixin and RecordableMixin into CheckableObject and RecordableObject
* adds ShareableObject for wrapping share related fields and functionality
* adds share functionality to EcoAccount and EMA, just like Intervention
3 years ago
mpeltriaux 4a4c9ad049 #36 Quality checks
* adds unchecking/unrecording of interventions in case of post-check|post-record editing
3 years ago
mpeltriaux 1c3ab898cc #36 Quality checks
* refactors toggling of recorded status into RecordableMixin
3 years ago
mpeltriaux 26c1cee27e #36 Quality checks
* adds quality check logic for EcoAccount with EcoAccountQualityChecker
* adds/updates translations
* adds quality check logic for EMA with EmaQualityChecker
3 years ago
mpeltriaux 619f2110e4 #36 Quality checks
* adds quality check logic for Compensations with CompensationQUalityChecker
* adds compensation quality checking to checking routine of RunCheckModalForm.is_valid()
* adds/updates translations
3 years ago
mpeltriaux af70303b32 #32 Disable file download
* refactors: attached files can only be downloaded by users with shared access
* adds hint on unshared data being unshared for compensation, ema, eco-account
* minor optical enhancement for user contact form
3 years ago
mpeltriaux 6ca5b32945 #26 Annual conservation report
* adds LegalData to EcoAccount to provide registration_date support ("agreement date") for old-data report generating
* adds/updates translations
3 years ago
mpeltriaux 6b839b7f60 #26 Annual conservation reports
* adds index form for selecting timespan and office of interest
* adds timespan support for TimespanReport
* fixes naive datetime issues
* fixes missing error message css tag
* adds/updates translations
3 years ago
mpeltriaux 9e7e5ee726 EcoAccount fixes
* adds deductable surface field into NewEcoAccountForm directly
* removes custom manager for LegalData and ResponsibilityData
3 years ago
mpeltriaux 85759a636a Database performance
* optimizes the db fetching for all index views and detail views
* introduces usage of managers.py in all necessary apps for wrapping basic fetch settings
* moves comment.html to comment_card.html under /konova/templates/konova/
* adds/updates translations
* fixes document typos
* drops comment rendering in public reports
* opens public reports in new tabs if button is clicked from the detail view
3 years ago
mpeltriaux f5f08b979b #25 Public reports
* adds fully functional EMA report
* adds/updates translations
3 years ago
mpeltriaux ce74d011f6 #25 Public reports
* prevents Actions column in tables from being rendered if there would be no buttons inside due to permission checking
* enhances amount of sql requests for detail view and report view
3 years ago
mpeltriaux 193ba4c658 #25 Public reports
* adds public report for compensations
* adds/updates translations
* prepares EMA and eco account reports
3 years ago
mpeltriaux af0fe655b3 Intervention template adjustments
* renames intervention variable to obj to match other template style
* renames open routes to detail routes
3 years ago
mpeltriaux f50dccb30b #17 Update setup
* removes unused organisation app from project
* removes null=True parameters for M2M fields in models
3 years ago
mipel 0e839f5e44 #7 New Form
* refactors/renames folders and files for generic template rendering
* removes unused choiceColumnForm.html
3 years ago
mipel 3842bcf0b1 #7 New Form
* adds NewEmaForm and EditEmaForm
* refactors ResponsibilityData related form fields into reusable mixin CompensationResponsibleFormMixin
   * used in NewEcoAccountForm and NewEmaForm for easier maintaining and reducing amount of code
* refactors templates /xy/new/view.html into /xy/form/view.html since the same template file is used for new and edit forms
3 years ago
mipel 1971cf5942 #7 New Form
* fixes bug where modified was not changed on an edit of compensation and ecoaccount
3 years ago
mipel 60f03591ef #7 New Form
* adds EditEcoAccountForm
* adds placeholders for some form fields
* changes comment card in detail view into rlp-grayish
* adds eco account detail view comment box
* removes unnecessary loading of dal scripts in view.html
* refactors generated identifier for data objects (10 digits to 6 uppercase letter-digit combination)
* improves generate_random_string() method by adding more options for generation of strings
* adds/updates translations
3 years ago
mipel d84fe68120 #7 New Form
* adds NewEcoAccountForm
* refactors NewCompensationForm into AbstractCompensationForm so main fields can be reused again
* fixes template bug in account detail view where the amount of deductions has been displayed instead of the available rest
* refactors _generate_new_identifier() into generate_new_identifier()
* refactors get_available_rest() into returning both, the total and relative amount
* improves saving of SimpleGeometryForm()
* adds/updates translations
3 years ago
mipel 46e1a9af86 #7 New Form
* links edit button in detail view with edit functionality
* fixes minor comment rendering bug
* fixes bug where compensation changes won't save
3 years ago
mipel d0aa125248 #7 New Form
* fixes bug where geometries have been created each time a SimpleGeomForm has been saved
3 years ago
mipel 3d31a13508 #7 New Form
* adds creation of new compensation directly from intervention detail view
* adds comment rendering on compensation detail view (WIP)
* adds shared_access_required decorator
* adds/updates translations
3 years ago
mipel 9cfb400bad #7 New Form
* adds NewCompensationForm content and functionality
* renames CODELIST_COMPENSATION_COMBINATION_ID into CODELIST_COMPENSATION_FUNDING_ID for more clarity
* reorganizes compensation forms into compensation/forms/forms.py and forms/modalForms.py
* adds new compensation html template in compensation/templates/compensation/new
* adds new default message template in message_templates.py: IDENTIFIER_REPLACED
* adds/updates translations
3 years ago
mpeltriaux ea0a07890c #7 New forms
* introduces bootstrap class form-control for proper html form input rendering
* fixes bug where missing shared users for an entry resulted in a None exception
* adds GenerateInput with template in generate-content-input.html, which provides a generate button for fetching server-side content
* adds/updates translations
3 years ago
mpeltriaux 877a1ca335 #7 New forms
* refactors large forms.py into forms/modalForms.py and forms/forms.py
* refactors custom input fields into intervention/inputs.py
3 years ago
mipel 9b728e5d10 #7 New forms WIP
* adds saving functionality for new intervention form
* refactors new identifier generating, so a pre-generated identifier from a new element form will be checked again before saving
* adds css fixes for disturbing input field:focus bugs
* adds missing csrf token to new collapsible form
* adds/updates translations
* introduces mark_as_deleted as only marking instead of using delete() which will really delete from the db
3 years ago
mipel 951477c58f #7 New forms WIP
* adds new collapsible styled form for new main data
* adds/updates translations
3 years ago
mipel 251f88526e #18 EcoAccount funding
* adds fundings field to AbstractCompensation model
* adds funded by to detail view templates of Compensation and EcoAccount
* adds/updates translations
3 years ago
mipel a7970a1221 #18 EcoAccount funding
* adds constraint for setting the deductable_surface too low -> existing deductions would not be valid anymore
* adds/updates translations
3 years ago
mipel 4c045618e6 Eco Account deduction
* adds deductable_surface to EcoAccount model to provide an easy way to change the deductable amount from an account -> depends on external funding e.g. with AktionBlau or similar
* adds overview of deducted and deductable volume to detail view
* adds check to eco account model, so the deductable_surface can never be larger than the total amount of after_state surface sum
* adds german formating for python logic based number formating
* adds/updates translations
3 years ago
mipel 416d11d1ee #18 File upload in certain folders
* adds try-except for removing folders in case of non existence or changed folder names on the hard drive
3 years ago
mipel e7b6b4dd8d #18 File upload in certain folders
* removes document file folder if the last EcoAccountDocument is removed from an eco account
3 years ago
mipel 799ce8d72c #18 File upload in certain folders
* removes document file folder if the last CompensationDocument is removed from a compensation
3 years ago
mipel 270f9ab7d2 #18 File upload in certain folders
* increases max_size for FileFields --> triggers when the file name will be automatically changed during upload
* adds Http404 Exception in case document file does not exist anymore on the hard drive
3 years ago
mipel 3c9d73533f #18 File upload in certain folders
* refactors documents and file upload to be distributed into different subfolders, depending on the type of document (InterventionDocument, RevocationDocument, ...)
* refactors Document model into AbstractDocument
* subclasses RevocationDocument, InterventionDocument, COmpensationDocument, EmaDocument and EcoAccountDocument from AbstractDocument to provide proper functionality for each
* adds new specialized routes for each new document type (opening, removing)
* drops generic get and remove routes for documents
3 years ago
mipel d569be80b3 Withdraw to deduct
* refactors Models and attributes
3 years ago
mipel cd5fb9cad6 Withdraw to deduct
* refactors all files and variable names
* WIP: Models and attributes
3 years ago
mipel 81cea4f045 [Compensation] Conservation office #5
* keeps responsible data in compensation model for potential future purposes
* refactors registration_office and conservation_office to map onto KonovaCodes instead of own Organization model
* adds str_as_office property-method to KonovaCode to provide an easy way of rendering template data
* adds missing highlighting in case of missing information about registration office and conservation office
* extends KonovaCode command update_codelist.py for CODELIST_PROCESS_TYPE_ID
* adds preselectors for konova codes in models of CompensationAction, Law and CompensationState
3 years ago
mipel 6b70ee8ba9 [Compensation] Conservation office #5
* keeps responsible data in compensation model for potential future purposes
* refactors registration_office and conservation_office to map onto KonovaCodes instead of own Organization model
* adds str_as_office property-method to KonovaCode to provide an easy way of rendering template data
* adds missing highlighting in case of missing information about registration office and conservation office
3 years ago
mipel 280510d729 [EcoAccount] See recorded state of withdraw #6
* adds prefiltering of withdraws --> excludes withdraws of as deleted flagged interventions
* renders intervention-recorded icon into eco account withdraws details view
* fixes bug in case of document deleting which does not contain any files
* renames RecordForm into RecordModalForm for more clarity
3 years ago
mipel 6ce17dd480 Payment date and comment #3
* adds payment-comment relation in NewPaymentForm
 * drops transfer note form field (may not be used anyway) and replace it with comment
 * adds/updates translations
3 years ago
mipel 97571d4363 Konova Codelist enhancements
* adds proper boolean mapping to update_codelist
* differs between id and atom_id for KonovaCode since atomIds are not unique (could change in the future)
* adds is_selectable and is_archived to KonovaCode
* scales width of DAL form fields to 100% width
* adds table-responsive wrapping container for table forms to prevent unwanted rendering artifacts in case of table resizing due to long content
* adds autocomplete routes for law, registration offices and conservation offices
3 years ago
mipel d33cf5ad4e Compensation app url reorganizing
* restructures urls into separate xy_urls files which are included inside of compensation/urls.py
* adds default ordering of Payment by .amount
3 years ago
mipel 24a6b7fd37 Konova code improvements
* improves rendering of codes as string (short names will be used if existing)
* reduces selectable konova codes to leafs (as discussed with experts)
* automatically resizes the width of modal form fields to w-100
* adds/updates translations
3 years ago
mipel 2469bde7ee Biotope code list
* integrates biotope code list to NewStateForm
* adds dal scripts automatically on compensation view
3 years ago
mipel e9aea7bcc4 Compensation action code list
* integrates action code list to NewActionForm
3 years ago
mipel 2c3f6bbcd1 Detail view adjustments
* adds EMA and eco account conservation office data to detail views
* adds line break in header of detail views
* adds/updates translations
3 years ago
mipel fd38ab8170 EMA and eco account
* adds EMA and eco account conservation office data to detail views
3 years ago
mipel 615b7bf5ea EMA
* fixes created timestamp in detail views where modified needs to be displayed
* adds fallback timestamp if data has not been edited, yet --> show created timestamp
* fixes bug where deleting of certain data didn't redirect to the index view
* adds quality_check() method for EMA, needed for recording
* adds all functions which are provided for compensations to EMA
* adds/updates translations
3 years ago
mipel d1f43f8c64 EMA
* adds Ema model (basically Compensation inherited)
* adds index view for EMAs
* fixes drop-down link bug for menu 'More' in navbar
* refactors some more forms to use process_request()
* adds modified attribute to BaseResource for easy last_modified check
* adds setting of modified attribute in all places where UserAction.EDITED is added to log
* adds EMA_ACCOUNT_IDENTIFIER_LENGTH and EMA_ACCOUNT_IDENTIFIER_TEMPLATE to ema/settings.py
* adds EmaAdmin to ema/admin.py
* fixes wrong title in intervention detail view html for revocations
* adds support for subtitle variable to BaseTable and generic_index.html
* drops next_version attribute from models
* adds/updates translations
* adds default ordering for UserActionLogEntry
   * removes extra ordering in log modal rendering
3 years ago
mipel 198462b051 Modal forms
* adds new POST functionality in NewStateModalForm, which does not use the super classes process_request() method
* adds explaining comments on the is_ajax() call
* updates translations
3 years ago
mipel 244e300715 Identifier generating
* refactors identifier generating into BaseObject class
3 years ago
mipel c8b6d001ef Minor enhancements
* refactors eco account rest surface calculation into designated method get_available_rest()
* refactors placeholder setter for BaseForm
* adds automatic eco account identifier generating on saving
* fixes ServerMessageImportance template tag
3 years ago