MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Shows finalized Date on Dmp and Dataset listing

This commit is contained in:
apapachristou 2019-06-04 12:53:35 +03:00
parent 147eb2ce44
commit 978e2d67d0
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
View File

@ -14,4 +14,5 @@ export interface DatasetListingModel {
status: Number; status: Number;
created: Date; created: Date;
modified: Date; modified: Date;
finalizedDat: Date;
} }

1
dmp-frontend/src/app/core/model/dmp/dmp-listing.ts
View File

@ -11,6 +11,7 @@ export interface DmpListingModel {
profile: String; profile: String;
creationTime: String; creationTime: String;
modifiedTime: String; modifiedTime: String;
finalizedDat: Date;
organisations: String; organisations: String;
groupId: string; groupId: string;
version: number; version: number;

3
dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
View File

@ -36,7 +36,8 @@
<div class="pt-1"> <div class="pt-1">
<div matTooltip="{{ dataset.profile }}" class="chip ml-2 mr-2">{{ dataset.profile }}</div> <div matTooltip="{{ dataset.profile }}" class="chip ml-2 mr-2">{{ dataset.profile }}</div>
</div> </div>
<p>{{'DATASET-LISTING.COLUMNS.PUBLISHED' | translate}} {{ dataset.created | date: "shortDate"}}</p> <p *ngIf="isDraft">{{'DATASET-LISTING.COLUMNS.LAST-EDITED' | translate}} {{ dataset.modified | date: "shortDate"}}</p>
<p *ngIf="!isDraft">{{'DATASET-LISTING.COLUMNS.PUBLISHED' | translate}} {{ dataset.finalizedDat | date: "shortDate"}}</p>
</div> </div>
</div> </div>
<!-- <div class="info"> <!-- <div class="info">

3
dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html
View File

@ -56,7 +56,8 @@
<div *ngFor="let profile of dmp.associatedProfiles" class="pt-1"> <div *ngFor="let profile of dmp.associatedProfiles" class="pt-1">
<div matTooltip="{{profile.label}}" class="chip ml-2 mr-2">{{profile.label}}</div> <div matTooltip="{{profile.label}}" class="chip ml-2 mr-2">{{profile.label}}</div>
</div> </div>
<p>{{'DMP-PROFILE-LISTING.COLUMNS.PUBLISHED' | translate}} {{dmp.creationTime | date: "shortDate"}}</p> <p *ngIf="isDraft">{{'DMP-PROFILE-LISTING.COLUMNS.LAST-EDITED' | translate}} {{dmp.modifiedTime | date: "shortDate"}}</p>
<p *ngIf="!isDraft">{{'DMP-PROFILE-LISTING.COLUMNS.PUBLISHED' | translate}} {{dmp.finalizedDat | date: "shortDate"}}</p>
</div> </div>
</div> </div>
<!-- <div class="row d-flex align-items-center my-1"> <!-- <div class="row d-flex align-items-center my-1">

4
dmp-frontend/src/assets/i18n/en.json
View File

@ -339,6 +339,7 @@
"DESCRIPTION": "Description", "DESCRIPTION": "Description",
"CREATED": "Created", "CREATED": "Created",
"PUBLISHED": "Published", "PUBLISHED": "Published",
"LAST-EDITED": "Last Edited",
"ACTIONS": "Actions", "ACTIONS": "Actions",
"DMP": "Dmp", "DMP": "Dmp",
"PROFILE": "Profile", "PROFILE": "Profile",
@ -479,7 +480,8 @@
"NAME": "Name", "NAME": "Name",
"STATUS": "Status", "STATUS": "Status",
"CREATED": "Created", "CREATED": "Created",
"PUBLISHED": "Published" "PUBLISHED": "Published",
"LAST-EDITED": "Last Edited"
}, },
"UPLOAD": { "UPLOAD": {
"UPLOAD-XML": "Import", "UPLOAD-XML": "Import",