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

next button commented

This commit is contained in:
Diamantis Tziotzios 2019-04-02 11:43:16 +03:00
parent e455072536
commit e7d53aadee
3 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@
<div class="col"></div> <div class="col"></div>
</div> </div>
<div class="row" style="margin-top: 30px"> <div class="row" style="margin-top: 30px" *ngIf="this.isAuthenticated()">
<div class="col-1"></div> <div class="col-1"></div>
<div class="col"> <div class="col">
<app-quick-wizard-create-add-component></app-quick-wizard-create-add-component> <app-quick-wizard-create-add-component></app-quick-wizard-create-add-component>
@ -22,11 +22,7 @@
<div class="row" style="margin-top: 30px"> <div class="row" style="margin-top: 30px">
<div class="col"></div> <div class="col"></div>
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12"> <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
<app-dashboard-card title={{dashboardStatisticsData?.totalDataManagementPlanCount}} headerIcon="mode_edit" <app-dashboard-card title={{dashboardStatisticsData?.totalDataManagementPlanCount}} headerIcon="mode_edit" [category]="this.isAuthenticated() ? 'DASHBOARD.MY-DMPS' : 'DASHBOARD.DMPS' " routelLink='/plans' buttonRedirectLink="/plans/new" buttonTitle="Create New DMP" footerIcon="open_in_new" linearColor="linear-gradient(60deg, #ef5350, #e53935)" boxShadow="0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(244, 67, 54, 0.4)">
[category]="this.isAuthenticated() ? 'DASHBOARD.MY-DMPS' : 'DASHBOARD.DMPS' " routelLink='/plans'
buttonRedirectLink="/plans/new" buttonTitle="Create New DMP" footerIcon="open_in_new"
linearColor="linear-gradient(60deg, #ef5350, #e53935)"
boxShadow="0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(244, 67, 54, 0.4)">
</app-dashboard-card> </app-dashboard-card>
<mat-card *ngIf="this.isAuthenticated()" class="example-card"> <mat-card *ngIf="this.isAuthenticated()" class="example-card">
<mat-card-header> <mat-card-header>
@ -36,8 +32,7 @@
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<mat-nav-list *ngIf="dmpActivities!=null"> <mat-nav-list *ngIf="dmpActivities!=null">
<mat-list-item (click)="redirect(activity.id, recentActivityTypeEnum.Dmp)" <mat-list-item (click)="redirect(activity.id, recentActivityTypeEnum.Dmp)" *ngFor="let activity of dmpActivities">
*ngFor="let activity of dmpActivities">
<p mat-line> <p mat-line>
{{activity.label}} {{activity.label}}
</p> </p>
@ -50,11 +45,7 @@
</mat-card> </mat-card>
</div> </div>
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12 "> <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12 ">
<app-dashboard-card title={{dashboardStatisticsData?.totalProjectCount}} headerIcon="list" <app-dashboard-card title={{dashboardStatisticsData?.totalProjectCount}} headerIcon="list" [category]="this.isAuthenticated() ? 'DASHBOARD.MY-PROJECTS' : 'DASHBOARD.PROJECTS' " routelLink='/projects' buttonRedirectLink="/projects/new" buttonTitle="Create New Project" footerIcon="open_in_new" linearColor="linear-gradient(60deg, #ffa726, #fb8c00)" boxShadow="0 4px 20px 0 rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 152, 0, 0.4)">
[category]="this.isAuthenticated() ? 'DASHBOARD.MY-PROJECTS' : 'DASHBOARD.PROJECTS' "
routelLink='/projects' buttonRedirectLink="/projects/new" buttonTitle="Create New Project"
footerIcon="open_in_new" linearColor="linear-gradient(60deg, #ffa726, #fb8c00)"
boxShadow="0 4px 20px 0 rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 152, 0, 0.4)">
</app-dashboard-card> </app-dashboard-card>
<mat-card *ngIf="this.isAuthenticated()" class="example-card"> <mat-card *ngIf="this.isAuthenticated()" class="example-card">
<mat-card-header> <mat-card-header>
@ -64,8 +55,7 @@
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<mat-nav-list *ngIf="projectActivities!=null"> <mat-nav-list *ngIf="projectActivities!=null">
<mat-list-item (click)="redirect(activity.id, recentActivityTypeEnum.Project)" <mat-list-item (click)="redirect(activity.id, recentActivityTypeEnum.Project)" *ngFor="let activity of projectActivities">
*ngFor="let activity of projectActivities">
<p mat-line> <p mat-line>
{{activity.label}} {{activity.label}}
</p> </p>
@ -78,11 +68,7 @@
</mat-card> </mat-card>
</div> </div>
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12"> <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
<app-dashboard-card title={{dashboardStatisticsData?.totalDataSetCount}} headerIcon="subject" <app-dashboard-card title={{dashboardStatisticsData?.totalDataSetCount}} headerIcon="subject" [category]="this.isAuthenticated() ? 'DASHBOARD.MY-DATASETS' : 'DASHBOARD.DATASETS'" routelLink='/datasets' buttonRedirectLink="/datasets/new" buttonTitle="Create New Dataset" footerIcon="open_in_new" linearColor="linear-gradient(60deg, #26c6da, #00acc1)" boxShadow="0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(0, 188, 212, 0.4)">
[category]="this.isAuthenticated() ? 'DASHBOARD.MY-DATASETS' : 'DASHBOARD.DATASETS'"
routelLink='/datasets' buttonRedirectLink="/datasets/new" buttonTitle="Create New Dataset"
footerIcon="open_in_new" linearColor="linear-gradient(60deg, #26c6da, #00acc1)"
boxShadow="0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(0, 188, 212, 0.4)">
</app-dashboard-card> </app-dashboard-card>
<mat-card *ngIf="this.isAuthenticated()" class="example-card"> <mat-card *ngIf="this.isAuthenticated()" class="example-card">
<mat-card-header> <mat-card-header>
@ -92,8 +78,7 @@
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<mat-nav-list *ngIf="datasetActivities!=null"> <mat-nav-list *ngIf="datasetActivities!=null">
<mat-list-item (click)="redirect(activity.id, recentActivityTypeEnum.Dataset)" <mat-list-item (click)="redirect(activity.id, recentActivityTypeEnum.Dataset)" *ngFor="let activity of datasetActivities">
*ngFor="let activity of datasetActivities">
<p mat-line> <p mat-line>
{{activity.label}} {{activity.label}}
</p> </p>
@ -107,4 +92,4 @@
</div> </div>
<div class="col"></div> <div class="col"></div>
</div> </div>
</div> </div>

