Commit Graph

2128 Commits

Author SHA1 Message Date
Diamantis Tziotzios 7a8375b988 Merge commit '2cb985c23c4ceda99efc78bcc8e77b3eceeb0bcf'
# Conflicts:
#	dmp-backend/elastic/src/main/java/eu/eudat/elastic/criteria/DatasetCriteria.java
#	dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dataset.java
#	dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java
#	dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java
#	dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java
#	dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
#	dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java
#	dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java
#	dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java
2021-12-09 12:18:39 +02:00
Konstantina Galouni b7d622e330 #7225: In dataset template, rename "users" to "editors" and add hint | #7226: In dataset templates, default descending sorting by "created".
1.  dataset-profile-listing.component.html: #7226: In <mat-table> added matSortActive="created" matSortDirection="desc".
2. dataset-profile-editor.component.html: #7225: Added hint in section 1.4 to make prominent when the new editors will receive an informative email.
3. assets/i18n/: #7225: In every language file, renamed "users" to "editors" (DATASET-TEMPLATE-USERS, DATASET-TEMPLATE-REMOVE-USER, DATASET-TEMPLATE-NO-USERS-YET, DATASET-TEMPLATE-VALIDATE-AND-ADD-USER) and added DATASET-TEMPLATE-USERS-HINT.
2021-11-30 12:21:03 +02:00
George Kalampokis 9dc4d52f91 Fix issue with Dataset copy status 2021-11-23 11:24:42 +02:00
Konstantina Galouni 52c7796e8e #7183: Do not query for authors (DMP invitation) until 3 letters have been typed.
1. multiple-auto-complete.component.ts:
   a. Added @Input field minLength (default 0)
   b. In method "_onInputFocus()" filter results, only if query >= minLength.
2. dmp-invitation-dialog.component.html: In <app-multiple-auto-complete>, added property [minLength]="3" (invite users to a DMP).
2021-11-22 13:36:02 +02:00
Konstantina Galouni 7a7f12b83a Fixed #7182: Required field names appearing in the warning modal.
dataset-wizard.component.ts & dmp-editor.component.ts & form-validation-errors-dialog.component.ts:
a. For 'mat-select', use placeholder instead of aria-label.
b. [Bug fix] For 'app-multiple-auto-complete' dig into 2 more levels (formControl.nativeElement.firstChild.firstChild.firstChild.children) --> reason: commit de99784b5e: moved <input> inside <mat-chip-list>.
2021-11-16 11:47:24 +02:00
Diamantis Tziotzios adeca327a2 ES lang update 2021-11-09 16:30:59 +02:00
Diamantis Tziotzios 1ec46b6840 es lang update 2021-11-09 16:23:57 +02:00
Konstantina Galouni de99784b5e In multiple and single autocomplete do not show "no results found" when user is typing | in multiple auto complete added parameter to check if "no results found" will be displayed | in multiple auto complete show full width for input & wrap title into multiple lines.
1. multiple-auto-complete.component.html:
   a. #7137: show full width for input ([matAutocompleteConnectedTo]="origin") | wrap title into multiple lines (added classes "title-subtitle-fn", "subtitle-fn", "subtitle-fn-inner" and updated classes "title-fn", "title-fn-inner").
   b. single-auto-complete.component.html: #7136: Show "No results found" when user is not typing and there are no results.
   c. added check to show this label according to "showNoResultsLabel" input parameter.
2. multiple-auto-complete.component.ts & single-auto-complete.component.ts:
   a. Added field "queryValue", input "showNoResultsLabel".
   b. increase "requestDelay" from 400 to 600ms.
