Commit Graph

47 Commits

Author SHA1 Message Date
1c38acea25 Revert "Merge branch 'Docker' into master"
This reverts commit cf282c937f, reversing
changes made to ee9834c0da.

Undos accidental remote merge
2022-07-13 11:21:51 +02:00
cf282c937f Merge branch 'Docker' into master 2022-07-13 11:02:57 +02:00
3f3ae4e31b # 177 Impressum link
* adds impressum link to footer
2022-06-21 14:27:32 +02:00
e90625c8b5 Merge pull request 'master' (#172) from master into Docker
Reviewed-on: SGD-Nord/konova#172
2022-06-02 08:53:32 +02:00
1e86a1ce5e #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
90e76bc8f5 Merge pull request 'Update docker' (#159) from master into Docker
Reviewed-on: SGD-Nord/konova#159
2022-05-09 14:03:12 +02:00
c6e784e6d4 Merge branch 'master' into 138_New_map_client 2022-04-19 14:08:20 +02:00
83d70b6d59 #146 (Parcel) table
* set default rpp for overview tables from 5 to 10
* improves loading speed of parcel table
2022-04-13 14:07:01 +02:00
8b7c4a82aa Merge pull request 'master' (#147) from master into Docker
Reviewed-on: SGD-Nord/konova#147
2022-04-13 08:48:19 +02:00
6060f1c1bd #142 Localized date improved
* fixes bug where created timestamp has been displayed on modified attribute on detail views
* enhances localized date and datetime rendering
* reorders sub menus in user's profile hub
2022-04-12 09:05:33 +02:00
ac4dacefe0 #138 Map client to views
* adds netgis map client to all detail and report views
* adds netgis map client to new object forms
* WIP: needs functionality server-client
2022-04-04 12:27:45 +02:00
b4e75fa2cd Revert "Revert accidental docker->master merge"
This reverts commit db834b581e.
2022-02-04 15:17:08 +01:00
db834b581e Revert accidental docker->master merge 2022-02-04 14:24:31 +01:00
0ff61e4ec7 Docker update 2022-02-04 14:00:18 +01:00
fac55f7acb Merge branch 'master' into Docker
# Conflicts:
#	konova/settings.py
#	konova/sub_settings/django_settings.py
2022-02-04 13:59:30 +01:00
0dbd4896f2 #93 Errors via mail
* configures server errors sending via mail
   * default for now is always 'ksp-servicestelle'
* includes improvements from #97
2022-01-31 15:24:26 +01:00
896ad55749 #95 Split settings file
* splits konova/settings.py file into more separate setting files in konova/sub_settings/
2022-01-31 15:09:06 +01:00
1235fc28b6 # HOTFIX
* fixes bug where errors occured once an email shall be sent. See issue #87 for details
2022-01-28 17:01:45 +01:00
81f2724f3f Merge branch 'master' into Docker
# Conflicts:
#	konova/sub_settings/django_settings.py
2022-01-28 16:41:21 +01:00
6deff28389 #31 API Token mail
* sends an email to the support address if a new token has been generated
2022-01-27 11:47:27 +01:00
134651c8f7 #31 API basic implementation
* adds new app to project
* adds relation between User model and new APIUserToken model
* adds first implementation for GET of intervention
* adds basic code layout for future extension by having new versions
2022-01-21 15:26:08 +01:00
b8353e1671 Merge pull request 'master' (#82) from master into Docker
Reviewed-on: SGD-Nord/konova#82
2022-01-20 12:32:56 +01:00
77e9c989aa # 70 Tab titles interventions
* adds content related tab title
* adds/updates translations
2022-01-20 12:12:04 +01:00
02b8042682 # Docker
* optimizes configuration
* removes unused settings
* extends README.md with docker installation guid
2022-01-17 12:45:03 +01:00
fdd2082171 # Docker 2022-01-13 17:22:29 +01:00
231b0e9477 # Docker 2022-01-13 15:42:07 +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
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
060ff5f4ad #26 Annual conservation report
* introduces new app 'analysis' for annual report generating and future features
* adds new templates (WIP)
* adds new routes (WIP)
2021-10-18 15:52:51 +02:00
a5be369ee6 Translations
* adds/updates translations
2021-10-15 09:25:26 +02:00
f4bfc0db6e #17 Update setup
* removes unused organisation app from project
* removes null=True parameters for M2M fields in models
2021-10-13 09:04:01 +02:00
mipel
49f7f3db53 Codelist integration
* adds codelist app
* adds KonovaCodeList and KonovaCode model for fetching and storing OSIRIS Codelisten entries
* adds update_codelist command for updating and fetching codes
* adds autocomplete route for using codelists in forms
2021-08-23 18:30:02 +02:00
mipel
510d77422a 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
2021-08-19 13:02:31 +02:00
mipel
6c4ced784b Modal and other tweaks
* removes WIKI_URL, replaces with HELP_LINK since it was the same before as well
* refactors modal form processing (process_request())
   * modal form can now display errors directly inside the modal (as intended by the devs)
   * modals now properly support the GET-POST workflow that is intended by the devs. More information here: https://github.com/trco/django-bootstrap-modal-forms/issues/183
* Improves label-field linking in generic_table_form_body.html
* removes isDeleteForm attribute from modal_form_script.html
2021-08-17 15:27:49 +02:00
mipel
66a0636e80 SSO and messages
* removes unused third party package from requirements.txt
* adds KonovaSSOClient as subclass of sso.Client for more control over login, e.g. which user data shall not be updated (found in konoa/sso/sso.py)
* adds Messenger class for communicating with SSO server (found in konova/utils/messenger.py)
2021-08-17 09:57:50 +02:00
mipel
6818ef290e Intervention revocation
* adds Revocation model to interventions/models.py
* adds revocations to interventions detail view
* fixes duplicated ids in html includes
* refactors controls for detail view into included template files (controls.html)
* reduces max length for payment transfer notes from 1000 to 200
* adds RevocationAdmin to intervention/admin.py
* adds new form for adding a Revocation to an intervention's legal_data
  * only one revocation per intervention possible
  * removes add button in case of an existing revocation
* adds revocation routes to intervention app
* renames document field in Document model into file for more clarity
* adds/updates translations
2021-08-04 13:32:35 +02:00
mipel
a6c51aede6 Payments add modal form
* adds help texts to add payment form
* adds removing button for payments
* refactors user fetching into BaseForm
* adds generic RemoveModalForm which is intended to be used for every modal form which shall remove something
* adds translations
* removes unused html
* prepares payment amount field to be able to process german inputs like '1.000,50' which is not the international default
2021-07-26 11:29:05 +02:00
mipel
76c7cce9bc Documents removing
* adds generic modal rendering using package django-bootstrap-modal-forms
* adds document file removing from hard drive
* adds translations
2021-07-23 18:27:53 +02:00
mipel
d139119a15 Intervention tables and model adjustments
* adds user access relation to certain models
* adds pagination to tables
* adds checked_on/_by attributes to intervention model
* adds custom column rendering for checked and registered columns
* adds first simple index filtering of default interventions for user
* adds translations
2021-07-21 15:40:34 +02:00
mipel
41fff3a687 User menu
* starts user menu implementation
2021-07-08 11:07:33 +02:00
mipel
b01442ef17 News app
* adds news app for future implementations
2021-07-06 08:53:08 +02:00
mipel
7b7865509a Simple footer finished 2021-07-02 13:46:06 +02:00
mipel
c422901e67 Simple navbar finished 2021-07-02 13:12:38 +02:00
mipel
972cbf5433 Refactoring to konova 2021-07-01 15:08:22 +02:00
mipel
947f50b11c Refactoring to konova 2021-07-01 14:38:57 +02:00