Skip to content
Snippets Groups Projects
Commit 29d5c542 authored by Julian Späth's avatar Julian Späth
Browse files

Merge branch 'enhancem' into 'master'

Enhancem

See merge request covid-19/frontend!20
parents 89ab0612 f558e3b6
No related branches found
No related tags found
No related merge requests found
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
</table> </table>
</section> </section>
<footer class="modal-card-foot"> <footer class="modal-card-foot">
<button class="button is-success"> <button class="button is-primary">
<span class="icon"><i class="fa fa-play"></i></span> <span class="icon"><i class="fa fa-play"></i></span>
<span>Multi Steiner</span> <span>Multi Steiner</span>
</button> </button>
<button class="button is-success"> <button class="button is-primary">
<span class="icon"><i class="fa fa-play"></i></span> <span class="icon"><i class="fa fa-play"></i></span>
<span>Key Pathway Miner</span> <span>Key Pathway Miner</span>
</button> </button>
......
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
<nav class="level" *ngIf="proteinData"> <nav class="level" *ngIf="proteinData">
<div class="level-item has-text-centered"> <div class="level-item has-text-centered">
<div> <div>
<p class="heading">Effects</p> <p class="heading">Viral protein</p>
<p class="title"> {{ proteinData.effects.length }}</p> <p class="title"> {{ proteinData.effects.length }}</p>
</div> </div>
</div> </div>
<div class="level-item has-text-centered"> <div class="level-item has-text-centered">
<div> <div>
<p class="heading">Protein Groups</p> <p class="heading">Host protein</p>
<p class="title">{{ proteinData.proteins.length }}</p> <p class="title">{{ proteinData.proteins.length }}</p>
</div> </div>
</div> </div>
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
</p> </p>
</header> </header>
<div class="card-content"> <div class="card-content">
<button (click)="showAnalysisDialog = true" class="button is-success" [disabled]="analysis.getCount() === 0"> <button (click)="showAnalysisDialog = true" class="button is-primary" [disabled]="analysis.getCount() === 0">
<span class="icon"> <span class="icon">
<i class="fa fa-list"></i> <i class="fa fa-list"></i>
</span> </span>
...@@ -140,10 +140,11 @@ ...@@ -140,10 +140,11 @@
<div *ngIf="showDetails" class="content"> <div *ngIf="showDetails" class="content">
<p><b>Protein Group:</b> {{ currentProteinAc }}</p> <p><b>Protein Group:</b> {{ currentProteinAc }}</p>
<p><b>Gene Name(s):</b> <span *ngFor="let geneName of geneNames"> {{ geneName }}</span></p> <!-- <p><b>Gene Name(s):</b> <span *ngFor="let geneName of geneNames"> {{ geneName }}</span></p>-->
<p><b>Protein Name(s):</b> <span *ngFor="let proteinName of proteinNames"> {{ proteinName }}</span></p> <!-- <p><b>Protein Name(s):</b> <span *ngFor="let proteinName of proteinNames"> {{ proteinName }}</span></p>-->
<p><b>Protein AC(s):</b> <p><b>Protein AC(s):</b>
<a href="https://www.uniprot.org/uniprot/{{proteinAc}}" target="_blank" *ngFor="let proteinAc of proteinAcs"> <a href="https://www.uniprot.org/uniprot/{{proteinAc}}" target="_blank"
*ngFor="let proteinAc of proteinAcs">
{{ proteinAc }} {{ proteinAc }}
</a> </a>
</p> </p>
...@@ -167,10 +168,14 @@ ...@@ -167,10 +168,14 @@
<div class="content"> <div class="content">
<h2>Summary</h2> <h2>Summary</h2>
<figure class="image"> <figure class="image">
<img src="assets/boxplot.png" alt="Boxplots"> <!-- <img src="assets/boxplot.png" alt="Boxplots">-->
</figure> </figure>
<button class="button" *ngIf="!inSelection(currentProteinAc)" (click)="addToSelection(currentProteinAc)">Select for analysis</button> <button class="button is-primary" *ngIf="!inSelection(currentProteinAc)"
<button class="button" *ngIf="inSelection(currentProteinAc)" (click)="removeFromSelection(currentProteinAc)">Remove from analysis</button> (click)="addToSelection(currentProteinAc)">Select for analysis
</button>
<button class="button is-primary" *ngIf="inSelection(currentProteinAc)"
(click)="removeFromSelection(currentProteinAc)">Remove from analysis
</button>
</div> </div>
</div> </div>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment