Diamantis Tziotzios
e8aef281d4
Merge branch 'Development'
2024-02-22 11:09:31 +02:00
Bernaldo Mihasi
93c5918251
make grant funder not mandatory for the creation/new version/clone of dmp
2023-09-18 17:48:54 +03:00
Konstantina Galouni
e878310b72
#8834 : Home page: Drafts query for both Datasets and DMPs.
...
1. RecentActivityCriteria.java: Added in RecentActivityCriteria field "private Integer status;", to be able to get only drafts.
2. DashBoardManager.java: In method "getNewRecentActivity()", add in Dataset and DMP requests status in criteria.
2023-07-17 18:10:49 +03:00
Diamantis Tziotzios
b04b35d62b
Merge branch 'Development'
...
# Conflicts:
# dmp-backend/web/src/main/resources/RDACommonStandards.txt
2022-02-25 12:19:29 +02:00
George Kalampokis
b6c28be3b3
Optimize Dashboard's recent activity logic, removed various unused fields from Listing Models and implement toDataModel conversion logic in some models
2022-02-21 17:16:32 +02:00
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
George Kalampokis
de4c430d91
Fix issue with related datasets on dashboard
2021-12-03 16:49:23 +02:00
George Kalampokis
19aa2bd411
Fix critical issue with public datasets
2021-11-25 16:45:29 +02:00
George Kalampokis
fc71e95cf3
Make dataset queries to return distinct results (avoid duplicate Id issues)
2021-11-24 16:23:02 +02:00
George Kalampokis
1a821179db
Even more Fixes over dashboard's sorting
2021-10-12 18:06:14 +03:00
George Kalampokis
29919f981a
Fix issue with recent activity sorting
2021-10-12 15:41:20 +03:00
George Kalampokis
9919886c26
Fix issues with dataset sorting on Dashboard with Elasticsearch
2021-10-08 11:02:56 +03:00
George Kalampokis
c964af25b5
Fix critical issue with public dataset query
2021-08-23 11:48:29 +03:00
George Kalampokis
5de811a76d
Vastly improve and optimize DMP and Dataset Queries (and with elastic)
2021-08-04 18:38:49 +03:00
George Kalampokis
016acaaa0f
When counting organizations for the user count only the active ones
2021-07-19 18:34:29 +03:00
George Kalampokis
72d88d9db4
Fix listing issues and improve elastic query
...
(cherry picked from commit dcd7f24cac
)
2021-06-29 14:25:38 +03:00
George Kalampokis
dcd7f24cac
Fix listing issues and improve elastic query
2021-06-29 11:45:20 +03:00
George Kalampokis
b76a787972
Hide grants without any active dmp
2021-05-10 17:17:08 +03:00
George Kalampokis
1c876cbcca
RecentActivity can now be sorted by finalizedAt and publishedAt
2020-07-31 17:04:18 +03:00
George Kalampokis
f97546ff38
Add finalized RecentActivity sort function
2020-07-31 13:21:01 +03:00
George Kalampokis
168b634681
Fix minor authentication issue
2020-07-31 13:16:29 +03:00
George Kalampokis
f86ba70d24
Fixed consistency issues with the public statistics
2020-07-31 12:20:29 +03:00
George Kalampokis
eb8e4a96e6
Reworked Recent Activity ordering and force status to be ordered in reverse of the others
2020-07-27 18:16:32 +03:00
George Kalampokis
3b09bef7d5
Fixed minor issues with the elastic search on recent activity
2020-07-24 12:38:16 +03:00
George Kalampokis
9c9db0b646
Improve data integrity of recent Activity data retrieval and added elastic support to it
2020-07-24 12:12:54 +03:00
George Kalampokis
14df3a4bbe
Add dataset filter like in getPaged on DataManagementPlanManager
2020-07-22 15:40:07 +03:00
George Kalampokis
f3c1244600
Separate RecentActivityTableRequest's offset to dmp and dataset offset (backend)
2020-07-22 10:28:25 +03:00
George Kalampokis
a60151560b
Temporary removed async gets for datasets (TODO: make them async again)
2020-07-21 17:30:12 +03:00
George Kalampokis
f432caa584
When getting user statistics on the dashboard make sure the DMP count to be distinct
2020-07-06 14:18:42 +03:00
George Kalampokis
d51099cedc
Further fixes and improvements over recent activity
2020-07-03 13:55:25 +03:00
George Kalampokis
acf8b58728
Fixed and improved the recent activity manager
2020-07-03 12:18:53 +03:00
George Kalampokis
b57f6fb73c
Recent Activity controller will require a custom DataTable Request
2020-07-03 10:43:19 +03:00
George Kalampokis
325979a896
Add criteria for the recent activity model
2020-07-02 11:57:59 +03:00
George Kalampokis
f821938542
Created a new Recent Activity model and backend end-point that contains more details about it's objects
2020-06-30 16:59:06 +03:00
George Kalampokis
be6227a81d
Fixed issue with dmp index when creating a new version, and some othe minor dmp index issues
2020-04-07 18:41:25 +03:00
George Kalampokis
dcede0b1eb
Add Dmp Index (ref #252 ), compacted Dmp Listing so now both the user and the public listing will use one component (ref #253 ) and refactor operation context
2020-04-01 18:16:06 +03:00
George Kalampokis
1b0b84a7d2
If elastic index fail to retrieve datasets for the dashboard show directly from the DB
2020-03-30 15:33:30 +03:00
George Kalampokis
7082b958ac
Fix dashboard showing incorrect dmp and dataset counts
2020-03-18 11:22:10 +02:00
George Kalampokis
35b89edabc
Integrate Public Dataset Listing to regular Dataset Listing
2020-03-16 18:50:29 +02:00
gkolokythas
0f6583ca4b
Fixes bug on "Search bar" not fetching published DMP and published Dataset Descriptions.
2020-01-03 16:52:27 +02:00
gkolokythas
3a58234282
Fixes bug on Dataset Description listing, fetching extra wrong items when "Member" criteria was selected.
2019-12-19 13:08:20 +02:00
gkolokythas
816ed4dd65
Fixes bug not filter out deleted items of DMP and Dataset. Refactors redirect when selecting Grant from Search bar. (Issue #215 )
2019-12-16 12:18:49 +02:00
gkolokythas
ccb96aeb13
Fixes bug on DMP's filter Role.
2019-09-26 12:44:39 +03:00
gkolokythas
2008986daf
Fixes bug on public dashboard counting non public entities. (Issue #157 )
2019-09-18 16:16:14 +03:00
gkolokythas
feaec87b82
Renames "Project" to "Grant on backend. (Issue #145 )
2019-07-31 17:57:34 +03:00
gkolokythas
d5c1469a98
Adds the Organisations statistics on public Dashboard.
2019-05-15 18:39:05 +03:00
gkolokythas
11c1ac33cf
Adds the criteria on DMP listing and refactors the backend userInfo.
2019-05-10 11:33:48 +03:00
gkolokythas
b52225308d
Adds the number of Organisation on Dashboard statistcs.
2019-04-22 17:19:08 +03:00
Diamantis Tziotzios
a7f138c1ea
Fixes Project listing on Dashboard.
2019-03-15 18:06:55 +02:00
ikalyvas
0d16d694fa
Refactors dependency injection on backend services
2019-03-05 17:33:59 +02:00