MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity
3,567 Commits 37 Branches 247 Tags 110 MiB
Commit Graph

3567 Commits

Author SHA1 Message Date
Kristian Ntavidi e46de79ec2 #7133 Multiplicity visibility rule fix 
* Inherit visibility value from clone reference
 2021-11-02 12:28:55 +02:00
Konstantina Galouni 7fefdd6aad Added rich text area field type for response in dataset > chapter > section > questions. 
1. RichTextAreaData.java: [NEW] file to extend FieldData.
2. ModelBuilder.java: Added case for richTextarea type.
3. ExportXmlBuilderDatasetProfile.java: Added case for RICH_TEXT_AREA.
4. ViewStyle.java: Define RICH_TEXT_AREA("richTextarea").
 2021-11-01 15:38:16 +02:00
Konstantina Galouni 193e7410a8 Added rich text area field type for response in dataset > chapter > section > questions. 
1. dataset-profile.module.ts: Added in declarations "DatasetProfileEditorRichTextAreaFieldComponent".
2. dataset-profile-editor-composite-field.component.html: Added RichTextArea as input field type for response to a question.
3. dataset-profile-editor-composite-field.component.ts: In method "addNewInput()" added case for RichTextArea.
4. dataset-profile-field-view-style.ts & view-style-enum.ts: Added RichTextArea.
5. field-data.ts: Added interface RichTextAreaFieldData.
6. enum-utils.service.ts: In methods "toDatasetProfileFieldViewStyleString()" and "toDatasetProfileViewTypeString()" added cases for RichTextArea
7. field-editor-model.ts: Added richTextarea.
8. component-profile-editor-default-value.component.html: Added <mat-form-field> for RichTextArea (how rich text area is initialized when this type is selected as response).
9. dataset-profile-editor-field.component.html: Added <mat-option> for RichTextArea (to select it) and <app-dataset-profile-editor-rich-text-area-field-component> (to show it).
10. dataset-profile-editor-field.component.ts: Added RichTextArea case everywhere.
11. dataset-wizard.component.ts & dmp-editor.component.ts: In method "_getPlaceHolder()" added case for richTextarea.
12. dataset-description-form.module.ts: Imported RichTextEditorModule.
13. form-field.component.html: Added RichTextArea case with <rich-text-editor-component>.
14. assets/i18n/: Added DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-RICH-TEXT-AREA-TITLE, DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-RICH-TEXT-AREA-PLACEHOLDER and DMP-EDITOR.TYPES.DATASET-PROFILE-FIELD-VIEW-STYLE.RICH-TEXT-AREA.
15. field-data/rich-text-area-field-data-editor-model.ts & field-type/rich-textarea/: [NEW] Files for Rich Text Area field type.
 2021-11-01 15:30:21 +02:00
Konstantina Galouni 03009edaa3 Use <rich-text-editor-component> when html editor is needed - replace in dataset template descriprion, section & question descriptions. 
1. dataset-profile-editor-section.component.html & dataset-profile-editor.component.html & dataset-profile-editor-composite-field.component.html: Replace <angular-editor> with <rich-text-editor-component> (custom common component when rich text editor is set).
2. dataset-profile-editor-section.component.ts & dataset-profile-editor.component.ts & dataset-profile-editor-composite-field.component.ts: Remove AngularEditorConfig (this is set in RichTextEditorComponent).
3. dataset-profile.module.ts: Instead of AngularEditorModule, import RichTextEditorModule (common component where rich text editor is set).
4. styles.scss: Moved css for angular editor to dedicated css file (src/app/library/rich-text-editor/rich-text-editor.component.scss) and keep here only "form-field-subscript-wrapper" class.
 2021-11-01 15:10:00 +02:00
Konstantina Galouni 7bdfcb70af Created common component for rich text editor configuration & added rich text for dmp and dataset description. 
1. library/rich-text-editor: [NEW] Common component which configures a rich text editor.
2. dataset-editor.component.html & main-info.component.html: Use <rich-text-editor-component> to allow rich text in dataset and dmp description.
3. dataset-overview.component.html & dmp-overview.component.html: Show dataset and dmp description as innerHTML.
4. dataset.module.ts & dmp.module.ts: Imported RichTextEditorModule.
 2021-11-01 14:45:02 +02:00