4
dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html
View File

@ -40,10 +40,10 @@
<mat-form-field *ngIf="compositeFieldFormGroup.get('hasCommentField').value" class="col-12" [formGroup]="compositeFieldFormGroup"> <mat-form-field *ngIf="compositeFieldFormGroup.get('hasCommentField').value" class="col-12" [formGroup]="compositeFieldFormGroup">
<input matInput formControlName="commentFieldValue" placeholder="comment"> <input matInput formControlName="commentFieldValue" placeholder="comment">
</mat-form-field> </mat-form-field>
<div class="col"></div> <!-- <div class="col"></div>
<button class="col-auto" mat-icon-button type="button" (click)="next(compositeField)"> <button class="col-auto" mat-icon-button type="button" (click)="next(compositeField)">
<mat-icon>expand_more</mat-icon> <mat-icon>expand_more</mat-icon>
</button> </button> -->
</div> </div>
</div> </div>

2
dmp-frontend/src/app/ui/quick-wizard/dataset-editor/dataset-editor-wizard.component.ts
View File

@ -9,8 +9,6 @@ import { BreadcrumbItem } from "../../misc/breadcrumb/definition/breadcrumb-item
import { IBreadCrumbComponent } from "../../misc/breadcrumb/definition/IBreadCrumbComponent"; import { IBreadCrumbComponent } from "../../misc/breadcrumb/definition/IBreadCrumbComponent";
import { DatasetDescriptionFormEditorModel } from "../../misc/dataset-description-form/dataset-description-form.model"; import { DatasetDescriptionFormEditorModel } from "../../misc/dataset-description-form/dataset-description-form.model";
import { QuickWizardDatasetDescriptionModel } from "./quick-wizard-dataset-description-model"; import { QuickWizardDatasetDescriptionModel } from "./quick-wizard-dataset-description-model";
import { IfStmt } from "@angular/compiler";
import { TranslateService } from "@ngx-translate/core";
@Component({ @Component({
selector: 'app-dataset-editor-wizard-component', selector: 'app-dataset-editor-wizard-component',