3. multiple-auto-complete.component.scss: wrap title into multiple lines (added classes "title-subtitle-fn", "subtitle-fn", "subtitle-fn-inner" and updated classes "title-fn", "title-fn-inner").
4. dmp-invitation-dialog.component.html: In <app-multiple-auto-complete> added parameter [showNoResultsLabel]="false".
2021-11-09 14:14:19 +02:00
Konstantina Galouni ca5883724a In Dataset Template selection cut description when templates are displayed in list and show description (instead of DMP-EDITOR.DATASET-DESCRIPTION.INTRO) in template preview.
1. multiple-auto-complete.component.html: Added class "title-fn-inner" to cut the displayed description of dataset templates.
2. multiple-auto-complete.component.scss: Css for class "title-fn" updated and for class "title-fn-inner" added to cut the displayed description of dataset templates.
3. available-profiles.component.html: Added class "list-option-inner" to cut the displayed description of dataset templates.
4. available-profiles.component.scss: Css for class "list-option" updated and for class "list-option-inner" added to cut the displayed description of dataset templates.
5. dataset-preview-dialog.component.html: Added [datasetDescription]="data?.template?.description" in <app-dataset-description>
6. dataset-description.component.ts: Added in class, field "datasetDescription".
7. dataset-description.component.html: Show template datasetDescription (as html) instead of DMP-EDITOR.DATASET-DESCRIPTION.INTRO.
2021-11-02 16:50:43 +02:00
Kristian Ntavidi e46de79ec2 #7133 Multiplicity visibility rule fix
* Inherit visibility value from clone reference
2021-11-02 12:28:55 +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 5a66754cbd Make DMP language Mandatory and set default language to English 2021-10-29 15:08:58 +03:00
Kristian Ntavidi ae0618d5be Fix multiplicty bug on Admin Template Editor. 2021-10-20 13:41:04 +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
George Kalampokis e8366aa61a Fix critical issue with dataset pagination 2021-10-13 17:50:15 +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
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 6de12fd0e8 Fix issue with RDA Common Standards 2021-10-12 18:05:38 +03:00
Kristian Ntavidi 74ec2126f0 Visibility Rules fix
* Reduce sourceValue visibility value based on logic.
2021-10-06 16:32:06 +03:00
Kristian Ntavidi 907ad14269 #7028 Text area fields minRows defaults to 3 2021-10-06 12:25:44 +03:00
George Kalampokis 06364873ca Fix issue with unordered multiplicity fields 2021-09-27 18:11:55 +03:00
Kristian Ntavidi faeb7e0d62 improvement on computing ordinal on mutliplicity fields 2021-09-27 16:25:17 +03:00
Diamantis Tziotzios 9cac208546 upgrade to Angular 12 2021-09-24 21:52:14 +03:00
Kristian Ntavidi d229189783 Visibility rule service refactor.
* Take into account other dependencies
* OR and AND logic support
2021-09-20 21:34:20 +03:00
Kristian Ntavidi b40e30ee60 Fix issue with visibility rules on multiplicity fields.
* Append new visibility rules on creation of multiplicity item
* Compute visibility rules for multiplicityItems on loading data (Researchers page)
2021-09-20 14:34:09 +03:00
Kristian Ntavidi ba865c9708 Dataset Editor (Researchers Page). Incrementing ordinals on multiplicity items. 2021-09-17 12:12:48 +03:00
Kristian Ntavidi 52c26cd864 Admin Dataset editor guard fix. 2021-09-09 09:09:27 +03:00
Kristian Ntavidi 0780c629c9 about how it works text updates 2021-08-30 20:57:21 +03:00
Diamantis Tziotzios 6bc5aaed25 pt user guide update 2021-08-16 18:36:10 +03:00
Kristian Ntavidi a7abe6c2d8 minor fix 2021-07-23 17:09:12 +03:00
Kristian Ntavidi 06961c0254 Deactivate Guard on dataset template editor 2021-07-23 17:03:29 +03:00
Kristian Ntavidi 1be8e8e8f9 Fix side actions on template editor z-index issue 2021-07-23 14:27:40 +03:00
Kristian Ntavidi 501a7175e8 Users on template editor 2021-07-23 14:16:59 +03:00
Kristian Ntavidi d8a2ad281c Animations on admin template editor (partial) 2021-07-23 13:16:40 +03:00
Kristian Ntavidi 59e3af2fa0 Fix adding dataset dropdown on datasets listing
* Get timecreated from backend
* Protect front from crashing when creationTime is not provided
2021-07-23 12:05:07 +03:00
Kristian Ntavidi 4c22799f91 Bug fixes on dataset templates editor Admin (partial)
* Make use of observables instead of setTimeouts
* Remove not nessecary calculations
2021-07-23 11:23:35 +03:00
Kristian Ntavidi 1d397d28cf Add ability to scroll on table of contents (dataset templates admin) 2021-07-21 16:41:38 +03:00
Kristian Ntavidi 008b6321ea Error dialog component on dataset wizard (update)
* On single error case, show it indepentently (not as list item)
2021-07-21 12:25:13 +03:00
Kristian Ntavidi a212f4e5a1 Subtle border on invalid emails inputs (in invitation dialog)
* Mutli auto compolete component extended
2021-07-21 12:16:22 +03:00
Kristian Ntavidi 1b731fdf20 Changes on multi-auto complete component.
* Give precedence on autocomplete option-selected over onblur.
* Invitation dialog on blur commit given email till that time, on emails list.
2021-07-21 11:09:13 +03:00
Kristian Ntavidi 5ddb7df2b4 Finalize dataset from dataset editor.
* Finalize dataset from dataset editor.
* Finalize dataset on dataset overview redirects you to dataset editor
* Grouping save action buttons
2021-07-20 13:32:40 +03:00
Kristian Ntavidi ee0c7df170 Pt translations on dataset-profiles-editor / listing 2021-07-15 17:12:17 +03:00
Kristian Ntavidi c33ffc153b Try translate finalize errors messages on Pt. 2021-07-13 10:42:36 +03:00
Kristian Ntavidi cce9df8eb7 Fixes
* Feedback message on error saving dataset.
* Unsubscribe backend calls on dashboard component destroy.
2021-07-09 13:03:09 +03:00
Kristian Ntavidi 6e21ad127d Language Pt fix 2021-07-07 08:17:48 +03:00
Kristian Ntavidi 684d784d1a Routing updates.
* Start new dmp Button navigates you to home.
* Login page redirects you to home page if user is already logged in.
2021-07-06 09:46:27 +03:00
Kristian Ntavidi 3e98297da9 Pt language updates. 2021-07-06 09:37:41 +03:00
George Kalampokis 1c365a191e Minor Update
(cherry picked from commit 295750684f)
2021-06-30 18:48:13 +03:00
George Kalampokis 295750684f Minor Update 2021-06-30 14:09:29 +03:00
Kristian Ntavidi 82c5586067 Dataset and dmp overview fix.
* Fix edit issue when multiple users have ownership of the same dmp/dataset.