George Kalampokis 6ff9ea2d05 When exporting to word/PDF HTML styled text, make <br> tag to be parsed once 2021-11-01 11:49:20 +02:00
George Kalampokis 0010ad846a When exporting to word/PDF HTML styled text, it will be preperly indented and it can read the change line character 2021-11-01 11:39:43 +02:00
George Kalampokis 5a66754cbd Make DMP language Mandatory and set default language to English 2021-10-29 15:08:58 +03:00
George Kalampokis fd26e2a742 Fix issue with DMP index not updating after a new user is invited 2021-10-27 18:16:44 +03:00
George Kalampokis 900a377d5f Fix critical issue with RDA Comoon Standard text load 2021-10-26 17:54:58 +03:00
George Kalampokis 93baa4a281 Add support for more html tags on the Document/PDF exporter 2021-10-26 16:21:28 +03:00
George Kalampokis 2c29469590 Allow to configure the path of the email templates (ref #7122) 2021-10-25 16:06:08 +03:00
Kristian Ntavidi ae0618d5be Fix multiplicty bug on Admin Template Editor. 2021-10-20 13:41:04 +03:00
George Kalampokis 8e2fea2ea0 Merge remote-tracking branch 'origin/Development' into Development 2021-10-20 12:42:21 +03:00
George Kalampokis e66362ec38 Add prometheus metric for the number of grants used based on DMP status (ref #6462) 2021-10-20 12:42:08 +03:00
George Kalampokis 35c4ec821e Add a special query logic with group by and count 2021-10-20 12:40:44 +03:00
Konstantinos Triantafyllou 81a5964a55 Remove google client id, commited by mistake 2021-10-19 11:50:24 +03:00
Konstantinos Triantafyllou 7a3f3f2fd5 Add reordering for inputs in a dataset template 2021-10-19 11:08:38 +03:00
Konstantina Galouni eeb5479a98 form-composite-title.component.html: [Bug fix] Show "view more/less" functionality only if there is extendedDescription. 2021-10-15 13:56:45 +03:00
Diamantis Tziotzios c3f28936af Dockerfile update 2021-10-13 18:47:41 +03:00
Diamantis Tziotzios 887789d9e5 Dockerfiile update 2021-10-13 18:17:53 +03:00
George Kalampokis e8366aa61a Fix critical issue with dataset pagination 2021-10-13 17:50:15 +03:00
George Kalampokis 942782fe3c Use metrics predifined names instead of plain Strings 2021-10-13 17:49:32 +03:00
George Kalampokis d0d918682b Refactor remote fetcher and made it independent of sun libraries 2021-10-13 17:48:46 +03:00
George Kalampokis 65644c3a35 Add extra sanity checks 2021-10-13 17:47:50 +03:00
George Kalampokis 045dd51014 Prevent the selection of an already selected dataset Templates 2021-10-13 16:10:56 +03:00
George Kalampokis 32e299fc45 Merge remote-tracking branch 'origin/Development' into Development 2021-10-13 11:49:17 +03:00
Konstantina Galouni f9bf688085 dataset-wizard.component.html: Added in dropdown list "Save & Continue" option (same as Save). | assets/i18n/: Added DATASET-WIZARD.ACTIONS.SAVE-AND-CONTINUE in language files. 2021-10-12 18:53:07 +03:00
George Kalampokis a4fef8e462 Refactor PDF conversion 2021-10-12 18:17:16 +03:00
Konstantina Galouni 198061aeaa Description boxes in admin forms replaced with rich text editor <angular-editor>. 
1. dataset-profile-editor-composite-field.component.ts & dataset-profile-editor-section.component.ts & dataset-profile-editor.component.ts: Initialize AngularEditorConfig.
2. dataset-profile-editor-composite-field.component.html & dataset-profile-editor-section.component.html & dataset-profile-editor.component.html: Use <angular-editor> in description.
3. multiple-auto-complete.component.html & dataset-profile-listing.component.html & form-section.component.html: Show description as html.
4. dataset-profile.module.ts: Imported HttpClientModule, AngularEditorModule (needed for <angular-editor>).
5. available-profiles.component.html: Show description as html, under the Dataset Template title, not as tooltip (matTooltip does not receive html).
6. available-profiles.component.ts: Added styleUrls: ['available-profiles.component.scss'].
7. available-profiles.component.scss: [NEW] Added css for class "list-option" to cut description if too long.
8. form-composite-title.component.html: Show description and extendedDescription as html | Add view more/less functionality to show/hide extendedDescription.
9. form-composite-title.component.ts: Added "public showExtendedDescription: boolean = false;" field.
10. form-composite-title.component.scss: Added css for "more" class, to make "view more/less" seem like link.
11. assets/i18n/: In language files added DATASET-EDITOR.QUESTION.EXTENDED-DESCRIPTION.VIEW-MORE (-LESS).
12. assets/styles.css: Added css for <angular-editor>, to be similar to the other text areas and forms.
 2021-10-12 18:14:22 +03:00
George Kalampokis 1a821179db Even more Fixes over dashboard's sorting 2021-10-12 18:06:14 +03:00
George Kalampokis 6de12fd0e8 Fix issue with RDA Common Standards 2021-10-12 18:05:38 +03:00
George Kalampokis 29919f981a Fix issue with recent activity sorting 2021-10-12 15:41:20 +03:00
George Kalampokis 7fe84d7de5 Eliminate Duplicate user when making a new version 2021-10-08 16:52:01 +03:00
George Kalampokis a3af8ce3a5 Merge branch 'spring-update' into Development 
# Conflicts:
#	dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java
#	dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
#	dmp-backend/web/src/main/java/eu/eudat/controllers/UserGuideController.java
#	dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
#	dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
#	dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java
#	dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java
 2021-10-08 16:04:52 +03:00
George Kalampokis 0e97e6c0a8 Fix issues with external sources 2021-10-08 12:14:09 +03:00
George Kalampokis 1d48ee81b9 Add additional null check for Elastic's Dmp Repository 2021-10-08 11:18:22 +03:00
George Kalampokis 9919886c26 Fix issues with dataset sorting on Dashboard with Elasticsearch 2021-10-08 11:02:56 +03:00
George Kalampokis 77d50773b8 Merge branch 'improved_queries' into Development 
# Conflicts:
#	dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
 2021-10-07 11:05:19 +03:00
George Kalampokis 0506f2d3a3 Merge remote-tracking branch 'origin/Development' into Development 2021-10-06 18:17:47 +03:00
George Kalampokis 524cededb6 Fix issue when exporting to docx/pdf 2021-10-06 18:16:39 +03:00
Kristian Ntavidi 74ec2126f0 Visibility Rules fix 
* Reduce sourceValue visibility value based on logic.
 2021-10-06 16:32:06 +03:00
George Kalampokis cb1d7b5340 Replace altChunk html to docx with direct parsing (manual) 2021-10-06 15:15:41 +03:00
George Kalampokis ef5e6a92e0 Fix critical issue with Dataset Template xml import 2021-10-06 15:02:21 +03:00
George Kalampokis 70538850a2 Merge remote-tracking branch 'origin/Development' into Development 2021-10-06 14:40:39 +03:00
George Kalampokis 407961e137 Fix critical issue with DMP queries without elastic 2021-10-06 14:21:54 +03:00
Kristian Ntavidi 907ad14269 #7028 Text area fields minRows defaults to 3 2021-10-06 12:25:44 +03:00
George Kalampokis 3ec942cfa7 Add support for Html text when exporting to docx (alpha) 2021-10-05 17:58:46 +03:00
George Kalampokis 54c862ecbb Minor metrics refactor 2021-10-05 13:09:02 +03:00
George Kalampokis b66bde871a Fix issue of new DMPs not showing on the user's listing with elasticsearch active (#7010) 2021-10-05 12:56:20 +03:00