Commit Graph

3383 Commits

Author SHA1 Message Date
George Kalampokis 72507dd1b8 Fix issue with DMP json export if it have been imported from json 2022-03-29 10:57:06 +03:00
argirok 35ea0b5d6c Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development 2022-03-29 10:32:39 +03:00
argirok f1746e49ff Add Croatia in contributors 2022-03-29 10:25:04 +03:00
Konstantina Galouni 5ceea10c49 #7638: [Bug fix] dmp-finalize-dialog.component.html: Truncate text and show tooltip with full dataset title. 2022-03-28 18:00:14 +03:00
Konstantina Galouni 650e0ceb06 #7636: [Bug fix] Copy dataset from latest activity or dataset listing: Reverting some changes from commit:b6c28be3b3
1. DatasetListingModel.java: Added  field DatasetProfileOverviewModel profile, getter/setter and set profile in methods "fromDataModel()" and "toDataModel()".
2. RecentActivityModel.java: Added field DatasetProfileOverviewModel profile and getter/setter.
3. RecentDatasetModel.java: Set profile in methods "fromEntity()" and "fromDmpEntity()".
2022-03-28 17:02:57 +03:00
Bernaldo Mihasi 78895a1df1 no message 2022-03-24 09:43:13 +02:00
argirok 1f71681fa2 add link to RDA specifications - pop up and user guide 2022-03-23 16:21:14 +02:00
argirok 62b60b93a8 URLConfiguration add FilterType. When filterType is "local" the filtering is applied in argos backend - not throught the API 2022-03-23 16:03:42 +02:00
George Kalampokis 864b4bfec8 Make rda mapping more lax 2022-03-22 16:40:51 +02:00
Bernaldo Mihasi 116f9b99ea fix tags - distribution_format word export 2022-03-22 14:03:22 +02:00
Konstantina Galouni 8734d7c1ba #7528: Fixes in exporting images to document.
WordBuilder.java: Use media types instead of file extension for IMAGE_TYPE_MAP | Calculate image dimensions inside document according to its initial ratio and remove from page size the top, bottom, left, right margins.
2022-03-21 18:19:51 +02:00
Bernaldo Mihasi 835ccaab89 Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development 2022-03-18 16:58:27 +02:00
Bernaldo Mihasi ba55881830 image export: pixels to points 2022-03-18 16:55:41 +02:00
argirok d2ac550478 add croatian language in other language files 2022-03-18 15:54:37 +02:00
argirok 0393951abe add latest changes in the croatian language file 2022-03-18 15:54:37 +02:00
argirok de5d8a9553 add croatian language file 2022-03-18 15:37:11 +02:00
George Kalampokis 3101cf0e42 Optimize image export 2022-03-17 17:08:45 +02:00
George Kalampokis 3c00d47407 Fix critical issue with dataset saving 2022-03-17 17:07:18 +02:00
Bernaldo Mihasi 65b4e58aad attach images in word export 2022-03-17 10:47:50 +02:00
Konstantina Galouni 7f9e12c731 Tiff image type added in file upload types | Language files updated.
1. dataset-profile-editor-upload-field.component.ts: Added image/tiff media type in available types for Upload.
2. en.json: Updated literals for "Upload" file field type and removed literals for "Table" field type, because the field is not ready yet.
3. de.json, es.json, gr.json, pt.json, sk.json, sr.json, tr.json: Added literals for "Upload" file field type.
2022-03-16 17:54:06 +02:00
Konstantina Galouni 9671a827df Added empty folder uploads 2022-03-16 13:14:36 +02:00
Konstantina Galouni 63e27b1d4a Remove .gitkeep file 2022-03-16 13:11:06 +02:00
Konstantina Galouni 5f89c26844 Added empty folder uploads 2022-03-16 13:06:31 +02:00
Konstantina Galouni 9ab9e6abc9 #7528: [NEW] Upload files field type - frontend.
1. dataset-profile-field-view-style.ts: Include "upload" field type.
2. field-data.ts: Export interface UploadFieldData.
3. config.json: Added new property "maxFileSizeInMB":10.
4. configuration.service.ts: Added _maxFileSizeInMB field and getter for it.
5. enum-utils.service.ts: Added cases for upload and table (not ready, to be added) field types.
6. rich-text-editor.module.ts: [Bug fix] Removed import of HttpClientModule (this is imported only once in order to work with interceptor).
7. field-editor-model.ts & dataset-profile-editor.component.ts: Added case and validators for "upload" field type.
8. dataset-profile.module.ts: Imports for upload.
9.dataset-profile-editor-composite-field.component & dataset-profile-editor-field.component: Added button for upload.
10. form-field.component: Added functionality for uploading and downloading files.
11. dataset-description-form.module.ts: Added "FileService" provider and import of "NgxDropzoneModule".
12. en.json: New literals for upload and table (to be added in other language files too).
13. New files for upload field type: file.service.ts, upload-field-data-editor-model.ts, dataset-profile-editor-upload-field.component.html, dataset-profile-editor-upload-field.component.ts, dataset-profile-editor-upload-field.component.scss
2022-03-16 13:00:03 +02:00
Konstantina Galouni 2a9d8b8296 #7528: [NEW] Upload files field type.
1. Datasets.java: In "delete()" method, call also fileManager.markAllFilesOfEntityIdAsDeleted.
2. DatasetManager.java: Added method "deleteOldFilesAndAddNew()" which is called by "createOrUpdate()", to mark as deleted files that are not used any more and save the new ones.
3. DatabaseRepository.java & DatabaseRepositoryImpl.java: Include in DAOs FileUploadDAO.
4. ModelBuilder.java & ViewStyle.java: Incluse "upload" field type.
5. field-data.ts:
	a. In "getOrdinal()" method return Integer instead of int.
	b. In "getValidations()" method added null check.
	c. In methods "fromJsonObject()" and "toMap()" added special if clauses for "upload" field type.
