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

Merge remote-tracking branch 'origin/ui-redesign' into ui-redesign

This commit is contained in:
George Kalampokis 2020-07-03 16:12:41 +03:00
parent 372c9bb074 e315bee7f7
commit fa15ae8774
10 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/core/services/dashboard/dashboard.service.ts
View File

@ -28,7 +28,7 @@ export class DashboardService {
return this.http.get<DashboardStatisticsModel>(this.actionUrl + 'me/getStatistics', { headers: this.headers }); return this.http.get<DashboardStatisticsModel>(this.actionUrl + 'me/getStatistics', { headers: this.headers });
} }
getRecentAcitvity(request: DataTableRequest<RecentActivityCriteria>): Observable<RecentActivityModel[]> { getRecentActivity(request: DataTableRequest<RecentActivityCriteria>): Observable<RecentActivityModel[]> {
return this.http.post<RecentActivityModel[]>(this.actionUrl + 'recentActivity', request, {headers: this.headers}); return this.http.post<RecentActivityModel[]>(this.actionUrl + 'recentActivity', request, {headers: this.headers});
} }
} }

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

@ -59,7 +59,7 @@
</mat-menu> </mat-menu>
</div> </div>
</div> </div>
<div class="d-flex justify-content-center"> <div *ngIf="datasetDrafts && datasetDrafts.length > 0" class="d-flex justify-content-center">
<button type="button" class="btn-load-more" (click)="loadMore()">{{'GENERAL.ACTIONS.LOAD-MORE' | translate}}</button> <button type="button" class="btn-load-more" (click)="loadMore()">{{'GENERAL.ACTIONS.LOAD-MORE' | translate}}</button>
</div> </div>

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

@ -130,7 +130,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="d-flex justify-content-center"> <div *ngIf="allRecentActivities && allRecentActivities.length > 0" class="d-flex justify-content-center">
<button type="button" class="btn-load-more" (click)="loadMore()">{{'GENERAL.ACTIONS.LOAD-MORE' | translate}}</button> <button type="button" class="btn-load-more" (click)="loadMore()">{{'GENERAL.ACTIONS.LOAD-MORE' | translate}}</button>
</div> </div>
</div> </div>

4
dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
View File

