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

no message

This commit is contained in:
Diamantis Tziotzios 2018-01-18 11:10:16 +02:00
parent 66952722ba
commit 943d121e98
10 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html
View File

@ -1,4 +1,6 @@
<div class="dataset-wizard">
<h3 *ngIf="isNew">New {{datasetWizardModel?.dmp?.project?.label}} Dataset</h3>
<h3 *ngIf="!isNew">{{datasetWizardModel?.dmp?.project?.label}} Dataset</h3>
<mat-horizontal-stepper [linear]="isLinear">
<mat-step [stepControl]="formGroup">
<form *ngIf="formGroup" [formGroup]="formGroup">
@ -79,7 +81,7 @@
{{option.label}}
</div>
</ng-template>
<mat-progress-bar [style.height.px]="2" mode="indeterminate"></mat-progress-bar>
<mat-progress-bar [style.height.px]="2" *ngIf="filteredExternalDatasetsAsync" mode="indeterminate"></mat-progress-bar>
</td-chips>
<div class="navigation-buttons-container">
@ -90,7 +92,7 @@
</mat-step>
<mat-step>
<ng-template matStepLabel>{{'DATASET-WIZARD.THIRD-STEP.TITLE' | translate}}</ng-template>
<dynamic-form class="full-width" *ngIf="datasetWizardModel && datasetWizardModel.id" [dataModel]="datasetWizardModel"></dynamic-form>
<dynamic-form class="full-width" *ngIf="datasetWizardModel && datasetWizardModel.id" [dataModel]="datasetWizardModel"></dynamic-form>
<div class="navigation-buttons-container">
<button style="margin-top:10px;" matStepperPrevious mat-raised-button color="primary">{{'DATASET-WIZARD.ACTIONS.BACK' | translate}}</button>
</div>

1
dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts
View File

@ -81,6 +81,7 @@ export class DatasetWizardComponent implements AfterViewInit {
.subscribe(data => {
this.datasetWizardModel = JsonSerializer.fromJSONObject(data, DatasetWizardModel);
this.formGroup = this.datasetWizardModel.buildForm();
this.loadDatasetProfiles();
});
} else if (dmpId != null) {
this.isNew = true;

2
dmp-frontend/src/app/datasets/dataset-listing.component.html
View File

@ -61,7 +61,7 @@
<!-- Column Definition: Created -->
<ng-container cdkColumnDef="created">
<mat-header-cell *matHeaderCellDef>{{'DATASET-LISTING.COLUMNS.CREATED' | translate}}</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.created}}</mat-cell>
<mat-cell *matCellDef="let row">{{row.created | date:'shortDate'}}</mat-cell>
</ng-container>
<!-- Column Definition: Submission Time -->

1
dmp-frontend/src/app/dmps/dmp-listing.component.html
View File

@ -53,6 +53,7 @@
<button mat-menu-item (click)="openShareDialog(row.id,row.label)"><mat-icon>share</mat-icon>{{'DMP-LISTING.ACTIONS.INVITE' | translate}}</button>
<button mat-menu-item (click)="addDataset(row.id)"><mat-icon>add</mat-icon>{{'DMP-LISTING.ACTIONS.ADD-DATASET' | translate}}</button>
<button mat-menu-item (click)="showDatasets(row.id)"><mat-icon>list</mat-icon>{{'DMP-LISTING.ACTIONS.DATASETS' | translate}}</button>
<button mat-menu-item (click)="newVersion(row.id)"><mat-icon>filter_none</mat-icon>{{'DMP-LISTING.ACTIONS.NEW-VERSION' | translate}}</button>
</mat-menu>
<button mat-icon-button [matMenuTriggerFor]="actionsMenu">
<mat-icon>more_vert</mat-icon>

4
dmp-frontend/src/app/dmps/dmp-listing.component.ts
View File

@ -61,6 +61,10 @@ export class DataManagementPlanListingComponent implements OnInit {
this.router.navigate(['/datasets/' + rowId]);
}
newVersion(rowId: String) {
//this.router.navigate(['/datasets/' + rowId]);
}
getDefaultCriteria(): DataManagementPlanCriteria {
const defaultCriteria = new DataManagementPlanCriteria();
return defaultCriteria;

10
dmp-frontend/src/app/form/dynamic-form.component.html
View File

@ -1,10 +1,10 @@
<div class="full-width full-height">
<mat-sidenav-container class="ng-sidebar-container">
<div class="dynamic-form-editor">
<!-- <mat-sidenav-container class="ng-sidebar-container"> -->
<!-- <mat-sidenav mode="push" position="right" [(opened)]="visibleSidebar">
<table-of-content class="toc-container full-height" [model]="datasetProfileDefinitionModel"></table-of-content>
</mat-sidenav> -->
<mat-sidenav-content>
<!-- <mat-sidenav-content> -->
<!-- <button mat-raised-button color="primary" style="margin: 15px;" (click)="toggleSidebar()" icon="fa-arrow-left">Table Of Contents</button> -->
<form *ngIf="form" novalidate [formGroup]="form" (ngSubmit)="onSubmit()">
<button mat-raised-button color="primary" *ngIf="datasetProfileDefinitionModel&&datasetProfileDefinitionModel.status != 1"
@ -44,7 +44,7 @@
</div>
</form>
</mat-sidenav-content>
</mat-sidenav-container>
<!-- </mat-sidenav-content>
</mat-sidenav-container> -->
</div>
<!-- <p>Form value: {{ form.value | json }}</p> -->

12
dmp-frontend/src/app/form/dynamic-form.component.css → dmp-frontend/src/app/form/dynamic-form.component.scss
View File

@ -4,7 +4,7 @@
width: 40%;
}
.toc-container {
/* .toc-container {
background: #f9f9f9 none repeat scroll 0 0;
border: 1px solid #aaa;
display: table;
@ -12,12 +12,20 @@
margin-bottom: 1em;
padding: 20px;
width: 100%;
}
} */
.ui-steps .ui-steps-item {
min-width: 10%;
}
.dynamic-form-editor {
// background-color: #e0e0e0;
// min-height: 80vh;
mat-vertical-stepper {
background-color: #e0e0e0;
}
}
.ng-sidebar-container {
overflow: inherit !important;

2
dmp-frontend/src/app/form/dynamic-form.component.ts
View File

@ -22,7 +22,7 @@ declare function simple_notifier(type: string, title: string, message: string):
selector: 'dynamic-form',
templateUrl: './dynamic-form.component.html',
styleUrls: [
'./dynamic-form.component.css'
'./dynamic-form.component.scss'
],
providers: [
],

2
dmp-frontend/src/app/user-management/login/login.component.html
View File

@ -21,7 +21,7 @@
</div>
</div>
<div *ngIf = "hasNativeLogin()">
<p class="tip">Or Be Classical</p>
<!-- <p class="tip">Or Be Classical</p> -->
<div class="card-form">
<div class="form-row">
<i class="material-icons">email</i>

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

@ -11,6 +11,7 @@
},
"SNACK-BAR": {
"SUCCESSFUL-CREATION": "Created Successfully",
"SUCCESSFUL-UPDATE": "Updated Successfully",
"SUCCESSFUL-LOGIN": "Successful Login",
"SUCCESSFUL-LOGOUT": "Successful Logout",
"UNSUCCESSFUL-LOGOUT": "Unsuccessful Logout",
@ -48,7 +49,8 @@
"EDIT": "Edit",
"INVITE": "Invite",
"ADD-DATASET": "Add Dataset",
"DATASETS": "Datasets"
"DATASETS": "Datasets",
"NEW-VERSION": "New Version"
}
},
"DATASET-WIZARD": {