(cherry picked from commit fd9d35aad3)
2021-06-30 13:38:53 +03:00
Kristian Ntavidi 57d1cf89b4 Dataset overview fix. Actions on unlocked dataset. 2021-06-30 13:01:33 +03:00
George Kalampokis 04f230dff1 Fix critical issue with dataset's copy dropdown
(cherry picked from commit d1e3aae36d)
2021-06-30 12:52:32 +03:00
George Kalampokis d1e3aae36d Fix critical issue with dataset's copy dropdown 2021-06-30 12:51:12 +03:00
Diamantis Tziotzios c16c35225f Merge branch 'Development' 2021-06-25 08:50:27 +03:00
Kristian Ntavidi d878562d3d Ui fixes on landpage (static pages) 2021-06-24 16:00:21 +03:00
Kristian Ntavidi e486169ae5 EOSC section added in index page (static page)
**Missing one link
2021-06-24 12:46:31 +03:00
Kristian Ntavidi ef7de5efe3 External Dataset type (newly added field). 2021-06-23 11:50:10 +03:00
Kristian Ntavidi 1a6df44eeb Add deactivate guards in dataset editor and dmp editor. 2021-06-23 10:54:05 +03:00
Kristian Ntavidi d90ab00833 DMP Profile listing. Restyle import dialog 2021-06-22 17:51:00 +03:00
Kristian Ntavidi ad0853dc20 DMP profile editor. Basic restyle 2021-06-22 16:48:46 +03:00
Kristian Ntavidi e2f262b385 Popup dialog on locked DMP/Datasets overview / editors 2021-06-22 14:12:58 +03:00
Kristian Ntavidi c9b376f76c Restyle DMP profile listing (Admin Pages) 2021-06-22 13:00:58 +03:00
Kristian Ntavidi 72b18b7770 Remove mat select ellipses. Wrap text below. 2021-06-17 19:12:47 +03:00
Kristian Ntavidi 92b60c7c90 DMP editor. Show popup dialog when dmp is locked. 2021-06-17 12:52:01 +03:00
Kristian Ntavidi 9161dbda56 UI fixes and bug fixes
* Member of dmp cannot see dmp editor anymore. Redirects to overview
* Hide percentage bar in dmp editor when editor is disabled (when finalized or locked)
* Change font sizes on Resource page (static pages)
* Fix issue of indeterministic disabled on DMP editor.
2021-06-17 12:25:46 +03:00
Kristian Ntavidi 22ddc1311f Admin Template Edtor. UI fix: toolbox scroll till the end of the question card. 2021-06-16 16:10:48 +03:00
Kristian Ntavidi f4591549c2 Admin Dataset Template Editor and Dataset profile editor UI improvemenets.
[Admin Template Editor]:
* Add question underneath each question and in the table of contents
* "Make conditional question" changed position
* Small restyles in required toggler and question preview component
* Input icons update
* Scrolling on top of question