6. application.properties:
   a. Added property "file.storage", to set the folder where the files will be permanently saved.
   b. Changed default spring.servlet.multipart.max-file-size and pring.servlet.multipart.max-request-size to 10 MB.
7. UserInvitationController.java: Deleted a print in System.out.
8. New files for upload field type: FileUploadDao.java, FileUploadDaoImpl.java, FileUpload.java, PostgreSQLEnumType.java (necessary for the enum EntityType), FileController.java, FileManager.java, UploadData.java.
2022-03-16 12:14:08 +02:00
Konstantina Galouni 744160c84a Add in DB table UploadFile 2022-03-16 11:32:06 +02:00
George Kalampokis dc06ba9201 Allow to return DMP with no Datasets for the Dataset Editor 2022-03-15 17:58:01 +02:00
George Kalampokis 4e0402df95 Fix issue with prefilling Mapper and empty array values 2022-03-15 17:55:40 +02:00
George Kalampokis 563711eae4 Fix issue saving tags from template when the field is a textField 2022-03-15 17:52:58 +02:00
George Kalampokis d3a1e85ba9 Fix issue with keeping non Admin users on Dataset Templates 2022-03-08 13:37:26 +02:00
George Kalampokis 56499223cf Fix issue with Grant authentication 2022-03-02 17:51:41 +02:00
George Kalampokis 75fc8a1d13 Update some entities based on the Db configuration 2022-03-02 17:51:17 +02:00
George Kalampokis 608c4f3fc0 Add get Parent values on json Searcher 2022-03-02 10:56:28 +02:00
George Kalampokis 5ea8b9b964 Minor fix for visibility Rules Service 2022-03-01 17:14:02 +02:00
George Kalampokis 1e572b3214 Fix issue with prefilling mapping 2022-03-01 17:11:14 +02:00
Konstantina Galouni 1dfcad7e88 dataset-profile-editor.component.html: #7519 (Additional commit) On "viewOnly" mode - finalized dataset template, change the "Save" button (left) to "Update", make it clickable and work as the "Update" button (top right on the last step) already does. 2022-03-01 15:25:14 +02:00
George Kalampokis f373c9016e Merge remote-tracking branch 'origin/Development' into Development 2022-03-01 14:40:09 +02:00
George Kalampokis ea72f64ed4 Replace DB DOIFunder with a json config file 2022-03-01 14:37:49 +02:00
Konstantina Galouni b68ede8cd7 #7518 & #7519: [Bug fix] in Required indication in Rich Text Area fields & editable general info on dataset template new version & date with time shown in dataset templates.
1. rich-text-editor.component.scss: Css for .editor-wrapper .disabled added.
2. rich-text-editor.component.ts: New "editable" Input() field added, to allow rich text area to be disabled and not editable.
3. dataset-profile-editor.component.html:
   a. In <rich-text-editor-component> set [editable]="form.controls['description'].status !== 'DISABLED'"
   b. #7518 Show required message and css  in rich text area when there is error "required" and description is touched (not dirty)
4. dataset-profile-editor.component.ts: #7519 comment disable of form controls label (title), description and language.
5. dataset-profile-listing.component.html: #7519 Time added in created column of dataset templates.
6. dataset-editor.component.html & form-field.component.html: #7518 Show required message and css  in rich text area when there is error "required" and description is touched (not dirty).
7. clone-dialog.component.html: Replaced <textarea> with <rich-text-editor-component> for description field.
8. clone-dialog.module.ts: Import RichTextEditorModule.
9. clone-dialog.component.ts: #7519 comment disable of form group label (title)
10. styles.scss: Css for class .form-field-subscript-wrapper updated.
2022-02-28 18:08:38 +02:00
George Kalampokis c3aff92cd4 Don't include Funder if it's not in the Doi Funder Table 2022-02-28 16:28:31 +02:00
George Kalampokis 5a3f871c58 Remove various unnecessary info messages 2022-02-28 15:24:10 +02:00
George Kalampokis 9f88bdae69 Possible fix for twitter login (part 2) 2022-02-24 15:45:19 +02:00
George Kalampokis 8d1c73deba Possible fix for twitter login 2022-02-24 15:42:36 +02:00
George Kalampokis 93aa2d36e5 Fix another issue with login 2022-02-24 10:47:12 +02:00
George Kalampokis 69a94fa236 Make email nullable field 2022-02-23 12:02:03 +02:00
George Kalampokis 94a225cf9f Add Description on Dataset Export 2022-02-22 16:39:35 +02:00
Bernaldo Mihasi 494ee47620 zenodo prefilling customizations 2022-02-22 15:53:25 +02:00
George Kalampokis 3c42ee3531 Improve tags pre-filling mapping 2022-02-22 14:15:51 +02:00
Bernaldo Mihasi 0bd08c2fac fixed tag prefilling 2022-02-22 14:00:22 +02:00
George Kalampokis 817ee9b44d Fixed ParsedTags 2022-02-22 13:39:52 +02:00