Merge remote-tracking branch 'origin/Development' into Development
This commit is contained in:
commit
d4672f1e60
|
|
@ -201,6 +201,10 @@ export class MultipleAutoCompleteComponent extends _CustomComponentMixinBase imp
|
|||
if (event.keyCode !== ENTER && (event.keyCode < 37 || event.keyCode > 40)) {
|
||||
this._inputSubject.next(this.inputValue);
|
||||
}
|
||||
|
||||
// if (event.keyCode !== ENTER && (event.keyCode < 37 || event.keyCode > 40) && event.keyCode !== COMMA) {
|
||||
// this._inputSubject.next(this.inputValue);
|
||||
// }
|
||||
}
|
||||
|
||||
public onKeyDown(event) {
|
||||
|
|
@ -232,6 +236,12 @@ export class MultipleAutoCompleteComponent extends _CustomComponentMixinBase imp
|
|||
if (this.inputValue && this.inputValue.length > 1 && this.autocomplete.options && this.autocomplete.options.length > 0 && this.autoSelectFirstOptionOnBlur) {
|
||||
this.optionSelectedInternal(this.autocomplete.options.first.value);
|
||||
}
|
||||
|
||||
// Clear text if not an option
|
||||
if (this.inputValue && this.inputValue.length > 1) {
|
||||
this.inputValue = '';
|
||||
document.getElementById((<HTMLInputElement>$event.target).id).focus();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@ export interface SingleAutoCompleteConfiguration {
|
|||
// Selected value formating template
|
||||
selectedValueTemplate?: TemplateRef<any>;
|
||||
|
||||
// To revert: "We set the items observable on focus to avoid the request being executed on component load."
|
||||
forceFocus?: boolean;
|
||||
|
||||
autoSelectFirstOptionOnBlur?: boolean;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ export class SingleAutoCompleteComponent extends _CustomComponentMixinBase imple
|
|||
|
||||
_onInputFocus() {
|
||||
// We set the items observable on focus to avoid the request being executed on component load.
|
||||
if (!this._items) {
|
||||
if (!this._items || this.forceFocus) {
|
||||
this._items = this._inputSubject.pipe(
|
||||
startWith(null),
|
||||
debounceTime(this.requestDelay),
|
||||
|
|
@ -242,6 +242,12 @@ export class SingleAutoCompleteComponent extends _CustomComponentMixinBase imple
|
|||
this.inputValue = this._displayFn(this.autocomplete.options.first.value);
|
||||
this.optionSelectedInternal(this.autocomplete.options.first.value);
|
||||
}
|
||||
|
||||
// Clear text if not an option
|
||||
else if (this.inputValue && this.inputValue.length > 1) {
|
||||
this.inputValue = '';
|
||||
document.getElementById((<HTMLInputElement>$event.target).id).focus();
|
||||
}
|
||||
}
|
||||
|
||||
onChange = (_: any) => { };
|
||||
|
|
@ -321,4 +327,8 @@ export class SingleAutoCompleteComponent extends _CustomComponentMixinBase imple
|
|||
get autoSelectFirstOptionOnBlur(): boolean {
|
||||
return this.configuration.autoSelectFirstOptionOnBlur != null ? this.configuration.autoSelectFirstOptionOnBlur : false;
|
||||
}
|
||||
|
||||
get forceFocus(): boolean {
|
||||
return this.configuration.forceFocus != null ? this.configuration.forceFocus : false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ ngx-guided-tour {
|
|||
|
||||
.guided-tour-spotlight-overlay {
|
||||
position: fixed;
|
||||
box-shadow: 0 0 0 9999px rgba(0,0,0,.7), 0 0 1.5rem rgba(0,0,0,.5);
|
||||
box-shadow: 0 0 0 9999px rgba(0, 0, 0, 0.7), 0 0 1.5rem rgba(0, 0, 0, 0.5);
|
||||
border-radius: 44px; /*custom add*/
|
||||
}
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ ngx-guided-tour {
|
|||
animation: pulse 2s linear infinite;
|
||||
|
||||
&:after {
|
||||
content: '';
|
||||
content: "";
|
||||
display: inline-block;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
|
@ -44,11 +44,11 @@ ngx-guided-tour {
|
|||
@keyframes pulse {
|
||||
from {
|
||||
transform: translate(-50%, -50%) scale(0.45);
|
||||
opacity: 1.0;
|
||||
opacity: 1;
|
||||
}
|
||||
to {
|
||||
transform: translate(-50%, -50%) scale(1);
|
||||
opacity: 0.0;
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -62,9 +62,11 @@ ngx-guided-tour {
|
|||
left: 50%;
|
||||
top: 50%;
|
||||
border-radius: 5px;
|
||||
transform: translate(-50%, -50%)
|
||||
transform: translate(-50%, -50%);
|
||||
}
|
||||
&.tour-bottom, &.tour-bottom-right, &.tour-bottom-left {
|
||||
&.tour-bottom,
|
||||
&.tour-bottom-right,
|
||||
&.tour-bottom-left {
|
||||
.tour-arrow::before {
|
||||
position: absolute;
|
||||
}
|
||||
|
|
@ -73,7 +75,9 @@ ngx-guided-tour {
|
|||
}
|
||||
}
|
||||
|
||||
&.tour-top, &.tour-top-right, &.tour-top-left {
|
||||
&.tour-top,
|
||||
&.tour-top-right,
|
||||
&.tour-top-left {
|
||||
margin-bottom: 10px;
|
||||
|
||||
.tour-arrow::before {
|
||||
|
|
@ -85,7 +89,8 @@ ngx-guided-tour {
|
|||
}
|
||||
}
|
||||
|
||||
&.tour-bottom , &.tour-top {
|
||||
&.tour-bottom,
|
||||
&.tour-top {
|
||||
.tour-arrow::before {
|
||||
// transform: translateX(-50%);
|
||||
// left: 50%;
|
||||
|
|
@ -98,14 +103,16 @@ ngx-guided-tour {
|
|||
margin-left: 10px;
|
||||
}
|
||||
|
||||
&.tour-bottom-right, &.tour-top-right {
|
||||
&.tour-bottom-right,
|
||||
&.tour-top-right {
|
||||
.tour-arrow::before {
|
||||
transform: translateX(-100%);
|
||||
left: calc(100% - 5px);
|
||||
}
|
||||
}
|
||||
|
||||
&.tour-bottom-left, &.tour-top-left {
|
||||
&.tour-bottom-left,
|
||||
&.tour-top-left {
|
||||
.tour-arrow::before {
|
||||
left: 5px;
|
||||
}
|
||||
|
|
@ -153,13 +160,13 @@ ngx-guided-tour {
|
|||
/*custom add*/
|
||||
font-weight: lighter !important;
|
||||
font-size: 16px !important;
|
||||
padding: 28px 5px 0px 65px;
|
||||
padding: 28px 5px 25px 65px;
|
||||
overflow: auto;
|
||||
text-align: left;
|
||||
color: #212121;
|
||||
line-height: 26px;
|
||||
white-space: pre-line;
|
||||
height: 210px;
|
||||
// height: 210px;
|
||||
}
|
||||
|
||||
h3.tour-title {
|
||||
|
|
@ -171,7 +178,7 @@ ngx-guided-tour {
|
|||
|
||||
.tour-buttons {
|
||||
overflow: hidden; // clearfix
|
||||
padding: 10px 70px 30px 65px; /*custom add*/
|
||||
padding: 10px 70px 18px 65px; /*custom add*/
|
||||
|
||||
button.link-button {
|
||||
padding-left: 0;
|
||||
|
|
@ -200,9 +207,9 @@ ngx-guided-tour {
|
|||
float: right;
|
||||
width: 133px;
|
||||
height: 40px;
|
||||
border: 1px solid #129D99;
|
||||
background: #FFFFFF 0% 0% no-repeat padding-box;
|
||||
color: #129D99;
|
||||
border: 1px solid #129d99;
|
||||
background: #ffffff 0% 0% no-repeat padding-box;
|
||||
color: #129d99;
|
||||
}
|
||||
|
||||
.next-button {
|
||||
|
|
@ -216,18 +223,19 @@ ngx-guided-tour {
|
|||
|
||||
/*custom add*/
|
||||
float: left;
|
||||
padding: 10px 0px;;
|
||||
padding: 10px 0px;
|
||||
width: 101px;
|
||||
background: #129D99 0% 0% no-repeat padding-box;
|
||||
background: #129d99 0% 0% no-repeat padding-box;
|
||||
}
|
||||
|
||||
/*custom add*/
|
||||
button.skip-button.link-button, .next-button {
|
||||
button.skip-button.link-button,
|
||||
.next-button {
|
||||
font-size: 14px;
|
||||
font-weight: bold;
|
||||
letter-spacing: 0.35px;
|
||||
height: 40px;
|
||||
box-shadow: 0px 3px 6px #1E202029;
|
||||
box-shadow: 0px 3px 6px #1e202029;
|
||||
border-radius: 30px;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { debounceTime } from 'rxjs/operators';
|
||||
import { debounceTime, delay } from 'rxjs/operators';
|
||||
import { ErrorHandler, Inject, Injectable } from '@angular/core';
|
||||
import { Observable, Subject, fromEvent } from 'rxjs';
|
||||
import { GuidedTour, TourStep, Orientation, OrientationConfiguration } from './guided-tour.constants';
|
||||
|
|
@ -63,11 +63,13 @@ export class GuidedTourService {
|
|||
}
|
||||
});
|
||||
} else {
|
||||
setTimeout(() => {
|
||||
if (this._checkSelectorValidity()) {
|
||||
this._guidedTourCurrentStepSubject.next(this.getPreparedTourStep(this._currentTourStepIndex));
|
||||
} else {
|
||||
this.nextStep();
|
||||
}
|
||||
}, 500);
|
||||
}
|
||||
} else {
|
||||
if (this._currentTour.completeCallback) {
|
||||
|
|
|
|||
|
|
@ -1,50 +1,38 @@
|
|||
<div class="main-content dashboard-main-container h-100" [class.non-auth-main-container]="!this.isAuthenticated()">
|
||||
<div *ngIf="this.isAuthenticated()" class="container-fluid">
|
||||
<div *ngIf="this.dashboardStatisticsData">
|
||||
<div *ngIf="!this.hasDmps()">
|
||||
<div class="main-content">
|
||||
<div class="col-auto">
|
||||
<div class="card" [style.display]="isVisible ? 'block' : 'none'">
|
||||
<!-- <a class="col-auto d-flex" (click)="closeCard()"><span class="ml-auto pt-3 material-icons clear-icon">clear</span></a> -->
|
||||
<p class="card-title mb-0 pt-4">{{'DASHBOARD.DMP-QUESTION' | translate}}</p>
|
||||
<p class="card-content mb-0">{{'DASHBOARD.INFO-DMP-TEXT' | translate}}</p>
|
||||
<p class="card-content pt-3 mb-0">
|
||||
{{'DASHBOARD.NEW-QUESTION' | translate}} <a href="https://www.openaire.eu/how-to-create-a-data-management-plan" target="_blank"><u>{{'DASHBOARD.OPEN-AIR-GUIDE' | translate}}</u></a> {{'DASHBOARD.LEARN-MORE' | translate}}
|
||||
</p>
|
||||
<div class="d-flex">
|
||||
<button type="button" class="col-auto align-self-center normal-btn" (click)="openNewDmpDialog()">{{'DASHBOARD.START-YOUR-FIRST-DMP' | translate}}</button>
|
||||
<img class="col-auto ml-auto laptop-img" src="../../../assets/splash/assets/img/1_Main/Png/Who Benefits copy.png" width="116" height="139">
|
||||
<!-- <img class="col-auto ml-auto laptop-img"> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-auto ml-auto stats">
|
||||
<div class="personal-usage">{{'DASHBOARD.PERSONAL-USAGE' | translate}}</div>
|
||||
<div class="counter-zero">0</div>
|
||||
<a [routerLink]="['/plans']" class="link">{{'DASHBOARD.DMPS' | translate}}</a>
|
||||
<div class="counter-zero">0</div>
|
||||
<a [routerLink]="['/datasets']" class="link">{{'DASHBOARD.DATASET-DESCRIPTIONS' | translate}}</a>
|
||||
<div class="counter-zero">0</div>
|
||||
<a class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a>
|
||||
<div class="counter-zero">0</div>
|
||||
<a class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="this.hasDmps()">
|
||||
<div class="main-content">
|
||||
<div class="col">
|
||||
<div class="card col-auto mt-0" [style.display]="isVisible ? 'block' : 'none'">
|
||||
<a class="col-auto d-flex" (click)="closeCard()"><span class="ml-auto mt-3 material-icons clear-icon">clear</span></a>
|
||||
<p class="card-content mb-0 pt-0">
|
||||
{{'DASHBOARD.DMP-ABOUT-BEG' | translate}}
|
||||
<a *ngIf="this.hasDmps()" class="col-auto d-flex" (click)="closeCard()"><span class="ml-auto mt-3 material-icons clear-icon">clear</span></a>
|
||||
|
||||
<p *ngIf="!this.hasDmps()" class="card-title mb-0 pt-4">{{'DASHBOARD.DMP-QUESTION' | translate}}</p>
|
||||
<p *ngIf="!this.hasDmps()" class="card-content mb-0">{{'DASHBOARD.INFO-DMP-TEXT' | translate}}</p>
|
||||
|
||||
<p *ngIf="!this.hasDmps()" class="card-content pt-3 mb-0">
|
||||
{{'DASHBOARD.NEW-QUESTION' | translate}} <a href="https://www.openaire.eu/how-to-create-a-data-management-plan" target="_blank"><u>{{'DASHBOARD.OPEN-AIR-GUIDE' | translate}}</u></a> {{'DASHBOARD.LEARN-MORE' | translate}}
|
||||
</p>
|
||||
<p *ngIf="this.hasDmps()" class="card-content mb-0 pt-0">{{'DASHBOARD.DMP-ABOUT-BEG' | translate}}
|
||||
<b>{{'DASHBOARD.DATASET-DESCRIPTIONS' | translate}}</b>
|
||||
{{'DASHBOARD.DMP-ABOUT-END' | translate}}</p>
|
||||
<div class="d-flex">
|
||||
{{'DASHBOARD.DMP-ABOUT-END' | translate}}
|
||||
</p>
|
||||
|
||||
<div class="row d-flex align-items-center">
|
||||
<div *ngIf="!this.hasDmps()" class="col-auto add-dataset-btn d-flex">
|
||||
<button type="button" class="col-auto align-self-center normal-btn" (click)="openNewDmpDialog()">{{'DASHBOARD.START-YOUR-FIRST-DMP' | translate}}</button>
|
||||
<!-- <img class="col-auto ml-auto laptop-img" src="../../../assets/splash/assets/img/1_Main/Png/Who Benefits copy.png" width="116" height="139"> -->
|
||||
<!-- <img class="col-auto ml-auto laptop-img"> -->
|
||||
</div>
|
||||
<div *ngIf="this.hasDmps()" class="new-dataset-tour add-dataset-btn col-auto d-flex">
|
||||
<button mat-raised-button type="button" class="col-auto align-self-center yellow-btn" (click)="addNewDataset()">{{'DASHBOARD.ACTIONS.ADD-DATASET-DESCRIPTION' | translate}}</button>
|
||||
<img class="col-auto ml-auto laptop-img" src="../../../assets/splash/assets/img/1_Main/Png/Who Benefits copy.png" width="116" height="139">
|
||||
</div>
|
||||
<span class="col-auto ml-auto">
|
||||
<img class="laptop-img\6" src="../../../assets/splash/assets/img/1_Main/Png/Who Benefits copy.png" width="116" height="139">
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div *ngIf="this.hasDmps()" class="col">
|
||||
<div class="latest-activity-title">{{'DASHBOARD.LATEST-ACTIVITY' | translate}}</div>
|
||||
<mat-tab-group mat-align-tabs="start" class="remove-border-bottom">
|
||||
<mat-tab label="{{'DASHBOARD.ALL' | translate}} ({{totalRecents}})">
|
||||
|
|
@ -70,7 +58,22 @@
|
|||
</mat-tab>
|
||||
</mat-tab-group>
|
||||
</div>
|
||||
<div class="col-auto stats">
|
||||
</div>
|
||||
|
||||
<!-- Right Sidebar -->
|
||||
<div *ngIf="!this.hasDmps()" class="col-auto ml-auto stats">
|
||||
<div class="personal-usage">{{'DASHBOARD.PERSONAL-USAGE' | translate}}</div>
|
||||
<div class="counter-zero">0</div>
|
||||
<a [routerLink]="['/plans']" class="link">{{'DASHBOARD.DMPS' | translate}}</a>
|
||||
<div class="counter-zero">0</div>
|
||||
<a [routerLink]="['/datasets']" class="link">{{'DASHBOARD.DATASET-DESCRIPTIONS' | translate}}</a>
|
||||
<div class="counter-zero">0</div>
|
||||
<a class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a>
|
||||
<div class="counter-zero">0</div>
|
||||
<a class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
|
||||
</div>
|
||||
|
||||
<div *ngIf="this.hasDmps()" class="col-auto stats">
|
||||
<div class="personal-usage">{{'DASHBOARD.PERSONAL-USAGE' | translate}}</div>
|
||||
<div [ngClass]="{'counter': dashboardStatisticsData?.totalDataManagementPlanCount != 0, 'counter-zero': dashboardStatisticsData?.totalDataManagementPlanCount == 0}">
|
||||
{{dashboardStatisticsData?.totalDataManagementPlanCount}}</div>
|
||||
|
|
@ -86,6 +89,12 @@
|
|||
<a href="#" class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="main-content">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@
|
|||
line-height: 1;
|
||||
font-size: 0.87rem;
|
||||
padding: 0.62rem 1.87rem;
|
||||
margin-left: 40px;
|
||||
// margin-left: 40px;
|
||||
}
|
||||
|
||||
.personal-usage {
|
||||
|
|
@ -394,6 +394,11 @@ input[type="text"] {
|
|||
// top: 7px;
|
||||
}
|
||||
|
||||
.add-dataset-btn {
|
||||
height: 40px;
|
||||
margin-left: 40px;
|
||||
}
|
||||
|
||||
::ng-deep .mat-tab-group.mat-primary .mat-ink-bar,
|
||||
.mat-tab-nav-bar.mat-primary .mat-ink-bar {
|
||||
background: #129d99;
|
||||
|
|
|
|||
|
|
@ -30,9 +30,10 @@ import { StartNewDmpDialogComponent } from '../dmp/start-new-dmp-dialogue/start-
|
|||
import { StartNewDatasetDialogComponent } from '../dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component';
|
||||
import { DatasetWizardEditorModel } from '../dataset/dataset-wizard/dataset-wizard-editor.model';
|
||||
import { DatasetWizardService } from '@app/core/services/dataset-wizard/dataset-wizard.service';
|
||||
import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service';
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
import { DatasetWizardModel } from '@app/core/model/dataset/dataset-wizard';
|
||||
import { UiNotificationService, SnackBarNotificationLevel } from '@app/core/services/notification/ui-notification-service';
|
||||
import { GuidedTourService } from '@app/library/guided-tour/guided-tour.service';
|
||||
import { GuidedTour, Orientation } from '@app/library/guided-tour/guided-tour.constants';
|
||||
|
||||
|
||||
@Component({
|
||||
|
|
@ -66,6 +67,10 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC
|
|||
totalDraftDatasets: number;
|
||||
totalRecents: number;
|
||||
|
||||
dmpText: string;
|
||||
datasetText: string;
|
||||
importFileText: string;
|
||||
startWizardText: string;
|
||||
|
||||
constructor(
|
||||
private router: Router,
|
||||
|
|
@ -80,7 +85,8 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC
|
|||
private userService: UserService,
|
||||
private dialog: MatDialog,
|
||||
private language: TranslateService,
|
||||
private uiNotificationService: UiNotificationService
|
||||
private uiNotificationService: UiNotificationService,
|
||||
private guidedTourService: GuidedTourService
|
||||
) {
|
||||
super();
|
||||
// this.dashboardStatisticsData.totalDataManagementPlanCount = 0;
|
||||
|
|
@ -125,6 +131,10 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC
|
|||
.pipe(takeUntil(this._destroyed))
|
||||
.subscribe(results => {
|
||||
this.dashboardStatisticsData = results;
|
||||
|
||||
if (this.dashboardStatisticsData && this.dashboardStatisticsData.totalDataManagementPlanCount === 0) {
|
||||
this.openDashboardTour();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -133,6 +143,12 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC
|
|||
}));
|
||||
}
|
||||
|
||||
// ngAfterContentChecked(): void {
|
||||
// if (this.dashboardStatisticsData && this.dashboardStatisticsData.totalDataManagementPlanCount === 0) {
|
||||
// this.openTour();
|
||||
// }
|
||||
// }
|
||||
|
||||
public isAuthenticated(): boolean {
|
||||
return !(!this.authentication.current());
|
||||
}
|
||||
|
|
@ -271,6 +287,73 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC
|
|||
});
|
||||
}
|
||||
|
||||
public dashboardTour: GuidedTour = {
|
||||
tourId: 'dashboard-tour',
|
||||
useOrb: true,
|
||||
steps: [
|
||||
{
|
||||
selector: '.new-dmp-dialog',
|
||||
content: 'Step 1',
|
||||
orientation: Orientation.BottomRight,
|
||||
isStepUnique: false,
|
||||
highlightPadding: 10,
|
||||
closeAction: () => this.openNewDmpDialog()
|
||||
},
|
||||
{
|
||||
selector: '.import-file',
|
||||
content: 'Step 2',
|
||||
orientation: Orientation.Bottom,
|
||||
isStepUnique: false,
|
||||
highlightPadding: 10
|
||||
},
|
||||
{
|
||||
selector: '.start-wizard',
|
||||
content: 'Step 3',
|
||||
orientation: Orientation.Bottom,
|
||||
isStepUnique: false,
|
||||
highlightPadding: 10,
|
||||
closeAction: () => this.dialog.closeAll()
|
||||
},
|
||||
{
|
||||
selector: '.new-dataset-tour',
|
||||
content: 'Step 4',
|
||||
orientation: Orientation.BottomLeft,
|
||||
isStepUnique: false,
|
||||
highlightPadding: 10
|
||||
}
|
||||
]
|
||||
};
|
||||
|
||||
public setDashboardTourDmpText(): void {
|
||||
this.dmpText = this.language.instant('DASHBOARD.TOUR-GUIDE.DMP') + '\n\n' +
|
||||
this.language.instant('DASHBOARD.TOUR-GUIDE.START-NEW');
|
||||
this.dashboardTour.steps[0].title = this.dmpText;
|
||||
}
|
||||
|
||||
public setDashboardImportFileText(): void {
|
||||
this.importFileText = this.language.instant('DASHBOARD.TOUR-GUIDE.IMPORT-DMP');
|
||||
this.dashboardTour.steps[1].title = this.importFileText;
|
||||
}
|
||||
|
||||
public setDashboardStartWizardText(): void {
|
||||
this.startWizardText = this.language.instant('DASHBOARD.TOUR-GUIDE.START-WIZARD');
|
||||
this.dashboardTour.steps[2].title = this.startWizardText;
|
||||
}
|
||||
|
||||
public setDatasetText(): void {
|
||||
this.datasetText = this.language.instant('DASHBOARD.TOUR-GUIDE.DATASET') + '\n\n' +
|
||||
this.language.instant('DASHBOARD.TOUR-GUIDE.NEW-DATASET');
|
||||
this.dashboardTour.steps[3].title = this.datasetText;
|
||||
}
|
||||
|
||||
openDashboardTour() {
|
||||
this.setDashboardTourDmpText();
|
||||
this.setDashboardImportFileText();
|
||||
this.setDashboardStartWizardText();
|
||||
this.setDatasetText();
|
||||
this.guidedTourService.startTour(this.dashboardTour);
|
||||
}
|
||||
|
||||
// onCallbackSuccess(datasetId: String): void {
|
||||
// this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-CREATION'), SnackBarNotificationLevel.Success);
|
||||
// this.router.navigate(['/reload']).then(() => { this.router.navigate(['/datasets', 'edit', datasetId]); });
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ export class DatasetEditorComponent extends BaseComponent {
|
|||
|
||||
public restartTour(label: string): void {
|
||||
this.setDashboardTourDmp(label);
|
||||
// console.log(this.dashboardTourDmp.steps[0].selector);
|
||||
this.guidedTourService.startTour(this.dashboardTourDmp);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -141,7 +141,6 @@ export class DatasetEditorDetailsComponent extends BaseComponent implements OnIn
|
|||
|
||||
public restartTour(label: string): void {
|
||||
this.setDashboardTourDmp(label);
|
||||
// console.log(this.dashboardTourDmp.steps[0].selector);
|
||||
this.guidedTourService.startTour(this.dashboardTourDmp);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ export class FundingInfoComponent extends BaseComponent implements OnInit {
|
|||
isCreateNewProject = false;
|
||||
isCreateNewFunder = false;
|
||||
grant: GrantTabModel;
|
||||
forceFocus = false;
|
||||
|
||||
grantAutoCompleteConfiguration: SingleAutoCompleteConfiguration;
|
||||
projectAutoCompleteConfiguration: SingleAutoCompleteConfiguration;
|
||||
|
|
@ -98,8 +99,10 @@ export class FundingInfoComponent extends BaseComponent implements OnInit {
|
|||
initialItems: () => this.searchGrant(''),
|
||||
displayFn: (item) => item['label'] + this.getGrantIdText(item),
|
||||
titleFn: (item) => item['label'] + this.getGrantIdText(item),
|
||||
subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : (item['key'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['key'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE'))
|
||||
};
|
||||
subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : (item['key'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['key'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE')),
|
||||
forceFocus: this.forceFocus,
|
||||
}
|
||||
// this.forceFocus = false;
|
||||
|
||||
this.projectAutoCompleteConfiguration = {
|
||||
filterFn: this.searchProject.bind(this),
|
||||
|
|
@ -116,7 +119,6 @@ export class FundingInfoComponent extends BaseComponent implements OnInit {
|
|||
grantRequestItem.criteria.like = query;
|
||||
if (this.funderFormGroup.get('existFunder').value) {
|
||||
grantRequestItem.criteria.funderReference = this.funderFormGroup.controls['existFunder'].value.reference;
|
||||
console.log(grantRequestItem);
|
||||
}
|
||||
return this.grantService.getWithExternal(grantRequestItem);
|
||||
}
|
||||
|
|
@ -237,8 +239,8 @@ export class FundingInfoComponent extends BaseComponent implements OnInit {
|
|||
|| (funder.existFunder !== null && funder.existFunder !== undefined && funder.existFunder.id !== undefined)) {
|
||||
this.grantformGroup.reset();
|
||||
this.grantformGroup.enable();
|
||||
this.forceFocus = true;
|
||||
this.setGrantValidators();
|
||||
// this.grantformGroup.updateValueAndValidity();
|
||||
} else {
|
||||
this.grantformGroup.reset();
|
||||
this.grantformGroup.disable();
|
||||
|
|
|
|||
|
|
@ -29,9 +29,6 @@ import { RecentActivityOrder } from '@app/core/common/enum/recent-activity-order
|
|||
import { GuidedTourService } from '@app/library/guided-tour/guided-tour.service';
|
||||
import { GuidedTour, Orientation } from '@app/library/guided-tour/guided-tour.constants';
|
||||
import { NgDialogAnimationService } from "ng-dialog-animation";
|
||||
import { StartNewDatasetDialogComponent } from '../start-new-dataset-dialogue/start-new-dataset-dialog.component';
|
||||
import { DatasetWizardEditorModel } from '@app/ui/dataset/dataset-wizard/dataset-wizard-editor.model';
|
||||
import { StartNewDmpDialogComponent } from '../start-new-dmp-dialogue/start-new-dmp-dialog.component';
|
||||
|
||||
@Component({
|
||||
selector: 'app-dmp-listing-component',
|
||||
|
|
|
|||
|
|
@ -9,17 +9,21 @@
|
|||
<h1 mat-dialog-title class="title">{{'NAV-BAR.START-NEW-DMP' | translate}}</h1>
|
||||
<p class="text">{{'NAV-BAR.START-NEW-DMP-TXT' | translate}}</p>
|
||||
<div class="actions">
|
||||
<div class="import-file col-auto">
|
||||
<button type="button" class="normal-btn upload-btn d-flex flex-row align-items-center" (click)="uploadFile($event)">
|
||||
<mat-icon class="pr-2">file_upload</mat-icon>
|
||||
{{ 'NAV-BAR.IMPORT-FROM-FILE' | translate }}
|
||||
</button>
|
||||
</div>
|
||||
<p class="m-0">{{ 'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.OR' | translate }}</p>
|
||||
<div class="start-wizard col-auto">
|
||||
<button type="button" class="normal-btn font-weight-bold d-flex flex-row align-items-center" (click)="startWizard()">
|
||||
<mat-icon>chevron_right</mat-icon>
|
||||
{{ 'NAV-BAR.START-WIZARD' | translate }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row pt-4">
|
||||
<mat-icon class="col-auto material-icons-outlined warn">info</mat-icon>
|
||||
<span class="col">
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<mat-expansion-panel class="row expansion-panel toc-section-header" [id]="pathName" [(expanded)]="panelExpanded">
|
||||
<mat-expansion-panel-header>
|
||||
<mat-panel-title>
|
||||
<h6 class='panel-title'>{{form.get('numbering').value}} {{form.get('title').value}}</h6>
|
||||
<h6 class='panel-title'>{{form.get('numbering').value}}. {{form.get('title').value}}</h6>
|
||||
</mat-panel-title>
|
||||
</mat-expansion-panel-header>
|
||||
<mat-panel-description class="col-12">
|
||||
|
|
|
|||
|
|
@ -18,8 +18,10 @@
|
|||
|
||||
<div class="collapse navbar-collapse justify-content-end" id="navigation">
|
||||
|
||||
<div class="col-md-auto" *ngIf="!(isAuthenticated() && onInvalidUrl())">
|
||||
<button type="button" class="normal-btn ml-auto" (click)="openNewDmpDialog()">{{ 'NAV-BAR.START-NEW-DMP' | translate }}</button>
|
||||
<div class="new-dmp-dialog col-md-auto ml-auto">
|
||||
<button type="button" class="normal-btn" (click)="openNewDmpDialog()">{{ 'NAV-BAR.START-NEW-DMP' | translate }}</button>
|
||||
</div>
|
||||
<div class="col-md-auto pl-0" *ngIf="!(isAuthenticated() && onInvalidUrl())">
|
||||
<!-- <button type="button" class="normal-btn ml-auto" [routerLink]="['/quick-wizard']">{{ 'NAV-BAR.START-NEW-DMP' | translate }}</button> -->
|
||||
<a class="ml-4 mr-4 faq-title" (click)="openFaqDialog()"><b>{{ 'FAQ.TITLE' | translate }}</b></a>
|
||||
<!-- <button mat-icon-button class="lang" [matMenuTriggerFor]="languageMenu"></button> -->
|
||||
|
|
|
|||
|
|
@ -134,3 +134,7 @@ $mat-card-header-size: 40px !default;
|
|||
background-color: #ececec;
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.new-dmp-dialog {
|
||||
padding: 0em .5em 0em 0em;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<div *ngIf="showItem(groupMenuItem);">
|
||||
<hr *ngIf="!firstGroup">
|
||||
<mat-list-item routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}" *ngFor="let groupMenuRoute of groupMenuItem.routes; let first = first" class="nav-item" [ngClass]="{'mt-4': first && firstGroup}">
|
||||
<a class="nav-link nav-row" *ngIf="groupMenuRoute.path !== '/contact-support' && groupMenuRoute.path !== '/co-branding' && groupMenuRoute.path !== '/feedback' && groupMenuRoute.path !== '/datasets'" [routerLink]="[groupMenuRoute.path]" [ngClass]="{'dmp-tour': groupMenuRoute.path == '/plans'}">
|
||||
<a class="new-dmp nav-link nav-row" *ngIf="groupMenuRoute.path !== '/contact-support' && groupMenuRoute.path !== '/co-branding' && groupMenuRoute.path !== '/feedback' && groupMenuRoute.path !== '/datasets'" [routerLink]="[groupMenuRoute.path]" [ngClass]="{'dmp-tour': groupMenuRoute.path == '/plans'}">
|
||||
<i class="material-icons icon">{{ groupMenuRoute.icon }}</i>
|
||||
<i *ngIf="groupMenuRoute.path == '/plans'" class="material-icons icon-mask">person</i>
|
||||
<span [ngClass]="{'pl-0': groupMenuRoute.path == '/plans'}">{{groupMenuRoute.title | translate}}</span>
|
||||
|
|
|
|||
|
|
@ -294,6 +294,7 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes
|
|||
restoreFocus: false,
|
||||
autoFocus: false,
|
||||
width: '653px',
|
||||
maxHeight: '90vh',
|
||||
data: {
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1355,6 +1355,14 @@
|
|||
"ADD-DATASET-DESCRIPTION": "Add Dataset",
|
||||
"ADD-DATASET": "Add Dataset",
|
||||
"ADD-DMP-DESCRIPTION": "Add DMP Description"
|
||||
},
|
||||
"TOUR-GUIDE": {
|
||||
"DMP": "This is your dashboard. You can view and edit all DMPs that you have either contributed to or created yourself.",
|
||||
"START-NEW": "Create your DMP with Start new DMP.",
|
||||
"IMPORT-DMP": "You can import a DMP",
|
||||
"START-WIZARD": "or create new in Argos.",
|
||||
"DATASET": "This is your dashboard. You can view and edit all Datasets that you have either contributed to or created yourself.",
|
||||
"NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process."
|
||||
}
|
||||
},
|
||||
"USER-DIALOG": {
|
||||
|
|
|
|||
|
|
@ -1359,6 +1359,14 @@
|
|||
"ADD-DATASET-DESCRIPTION": "Add Dataset",
|
||||
"ADD-DATASET": "Add Dataset",
|
||||
"ADD-DMP-DESCRIPTION": "Add DMP Description"
|
||||
},
|
||||
"TOUR-GUIDE": {
|
||||
"DMP": "This is your dashboard. You can view and edit all DMPs that you have either contributed to or created yourself.",
|
||||
"START-NEW": "Create your DMP with Start new DMP.",
|
||||
"IMPORT-DMP": "You can import a DMP",
|
||||
"START-WIZARD": "or create new in Argos.",
|
||||
"DATASET": "This is your dashboard. You can view and edit all Datasets that you have either contributed to or created yourself.",
|
||||
"NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process."
|
||||
}
|
||||
},
|
||||
"USER-DIALOG": {
|
||||
|
|
|
|||
|
|
@ -1355,6 +1355,14 @@
|
|||
"ADD-DATASET-DESCRIPTION": "Añadir la descripción del dataset",
|
||||
"ADD-DATASET": "Añadir un dataset",
|
||||
"ADD-DMP-DESCRIPTION": "Añadir la descripción de un PGD"
|
||||
},
|
||||
"TOUR-GUIDE": {
|
||||
"DMP": "This is your dashboard. You can view and edit all DMPs that you have either contributed to or created yourself.",
|
||||
"START-NEW": "Create your DMP with Start new DMP.",
|
||||
"IMPORT-DMP": "You can import a DMP",
|
||||
"START-WIZARD": "or create new in Argos.",
|
||||
"DATASET": "This is your dashboard. You can view and edit all Datasets that you have either contributed to or created yourself.",
|
||||
"NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process."
|
||||
}
|
||||
},
|
||||
"USER-DIALOG": {
|
||||
|
|
|
|||
|
|
@ -1355,6 +1355,14 @@
|
|||
"ADD-DATASET-DESCRIPTION": "Προσθήκη Περιγραφής Συνόλου Δεδομένων",
|
||||
"ADD-DATASET": "Προσθήκη Συνόλου Δεδομένων",
|
||||
"ADD-DMP-DESCRIPTION": "Προσθήκη Περιγραφής Σχεδίου Διαχείρισης Δεδομένων "
|
||||
},
|
||||
"TOUR-GUIDE": {
|
||||
"DMP": "This is your dashboard. You can view and edit all DMPs that you have either contributed to or created yourself.",
|
||||
"START-NEW": "Create your DMP with Start new DMP.",
|
||||
"IMPORT-DMP": "You can import a DMP",
|
||||
"START-WIZARD": "or create new in Argos.",
|
||||
"DATASET": "This is your dashboard. You can view and edit all Datasets that you have either contributed to or created yourself.",
|
||||
"NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process."
|
||||
}
|
||||
},
|
||||
"USER-DIALOG": {
|
||||
|
|
|
|||
|
|
@ -1355,6 +1355,14 @@
|
|||
"ADD-DATASET-DESCRIPTION": "Pridať súbor dát",
|
||||
"ADD-DATASET": "Pridať súbor dát",
|
||||
"ADD-DMP-DESCRIPTION": "Pridať opis DMP"
|
||||
},
|
||||
"TOUR-GUIDE": {
|
||||
"DMP": "This is your dashboard. You can view and edit all DMPs that you have either contributed to or created yourself.",
|
||||
"START-NEW": "Create your DMP with Start new DMP.",
|
||||
"IMPORT-DMP": "You can import a DMP",
|
||||
"START-WIZARD": "or create new in Argos.",
|
||||
"DATASET": "This is your dashboard. You can view and edit all Datasets that you have either contributed to or created yourself.",
|
||||
"NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process."
|
||||
}
|
||||
},
|
||||
"USER-DIALOG": {
|
||||
|
|
|
|||
|
|
@ -1320,7 +1320,7 @@
|
|||
"TITLE-DASHED": "-Dil-",
|
||||
"CLOSE": "Kapat"
|
||||
},
|
||||
"DAHBOARD": {
|
||||
"DASHBOARD": {
|
||||
"MY-GRANTS": "Hibelerim",
|
||||
"GRANTS": "Hibeler",
|
||||
"MY-DMPS": "VYP'larım",
|
||||
|
|
@ -1355,6 +1355,14 @@
|
|||
"ADD-DATASET-DESCRIPTION": "Veri Seti Tanımı Ekle",
|
||||
"ADD-DATASET": "Veri Seti Ekle",
|
||||
"ADD-DMP-DESCRIPTION": "VYP Tanımı Ekle"
|
||||
},
|
||||
"TOUR-GUIDE": {
|
||||
"DMP": "This is your dashboard. You can view and edit all DMPs that you have either contributed to or created yourself.",
|
||||
"START-NEW": "Create your DMP with Start new DMP.",
|
||||
"IMPORT-DMP": "You can import a DMP",
|
||||
"START-WIZARD": "or create new in Argos.",
|
||||
"DATASET": "This is your dashboard. You can view and edit all Datasets that you have either contributed to or created yourself.",
|
||||
"NEW-DATASET": "With Add Dataset you can describe new datasets anytime in the research process."
|
||||
}
|
||||
},
|
||||
"USER-DIALOG": {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<div class="row">
|
||||
<!-- <div class="col"></div> -->
|
||||
<div class="col-auto"><button mat-raised-button type="button" class="cancel-btn" (click)="cancel()">{{ data.cancelButton }}</button></div>
|
||||
<div *ngIf="data.isDeleteConfirmation" class="col-auto"><button mat-raised-button type="button" (click)="confirm()" class="delete">{{ data.confirmButton }}</button></div>
|
||||
<div *ngIf="data.isDeleteConfirmation" class="col-auto"><button mat-raised-button type="button" (click)="confirm()" class="delete-btn">{{ data.confirmButton }}</button></div>
|
||||
<div *ngIf="!data.isDeleteConfirmation && !data.privacyPolicyNames" class="col-auto"><button mat-raised-button type="button" (click)="confirm()" class="submit-btn">{{ data.confirmButton }}</button></div>
|
||||
<div *ngIf="!data.isDeleteConfirmation && data.privacyPolicyNames" class="col-auto"><button mat-raised-button type="button" [disabled]="!agreePrivacyPolicyNames" (click)="confirm()" class="submiit-btn">{{ data.confirmButton }}</button></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -69,4 +69,14 @@
|
|||
background-color: #129d99;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
.delete-btn {
|
||||
min-width: 101px;
|
||||
height: 43px;
|
||||
background: #ffffff;
|
||||
color: #ba2c2c;
|
||||
border: 1px solid #ba2c2c;
|
||||
border-radius: 30px;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue