-
+
-
@@ -32,10 +29,7 @@
+
+
+
+
-
-
-
-
-
\ No newline at end of file
+-->
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
index 4e8e20359..943bc71cd 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
@@ -119,8 +119,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
.pipe(takeUntil(this._destroyed))
.subscribe(data => {
this.dmp = data;
- this.checkLockStatus(this.dmp.id);
- this.setIsUserOwner();
+ // this.checkLockStatus(this.dmp.id);
this.getAllVersions(this.dmp);
const breadCrumbs = [];
breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.PUBLIC-DMPS'), url: "/explore-plans" });
@@ -156,8 +155,10 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
}
isUserAuthor(userId: string): boolean {
- const principal: Principal = this.authentication.current();
- return userId === principal.id;
+ if (this.isAuthenticated()) {
+ const principal: Principal = this.authentication.current();
+ return userId === principal.id;
+ } else return false;
}
editClicked(dmp: DmpOverviewModel) {
diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.html b/dmp-frontend/src/app/ui/navbar/navbar.component.html
index cbc48d156..5f7074c62 100644
--- a/dmp-frontend/src/app/ui/navbar/navbar.component.html
+++ b/dmp-frontend/src/app/ui/navbar/navbar.component.html
@@ -19,8 +19,7 @@
{{ 'FAQ.TITLE' | translate }}
@@ -33,9 +32,7 @@
@@ -92,15 +86,87 @@
+
+
+
+
+
+
+ {{ 'ABOUT.WELCOME' | translate }}
+{{ 'ABOUT.WELCOME-MESSAGE' | translate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'DASHBOARD.LATEST-ACTIVITY' | translate}}
+ {{'DASHBOARD.EMPTY-LIST' | translate}}
+ {{'DASHBOARD.EMPTY-LIST' | translate}}
+ {{'DASHBOARD.EMPTY-LIST' | translate}}
+
+
+
+
+
+ {{'DASHBOARD.PERSONAL-USAGE' | translate}}
+ 0
+ {{'DASHBOARD.PUBLIC-DMPS' | translate}}
+ 0
+ {{'DASHBOARD.PUBLIC-DATASETS' | translate}}
+ 0
+ {{'DASHBOARD.GRANTS' | translate}}
+ 0
+ {{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}
+
+
+ {{'DASHBOARD.PERSONAL-USAGE' | translate}}
+
+ {{dashboardStatisticsData?.totalDataManagementPlanCount}}
+ {{'DASHBOARD.PUBLIC-DMPS' | translate}}
+
+ {{dashboardStatisticsData?.totalDataSetCount}}
+ {{'DASHBOARD.PUBLIC-DATASETS' | translate}}
+
+ {{dashboardStatisticsData?.totalGrantCount}}
+ {{'DASHBOARD.GRANTS' | translate}}
+
+ {{dashboardStatisticsData?.totalOrganisationCount}}
+ {{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}
+