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 a421601bb..b86eb3f61 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
@@ -80,8 +80,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit { //IBr
//TODO refactor
// this.formGroup.get('order').setValue(this.order.PUBLISHED);
} else {
- //TODO refactor
- // this.formGroup.get('order').setValue(this.order.MODIFIED);
+ this.formGroup.get('order').setValue(this.order.UpdatedAt);
}
if (!this.isPublic && !this.authService.currentAccountIsAuthenticated()) {
this.router.navigateByUrl("/explore-plans");
@@ -163,6 +162,17 @@ export class DmpListingComponent extends BaseComponent implements OnInit { //IBr
this.refresh(this.lookup);
}
+ orderByChanged(){
+ if (this.formGroup.get('order').value == RecentActivityOrder.Status){
+ this.lookup.order = { items: ['-' + nameof
(x => x.status)] };
+ } else if(this.formGroup.get('order').value == RecentActivityOrder.Label){
+ this.lookup.order = { items: ['-' + nameof(x => x.label)] };
+ }else{
+ this.lookup.order = { items: ['-' + nameof(x => x.updatedAt)] };
+ }
+ this.refresh(this.lookup);
+ }
+
private refresh(lookup: DmpLookup) {
lookup.project = {
fields: [
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
index 73278bb9b..865bdce54 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
@@ -64,13 +64,13 @@
- {{ dmpReference.reference?.data?.name }},
- {{ dmpReference.reference?.data?.name }}
+ {{ dmpReference.reference?.label }},
+ {{ dmpReference.reference?.label }}
- {{ dmpReference.reference?.data?.name }},
- {{ dmpReference.reference?.data?.name }}
+ {{ dmpReference.reference?.label }},
+ {{ dmpReference.reference?.label }}