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

When clicking the Datasets icon & number, the user should be navigated to the Datasets listing page and the DPM filter should be set. (Ticket #80)

This commit is contained in:
apapachristou 2019-05-15 09:57:10 +03:00
parent 99fc3df7fa
commit 9c0be255c3
5 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,8 +40,10 @@
<mat-icon class="gray-icon pt-2">settings</mat-icon> <mat-icon class="gray-icon pt-2">settings</mat-icon>
<h4 class="mt-2 ml-1 mr-3 p-1">OWNER</h4> <h4 class="mt-2 ml-1 mr-3 p-1">OWNER</h4>
<mat-icon class="gray-icon pt-2">storage</mat-icon> <div class="datasets-counter">
<h4 class="length mt-2 ml-1 mr-3 p-1">{{dmp.datasets.length}}</h4> <mat-icon (click)="$event.stopImmediatePropagation(); datasetClicked(dmp)" class="gray-icon pt-2">storage</mat-icon>
<h4 (click)="$event.stopImmediatePropagation(); datasetClicked(dmp)" class="mt-2 ml-1 mr-3 p-1">{{dmp.datasets.length}}</h4>
</div>
<mat-icon class="gray-icon pt-2">assignment</mat-icon> <mat-icon class="gray-icon pt-2">assignment</mat-icon>
<div *ngFor="let profile of dmp.associatedProfiles" class="pt-1"> <div *ngFor="let profile of dmp.associatedProfiles" class="pt-1">

12
dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss
View File

@ -25,8 +25,16 @@
flex-wrap: wrap; flex-wrap: wrap;
} }
.about-item .length { // .about-item .length {
color: rgb(70, 135, 240); // color: rgb(70, 135, 240);
// }
.datasets-counter {
display: flex;
}
.datasets-counter :hover {
color: #4687e6 !important;
} }
.about-item .title { .about-item .title {

15
dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
View File

@ -2,8 +2,15 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { DmpListingModel } from '../../../../core/model/dmp/dmp-listing'; import { DmpListingModel } from '../../../../core/model/dmp/dmp-listing';
import { MatDialog } from '@angular/material'; import { MatDialog } from '@angular/material';
import { DmpInvitationDialogComponent } from '../../invitation/dmp-invitation.component'; import { DmpInvitationDialogComponent } from '../../invitation/dmp-invitation.component';
import { Router } from '@angular/router'; import { Router, ActivatedRoute } from '@angular/router';
import { ProjectListingModel } from '../../../../core/model/project/project-listing'; import { ProjectListingModel } from '../../../../core/model/project/project-listing';
import { RequestItem } from '../../../../core/query/request-item';
import { TagCriteria } from '../../../../core/query/tag/tag-criteria';
import { DmpCriteria } from '../../../../core/query/dmp/dmp-criteria';
import { DatasetCriteria } from '../../../../core/query/dataset/dataset-criteria';
import { DmpService } from '../../../../core/services/dmp/dmp.service';
import { DatasetService } from '../../../../core/services/dataset/dataset.service';
import { DataTableRequest } from '../../../../core/model/data-table/data-table-request';
@Component({ @Component({
selector: 'app-dmp-listing-item-component', selector: 'app-dmp-listing-item-component',
@ -18,7 +25,7 @@ export class DmpListingItemComponent implements OnInit {
isDraft: boolean; isDraft: boolean;
constructor(private router: Router, private dialog: MatDialog) { } constructor(private router: Router, private dialog: MatDialog, private route: ActivatedRoute, private datasetService: DatasetService) { }
ngOnInit() { ngOnInit() {
if (this.dmp.status == 0) { this.isDraft = true } if (this.dmp.status == 0) { this.isDraft = true }
@ -55,4 +62,8 @@ export class DmpListingItemComponent implements OnInit {
projectClicked(projectId: String) { projectClicked(projectId: String) {
this.router.navigate(['/projects/edit/' + projectId]); this.router.navigate(['/projects/edit/' + projectId]);
} }
datasetClicked(dmp: DmpListingModel) {
this.router.navigate(['/datasets'], { queryParams: { dmpId: dmp.id } });
}
} }

23
dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css
View File

@ -1,21 +1,22 @@
.sidebar-footer { .sidebar-footer {
padding: white; padding: white;
color: rgb(117, 117, 117); color: rgb(117, 117, 117);
/* background-color: #ffffff; */ /* background-color: #ffffff; */
/* box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 255, 255, 0.4); */ /* box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 255, 255, 0.4); */
} }
.sidebar-footer .option { .sidebar-footer .option {
margin: 0px; margin: 0px;
padding-top: 2px; padding-top: 2px;
padding-bottom: 2px; padding-bottom: 2px;
padding-right: 10px; padding-right: 10px;
border-radius: 0px; border-radius: 0px;
color: white;
} }
.sidebar-footer .vl { .sidebar-footer .vl {
border-right: 1px solid #d4d4d4; border-right: 1px solid #d4d4d4;
color: white; color: white;
} }
.option .style-icon { .option .style-icon {

2
dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html
View File

@ -4,5 +4,5 @@
Glossary Glossary
</a> </a>
<a class="option vl" href="#"><i class="fa fa-book style-icon"></i>Guide</a> <a class="option vl" href="#"><i class="fa fa-book style-icon"></i>Guide</a>
<a class="option vl" href="#"><i class="fa fa-life-ring style-icon"></i>Help</a> <a class="option" href="#"><i class="fa fa-life-ring style-icon"></i>Help</a>
</div> </div>