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

Replace last visited table by last edited table

This commit is contained in:
apapachristou 2019-05-06 10:01:26 +03:00
parent f0bedb1c71
commit ffbcd91c54
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dmp-frontend/src/app/ui/dashboard/dashboard.component.html
View File

@ -57,16 +57,16 @@
</div> </div>
</div> </div>
<div class="row"> <!-- <div class="row">
<div class="col-lg-12 col-md-12"> <div class="col-lg-12 col-md-12">
<app-recent-visited-activity></app-recent-visited-activity> <app-recent-visited-activity></app-recent-visited-activity>
</div> </div>
</div> </div> -->
<!-- <div class="row"> <div class="row">
<div class="col-lg-12 col-md-12"> <div class="col-lg-12 col-md-12">
<app-recent-edited-activity></app-recent-edited-activity> <app-recent-edited-activity></app-recent-edited-activity>
</div> </div>
</div> --> </div>
</div> </div>

10
dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
View File

@ -8,7 +8,8 @@
{{ 'RECENT-ACTIVITY.LICENSE' | translate}} {{ 'RECENT-ACTIVITY.LICENSE' | translate}}
</p> </p>
</div> </div>
<div class="view-all" [class.clickable]="isAuthenticated()" (click)="navigateToUrl()">{{ 'GENERAL.ACTIONS.VIEW-ALL' | translate}}</div> <div class="view-all" [class.clickable]="isAuthenticated()" (click)="navigateToUrl()">
{{ 'GENERAL.ACTIONS.VIEW-ALL' | translate}}</div>
</div> </div>
<div class="card-body table-responsive"> <div class="card-body table-responsive">
<table class="table table-hover"> <table class="table table-hover">
@ -19,11 +20,12 @@
<th>{{ 'DATASET-PROFILE-LISTING.COLUMNS.ROLE' | translate }}</th> <th>{{ 'DATASET-PROFILE-LISTING.COLUMNS.ROLE' | translate }}</th>
<th>{{ 'DATASET-PROFILE-LISTING.COLUMNS.ORGANIZATION' | translate }}</th> <th>{{ 'DATASET-PROFILE-LISTING.COLUMNS.ORGANIZATION' | translate }}</th>
<th>{{ 'DATASET-PROFILE-LISTING.COLUMNS.STATUS' | translate }}</th> <th>{{ 'DATASET-PROFILE-LISTING.COLUMNS.STATUS' | translate }}</th>
<th>{{ 'DATASET-PROFILE-LISTING.COLUMNS.VISITED' | translate }}</th> <th>{{ 'DATASET-PROFILE-LISTING.COLUMNS.EDITED' | translate }}</th>
<th></th> <th></th>
</thead> </thead>
<tbody *ngIf="dmpActivities != null"> <tbody *ngIf="dmpActivities != null">
<tr (click)="redirect(activity.id, recentActivityTypeEnum.Dmp)" *ngFor="let activity of dmpActivities" style="cursor: pointer;"> <tr (click)="redirect(activity.id, recentActivityTypeEnum.Dmp)" *ngFor="let activity of dmpActivities"
style="cursor: pointer;">
<td>{{ activity.label }}</td> <td>{{ activity.label }}</td>
<td> <td>
<div class="template-name"> <div class="template-name">
@ -41,7 +43,7 @@
<td *ngIf="activity.status === 0" style="padding-left: 12px"> <td *ngIf="activity.status === 0" style="padding-left: 12px">
{{ enumUtils.toDmpStatusString(activity.status) }} {{ enumUtils.toDmpStatusString(activity.status) }}
</td> </td>
<td>{{ activity.creationTime | date: "shortDate" }}</td> <td style="padding-left: 12px">{{ activity.creationTime | date: "shortDate" }}</td>
<td><i class="material-icons more-icon">more_horiz</i></td> <td><i class="material-icons more-icon">more_horiz</i></td>
</tr> </tr>
</tbody> </tbody>

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

@ -339,6 +339,7 @@
"ORGANIZATION": "Organization", "ORGANIZATION": "Organization",
"STATUS": "Status", "STATUS": "Status",
"VISITED": "Visited", "VISITED": "Visited",
"EDITED": "Edited",
"DESCRIPTION": "Description", "DESCRIPTION": "Description",
"CREATED": "Created", "CREATED": "Created",
"ACTIONS": "Actions", "ACTIONS": "Actions",
@ -490,7 +491,8 @@
}, },
"DMP": { "DMP": {
"LIKE": "Search DMPs", "LIKE": "Search DMPs",
"PROJECTS": "Projects" "PROJECTS": "Projects",
"SELECT-PROJECTS": "Select Projects"
}, },
"USERS": { "USERS": {
"LABEL": "Search", "LABEL": "Search",