Commit a33d44d2 authored by Rajkumar-D's avatar Rajkumar-D
Browse files

Updating horizontal steper

parent bd87da87
Pipeline #278454 failed with stages
in 24 seconds
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
</div> </div>
</div> </div>
<mat-vertical-stepper #stepper *ngIf="checklistGroupDataSource"> <mat-horizontal-stepper #stepper *ngIf="checklistGroupDataSource">
<mat-step label="Select checklist group"> <mat-step label="Select checklist group">
<p>Please select a checklist group first.</p> <p>Please select a checklist group first.</p>
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
<!-- <button mat-button matStepperNext (click)="">Done</button> --> <!-- <button mat-button matStepperNext (click)="">Done</button> -->
</div> </div>
</mat-step> </mat-step>
</mat-vertical-stepper> </mat-horizontal-stepper>
</mat-expansion-panel> </mat-expansion-panel>
<mat-expansion-panel *ngIf="checklistType === ChecklistType.sample" (opened)="panelOpenState = true" <mat-expansion-panel *ngIf="checklistType === ChecklistType.sample" (opened)="panelOpenState = true"
(closed)="panelOpenState = false"> (closed)="panelOpenState = false">
......
...@@ -174,7 +174,7 @@ export class ChecklistComponent implements OnInit { ...@@ -174,7 +174,7 @@ export class ChecklistComponent implements OnInit {
} }
this.selectedChecklist.fieldGroups.forEach((fieldGroup) => { this.selectedChecklist.fieldGroups.forEach((fieldGroup) => {
fieldGroup.fields.forEach((field) => { fieldGroup.fields.forEach((field) => {
this.selectedFields[field.label] = (field.mandatory === 'mandatory'); this.selectedFields[field.label] = (field.mandatory === 'mandatory' || field.mandatory === 'recommended');
this.mandatoryFields[field.label] = (field.mandatory === 'mandatory'); this.mandatoryFields[field.label] = (field.mandatory === 'mandatory');
}); });
}); });
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<mat-divider></mat-divider> <mat-divider></mat-divider>
<div class="container"> <div class="container">
<mat-card> <mat-card>
<mat-vertical-stepper #stepper> <mat-horizontal-stepper #stepper>
<mat-step label="Select an existing policy" *ngIf="action!='Edit'"> <mat-step label="Select an existing policy" *ngIf="action!='Edit'">
<app-report (selectedRecord)="getSelectedPolicy($event,stepper)" <app-report (selectedRecord)="getSelectedPolicy($event,stepper)"
[reportType]="ReportType.policies" [embDefaultSearch]="true" [embeded]="true"> [reportType]="ReportType.policies" [embDefaultSearch]="true" [embeded]="true">
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
</div> </div>
</mat-step> </mat-step>
</mat-vertical-stepper> </mat-horizontal-stepper>
</mat-card> </mat-card>
</div> </div>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<mat-divider></mat-divider> <mat-divider></mat-divider>
<div class="container"> <div class="container">
<mat-card> <mat-card>
<mat-vertical-stepper #stepper> <mat-horizontal-stepper #stepper>
<mat-step label="Select an existing DAC" *ngIf="action!='Edit'"> <mat-step label="Select an existing DAC" *ngIf="action!='Edit'">
<app-report (selectedRecord)="getSelectedDac($event,stepper)" [reportType]="ReportType.dacs" <app-report (selectedRecord)="getSelectedDac($event,stepper)" [reportType]="ReportType.dacs"
[embDefaultSearch]="true" [embeded]="true"> [embDefaultSearch]="true" [embeded]="true">
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</div> </div>
</mat-step> </mat-step>
</mat-vertical-stepper> </mat-horizontal-stepper>
</mat-card> </mat-card>
</div> </div>
......
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
<p>You can use this service for a range of submission activities as well as reports <p>You can use this service for a range of submission activities as well as reports
on your submissions. For help with submitting your data, including the use of on your submissions. For help with submitting your data, including the use of
this interface, please refer to our <a href="https://ena-docs.readthedocs.io/en/latest/index.html">Help this interface, please refer to our <a href="https://ena-docs.readthedocs.io/en/latest/index.html">Help
Guides. </a>. Please familiarise yourself with Guides. </a>Please familiarise yourself with
the different submission interfaces and what can be submitted through each by the different submission interfaces and what can be submitted through each by
reading our <a href="https://ena-docs.readthedocs.io/en/latest/submit/general-guide.html">General Guide on reading our <a href="https://ena-docs.readthedocs.io/en/latest/submit/general-guide.html">General Guide on
ENA Data ENA Data
Submission.</a>. All users are advised to take a Submission.</a>All users are advised to take a
moment to understand the <a moment to understand the <a
href="https://ena-docs.readthedocs.io/en/latest/submit/general-guide/metadata.html">ENA Metadata href="https://ena-docs.readthedocs.io/en/latest/submit/general-guide/metadata.html">ENA Metadata
Model.</a> You may also like to review how the release Model.</a> You may also like to review how the release
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
<span *ngIf="!isEga()" [routerLink]="['/report',ReportType.unsubmittedFiles,{defaultSearch: true}]"> <span *ngIf="!isEga()" [routerLink]="['/report',ReportType.unsubmittedFiles,{defaultSearch: true}]">
<mat-icon class="insert_chart icon-safron">insert_chart</mat-icon> <mat-icon class="insert_chart icon-safron">insert_chart</mat-icon>
<p class="mat-small mat-caption">Unsubmitted files report <p class="mat-small mat-caption">Unsubmitted Files Report
</p> </p>
</span> </span>
</div> </div>
......
.headerContent{ .headerContent{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.toolbar { .toolbar {
display: flex ; display: flex ;
position: relative; position: relative;
...@@ -18,8 +15,6 @@ ...@@ -18,8 +15,6 @@
padding-top: 14px; padding-top: 14px;
} }
.mat-toolbar.mat-primary { .mat-toolbar.mat-primary {
background: #70bdbd; background: #70bdbd;
color: white; color: white;
...@@ -66,9 +61,10 @@ nav ul.menu li a{ ...@@ -66,9 +61,10 @@ nav ul.menu li a{
cursor: pointer; cursor: pointer;
} }
.egalogo{ .egalogo{
width:17%; width:16%;
min-width: 12%; min-width: 10%;
cursor: pointer; cursor: pointer;
margin-left: 5px;
} }
.title{ .title{
color:white; color:white;
...@@ -91,12 +87,15 @@ nav ul.menu li a{ ...@@ -91,12 +87,15 @@ nav ul.menu li a{
.linkDiv{ .linkDiv{
width: 50%; width: 50%;
} }
.logo{ .enalogo{
width:15%; width:15%;
cursor: pointer; cursor: pointer;
} }
.egalogo{
width:10%;
cursor: pointer;
}
.title{ .title{
color:white; color:white;
width:25%; width:25%;
...@@ -109,10 +108,15 @@ nav ul.menu li a{ ...@@ -109,10 +108,15 @@ nav ul.menu li a{
.title{ .title{
display: none; display: none;
} }
.logo{ .enalogo{
width:25%; width:25%;
cursor: pointer; cursor: pointer;
} }
.egalogo{
width:15%;
cursor:pointer
}
.linkDiv{ .linkDiv{
width: 75%; width: 75%;
text-align: right; text-align: right;
......
...@@ -13,6 +13,16 @@ ...@@ -13,6 +13,16 @@
<img src="assets/ega-logo.png" alt="ENA Logo"> <img src="assets/ega-logo.png" alt="ENA Logo">
</div> </div>
</ng-container> </ng-container>
<ng-container *ngIf="!isAuthenticated()">
<div class="enalogo" routerLink="">
<img src="assets/ENA_Logo_notagline.png" alt="ENA Logo">
</div>
<div class="egalogo" routerLink="">
<img src="assets/ega-logo.png" alt="ENA Logo">
</div>
</ng-container>
<div class="float-left inline-block padding-left-large" id="local-title"> <div class="float-left inline-block padding-left-large" id="local-title">
<a routerLink=""> <a routerLink="">
<div class="title"> <div class="title">
...@@ -27,7 +37,8 @@ ...@@ -27,7 +37,8 @@
<ul id="local-nav" class="dropdown menu float-left" data-description="navigational"> <ul id="local-nav" class="dropdown menu float-left" data-description="navigational">
<li class="toolbar-text"><a href="https://www.ebi.ac.uk/ena/browser/support">Support <i <li class="toolbar-text"><a href="https://www.ebi.ac.uk/ena/browser/support">Support <i
class="icon icon-generic" data-icon="x"></i></a></li> class="icon icon-generic" data-icon="x"></i></a></li>
<li class="toolbar-text" *ngIf="isAuthenticated()"><a [routerLink]="['/accountInfo']">Manage <li class="toolbar-text" *ngIf="isAuthenticated() && !isEga()"><a
[routerLink]="['/accountInfo']">Manage
Account Account
<i class="material-icons accountIcon">account_box</i> <i class="material-icons accountIcon">account_box</i>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</mat-panel-title> </mat-panel-title>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<mat-vertical-stepper #stepper> <mat-horizontal-stepper #stepper>
<mat-step label="Please select a study"> <mat-step label="Please select a study">
<app-report (selectedRecord)="getSelectedStudy($event,stepper)" [reportType]="reportType" <app-report (selectedRecord)="getSelectedStudy($event,stepper)" [reportType]="reportType"
[embDefaultSearch]="true" [embeded]="true"></app-report> [embDefaultSearch]="true" [embeded]="true"></app-report>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
</div> </div>
</mat-step> </mat-step>
</mat-vertical-stepper> </mat-horizontal-stepper>
</mat-expansion-panel> </mat-expansion-panel>
<mat-expansion-panel (opened)="panelOpenState = true" (closed)="panelOpenState = false" class="mat-body"> <mat-expansion-panel (opened)="panelOpenState = true" (closed)="panelOpenState = false" class="mat-body">
<mat-expansion-panel-header> <mat-expansion-panel-header>
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<b>Upload filled spreadsheet to register taxa</b> <b>Upload filled spreadsheet to register taxa</b>
</mat-panel-title> </mat-panel-title>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<mat-vertical-stepper #stepper> <mat-horizontal-stepper #stepper>
<mat-step label="Upload Spreadsheet"> <mat-step label="Upload Spreadsheet">
<form (ngSubmit)="uploadFile(form,stepper)" #form="ngForm"> <form (ngSubmit)="uploadFile(form,stepper)" #form="ngForm">
<input type="file" required name="spreadSheet" [(ngModel)]="form.spreadSheet" observeFiles /> <input type="file" required name="spreadSheet" [(ngModel)]="form.spreadSheet" observeFiles />
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
[ngTemplateOutletContext]="{validDs:validSpreadsheetDataSource,invalidDs:invalidSpreadsheetDataSource,souece:'Spreadsheet'}"> [ngTemplateOutletContext]="{validDs:validSpreadsheetDataSource,invalidDs:invalidSpreadsheetDataSource,souece:'Spreadsheet'}">
</ng-template> </ng-template>
</mat-step> </mat-step>
</mat-vertical-stepper> </mat-horizontal-stepper>
</mat-expansion-panel> </mat-expansion-panel>
</mat-accordion> </mat-accordion>
</mat-expansion-panel> </mat-expansion-panel>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment