Commit Graph

2187 Commits

Author SHA1 Message Date
Efstratios Giannopoulos 9b30fb60d7 common model changes 2024-03-26 16:30:13 +02:00
Sofia Papacharalampous 8be851763b user-profile > unlink account 2024-03-26 15:57:59 +02:00
Efstratios Giannopoulos 30e3bbf9de Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-03-22 18:33:26 +02:00
amentis d4d06a9d47 lock and description template fixes 2024-03-22 15:18:51 +02:00
Efstratios Giannopoulos 704c9f2018 file transformer changes 2024-03-22 13:49:26 +02:00
amentis 4e61353f77 remove section selection from add description pop up and fix dashboard home page sizes 2024-03-22 09:41:35 +02:00
Efstratios Giannopoulos 598e27bf74 dmp user changes 2024-03-21 18:44:19 +02:00
amentis efc0db5500 ui changes for lock 2024-03-21 13:06:59 +02:00
Efstratios Giannopoulos e61f1afaf5 dmp version add not finalized 2024-03-21 12:12:12 +02:00
Efstratios Giannopoulos f663fc24b7 add visibility to models 2024-03-21 10:17:39 +02:00
Efstratios Giannopoulos 709fecf1f1 add visibility to models 2024-03-21 10:16:55 +02:00
amentis ba33b29e41 fix lock and add entity locks admin page 2024-03-21 09:46:18 +02:00
Efstratios Giannopoulos 48a310e561 visibility changes 2024-03-20 18:40:34 +02:00
Efstratios Giannopoulos 2f283ae594 migration fixes 2024-03-20 18:39:47 +02:00
Diamantis Tziotzios cdd753a5d8 no message 2024-03-20 12:36:51 +02:00
Diamantis Tziotzios 674ce60a29 ui fixes 2024-03-20 12:35:55 +02:00
amentis b66932b413 fix start new description dialog 2024-03-19 18:27:30 +02:00
Sofia Papacharalampous 28ae763eb8 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-03-19 17:26:08 +02:00
Efstratios Giannopoulos 5801818a69 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-03-19 17:22:10 +02:00
Efstratios Giannopoulos c480e8e508 authz changes 2024-03-19 17:21:50 +02:00
Sofia Papacharalampous 551249af33 styling changes
*user-profile
2024-03-19 17:12:36 +02:00
amentis ed3f3ebb27 build description persist model for validate endpoint 2024-03-19 13:54:23 +02:00
Efstratios Giannopoulos b49975931b authz changes 2024-03-19 12:48:17 +02:00
Efstratios Giannopoulos f19ac6c45e fix elastic configuration 2024-03-19 12:11:01 +02:00
amentis 9a99c0c300 add validate description 2024-03-19 09:50:29 +02:00
amentis f71bc64ce5 change pop up description finalize dialog 2024-03-15 15:48:32 +02:00
amentis 65d62b2849 fix description authz 2024-03-15 15:16:20 +02:00
Efstratios Giannopoulos 388857cdce Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-03-15 14:14:27 +02:00
Efstratios Giannopoulos 266c05ee80 description authz 2024-03-15 14:13:55 +02:00
amentis 498ffca73d dmp finalize changes 2024-03-15 11:39:01 +02:00
amentis 3045130b27 add dmp finalize 2024-03-15 09:39:36 +02:00
Efstratios Giannopoulos dadda72a09 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
#	dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
2024-03-14 11:26:21 +02:00
Efstratios Giannopoulos cef1e295f7 dmp authz changes 2024-03-14 11:23:46 +02:00
amentis 9d6fbcd3ee dashboard changes and add finalize description 2024-03-14 09:36:07 +02:00
Diamantis Tziotzios dfd2f3eeff dmp finalizatiion popup 2024-03-13 19:24:01 +02:00
Efstratios Giannopoulos e9cbf27295 authz changes 2024-03-13 17:45:25 +02:00
Efstratios Giannopoulos cbfe4ec4f2 authz changes 2024-03-13 17:04:17 +02:00
Thomas Georgios Giannos 1b7ecf201e Getting annotation authors on query responses, ui update 2024-03-13 13:24:21 +02:00
Efstratios Giannopoulos ae56e2dbf2 fix counter backend 2024-03-13 11:47:48 +02:00
Efstratios Giannopoulos 5f88e835b7 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-03-13 10:02:25 +02:00
Efstratios Giannopoulos 52e1c42cd2 reference autz fix 2024-03-13 10:02:04 +02:00
amentis a45dec7a5f fix backend dmp user and dashboard ui fixes 2024-03-12 18:47:57 +02:00
Efstratios Giannopoulos cfbd3233ec authz changes 2024-03-12 18:27:16 +02:00
amentis b8f14e957e add remove backend validators, fix public dmp/descriptions 2024-03-12 14:07:47 +02:00
Efstratios Giannopoulos e3ac2394c2 common models changes 2024-03-12 11:07:47 +02:00
Efstratios Giannopoulos a399b183f6 remove old files 2024-03-11 18:32:06 +02:00
Thomas Georgios Giannos 3fc805ab85 Sending annotation users event on dmp persist 2024-03-11 16:02:09 +02:00
Thomas Georgios Giannos 7347fbbd5a Adding annotation entity touch event 2024-03-11 15:55:52 +02:00
amentis 06e6ee406b fixes 2024-03-11 15:20:09 +02:00
Efstratios Giannopoulos 097d2832be Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
#	dmp-backend/core/src/main/java/eu/eudat/audit/AuditableAction.java
2024-03-11 15:03:04 +02:00
Efstratios Giannopoulos 403e618d04 deposit changes 2024-03-11 15:01:56 +02:00
amentis 83ee9a7e45 fixes 2024-03-11 09:47:03 +02:00
Efstratios Giannopoulos 49f3da1314 file transformer changes 2024-03-08 18:36:16 +02:00
Thomas Georgios Giannos f37407063f Updating queue configurations 2024-03-08 11:47:37 +02:00
amentis 2c8982bfef fixes 2024-03-07 17:14:39 +02:00
Efstratios Giannopoulos f92f3c1a4d Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-03-06 18:18:24 +02:00
Efstratios Giannopoulos 535c07a1ad common models changes 2024-03-06 18:18:10 +02:00
amentis 5851c2ff26 ui fixes and add dmpBlueprintVersionStatus lookup field 2024-03-06 11:53:40 +02:00
amentis 6c82fcf8b0 builder component bean conflict fix 2024-03-05 13:59:53 +02:00
amentis 4ebabd68ab prefilling source changes 2024-03-05 13:41:58 +02:00
Efstratios Giannopoulos 0530373c83 change to common models for Deposit 2024-03-04 16:36:15 +02:00
amentis 5fc7241dc2 dmp fixes 2024-03-04 12:42:14 +02:00
amentis b84cd93ce6 dmp ui fixes 2024-03-01 18:50:46 +02:00
amentis f0c076fe4f prefilling source changes 2024-03-01 18:45:32 +02:00
amentis a5c194ac95 prefilling small changes 2024-03-01 11:14:27 +02:00
Efstratios Giannopoulos 25adaf23e2 prefiling changes 2024-03-01 10:54:52 +02:00
Efstratios Giannopoulos 46862e06cc Prefilling changes 2024-02-29 17:51:20 +02:00
amentis 96696f1a14 UI separate prefilling sources fixed Value fields 2024-02-29 15:18:55 +02:00
amentis b8c5edf4fb separate prefilling sources fixed Value fields 2024-02-29 11:46:59 +02:00
Efstratios Giannopoulos ef50193175 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-02-28 18:49:24 +02:00
Efstratios Giannopoulos 8237e7936d migration changes 2024-02-28 18:48:46 +02:00
amentis fd77a44039 remove ExternalUrlConfigProvider 2024-02-28 17:37:56 +02:00
amentis 9989f5ca69 prefilling sources ui changes 2024-02-28 13:29:53 +02:00
amentis dad32207e3 add dmp blueprint prefilling source and validation prefilling source fixes 2024-02-27 16:27:26 +02:00
amentis 57908f342b refactor reference type enums to prefilling source and ui code clean up 2024-02-26 19:47:20 +02:00
Efstratios Giannopoulos e0deaef950 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-02-23 18:55:51 +02:00
Efstratios Giannopoulos 098b80b3f4 migration changes 2024-02-23 18:55:35 +02:00
amentis adcf169b17 make referenceType api config independent and add PrefillingSource definition 2024-02-23 14:30:05 +02:00
Efstratios Giannopoulos dabbbf3fa4 remove external dataset field 2024-02-23 11:40:40 +02:00
Diamantis Tziotzios 3f8716ab0a prefilling source defintion classes 2024-02-23 10:32:18 +02:00
amentis fdf8e13af9 Add Prefilling Source Entity backend stack 2024-02-22 19:01:23 +02:00
Efstratios Giannopoulos a28323dcaf migration changes 2024-02-22 18:33:52 +02:00
amentis 40f56986b4 small dmp overview fixes 2024-02-22 15:05:09 +02:00
amentis 9f42381992 delete old DmpUserInviteType 2024-02-22 14:03:27 +02:00
amentis a387349aad create common dmpUser component for dmp ui and dmp overview popup invite 2024-02-22 13:57:42 +02:00
Alexandros Mandilaras 3e5ea407e4 revert duplicate 2024-02-22 11:55:34 +02:00
Alexandros Mandilaras ec4cf780eb add revision propery 2024-02-22 11:52:47 +02:00
Alexandros Mandilaras b8cd2e3757 set version and groupid for core 2024-02-22 10:56:46 +02:00
Alexandros Mandilaras 63bc7f3685 typo fix 2024-02-22 10:26:33 +02:00
Alexandros Mandilaras 3d2018f59a copy core in Dockerfile also 2024-02-22 10:01:08 +02:00
Alexandros Mandilaras d7c480f0ee add dev profile 2024-02-22 09:40:50 +02:00
Alexandros Mandilaras a95ed902d5 comment dirs that dont exist in this branch 2024-02-22 09:34:49 +02:00
Alexandros Mandilaras 530623b931 build as name change 2024-02-22 09:32:38 +02:00
Alexandros Mandilaras 5bb31d0a59 upgrade argos Dockerfiles 2024-02-22 09:30:30 +02:00
Efstratios Giannopoulos f7babf1f0b migration changes 2024-02-21 18:38:28 +02:00
Diamantis Tziotzios 446268719d Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-02-21 17:52:59 +02:00
Diamantis Tziotzios c9c0ea614b reference types @ description editor 2024-02-21 17:52:50 +02:00
Thomas Georgios Giannos 0634324151 Adding dmp and description touched integration events 2024-02-21 17:45:48 +02:00
amentis 4738a92f6e add section id to DmpUser 2024-02-21 12:46:24 +02:00
amentis a1394e6629 fix dmp save and view references 2024-02-21 11:03:11 +02:00
Efstratios Giannopoulos 07cdb91b9e renames 2024-02-21 09:55:29 +02:00
amentis 0cbcae3afe add dmpUser ui 2024-02-20 17:00:20 +02:00
amentis c55f160d9b add semantics controller 2024-02-20 14:58:16 +02:00
amentis d3659aad24 add semantics to dmp blueprint 2024-02-20 11:37:09 +02:00
Efstratios Giannopoulos 61560ec8ad reference changes 2024-02-20 11:28:33 +02:00
Efstratios Giannopoulos d50613f416 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-02-20 10:12:38 +02:00
Efstratios Giannopoulos eb228fa329 reference type changes 2024-02-20 10:11:49 +02:00
amentis 057f444ff1 description template semantics small fix 2024-02-20 09:38:32 +02:00
Efstratios Giannopoulos 9f36710276 update remote fetcher 2024-02-19 18:10:34 +02:00
Efstratios Giannopoulos a44fe43cf3 fix supportive materials to use config 2024-02-19 17:28:46 +02:00
amentis fd30b89f93 fetcher, ui small changes 2024-02-19 15:50:01 +02:00
amentis b343b76c9e reference type small changes 2024-02-16 17:42:01 +02:00
Diamantis Tziotzios 4f5b3cf647 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-02-16 11:49:04 +02:00
Diamantis Tziotzios bc8da3676a no message 2024-02-16 11:48:56 +02:00
amentis 720e5f96f3 reference type small changes 2024-02-16 11:24:28 +02:00
Diamantis Tziotzios 244c8f2afd reference type ui fixes 2024-02-15 18:36:46 +02:00
amentis aabcdd8c65 reference type changes 2024-02-15 16:43:12 +02:00
amentis 6e443c69fa small changes 2024-02-13 18:26:26 +02:00
Efstratios Giannopoulos 384b9883a8 more reference type changes 2024-02-13 18:16:59 +02:00
Efstratios Giannopoulos f826c2297b reference type changes 2024-02-13 15:54:28 +02:00
Efstratios Giannopoulos 40316781a2 RemoteFetcherService changes 2024-02-13 12:22:11 +02:00
Efstratios Giannopoulos 28d08d99e8 clean up code 2024-02-13 09:53:33 +02:00
Diamantis Tziotzios 366dcf6e01 Merge branch 'reference-type-refactor' into dmp-refactoring
# Conflicts:
#	dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html
#	dmp-frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.html
#	dmp-frontend/src/app/ui/reference/reference-field/reference-field.component.html
#	dmp-frontend/src/app/ui/reference/reference-field/reference-field.component.ts
2024-02-12 18:33:21 +02:00
Efstratios Giannopoulos fef2df6014 Merge branch 'reference-type-refactor' of code-repo.d4science.org:MaDgiK-CITE/argos into reference-type-refactor
# Conflicts:
#	dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ReferenceController.java
2024-02-12 17:44:46 +02:00
Efstratios Giannopoulos 957c1fad58 reference fetcher changes 2024-02-12 17:43:41 +02:00
Diamantis Tziotzios 9f5002802b some frontend changes for reference type refactor 2024-02-09 22:46:05 +02:00
amentis 1a6e776b41 description template validation changes 2024-02-09 15:07:15 +02:00
Thomas Georgios Giannos 80096e9164 Refactoring public api dependencies from 'to be deleted' data and queryable modules 2024-02-09 13:24:23 +02:00
Thomas Georgios Giannos 510ec954fa Adding versions on description template query 2024-02-09 11:45:17 +02:00
Efstratios Giannopoulos 87dd56ff2c reference type refactor 2024-02-08 18:27:54 +02:00
Efstratios Giannopoulos 4f1b05ab20 reference-type-refactor 2024-02-08 18:12:47 +02:00
Efstratios Giannopoulos 9d4e814d1c Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
#	dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java
2024-02-08 11:07:37 +02:00
Efstratios Giannopoulos ab653e4f94 code clean up 2024-02-08 11:04:38 +02:00
amentis 2204119503 description template field type validation fix 2024-02-08 10:46:30 +02:00
Diamantis Tziotzios 0c2fb8cbef Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-02-08 09:40:24 +02:00
Diamantis Tziotzios 3a514af843 more description editor changes 2024-02-08 09:40:16 +02:00
Efstratios Giannopoulos f8251aaf43 bug fix 2024-02-07 17:23:47 +02:00
Thomas Georgios Giannos 6e767f1e5e Added all versions listing on dmp blueprints, actions menu on that listing not yet functional 2024-02-07 17:13:13 +02:00
amentis 02cd51b751 description template backend validator changes 2024-02-07 16:27:14 +02:00
amentis 3deb17dbea remove dmp blueprint editor old code 2024-02-07 16:03:45 +02:00
Diamantis Tziotzios 8bf262693f more description editor changes 2024-02-07 14:15:25 +02:00
Efstratios Giannopoulos 2b436be2cd description properties changes 2024-02-07 13:53:01 +02:00
George Kalampokis ed2a29d14b Update file transformer base version 2024-02-06 18:05:39 +02:00
Efstratios Giannopoulos a52a3758d5 remove old logic 2024-02-06 16:38:18 +02:00
George Kalampokis fbe9683842 Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring 2024-02-06 16:20:45 +02:00
Efstratios Giannopoulos 51285f722b remove old logic 2024-02-06 16:20:37 +02:00
George Kalampokis a22644be56 Merge remote-tracking branch 'origin/dmp-refactor-desc-templates' into dmp-refactoring 2024-02-06 16:18:58 +02:00
amentis b4ccd71f85 description templates fix reapply validation 2024-02-06 16:00:52 +02:00
Efstratios Giannopoulos f7dc3e5a32 description use storage file 2024-02-06 15:03:49 +02:00
Efstratios Giannopoulos fd974d3ee4 change description properties definition 2024-02-06 12:27:47 +02:00
George Kalampokis 3ac4ed1237 Apply minor file transformer fixes 2024-02-06 09:40:28 +02:00
amentis fc756a1780 description templates validation fixes (in progress) 2024-02-05 17:59:11 +02:00
amentis 8bf1e0c4d6 small fix 2024-02-05 10:26:41 +02:00
Thomas Georgios Giannos e4c1efe98c Added versioning fields on DmpBlueprintEntity and stack 2024-02-02 14:59:11 +02:00
George Kalampokis 02a1437a91 Update File Transformer Builder 2024-02-01 18:15:06 +02:00
Efstratios Giannopoulos 5f6eab6e11 remove old code 2024-02-01 17:46:28 +02:00
Efstratios Giannopoulos 55fb0f3e00 remove old code 2024-02-01 17:29:04 +02:00
Efstratios Giannopoulos cba0741149 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring 2024-02-01 16:58:26 +02:00
Efstratios Giannopoulos 8524213d14 remove old code 2024-02-01 16:58:05 +02:00
Diamantis Tziotzios 8d5b399dba ui changes for description template editor 2024-02-01 16:57:40 +02:00
Efstratios Giannopoulos 46c19f61a1 update description properties json format 2024-02-01 16:40:11 +02:00
Thomas Georgios Giannos 1fc4e8add5 Added integration events and handlers on the main app outbox queue for tenants 2024-02-01 16:05:21 +02:00
Diamantis Tziotzios bef333ebc9 description templates editor ui fixes. 2024-02-01 15:41:05 +02:00
amentis da62f79a73 dmp editor add dmp associated user and placeholders 2024-02-01 14:42:23 +02:00
Thomas Georgios Giannos 30abd31974 Added data field on AssociatedProfilePublicModel on public api 2024-02-01 12:53:02 +02:00
Efstratios Giannopoulos 4a3f002672 move public api classes 2024-02-01 11:13:07 +02:00
Thomas Georgios Giannos 23c19888ca Added missing mapping for AssociatedProfilePublicModel on public api 2024-02-01 10:24:39 +02:00
amentis 3c32e57aad reference type editor changes 2024-01-31 18:39:18 +02:00
Efstratios Giannopoulos b4f55a721c Merge branch 'dmp-refactor-desc-templates' into dmp-refactoring 2024-01-31 17:49:56 +02:00
amentis 6eea7d8088 dmp editor small changes 2024-01-31 17:07:16 +02:00
Thomas Georgios Giannos 8f7a3cf768 Resolving issues with notification service user integration (on user creation) 2024-01-31 15:23:41 +02:00
Efstratios Giannopoulos 7e63abca50 refactor description template xml 2024-01-31 14:44:20 +02:00
Efstratios Giannopoulos 6a0d1a7c8b refactor description template xml 2024-01-31 14:33:24 +02:00
Diamantis Tziotzios 2ba9e146e5 more ui changes 2024-01-31 12:53:30 +02:00
Diamantis Tziotzios 078ca9e0cb minor ui fixes 2024-01-31 12:30:21 +02:00
amentis 285978fb58 add contacts dmp editor ui 2024-01-31 11:27:36 +02:00
Diamantis Tziotzios 59c425a240 no message 2024-01-31 10:44:48 +02:00
Diamantis Tziotzios 5377b1db18 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring 2024-01-30 19:28:09 +02:00
Diamantis Tziotzios f296bc44f9 description template frontend changes 2024-01-30 19:27:55 +02:00
Efstratios Giannopoulos 4d1d712215 xml serializer changes 2024-01-30 18:34:22 +02:00
Efstratios Giannopoulos 16222fc02c bug fix 2024-01-30 17:23:18 +02:00
Efstratios Giannopoulos 268b82eb49 update description template xml 2024-01-30 16:31:03 +02:00
amentis 7d66c1e857 fix dmp contact builders 2024-01-30 15:24:15 +02:00
Efstratios Giannopoulos 2f48b3bae2 remove old code 2024-01-29 18:26:58 +02:00
Efstratios Giannopoulos aebc6056f9 UserRemovalIntegrationEvent changes 2024-01-29 18:10:55 +02:00
Thomas Georgios Giannos 80a3aa5616 Setting outbox calls on user updates / creations, removing not needed inbox events 2024-01-29 16:51:29 +02:00
Diamantis Tziotzios 4542189a26 autocomplete changes 2024-01-29 14:39:20 +02:00
amentis 8fb3556acb dmp blueprint editor fixes 2024-01-29 13:13:30 +02:00
amentis ea6e2765ea add integration event component names 2024-01-29 09:37:25 +02:00
Efstratios Giannopoulos d89d8d4aa8 DescriptionTemplate version status fixes 2024-01-26 18:18:05 +02:00
Thomas Georgios Giannos a55d7c3692 Adding outbox events for users on the main app 2024-01-26 17:42:45 +02:00
George Kalampokis ac932ffb05 Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring 2024-01-26 12:55:08 +02:00
George Kalampokis c9121ebb1a Fix error if one of the file transformer clients doesn't respond 2024-01-26 12:54:55 +02:00
Efstratios Giannopoulos 2726d232dd upgrade blueprint xml 2024-01-26 12:42:46 +02:00
Efstratios Giannopoulos c05ccef28e change blueprint to user description template group id 2024-01-26 11:41:20 +02:00
Diamantis Tziotzios 4644d24874 various UI updates 2024-01-25 20:55:42 +02:00
Diamantis Tziotzios ae543324a4 dmp blueprint editor changes 2024-01-25 18:08:47 +02:00
amentis b6a85e151d add xml type to dmp blueprint entity 2024-01-25 15:50:52 +02:00
amentis f8fa4e519b fix dmp blueprint system fields ui 2024-01-25 15:49:34 +02:00
Thomas Georgios Giannos ecb82f5812 Removing certificate from repo 2024-01-25 13:15:15 +02:00