[Dataset Editor]:
* Show asterisk on required fields

Pt language updates
2021-06-16 15:52:39 +03:00
Kristian Ntavidi 54b2661ebd Ui fixes.
* Fix issue on table of contents in dataset editor. Invalid fields that are hidden via visibility rules, are not computed in in the validity of the tocEntry.
2021-06-15 09:58:51 +03:00
George Kalampokis e615c403d3 Final fix over storing array of data from Datasets 2021-06-14 18:01:04 +03:00
George Kalampokis dcf88479bd Allow to store and retrieve combobox multivalues with commas 2021-06-14 14:21:27 +03:00
Kristian Ntavidi add23dab2f Grant search fix.
* Change the way the single auto complete refreshes.
* Remove some unnecessary code.
2021-06-14 01:46:29 +03:00
Kristian Ntavidi d9826095bc Dmp editor. Fix issue on selecting grant after search. 2021-06-11 15:35:47 +03:00
Kristian Ntavidi bb80cfd300 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
#	dmp-frontend/src/assets/i18n/tr.json
2021-06-11 12:20:57 +03:00
Kristian Ntavidi a3c9df87df Add validate button on Dataset Wizard. Show in red invalid fieldsets in table of contents 2021-06-11 12:16:50 +03:00
Diamantis Tziotzios ef3c2e4e83 lang update 2021-06-08 20:26:45 +03:00
Diamantis Tziotzios f5d266554b Merge commit 'ca91c14114b8994d41fdf2b97fc6d1a4d82ffa4e' 2021-05-19 14:22:47 +03:00
Diamantis Tziotzios 5483847754 culture service workaround 2021-05-19 14:22:03 +03:00
Diamantis Tziotzios ca91c14114 pt lang update 2021-05-12 13:56:14 +03:00
Kristian Ntavidi 29ad55b3f8 Invitation fix.
Fixing  issue when user opens invitation without being logged id.
2021-05-11 11:50:25 +03:00
Kristian Ntavidi 9eb1c12afd DMP Overview. Provide user feedback of invalid datasets on finalize. Prevent user from submitting invalid Datasets. 2021-05-10 15:51:10 +03:00
Kristian Ntavidi c157ecc4e7 Admin template editor. Fix invalid visibility rules case. 2021-05-05 15:50:20 +03:00
Kristian Ntavidi 9ccae4d2c7 Admin template Editor. Temporary patch. Make value unrequired in visibility rules. 2021-05-05 13:04:30 +03:00
Kristian Ntavidi b825a80e61 DMP Editor patch: Form is not invalid invalid anymore when change from createnew funder to existing 2021-04-30 16:42:59 +03:00
Kristian Ntavidi b82398d97e DMP Editor. Organizations identifier query params patch. 2021-04-30 16:14:13 +03:00
George Kalampokis a155f2cbec Allow to search organizations based on reference 2021-04-30 15:25:31 +03:00
Kristian Ntavidi a8f75aafb9 DMP Editor. Prefixing queries on searching existing identifiers. 2021-04-30 14:34:28 +03:00
George Kalampokis 8a7cfab3b8 Fix various issues 2021-04-30 13:10:11 +03:00
Kristian Ntavidi b486a27e48 Unique identifiers(in references) on on researchers, organisations, funders, grants, projects (frontend) ( !! Needs configurationw with backend ). Backend error messages translate to PT. 2021-04-30 10:57:13 +03:00
Kristian Ntavidi 57910d8271 Sort languages alphabetically 2021-04-28 12:16:08 +03:00
Kristian Ntavidi e9e953aee3 Bug fixes and language updates.
Admin Templates listing table fix. When a filter is applied, gets you to the first page. Total templates number fix .
Admin Template Editor. Enable editing Description in finalized templates.
Dataset wizard. Fix NaN in total progress when finalized. (remove all edit/save actions).
Portuguese language update.
2021-04-27 23:33:30 +03:00
George Kalampokis 77bcb95ad7 Fix issues when cloning dataset templates 2021-04-27 10:38:20 +03:00
Kristian Ntavidi c6b8ad5639 Adrim template editor. Save and discard buttons on the left side. 2021-04-14 09:57:30 +03:00
Kristian Ntavidi 66d9f41081 Admin template editor. Move save/delete/update buttons on top. Add "Back to top" button. 2021-04-13 16:27:29 +03:00
Kristian Ntavidi e801bbf2e2 User Dataset Editor. Table of contents loads properly on saved template. Table of contents and tempalte description have the same visibilityRules service. 2021-04-13 11:19:09 +03:00