Commit Graph

1041 Commits

Author SHA1 Message Date
Diamantis Tziotzios 3b3b522089 Moves datasetWizard style from html to its respective scss file. 2019-03-14 11:52:14 +02:00
Diamantis Tziotzios 3d3eff8a65 Adds Save and Finalize functionality on QuickWizard. Fixes Save on QuickWizard so one can save even if form is invalid. 2019-03-14 11:50:06 +02:00
Diamantis Tziotzios e90d23ae54 Adds tooltips on Quick wizard icons. 2019-03-14 11:31:06 +02:00
Diamantis Tziotzios 2843ac6660 Fixes bug on Composite Field when all child fields where deleted. 2019-03-14 11:29:35 +02:00
Diamantis Tziotzios 19416d29e7 breadcrumb style fix. quick create dmp style fix 2019-03-14 10:37:58 +02:00
Diamantis Tziotzios 9dd2c606ed Fixes disabled functionality on "Save and Finalize" button. 2019-03-13 17:30:12 +02:00
Diamantis Tziotzios 32d189af03 Reintroduces description property on Sections. 2019-03-08 17:12:53 +02:00
Diamantis Tziotzios b1ea68670a Fixes bug on Additional information and rearranges nearby elements. 2019-03-08 17:09:34 +02:00
Diamantis Tziotzios 67c4d2f55a fix Botstrap Col Fields On Quick Create Dataset DatasetStep DatasetFormGroup 2019-03-07 14:31:09 +02:00
Diamantis Tziotzios 583db09764 CompositeField Set scss To Title For Render 2019-03-07 12:47:31 +02:00
Diamantis Tziotzios c8bea58d89 Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-03-07 12:05:06 +02:00
Diamantis Tziotzios 5c608c11e8 ADDITIONAL-INFORMATION On CompositeFields
Fix Import Dataset Profiles Desc Extendet And  Additional
2019-03-07 12:04:54 +02:00
Diamantis Tziotzios 009d24b97b Fixes Dmp Import dialogue view 2019-03-06 17:58:49 +02:00
Diamantis Tziotzios 443f010335 Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-03-06 16:59:35 +02:00
Diamantis Tziotzios d1e71d065a Project Img Fix To SelectOn IsNew Or On Edit Mode 2019-03-06 16:59:22 +02:00
Diamantis Tziotzios 89d96d888d Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-03-06 16:47:27 +02:00
Diamantis Tziotzios e8067b8620 Refactors Dmp import, Dmp Profile import and Dataset import dialogues. 2019-03-06 16:44:50 +02:00
ikalyvas 3a3bea121e Fixes bug with quick wizard navigation after save 2019-03-06 16:41:24 +02:00
Diamantis Tziotzios 9a14a73b86 set Default Project criteria Value And Add en.json the "NONE":"-" 2019-03-06 16:19:08 +02:00
Diamantis Tziotzios 6f6ba650ac Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-03-06 14:20:58 +02:00
Diamantis Tziotzios 0b8313abd0 Ctriteria Null Value Set Up DmpProfiles FixBug To show Values On StartUp 2019-03-06 14:20:49 +02:00
Diamantis Tziotzios 80bd6dbbfd Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-03-06 12:38:06 +02:00
Diamantis Tziotzios 71a22b1152 Fixes bug Upload Dmp 2019-03-06 12:37:42 +02:00
Diamantis Tziotzios 01d66e4393 dash Quick Actions Buttons 2019-03-06 12:19:10 +02:00
Diamantis Tziotzios 391bf0bca1 Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-03-06 12:03:14 +02:00
Diamantis Tziotzios dee23a0e8f dashboard QuickWizard Buttons 2019-03-06 12:03:02 +02:00
Diamantis Tziotzios 9eb9364683 Fixes and polishes Quick Dataset Create. 2019-03-06 11:43:48 +02:00
Diamantis Tziotzios 0d7d38278d disable QuickWizard SingleAutoComplete to change DatasetProfile if Has Datasets
And refactor create-add Page UI
2019-03-05 18:25:38 +02:00
Diamantis Tziotzios 2b7d663830 QuickWizard Fix DatasetList And DefinitionProfile from Dmp Of DatasetsList 2019-03-05 14:04:08 +02:00
Diamantis Tziotzios 6ab752b99c Adds Dmp Import functionality. 2019-03-05 13:59:34 +02:00
Diamantis Tziotzios ab8022d133 QuickWizard Fix Merge Component And Fix Thi InitSteper 2019-03-05 13:21:04 +02:00
Diamantis Tziotzios edbed239db Adds Quick dataset create functionality. 2019-03-05 12:20:10 +02:00
Diamantis Tziotzios 74694c82b6 steper init On step 2019-03-01 18:18:17 +02:00
Diamantis Tziotzios da8d929d9e quickWizard Create project
quickWizard Create Dmp
quickWizard Create Datasets
2019-03-01 17:16:21 +02:00
Diamantis Tziotzios 88f789bbb4 quick Wizard Main Component 2019-03-01 17:15:25 +02:00
Diamantis Tziotzios 832b08e715 Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-02-25 18:56:10 +02:00
Diamantis Tziotzios cd44392d9a Dmp Profile ImportDownload XML 2019-02-25 18:53:36 +02:00
Diamantis Tziotzios b6c09565c8 Delete Dataset Profile + Status +Error Code 2019-02-25 18:49:26 +02:00
Diamantis Tziotzios 5302024a0b Dataset Profile Download Xml And Import FromXml 2019-02-25 18:46:16 +02:00
Diamantis Tziotzios c6cc9ff0f1 Deletes obsolete folder lang. 2019-02-25 12:25:36 +02:00
Diamantis Tziotzios c4058efa8b conf changes 2019-02-15 18:36:06 +02:00
Diamantis Tziotzios 3f97ab9f41 Delete SnackBar Dmp Error 2019-02-15 16:19:07 +02:00
Diamantis Tziotzios f3168f4e06 Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-02-15 13:41:21 +02:00
Diamantis Tziotzios 24386b5d43 autocomplete fix 2019-02-15 13:41:14 +02:00
Diamantis Tziotzios cdec34cc1e Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-02-15 13:11:24 +02:00
Diamantis Tziotzios 19d16072cd Fix Dataset Profile Delete 2019-02-15 13:11:11 +02:00
Diamantis Tziotzios f6f28d6058 Fixes bug on Researchers autocomplete with case sensitivity. 2019-02-15 13:03:59 +02:00
Diamantis Tziotzios 7380c55443 Fixes single and multiple autocomplete's performance. 2019-02-15 13:00:26 +02:00
Diamantis Tziotzios d89aedebc6 Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring
# Conflicts:
#	dmp-frontend/src/app/ui/admin/dataset-profile/dataset-profile.module.ts
2019-02-15 12:28:46 +02:00
Diamantis Tziotzios 9aff41e4c4 changes for angular aot build 2019-02-15 12:27:47 +02:00
Diamantis Tziotzios 80570787d0 Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-02-15 12:26:37 +02:00
Diamantis Tziotzios 0f964cddd0 Dataset + Dataset Profile Date Picker Option For Fields
Frond And Back End
2019-02-15 12:26:14 +02:00
Diamantis Tziotzios 326e5e0356 admin login page 2019-02-15 11:18:14 +02:00
Diamantis Tziotzios 54779bf53f autocomplete fix 2019-02-15 10:51:21 +02:00
Diamantis Tziotzios 1a0728295b autocomplete disabled fixed 2019-02-14 18:56:06 +02:00
Diamantis Tziotzios d2b15a2885 fix Dmp Version Clone
remove Dmp Edite And Lock on Final Dmps
2019-02-14 14:14:44 +02:00
Diamantis Tziotzios bbfd5e9812 set "Add one more fieldset + " on en.json
fix visibiliti on Radio-Box Word-List And Multiplisiti Button on  Finalized Datasets-Profiles And Dataset-Editors
2019-02-14 13:27:41 +02:00
Diamantis Tziotzios f88acb4bd1 Fix Invitation Dialog Box For Invite From Dmp 2019-02-14 12:18:39 +02:00
Diamantis Tziotzios 8a67f0c7f1 Dmp-Profile Delete + Enum 2019-02-13 17:51:16 +02:00
Diamantis Tziotzios b498a53441 Dmp Clone - NewVersion Fix Disabled Propertys 2019-02-13 17:11:10 +02:00
Diamantis Tziotzios 89e13b2e03 Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-02-13 15:50:18 +02:00
Diamantis Tziotzios c9c4de0dc9 Dmp Profile Fix And Working And Required And Tested 2019-02-13 15:44:08 +02:00
Diamantis Tziotzios 83e3c7a69d Fixes login functionality for Facebook, Twitter, LinkedIn, B2Access. 2019-02-13 14:36:07 +02:00
Diamantis Tziotzios 158e924e78 Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-02-12 14:19:22 +02:00
Diamantis Tziotzios 533fcd9587 set Correct Value to Composite Profile editor value
fix Dmp Version Editor To Disable Name
2019-02-12 14:19:03 +02:00
Diamantis Tziotzios 056b4c8371 Fixes upload image functionality on Project. 2019-02-12 13:48:24 +02:00
Diamantis Tziotzios 61d8fa1181 Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-02-11 15:46:39 +02:00
Diamantis Tziotzios cd1bd66d2c Reaserchers Fix Url
diasable Finalize And Delete and Create External Res buttons on Finalized dataset
2019-02-11 15:44:03 +02:00
Diamantis Tziotzios 22592cfe75 Adds finalize functionality on Dataset Profiles and refactors frontend and backend to suit that change. 2019-02-11 14:04:45 +02:00
Diamantis Tziotzios 35d85f5f6e Explore Datasets Fix
Search Css Fix
2019-02-08 18:35:35 +02:00
Diamantis Tziotzios 6620c6625a Profile EditorFieldDefaultValue
Finalize Dialog DMP Fix Style
Put Error On Required Fields
Fix Parse DefaulValue false!="false"
2019-02-08 12:31:22 +02:00
Diamantis Tziotzios 17ce0ef455 Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-02-08 11:04:26 +02:00
Diamantis Tziotzios 5fa776bb39 Listing Css Link colore
Fix Text Area  Peace Holder
Default Value Requierd
Finalize Button On Dmp Fix
Fix Nav Button Colors
2019-02-08 11:04:12 +02:00
Diamantis Tziotzios bceaad3247 visibility service is also using the form group to reset values for hidden fields 2019-02-08 10:48:28 +02:00
Diamantis Tziotzios 35b7c8190a visibillity rules change to evaluate child rules on a change. 2019-02-07 10:26:00 +02:00
Diamantis Tziotzios ad84ff8235 Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-02-06 13:14:48 +02:00
Diamantis Tziotzios b55d027e97 external dataset Fix Name 2019-02-06 13:14:12 +02:00
Diamantis Tziotzios 63e9c2f736 Css buttons Z-index Fix And NavBar Buttons:hover color Fix 2019-02-06 13:13:47 +02:00
Diamantis Tziotzios f3e8d20e37 Create Delete EndPoind And Button ForDataset Profiles 2019-02-06 13:10:44 +02:00
Diamantis Tziotzios 03bfbdf8ad Refactors Single Dataset Enpoint to support different formats (JSON, XML, DOCX) 2019-02-06 12:48:05 +02:00
Diamantis Tziotzios 2ebd3f1cb8 Refactors Single DMP Enpoint to support different formats (JSON, XML, DOCX) 2019-02-06 12:46:14 +02:00
Diamantis Tziotzios 5f2646c98f Add Validator to Id on DatasetProfile
Fix DafaultValue on WordListComponent
set On DeleteDataset To Return Back
2019-02-04 18:10:22 +02:00
Diamantis Tziotzios 8a07e98d9e Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-02-04 15:42:08 +02:00
Diamantis Tziotzios 8e0b869a80 Fix Multiplicity Back And Ftrond New Ids
Create DeleteButon To RadioBox AndWordList
Try To fix ProgressBar
2019-02-04 15:41:54 +02:00
Diamantis Tziotzios 632577b171 Removes obsolete methods and changes url names on frontend services and backend controllers. 2019-02-01 18:56:55 +02:00
Diamantis Tziotzios 0b171bc67d Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-02-01 10:29:11 +02:00
Diamantis Tziotzios 853be683a8 Delete buttons
LogIn Page Fix
fix Multiplisity Ids
fixVizibility to Child Items
2019-02-01 10:29:00 +02:00
Diamantis Tziotzios a6a7b2bdce Refactor the Datasets endpoint 2019-01-31 17:53:37 +02:00
Diamantis Tziotzios 8b77ab759a Small fixes on Project's endpoint listing. 2019-01-31 16:06:43 +02:00
Diamantis Tziotzios e829c5e6f0 Parameterizes DMPs query endpoint for more efficient listing 2019-01-31 15:56:53 +02:00
Diamantis Tziotzios 6a7c1b6e9d Parameterizes Project's query endpoint for more efficient listing. 2019-01-31 13:24:11 +02:00
Diamantis Tziotzios 498f690f22 Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-01-31 12:31:02 +02:00
Diamantis Tziotzios 52f7c6dc0c visibility create function scanIfChildsOfCompositeFieldHasVisibleItems
fix style delete buttons
fix AutoComplete copnonnent get from Url to external resorsis
multiplisity model clone for mulitiplicity
2019-01-31 12:29:35 +02:00
Diamantis Tziotzios 5d514d6610 One more file for the refactor on endpoint for Project 2019-01-31 12:16:09 +02:00
Diamantis Tziotzios 0552870362 Removes and refactors endpoints from Project. 2019-01-30 18:37:49 +02:00
Diamantis Tziotzios ce223994ae Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-01-29 18:34:50 +02:00
Diamantis Tziotzios 8b45ee5548 Validation to Ids and
New Component  Component-Profile-Editor-default-value
delete row in radioBox
add To i18.enJson
2019-01-29 18:34:19 +02:00
Diamantis Tziotzios 68610bda1b Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-01-29 18:33:23 +02:00
Diamantis Tziotzios 528e5279c8 dataset draft save without validation 2019-01-29 18:33:17 +02:00
Diamantis Tziotzios d5740a560c Removes and refactors endpoints from DMPs 2019-01-29 18:25:40 +02:00
Diamantis Tziotzios 339f65f499 Dependency injection applied on DMPs and some API route name changes. 2019-01-29 13:05:36 +02:00
Diamantis Tziotzios 2bb18786b3 Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring 2019-01-29 09:56:53 +02:00
Diamantis Tziotzios e10179d042 Fixed the dmp delete function 2019-01-29 09:56:46 +02:00
Diamantis Tziotzios b460d35f7e visibillity rule changes 2019-01-29 09:47:50 +02:00
Diamantis Tziotzios 245f533a98 page Id fix Id_to Guid
fix icon to add radio button
comment the Visibility rule frome admin editor
fix delete plice for selection
2019-01-28 18:26:46 +02:00
Diamantis Tziotzios fd809ab361 dataset admin combobox fix 2019-01-28 17:47:12 +02:00
Diamantis Tziotzios 196435d069 Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring
# Conflicts:
#	dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
#	dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html
#	dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.ts
#	dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts
#	dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html
#	dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts
#	dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.html
#	dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.ts
#	dmp-frontend/src/app/ui/misc/dataset-description-form/visibility-rules/visibility-rules.service.ts
2019-01-28 15:51:33 +02:00
Diamantis Tziotzios cdba456c1d dataset dynamic form visibility service changes 2019-01-28 15:47:31 +02:00
Diamantis Tziotzios df51afe833 try to fix the ComboBox 2019-01-28 15:05:19 +02:00
Diamantis Tziotzios 7a60c3a435 dataset profile editor fix delete section in section
dataset profile fix validation for save
2019-01-28 14:18:48 +02:00
Diamantis Tziotzios 8c5c57375a validator to external datases tipe requierd, Space in to Dataset Fields Titles, AutoComplete Fix option selection 2019-01-25 15:54:14 +02:00
Diamantis Tziotzios c991da090b Dmp Editor Delete Fix , project editor & Critiria Start End Date validator 2019-01-24 17:30:23 +02:00
Diamantis Tziotzios 5ff63f3ce9 Add functionality create DMP from project list Panel 2019-01-24 12:46:29 +02:00
Ioannis Kalyvas 3c629a9c70 Adds delete operation on UI and backend 2019-01-23 14:38:03 +02:00
Diamantis Tziotzios 9d11adbcbd error models and profile pages bug fixes 2019-01-21 13:14:20 +02:00
Diamantis Tziotzios 41fb94eee9 ui resrtucturing 2019-01-18 19:03:45 +02:00
Ioannis Kalyvas 4845ba84a7 Added Delete action on Projects , Datasets and Datamanagement Plans 2018-11-30 16:57:20 +02:00
Diamantis Tziotzios 68559314f3 fixed popup style 2018-11-29 16:19:08 +02:00
Diamantis Tziotzios 89e4babf9d edit button fix 2018-11-29 15:51:21 +02:00
Diamantis Tziotzios 592fc44025 various style fixes 2018-11-29 14:26:18 +02:00
Diamantis Tziotzios 92d9c2cf03 rxjs refactor 2018-11-27 19:33:17 +02:00
Diamantis Tziotzios 05a6ddd90f conf refactor 2018-11-27 16:13:56 +02:00
Diamantis Tziotzios 68dddddf45 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-frontend/src/app/app.module.ts
#	dmp-frontend/src/app/services/data-management-plan/data-management-plan.service.ts
2018-11-27 16:04:53 +02:00
Diamantis Tziotzios 1d7ff00c5d conf moved to environment 2018-11-27 16:03:57 +02:00
Ioannis Kalyvas 01afdabb21 Added Navigation to next question by pressing on a button. Introduces MarkForConsideration Component 2018-11-01 18:02:15 +02:00
Ioannis Kalyvas bdcc628862 Introducing component for showing pending and unanswered questions 2018-10-30 13:03:02 +02:00
Ioannis Kalyvas 38d356703a Fixed Issue With Visibility Service on initial values 2018-10-22 12:37:55 +03:00
Ioannis Kalyvas 7cc9854f11 Fixed Issues With Progress Bar inflicted by changes in visibility service 2018-10-22 10:48:56 +03:00
Ioannis Kalyvas 2c2133bb28 Changes to support better data extraction from answers when generating OpenXML document 2018-10-19 12:59:54 +03:00
Ioannis Kalyvas b7193d2dda Implemented Preview Step in Admin Dataset Profile Definition 2018-10-19 10:35:35 +03:00
Ioannis Kalyvas c5b6b218b5 Fixed Issue with BreadCrumb Service 2018-10-18 13:21:56 +03:00
Ioannis Kalyvas ed46666a4f Implemented Fixed Dataset Description Field Numbering 2018-10-18 12:34:11 +03:00
Ioannis Kalyvas 01de2754e5 Implemented Frontend Editor And Action Listing For Cloning Dataset Profiles (Ticket #50 - Cloning dataset profiles) 2018-10-16 14:11:15 +03:00
Ioannis Kalyvas 85c5a6bf2e Renamed Dataset Admin Listing To Dataset Profile Admin Listing 2018-10-16 10:06:43 +03:00
Ioannis Kalyvas 5d6ba74d61 Enabled Public Dataset Description Search for authenticated Users (#Task38 - Exploring dataset descriptions by authenticated users) 2018-10-15 15:58:30 +03:00
Ioannis Kalyvas f1ff0ebf0b Implemented Publishing Datasets in finalised DMP's (Ticket #47 - Publishing Datasets - DMP Finalisation) 2018-10-15 15:50:01 +03:00
Ioannis Kalyvas d07c06df87 Fixed CSS issue for Dataset Criteria 2018-10-15 13:19:56 +03:00
Ioannis Kalyvas 6a52950e1d Changed Published dataset descriptions page to include Datatable Criteria in Facet Search Component 2018-10-15 13:17:54 +03:00
Ioannis Kalyvas 099a839e80 Enhanced the behaviour of finalising DMP's with Dataset withdrawal 2018-10-15 12:04:20 +03:00
Ioannis Kalyvas b660176534 Fixed some issues with actions on Datasets on different Dataset States 2018-10-15 11:16:04 +03:00
Ioannis Kalyvas ae618c3e29 Updated dependencies to resolve npm packages vulnerabilities 2018-10-12 18:17:31 +03:00
Ioannis Kalyvas 31fd9b8b14 Completed Dataset Editing/Viewing alongside DMP finalisation (Ticket #45 - Dataset editing / viewing modes) 2018-10-12 11:22:23 +03:00
Ioannis Kalyvas c33d5ea50a Fixed Bugs With Some Search Fields and Dataset Locking 2018-10-11 14:22:49 +03:00
Ioannis Kalyvas 2ca29e303b Implementation of DMP finalisation with option to finalise Datasets that belong to the DMP (Ticket #46 - Finalization of DMPs) 2018-10-11 14:22:03 +03:00
Ioannis Kalyvas 1d4eb0128e Implemented Simple Locking Mechanism for Editing/Viewing Datasets - (Ticket #45 - Dataset editing / viewing modes) 2018-10-10 10:48:41 +03:00
Ioannis Kalyvas 99588ef126 Fixed Bug For Facet Search not applying the right Project State (Active, Finished) 2018-10-09 13:58:36 +03:00
Ioannis Kalyvas 6e69c4b518 no message 2018-10-09 13:17:32 +03:00
Ioannis Kalyvas 66e66be4a1 Improved Performance For Invitations
Fixed Email Template To support dynamic domains
2018-10-09 13:04:03 +03:00
Ioannis Kalyvas b112748ba4 Added Option To Download DMP as XML 2018-10-09 11:28:44 +03:00
Ioannis Kalyvas 919acff3ae Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-frontend/src/app/shared/components/facets/facet-search-component/facet-search-section.component.ts
2018-10-08 18:20:16 +03:00
Ioannis Kalyvas aa04f65d84 fixed bugs for Facet Search 2018-10-08 18:14:27 +03:00
Diamantis Tziotzios 1661286f85 added help content configuration, fixed facets option height bug 2018-10-08 17:58:52 +03:00
Diamantis Tziotzios af99c1f418 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-10-08 10:05:06 +03:00
Diamantis Tziotzios 9444d07833 production configuration changes 2018-10-08 10:04:59 +03:00
Ioannis Kalyvas aa58b26723 no message 2018-10-05 18:12:19 +03:00
Ioannis Kalyvas 510384cdb7 Fixed Formatting in files 2018-10-05 18:00:54 +03:00
Ioannis Kalyvas 6ace88ecda Fixed Bugs for Facet Search on Public Dataset Page 2018-10-05 14:23:59 +03:00
Ioannis Kalyvas 6a72f8dbba no message 2018-10-05 13:03:22 +03:00
Ioannis Kalyvas b8c78e7135 Introduced Facet Search Component On Dataset Public Listing 2018-10-05 09:56:50 +03:00
Ioannis Kalyvas e0c302e67e no message 2018-10-02 17:33:58 +03:00
Ioannis Kalyvas a5160738eb no message 2018-09-18 15:41:24 +03:00
Ioannis Kalyvas 8c7d505178 no message 2018-09-06 15:50:38 +03:00
Ioannis Kalyvas bfdcdff33a no message 2018-09-04 12:36:18 +03:00
Ioannis Kalyvas d5a677184f no message 2018-08-31 11:14:56 +03:00
Ioannis Kalyvas b34c96b264 no message 2018-08-30 14:09:36 +03:00
Ioannis Kalyvas f8c3ce4362 no message 2018-08-27 18:09:33 +03:00
Ioannis Kalyvas 555f8fb1e7 no message 2018-08-27 12:00:09 +03:00
Ioannis Kalyvas 3ad1c1c8f2 no message 2018-08-24 18:21:02 +03:00
Ioannis Kalyvas 46db0d4184 no message 2018-07-24 15:53:34 +03:00
Ioannis Kalyvas 32eff9b523 no message 2018-07-24 14:19:52 +03:00
Ioannis Kalyvas 14f9be46f0 no message 2018-07-24 12:04:12 +03:00
Diamantis Tziotzios 518a2ffd3c no message 2018-07-24 10:58:55 +03:00
Diamantis Tziotzios 22582676a3 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot
# Conflicts:
#	dmp-backend/src/test/resources/applicationContextTEST.xml
2018-07-23 18:56:09 +03:00
Ioannis Kalyvas 29884ab016 no message 2018-07-23 17:01:27 +03:00
Ioannis Kalyvas c25c9d72cf no message 2018-07-23 16:09:19 +03:00
Ioannis Kalyvas 78b91ee3e0 no message 2018-07-11 16:47:36 +03:00
Ioannis Kalyvas efb7af10b5 no message 2018-06-29 11:29:43 +03:00
Ioannis Kalyvas 8eb3632fd2 no message 2018-06-28 12:28:16 +03:00
Ioannis Kalyvas 92ddb33eb8 no message 2018-06-27 18:37:26 +03:00
Ioannis Kalyvas b7d5dfb198 no message 2018-06-27 13:29:21 +03:00
Ioannis Kalyvas 5de4c1ada0 no message 2018-06-05 11:18:01 +03:00
Ioannis Kalyvas af8991b97a no message 2018-05-28 12:50:42 +03:00
Ioannis Kalyvas cc5e080219 no message 2018-05-14 09:44:35 +03:00
Ioannis Kalyvas 651c7bb0f5 no message 2018-03-28 16:24:47 +03:00
Ioannis Kalyvas bdf4a76a21 no message 2018-03-21 15:15:06 +02:00
Ioannis Kalyvas 376ceb5cb8 no message 2018-03-08 12:54:56 +02:00
Ioannis Kalyvas e835c35c7c no message 2018-03-06 16:58:38 +02:00
Ioannis Kalyvas 8cb464c1e9 no message 2018-03-05 18:18:45 +02:00
Ioannis Kalyvas 52bceed971 no message 2018-03-01 11:14:10 +02:00
annampak 1715e8629f name & version field diasabled in new version dmp 2018-02-28 16:59:41 +02:00
annampak 7c6815fef0 organisations without chips 2018-02-23 14:12:58 +02:00
annampak 5d635d0bb5 login eudat 2018-02-23 13:09:25 +02:00
annampak c2f5c4123b login button eudat 2018-02-23 13:08:24 +02:00
annampak 643793889d eudat button 2018-02-23 12:41:39 +02:00
Ioannis Kalyvas 4948737142 no message 2018-02-23 12:36:51 +02:00
Ioannis Kalyvas 70db1b2894 no message 2018-02-21 12:07:31 +02:00
annampak ca19d29ab7 no message 2018-02-16 18:50:50 +02:00
annampak 8b7df4d324 no message 2018-02-16 18:49:04 +02:00
annampak bff6cf57fe autocopmlete with chips 2018-02-16 18:48:23 +02:00
Ioannis Kalyvas bf10c0c31c no message 2018-02-16 12:34:02 +02:00
Ioannis Kalyvas 8892c62791 no message 2018-02-16 09:45:18 +02:00
annampak eb62c65272 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-02-14 12:38:39 +02:00
annampak 451ec28bda autocomplete chips component 2018-02-14 12:38:19 +02:00
Ioannis Kalyvas 49fa6609ea no message 2018-02-12 10:17:21 +02:00
annampak edde3cb050 no message 2018-02-09 18:50:43 +02:00
Ioannis Kalyvas db72ca982d Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-02-09 17:56:12 +02:00
Ioannis Kalyvas 4fade0d9b0 no message 2018-02-09 17:54:41 +02:00
annampak 6548220469 no message 2018-02-09 17:54:37 +02:00
annampak a7baad7322 dmp actions icons- language- dataset title 2018-02-09 17:05:01 +02:00
annampak 9558be7e1d radio buttons inline 2018-02-09 13:38:03 +02:00
annampak ba8e64c3d6 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-02-09 11:02:07 +02:00
annampak bb60873046 no message 2018-02-09 11:01:59 +02:00
Ioannis Kalyvas c8d43a3bed Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-02-08 17:54:42 +02:00
Ioannis Kalyvas d44052299a no message 2018-02-08 17:54:31 +02:00
annampak 33701ac3cb available profiles dialog window 2018-02-08 17:32:23 +02:00
annampak 04389b0613 no message 2018-02-08 10:52:57 +02:00
annampak 6efe95614e available profiles 2018-02-08 10:50:39 +02:00
Ioannis Kalyvas b4f59b0ce6 no message 2018-02-08 10:42:02 +02:00
Ioannis Kalyvas ca1593d5a7 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-frontend/src/app/dmps/dmps.module.ts
2018-02-07 12:00:33 +02:00
Ioannis Kalyvas 5692b2072f no message 2018-02-07 11:56:30 +02:00
annampak 3df3ed15ce Dataset Profile Datatable Admin- material was implemented 2018-02-06 15:56:33 +02:00
annampak b3bf19be0b dmp delete 2018-02-05 13:26:23 +02:00
annampak 18a6c7cc85 rename column version --> latest version 2018-02-05 12:38:11 +02:00
annampak 2fb06c63d0 Confirmation message dmp delete 2018-02-05 12:34:25 +02:00
annampak 49fe557fdc Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-02-05 11:44:50 +02:00
annampak 72cad823fb add researcher from dmp editor 2018-02-05 11:44:40 +02:00
Ioannis Kalyvas c36fa5e6f8 no message 2018-02-02 17:24:30 +02:00
Ioannis Kalyvas 9d0c4a4a85 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-02-02 17:24:22 +02:00
Ioannis Kalyvas 5340e90c65 no message 2018-02-02 17:24:06 +02:00
annampak 47629c9e2b welcome page statistics 2018-02-02 16:07:25 +02:00
Ioannis Kalyvas ab73f2ad62 no message 2018-02-02 13:09:38 +02:00
annampak 8653c06111 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-admin/src/app/routes.ts
#	dmp-frontend/package.json
2018-02-02 13:00:30 +02:00
annampak 6b5390b09a transfer dataset profile form from admin to front-end (models + services) , dataset profile form became a module. 2018-02-02 12:57:24 +02:00
Ioannis Kalyvas cd8b338d06 no message 2018-02-02 12:33:37 +02:00
Ioannis Kalyvas 9f324b9f19 no message 2018-02-01 16:04:36 +02:00
Ioannis Kalyvas e0237e1045 no message 2018-01-31 18:05:49 +02:00
Ioannis Kalyvas a70529fb93 no message 2018-01-31 17:39:16 +02:00
annampak 702339d9d6 no message 2018-01-30 14:33:23 +02:00
Ioannis Kalyvas 4d191f50ca no message 2018-01-30 14:23:47 +02:00
Ioannis Kalyvas fec219c3ee Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-30 13:08:04 +02:00
Ioannis Kalyvas 627644a237 no message 2018-01-30 13:07:51 +02:00
annampak 3f791b1fde no message 2018-01-30 12:45:27 +02:00
annampak c3a478a5fb no message 2018-01-30 12:44:44 +02:00
annampak 70b443beb5 required field profile in Dmp editor 2018-01-30 12:44:18 +02:00
Ioannis Kalyvas f1ee3095f9 no message 2018-01-30 11:35:26 +02:00
Ioannis Kalyvas 56531976de no message 2018-01-26 18:08:17 +02:00
annampak f8e848ba1d no message 2018-01-26 18:01:26 +02:00
annampak f390505f52 no message 2018-01-26 17:50:16 +02:00
annampak 9f2d490e61 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts
2018-01-26 16:24:23 +02:00
annampak ae847c2db2 no message 2018-01-25 17:26:08 +02:00
Ioannis Kalyvas a47b5702dd no message 2018-01-25 17:24:21 +02:00
Ioannis Kalyvas 5ef8689e54 no message 2018-01-25 10:14:43 +02:00
annampak b30b5fd792 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-24 16:54:54 +02:00
annampak d1c9d00ba7 no message 2018-01-24 16:54:43 +02:00
Ioannis Kalyvas c6e2e8aec4 no message 2018-01-24 16:11:09 +02:00
annampak d7a4264af7 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-24 13:41:50 +02:00
annampak 4dd2acc44a saved dataset opens in 3rd step 2018-01-24 13:41:31 +02:00
Ioannis Kalyvas 00a1f80f01 no message 2018-01-24 13:29:53 +02:00
Ioannis Kalyvas f985d467d0 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-23 17:22:01 +02:00
Ioannis Kalyvas 76b4023f4a no message 2018-01-23 17:21:38 +02:00
annampak 4bd70ffdfb dmp associated users 2018-01-23 15:46:38 +02:00
annampak 46479118e7 dmp associated users, dmp cloning 2018-01-23 13:56:43 +02:00
annampak dcada74d7b num of datasets column 2018-01-23 10:49:54 +02:00
annampak 4741c31c0c make it public functionality 2018-01-19 17:19:02 +02:00
annampak 62c4fb0547 no message 2018-01-19 15:59:48 +02:00
annampak 12062b0ef9 array of pages 2018-01-19 15:56:27 +02:00
Ioannis Kalyvas 64509cb2ee no message 2018-01-19 15:48:40 +02:00
Ioannis Kalyvas 04dd1145b5 no message 2018-01-19 13:35:09 +02:00
annabakouli 6a93ed8ef8 no message 2018-01-19 11:31:05 +02:00
annampak 24ce69db63 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-19 10:09:44 +02:00
annampak e4d1fd5398 make public butto, save and finalize, dataset profile field 2018-01-19 10:09:35 +02:00
annabakouli 9bbaaa7f9e no message 2018-01-18 12:27:30 +02:00
Diamantis Tziotzios 943d121e98 no message 2018-01-18 11:10:16 +02:00
Diamantis Tziotzios 66952722ba no message 2018-01-17 19:30:09 +02:00
Diamantis Tziotzios 18cbd7468c Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts
2018-01-17 17:19:02 +02:00
Diamantis Tziotzios 05cbadb17b no message 2018-01-17 17:17:16 +02:00
annabakouli 39acf89bb4 no message 2018-01-17 17:06:35 +02:00
annabakouli c8caa8d50a no message 2018-01-17 14:03:51 +02:00
Diamantis Tziotzios a6e79e3551 no message 2018-01-17 13:57:41 +02:00
Diamantis Tziotzios eab18999ec no message 2018-01-17 12:11:58 +02:00
annampak 694807623b Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-12 18:57:57 +02:00
annampak 3f99bc86b2 no message 2018-01-12 18:57:01 +02:00
annabakouli cb2d276369 no message 2018-01-12 18:32:47 +02:00
annabakouli 81598f35e0 no message 2018-01-12 12:17:37 +02:00
annabakouli e4276815a9 no message 2018-01-12 11:38:34 +02:00
annabakouli 556b1706d6 no message 2018-01-12 11:00:26 +02:00
annabakouli b72ed6eae9 no message 2018-01-12 10:14:28 +02:00
annampak d617ad0bb1 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-11 18:29:23 +02:00
annampak ffc59e912e dynamic comment field 2018-01-11 18:28:34 +02:00
annabakouli d16df93e9f no message 2018-01-11 18:25:41 +02:00
annabakouli c277ea3095 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-11 18:19:32 +02:00
annabakouli 9b3f58f31a no message 2018-01-11 18:19:15 +02:00
annampak d621ef687d progress bar, comment field 2018-01-11 18:14:23 +02:00
annampak 91eecde080 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-11 13:15:29 +02:00
annampak 2bc57251e0 no message 2018-01-11 13:15:15 +02:00
annabakouli f34b39d4c1 no message 2018-01-11 13:13:01 +02:00
annabakouli 60b12fe501 no message 2018-01-10 18:05:23 +02:00
annampak e4db152669 alternate row 2018-01-10 14:21:18 +02:00
annampak 9789ebe3eb ui enhancements 2018-01-10 14:09:42 +02:00
annampak 05dab7f674 progress bar, change server url 2018-01-10 10:17:22 +02:00
annampak fa10688e98 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-09 16:26:48 +02:00
annampak 586f075d1c save dynamic form - create new form bug -> fixed 2018-01-09 16:26:27 +02:00
annabakouli 4eff328ebb no message 2018-01-09 13:31:01 +02:00
annampak 997d4b61da no message 2018-01-08 18:25:08 +02:00
annabakouli abc114b8ab no message 2018-01-08 17:15:45 +02:00
annabakouli 37ae617dfa no message 2018-01-08 16:57:21 +02:00
annampak 0bb338e468 no message 2018-01-08 16:47:08 +02:00
annampak b75bb3367e Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-08 13:51:13 +02:00
annampak cb6d46256c required validation 2018-01-08 13:50:43 +02:00
annabakouli a6e2dd60b4 no message 2018-01-08 13:44:48 +02:00
annampak 693dfc5bb0 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-05 19:02:35 +02:00
annampak dcf0c5ca87 comment field 2018-01-05 19:02:26 +02:00
annabakouli 9da5a8a17b no message 2018-01-05 17:40:19 +02:00
annampak 067e0528dc Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-05 09:49:35 +02:00
annampak 3faa7c29cb data label in field, description, extended description in datasetfield 2018-01-05 09:49:12 +02:00
annabakouli 2d2d718a3a no message 2018-01-05 09:47:52 +02:00
annabakouli 3f5a627d18 no message 2018-01-03 18:36:31 +02:00
annampak 67aa17324c Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2018-01-03 13:36:38 +02:00
annampak b844b54b94 chnage on section model 2018-01-03 13:36:28 +02:00
annabakouli e47d488cac no message 2018-01-03 12:44:54 +02:00
annampak 391fd20baf Form with material design 2017-12-28 18:32:28 +02:00
annampak e7ccb8c1d2 bootstap is replaced with material 2017-12-22 18:37:43 +02:00
annabakouli 9af2be155b no message 2017-12-22 16:30:15 +02:00
annampak 5a79779335 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-22 15:46:45 +02:00
annampak bc4e033247 replace ng prime with material 2017-12-22 15:46:36 +02:00
annabakouli 70c2ad9bef no message 2017-12-22 15:42:47 +02:00
annabakouli 62a7c1fad3 no message 2017-12-22 10:31:05 +02:00
annabakouli bd1bc36085 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-21 12:38:30 +02:00
annabakouli b722e5d886 no message 2017-12-21 12:38:18 +02:00
Diamantis Tziotzios 5e4a31748e no message 2017-12-21 12:12:44 +02:00
Diamantis Tziotzios cfd2188a47 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-21 11:46:20 +02:00
Diamantis Tziotzios 1ae1d7cc9f no message 2017-12-21 11:46:11 +02:00
annabakouli 173345ed17 no message 2017-12-21 11:44:57 +02:00
Diamantis Tziotzios ddd25c4e84 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-21 11:39:22 +02:00
Diamantis Tziotzios 5b28cc8032 no message 2017-12-21 11:39:17 +02:00
annabakouli 57f7b672aa no message 2017-12-21 11:26:11 +02:00
Diamantis Tziotzios 2af51a18d2 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-21 11:23:55 +02:00
Diamantis Tziotzios 1ae37dd3ab no message 2017-12-21 11:23:38 +02:00
annampak fbf788781d Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-21 11:16:57 +02:00
annampak a6ee53b6a4 dataset profile in dmp editor 2017-12-21 11:16:46 +02:00
Diamantis Tziotzios 9ed17168db no message 2017-12-21 10:54:49 +02:00
annampak cc539abbc5 no message 2017-12-20 18:54:48 +02:00
annampak f530a2b862 dmp editor profile autocomplete field 2017-12-20 18:50:16 +02:00
Diamantis Tziotzios b1e4787a92 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-20 17:15:39 +02:00
Diamantis Tziotzios d7658687ba no message 2017-12-20 17:15:27 +02:00
annabakouli 06f1086ceb no message 2017-12-20 16:52:09 +02:00
annampak d05b2ba5e2 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-20 16:11:53 +02:00
annampak 5b4d345483 homepage minor changes 2017-12-20 16:11:41 +02:00
Diamantis Tziotzios 91500c6061 Merge branches 'Development' and 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 2017-12-20 15:34:40 +02:00
Diamantis Tziotzios 7ac0cde7c1 no message 2017-12-20 15:34:32 +02:00