-
+
clear

{{'DASHBOARD.DMP-ABOUT-BEG' | translate}} diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss index 7be22ca89..881873112 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss @@ -13,7 +13,8 @@ background: #ffffff 0% 0% no-repeat padding-box; box-shadow: 0px 3px 6px #00000029; border-radius: 4px; - width: 712px; + max-width: 712px; + min-width: 17.5rem; margin-bottom: 3.75rem; /* height: 407px; */ opacity: 1; 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 a48626cb8..85ff1e9f8 100644 --- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html +++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html @@ -21,7 +21,7 @@

- +
{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}
{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}
diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts index 138285ee3..7808892ef 100644 --- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts @@ -69,7 +69,7 @@ export class DraftsComponent extends BaseComponent implements OnInit { // const fields: Array = []; // fields.push('-modified'); this.formGroup.get('order').setValue(this.order.MODIFIED); - const fields: Array = ["-" + this.formGroup.get('order').value]; + const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; const dmpDataTableRequest: DataTableRequest = new DataTableRequest(0, 5, { fields: fields }); dmpDataTableRequest.criteria = new DatasetCriteria(); dmpDataTableRequest.criteria.status = DmpStatus.Draft; @@ -301,7 +301,7 @@ export class DraftsComponent extends BaseComponent implements OnInit { refresh(): void { // const fields: Array = []; // fields.push('-modified'); - const fields: Array = ["-" + this.formGroup.get('order').value]; + const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; this.startIndex = 0; const dmpDataTableRequest: DataTableRequest = new DataTableRequest(0, 5, { fields: fields }); dmpDataTableRequest.criteria = new DatasetCriteria(); @@ -317,7 +317,7 @@ export class DraftsComponent extends BaseComponent implements OnInit { public loadMore() { this.startIndex = this.startIndex + this.pageSize; // const fields: Array = ["-modified"]; - const fields: Array = ["-" + this.formGroup.get('order').value]; + const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; const request = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields }); request.criteria = new DatasetCriteria(); request.criteria.status = DmpStatus.Draft; 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 7e402570a..f638431c6 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 @@ -22,7 +22,7 @@
- +
{{ 'DMP-LISTING.DMP' | translate }}
{{ 'DMP-LISTING.EDITED' | translate }}: {{ activity.modified | date: "longDate" }}
@@ -90,7 +90,7 @@
- +
{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}
{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}
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 a822fe50a..6192039f0 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 @@ -75,12 +75,12 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn ngOnInit() { if (this.isAuthenticated()) { - const fields: Array = []; + this.formGroup.get('order').setValue(this.order.MODIFIED); + const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; // const fields: Array = ["-modified"]; const allDataTableRequest: DataTableMultiTypeRequest = new DataTableMultiTypeRequest(0, 0, 5, { fields: fields }); allDataTableRequest.criteria = new RecentActivityCriteria(); allDataTableRequest.criteria.like = ""; - this.formGroup.get('order').setValue(this.order.MODIFIED); allDataTableRequest.criteria.order = this.formGroup.get('order').value; this.dashboardService .getRecentActivity(allDataTableRequest) @@ -458,7 +458,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn } refresh(): void { - const fields: Array = []; + const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; // const fields: Array = ["-modified"]; this.startIndex = 0; const allDataTableRequest: DataTableMultiTypeRequest = new DataTableMultiTypeRequest(0, 0, this.pageSize, { fields: fields }); @@ -481,7 +481,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn } public loadMore() { - const fields: Array = []; + const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; // const fields: Array = ["-modified"]; const request = new DataTableMultiTypeRequest(this.dmpOffset, this.datasetOffset, this.pageSize, { fields: fields }); request.criteria = new RecentActivityCriteria(); 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 802b5895f..0d8902156 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 @@ -21,7 +21,7 @@
- +
{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}
{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts index 9760b3b34..c6406a645 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts @@ -66,7 +66,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen if (this.isAuthenticated()) { // const fields: Array = ["-modified"]; this.formGroup.get('order').setValue(this.order.MODIFIED); - const fields: Array = ["-" + this.formGroup.get('order').value]; + const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; const datasetDataTableRequest: DataTableRequest = new DataTableRequest(0, this.pageSize, { fields: fields }); datasetDataTableRequest.criteria = new DatasetCriteria(); datasetDataTableRequest.criteria.like = ""; @@ -88,7 +88,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen refresh(): void { // const fields: Array = ["-modified"]; - const fields: Array = ["-" + this.formGroup.get('order').value]; + const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; this.startIndex = 0; const datasetDataTableRequest: DataTableRequest = new DataTableRequest(0, this.pageSize, { fields: fields }); datasetDataTableRequest.criteria = new DatasetCriteria(); @@ -105,7 +105,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen public loadMore() { this.startIndex = this.startIndex + this.pageSize; // const fields: Array = ["-modified"]; - const fields: Array = ["-" + this.formGroup.get('order').value]; + const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; const request = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields }); request.criteria = new DatasetCriteria(); 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 43d543868..77a0cfb0e 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 @@ -21,7 +21,7 @@
- +
{{ 'DMP-LISTING.DMP' | translate }}
{{ 'DMP-LISTING.EDITED' | translate }}: {{ activity.modifiedTime | date: "longDate" }}
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts index 6c2910118..670df71fa 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts @@ -68,7 +68,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O if (this.isAuthenticated()) { // const fields: Array = ["-modified"]; this.formGroup.get('order').setValue(this.order.MODIFIED); - const fields: Array = ["-" + this.formGroup.get('order').value]; + const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; const dmpDataTableRequest: DataTableRequest = new DataTableRequest(0, 5, { fields: fields }); dmpDataTableRequest.criteria = new DmpCriteria(); dmpDataTableRequest.criteria.like = ""; @@ -345,7 +345,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O refresh(): void { // const fields: Array = ["-modified"]; - const fields: Array = ["-" + this.formGroup.get('order').value]; + const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; this.startIndex = 0; const dmpDataTableRequest: DataTableRequest = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields }); dmpDataTableRequest.criteria = new DmpCriteria(); @@ -362,7 +362,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O public loadMore() { this.startIndex = this.startIndex + this.pageSize; // const fields: Array = ["-modified"]; - const fields: Array = ["-" + this.formGroup.get('order').value]; + const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; const request = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields }); request.criteria = new DmpCriteria(); diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts index ab721751e..cbd17941c 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts @@ -152,7 +152,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB // let fields: Array = new Array(); // fields.push('-modified'); //if (this.sort && this.sort.active) { fields = this.sort.direction === 'asc' ? ['+' + this.sort.active] : ['-' + this.sort.active]; } - const fields: Array = ["-" + this.formGroup.get('order').value]; + const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; const request = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields }); this.criteria.isPublic = this.isPublic; request.criteria = this.criteria; @@ -168,7 +168,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB public loadMore() { this.startIndex = this.startIndex + this.pageSize; // const fields: Array = ["-modified"]; - const fields: Array = ["-" + this.formGroup.get('order').value]; + const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; const request = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields }); this.criteria.isPublic = this.isPublic; request.criteria = this.criteria; diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html index d3ef8fcbc..2c0ffa8b2 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html +++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html @@ -1,5 +1,5 @@
- +
{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}
{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{dataset.modified | date:"longDate"}}
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts index 1e91f56e9..9cbd9283f 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts @@ -185,7 +185,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread // let fields: Array = new Array(); // if (this.sort && this.sort.active) { fields = this.sort.direction === 'asc' ? ['+' + this.sort.active] : ['-' + this.sort.active]; } // fields.push('-modified'); - const fields: Array = ["-" + this.formGroup.get('order').value]; + const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; const request = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields }); this.setPublicCriteria(); @@ -209,7 +209,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread public loadMore() { this.startIndex = this.startIndex + this.pageSize; // const fields: Array = ["-modified"]; - const fields: Array = ["-" + this.formGroup.get('order').value]; + const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; const request = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields }); this.setPublicCriteria(); request.criteria = this.criteria; diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html index 807a4acd0..4af83d5d0 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html @@ -1,5 +1,5 @@