From 16af9e8f3ed567828c8f73893e64fa8ff1cfc9a1 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 3 Jul 2020 14:00:23 +0300 Subject: [PATCH] Fixes bug on loadMore and fixes spelling on recent activities --- .../core/services/dashboard/dashboard.service.ts | 2 +- .../app/ui/dashboard/drafts/drafts.component.html | 2 +- .../recent-edited-activity.component.html | 2 +- .../recent-edited-activity.component.ts | 4 ++-- .../recent-edited-dataset-activity.component.html | 2 +- .../recent-edited-dmp-activity.component.html | 2 +- dmp-frontend/src/assets/css/demo.css | 13 +++++++++++-- dmp-frontend/src/assets/i18n/en.json | 4 +++- dmp-frontend/src/assets/i18n/es.json | 4 +++- dmp-frontend/src/assets/i18n/gr.json | 4 +++- 10 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dmp-frontend/src/app/core/services/dashboard/dashboard.service.ts b/dmp-frontend/src/app/core/services/dashboard/dashboard.service.ts index 93377f52b..2fb3a672f 100644 --- a/dmp-frontend/src/app/core/services/dashboard/dashboard.service.ts +++ b/dmp-frontend/src/app/core/services/dashboard/dashboard.service.ts @@ -28,7 +28,7 @@ export class DashboardService { return this.http.get(this.actionUrl + 'me/getStatistics', { headers: this.headers }); } - getRecentAcitvity(request: DataTableRequest): Observable { + getRecentActivity(request: DataTableRequest): Observable { return this.http.post(this.actionUrl + 'recentActivity', request, {headers: this.headers}); } } diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html index eb053a3c7..aca54fa5f 100644 --- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html +++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html @@ -59,7 +59,7 @@ -
+
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html index d4bb29370..3945e5cc0 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html @@ -130,7 +130,7 @@
-
+
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts index aeaa2088e..ddd1c7167 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts @@ -67,7 +67,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn allDataTableRequest.criteria = new RecentActivityCriteria(); allDataTableRequest.criteria.like = ""; this.dashboardService - .getRecentAcitvity(allDataTableRequest) + .getRecentActivity(allDataTableRequest) .subscribe(response => { this.allRecentActivities = response; this.totalCountRecentEdited.emit(this.pageSize); @@ -370,7 +370,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn request.criteria = new RecentActivityCriteria(); request.criteria.like = ""; - this.dashboardService.getRecentAcitvity(request).pipe(takeUntil(this._destroyed)).subscribe(result => { + this.dashboardService.getRecentActivity(request).pipe(takeUntil(this._destroyed)).subscribe(result => { if (!result) { return []; } this.allRecentActivities = this.allRecentActivities.concat(result); }); diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html index b555cdc02..7a3b48a1f 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html @@ -61,7 +61,7 @@ -
+
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html index 9add5f9a7..a495e9052 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html @@ -67,7 +67,7 @@ -
+
diff --git a/dmp-frontend/src/assets/css/demo.css b/dmp-frontend/src/assets/css/demo.css index b8c55e631..efae1933a 100644 --- a/dmp-frontend/src/assets/css/demo.css +++ b/dmp-frontend/src/assets/css/demo.css @@ -409,8 +409,8 @@ textarea { p { text-align: left; font-family: 'Roboto', sans-serif; - font-weight: 300; - font-size: 1.25rem; + /* font-weight: 300; + font-size: 1.25rem; */ letter-spacing: 0px; color: #212121; } @@ -648,6 +648,15 @@ hr { padding-right: .5rem; } +.btn-load-more { + border: 2px solid #212121; + border-radius: 30px; + opacity: 1; + width: 132px; + height: 40px; + margin-top: 4.125rem; +} + @media (min-width: 576px) { .container { max-width: 540px; diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index db1b97c8b..9393ad549 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -397,7 +397,9 @@ "VERSION": "Version", "CONTAINED-DATASETS": "Contained Dataset Descriptions", "TEXT-INFO": "Information in a DMP show how datasets have been collected and/or generated, how they have been processed and analysed, i.e. using which tools, standards, methodologies etc, but also where and how datasets are backed up, published and preserved, including any costs associated with personnel dedicated for data curation/ stewardship activities or costs for acquiring or building data management services.", - "TEXT-INFO-QUESTION": "Not sure how a DMP looks in practice? Browse Public DMPs and LIBER community in Zenodo to get an idea!", + "TEXT-INFO-QUESTION": "Not sure how a DMP looks in practice? Browse Public DMPs and", + "LINK-ZENODO": "LIBER community in Zenodo", + "GET-IDEA": "to get an idea!", "COLUMNS": { "NAME": "Name", "GRANT": "Grant", diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index 70de7834e..14d5538ed 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -396,7 +396,9 @@ "VERSION": "Versión", "CONTAINED-DATASETS": "Descripción del Dataset contenidos", "TEXT-INFO": "Information in a DMP show how datasets have been collected and/or generated, how they have been processed and analysed, i.e. using which tools, standards, methodologies etc, but also where and how datasets are backed up, published and preserved, including any costs associated with personnel dedicated for data curation/ stewardship activities or costs for acquiring or building data management services. Not sure how a DMP looks in practice? Browse Public DMPs and LIBER community in Zenodo to get an idea!", - "TEXT-INFO-QUESTION": "Not sure how a DMP looks in practice? Browse Public DMPs and LIBER community in Zenodo to get an idea!", + "TEXT-INFO-QUESTION": "Not sure how a DMP looks in practice? Browse Public DMPs and", + "LINK-ZENODO": "LIBER community in Zenodo", + "GET-IDEA": "to get an idea!", "COLUMNS": { "NAME": "Nombre", "GRANT": "Subvención", diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json index 4f82d9214..0004865c3 100644 --- a/dmp-frontend/src/assets/i18n/gr.json +++ b/dmp-frontend/src/assets/i18n/gr.json @@ -396,7 +396,9 @@ "VERSION": "Έκδοση", "CONTAINED-DATASETS": "Δεδομένα που συμπεριλαμβάνει", "TEXT-INFO": "Information in a DMP show how datasets have been collected and/or generated, how they have been processed and analysed, i.e. using which tools, standards, methodologies etc, but also where and how datasets are backed up, published and preserved, including any costs associated with personnel dedicated for data curation/ stewardship activities or costs for acquiring or building data management services. Not sure how a DMP looks in practice? Browse Public DMPs and LIBER community in Zenodo to get an idea!", - "TEXT-INFO-QUESTION": "Not sure how a DMP looks in practice? Browse Public DMPs and LIBER community in Zenodo to get an idea!", + "TEXT-INFO-QUESTION": "Not sure how a DMP looks in practice? Browse Public DMPs and", + "LINK-ZENODO": "LIBER community in Zenodo", + "GET-IDEA": "to get an idea!", "COLUMNS": { "NAME": "Τίτλος", "GRANT": "Επιχορήγηση",