@ -67,7 +67,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
allDataTableRequest.criteria = new RecentActivityCriteria(); allDataTableRequest.criteria = new RecentActivityCriteria();
allDataTableRequest.criteria.like = ""; allDataTableRequest.criteria.like = "";
this.dashboardService this.dashboardService
.getRecentAcitvity(allDataTableRequest) .getRecentActivity(allDataTableRequest)
.subscribe(response => { .subscribe(response => {
this.allRecentActivities = response; this.allRecentActivities = response;
this.totalCountRecentEdited.emit(this.allRecentActivities.length); this.totalCountRecentEdited.emit(this.allRecentActivities.length);
@ -370,7 +370,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
request.criteria = new RecentActivityCriteria(); request.criteria = new RecentActivityCriteria();
request.criteria.like = ""; request.criteria.like = "";
this.dashboardService.getRecentAcitvity(request).pipe(takeUntil(this._destroyed)).subscribe(result => { this.dashboardService.getRecentActivity(request).pipe(takeUntil(this._destroyed)).subscribe(result => {
if (!result) { return []; } if (!result) { return []; }
this.allRecentActivities = this.allRecentActivities.concat(result); this.allRecentActivities = this.allRecentActivities.concat(result);
}); });

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

@ -61,7 +61,7 @@
</mat-menu> </mat-menu>
</div> </div>
</div> </div>
<div class="d-flex justify-content-center"> <div *ngIf="datasetActivities && datasetActivities.length > 0" class="d-flex justify-content-center">
<button type="button" class="btn-load-more" (click)="loadMore()">{{'GENERAL.ACTIONS.LOAD-MORE' | translate}}</button> <button type="button" class="btn-load-more" (click)="loadMore()">{{'GENERAL.ACTIONS.LOAD-MORE' | translate}}</button>
</div> </div>
</div> </div>

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

@ -67,7 +67,7 @@
</mat-menu> </mat-menu>
</div> </div>
</div> </div>
<div class="d-flex justify-content-center"> <div *ngIf="dmpActivities && dmpActivities.length > 0" class="d-flex justify-content-center">
<button type="button" class="btn-load-more" (click)="loadMore()">{{'GENERAL.ACTIONS.LOAD-MORE' | translate}}</button> <button type="button" class="btn-load-more" (click)="loadMore()">{{'GENERAL.ACTIONS.LOAD-MORE' | translate}}</button>
</div> </div>
</div> </div>

13
dmp-frontend/src/assets/css/demo.css
View File

@ -409,8 +409,8 @@ textarea {
p { p {
text-align: left; text-align: left;
font-family: 'Roboto', sans-serif; font-family: 'Roboto', sans-serif;
font-weight: 300; /* font-weight: 300;
font-size: 1.25rem; font-size: 1.25rem; */
letter-spacing: 0px; letter-spacing: 0px;
color: #212121; color: #212121;
} }
@ -648,6 +648,15 @@ hr {
padding-right: .5rem; padding-right: .5rem;
} }
.btn-load-more {
border: 2px solid #212121;
border-radius: 30px;
opacity: 1;
width: 132px;
height: 40px;
margin-top: 4.125rem;
}
@media (min-width: 576px) { @media (min-width: 576px) {
.container { .container {
max-width: 540px; max-width: 540px;

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

@ -397,7 +397,9 @@
"VERSION": "Version", "VERSION": "Version",
"CONTAINED-DATASETS": "Contained Dataset Descriptions", "CONTAINED-DATASETS": "Contained Dataset Descriptions",
"TEXT-INFO": "Information in a DMP show how datasets have been collected and/or generated, how they have been processed and analysed, i.e. using which tools, standards, methodologies etc, but also where and how datasets are backed up, published and preserved, including any costs associated with personnel dedicated for data curation/ stewardship activities or costs for acquiring or building data management services.", "TEXT-INFO": "Information in a DMP show how datasets have been collected and/or generated, how they have been processed and analysed, i.e. using which tools, standards, methodologies etc, but also where and how datasets are backed up, published and preserved, including any costs associated with personnel dedicated for data curation/ stewardship activities or costs for acquiring or building data management services.",
"TEXT-INFO-QUESTION": "Not sure how a DMP looks in practice? Browse Public DMPs and LIBER community in Zenodo to get an idea!", "TEXT-INFO-QUESTION": "Not sure how a DMP looks in practice? Browse Public DMPs and",
"LINK-ZENODO": "LIBER community in Zenodo",
"GET-IDEA": "to get an idea!",
"COLUMNS": { "COLUMNS": {
"NAME": "Name", "NAME": "Name",
"GRANT": "Grant", "GRANT": "Grant",

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

@ -396,7 +396,9 @@
"VERSION": "Versión", "VERSION": "Versión",
"CONTAINED-DATASETS": "Descripción del Dataset contenidos", "CONTAINED-DATASETS": "Descripción del Dataset contenidos",
"TEXT-INFO": "Information in a DMP show how datasets have been collected and/or generated, how they have been processed and analysed, i.e. using which tools, standards, methodologies etc, but also where and how datasets are backed up, published and preserved, including any costs associated with personnel dedicated for data curation/ stewardship activities or costs for acquiring or building data management services. Not sure how a DMP looks in practice? Browse Public DMPs and LIBER community in Zenodo to get an idea!", "TEXT-INFO": "Information in a DMP show how datasets have been collected and/or generated, how they have been processed and analysed, i.e. using which tools, standards, methodologies etc, but also where and how datasets are backed up, published and preserved, including any costs associated with personnel dedicated for data curation/ stewardship activities or costs for acquiring or building data management services. Not sure how a DMP looks in practice? Browse Public DMPs and LIBER community in Zenodo to get an idea!",
"TEXT-INFO-QUESTION": "Not sure how a DMP looks in practice? Browse Public DMPs and LIBER community in Zenodo to get an idea!", "TEXT-INFO-QUESTION": "Not sure how a DMP looks in practice? Browse Public DMPs and",
"LINK-ZENODO": "LIBER community in Zenodo",
"GET-IDEA": "to get an idea!",
"COLUMNS": { "COLUMNS": {
"NAME": "Nombre", "NAME": "Nombre",
"GRANT": "Subvención", "GRANT": "Subvención",

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

@ -396,7 +396,9 @@
"VERSION": "Έκδοση", "VERSION": "Έκδοση",
"CONTAINED-DATASETS": "Δεδομένα που συμπεριλαμβάνει", "CONTAINED-DATASETS": "Δεδομένα που συμπεριλαμβάνει",
"TEXT-INFO": "Information in a DMP show how datasets have been collected and/or generated, how they have been processed and analysed, i.e. using which tools, standards, methodologies etc, but also where and how datasets are backed up, published and preserved, including any costs associated with personnel dedicated for data curation/ stewardship activities or costs for acquiring or building data management services. Not sure how a DMP looks in practice? Browse Public DMPs and LIBER community in Zenodo to get an idea!", "TEXT-INFO": "Information in a DMP show how datasets have been collected and/or generated, how they have been processed and analysed, i.e. using which tools, standards, methodologies etc, but also where and how datasets are backed up, published and preserved, including any costs associated with personnel dedicated for data curation/ stewardship activities or costs for acquiring or building data management services. Not sure how a DMP looks in practice? Browse Public DMPs and LIBER community in Zenodo to get an idea!",
"TEXT-INFO-QUESTION": "Not sure how a DMP looks in practice? Browse Public DMPs and LIBER community in Zenodo to get an idea!", "TEXT-INFO-QUESTION": "Not sure how a DMP looks in practice? Browse Public DMPs and",
"LINK-ZENODO": "LIBER community in Zenodo",
"GET-IDEA": "to get an idea!",
"COLUMNS": { "COLUMNS": {
"NAME": "Τίτλος", "NAME": "Τίτλος",
"GRANT": "Επιχορήγηση", "GRANT": "Επιχορήγηση",