From d321576f177070ec0bc448286a86ccae31dfc077 Mon Sep 17 00:00:00 2001
From: AndiMajore <andi.majore@googlemail.com>
Date: Mon, 1 Aug 2022 17:55:19 +0200
Subject: [PATCH] updated license agreement
---
.../license-agreement/license-agreement.component.html | 7 ++++---
.../license-agreement/license-agreement.component.scss | 6 +++++-
src/app/config.ts | 5 ++---
.../launch-analysis/launch-analysis.component.scss | 3 +--
src/index.html | 10 +++++-----
src/stylesheets/styles.scss | 3 +++
6 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/app/components/license-agreement/license-agreement.component.html b/src/app/components/license-agreement/license-agreement.component.html
index 3c38c98d..18364cf2 100644
--- a/src/app/components/license-agreement/license-agreement.component.html
+++ b/src/app/components/license-agreement/license-agreement.component.html
@@ -1,17 +1,18 @@
<div
class="modal absolute"
- [class.is-active]="show && drugstoneConfig.config.useNedrexLicensed && license"
+ [class.is-active]="show && drugstoneConfig.config.licensedDatasets && license"
>
<div class="modal-background"></div>
<div class="modal-card">
<header class="modal-card-head">
<p class="modal-card-title">
<span class="icon"><i class="fa fa-key"></i></span>
- NeDRex License
+ Data License Agreement
</p>
</header>
<section class="modal-card-body">
- <div [innerHTML]="license"></div>
+ <div class="is-text-align-justify" style="margin-bottom: 16px"> <i>For the use of licenced data of sources like DrugBank and OMIM, partially provided by the NeDRex database, the terms of use for data of the NeDRex platform have to be accepted:</i></div>
+ <div [innerHTML]="license" class="is-text-align-justify"></div>
</section>
<footer class="modal-card-foot">
<button
diff --git a/src/app/components/license-agreement/license-agreement.component.scss b/src/app/components/license-agreement/license-agreement.component.scss
index b197fa21..9e45929b 100644
--- a/src/app/components/license-agreement/license-agreement.component.scss
+++ b/src/app/components/license-agreement/license-agreement.component.scss
@@ -1,3 +1,7 @@
.absolute {
position: absolute !important;
-}
\ No newline at end of file
+}
+
+.is-text-align-justify {
+ text-align: justify
+}
diff --git a/src/app/config.ts b/src/app/config.ts
index 6ccd172f..85d3daf2 100644
--- a/src/app/config.ts
+++ b/src/app/config.ts
@@ -79,10 +79,10 @@ export interface IConfig {
autofillEdges: boolean;
interactions?: InteractionDatabase;
physicsOn?: boolean;
+ licensedDatasets?: boolean;
identifier?: Identifier;
nodeShadow?: boolean;
edgeShadow?: boolean;
- useNedrexLicensed?: boolean;
algorithms: { [key in AlgorithmTarget]: Array<AlgorithmType | QuickAlgorithmType> }
}
@@ -163,12 +163,11 @@ export const defaultConfig: IConfig = {
interactionProteinProtein: 'NeDRex',
associatedProteinDisorder: 'NeDRex',
indicationDrugDisorder: 'NeDRex',
- licencedDatasets: false,
+ licensedDatasets: false,
nodeShadow: true,
edgeShadow: true,
autofillEdges: true,
physicsOn: false,
- useNedrexLicensed: true,
selfReferences: false,
algorithms: {
'drug': ['trustrank', 'closeness', 'degree', 'proximity'],
diff --git a/src/app/dialogs/launch-analysis/launch-analysis.component.scss b/src/app/dialogs/launch-analysis/launch-analysis.component.scss
index 6100ca69..f6c5d835 100644
--- a/src/app/dialogs/launch-analysis/launch-analysis.component.scss
+++ b/src/app/dialogs/launch-analysis/launch-analysis.component.scss
@@ -1,6 +1,5 @@
.modal-card {
- height: 800px;
- max-height: 80vh;
+ height: 500px;
}
.modal-card-body {
diff --git a/src/index.html b/src/index.html
index 5dda7122..f5b3eef1 100644
--- a/src/index.html
+++ b/src/index.html
@@ -94,8 +94,8 @@
<drugst-one id="netexp1"
pluginId="2"
groups='{"nodeGroups":{"important":{"type":"gene","color":"#ff881f","font":{"color":"#000000"},"groupName":"Important Gene","shape":"star"},"gene":{"type":"gene","color":"#4da300","font":{"color":"#f0f0f0"},"groupName":"Gene","shape":"circle"}}}'
- config='{"licencedDatasets": false, "licencedDatasets": false,"physicsOn":false,"identifier":"symbol","title":"Breast cancer example network","nodeShadow":true,"edgeShadow":false,"autofillEdges":true,"showLegend":true}'
- network='{"nodes":[{"id":"ATM","label":"ATM","group":"gene","x":289,"y":242},{"id":"BARD1","label":"BARD1","group":"gene","x":44,"y":250},{"id":"BRCA1","label":"BRCA1","group":"gene","x":466,"y":576},{"id":"BRCA2","label":"BRCA2","group":"gene","x":507,"y":285},{"id":"BRIP1","label":"BRIP1","group":"gene","x":54,"y":474},{"id":"CHEK2","label":"CHEK2","group":"gene","x":216,"y":590},{"id":"CDH1","label":"CDH1","group":"gene","x":320,"y":-57},{"id":"NF1","label":"NF1","group":"gene","x":481,"y":111},{"id":"NBN","label":"NBN","group":"gene","x":-57,"y":314},{"id":"PALB2","label":"PALB2","group":"gene","x":450,"y":190},{"id":"PTEN","label":"PTEN","group":"important","x":305,"y":494},{"id":"RAD51C","label":"RAD51C","group":"gene","x":182,"y":-90},{"id":"RAD51D","label":"RAD51D","group":"gene","x":368,"y":73},{"id":"STK11","label":"STK11","group":"gene","x":686,"y":330},{"id":"TP53","label":"TP53","group":"important","x":333,"y":316}]}'
+ config='{"licensedDatasets": false, "physicsOn":false,"identifier":"symbol","title":"Breast cancer example network","nodeShadow":true,"edgeShadow":false,"autofillEdges":true,"showLegend":true}'
+ network='{"nodes":[{"id":"FOXP3","label":"FOXP3","group":"gene"},{"id":"ATM","label":"ATM","group":"gene","x":289,"y":242},{"id":"BARD1","label":"BARD1","group":"gene","x":44,"y":250},{"id":"BRCA1","label":"BRCA1","group":"gene","x":466,"y":576},{"id":"BRCA2","label":"BRCA2","group":"gene","x":507,"y":285},{"id":"BRIP1","label":"BRIP1","group":"gene","x":54,"y":474},{"id":"CHEK2","label":"CHEK2","group":"gene","x":216,"y":590},{"id":"CDH1","label":"CDH1","group":"gene","x":320,"y":-57},{"id":"NF1","label":"NF1","group":"gene","x":481,"y":111},{"id":"NBN","label":"NBN","group":"gene","x":-57,"y":314},{"id":"PALB2","label":"PALB2","group":"gene","x":450,"y":190},{"id":"PTEN","label":"PTEN","group":"important","x":305,"y":494},{"id":"RAD51C","label":"RAD51C","group":"gene","x":182,"y":-90},{"id":"RAD51D","label":"RAD51D","group":"gene","x":368,"y":73},{"id":"STK11","label":"STK11","group":"gene","x":686,"y":330},{"id":"TP53","label":"TP53","group":"important","x":333,"y":316}]}'
>
</drugst-one>
@@ -104,8 +104,8 @@
<!-- <drugst-one id="netexp1"-->
<!-- pluginId="2"-->
<!-- groups='{"nodeGroups":{"node":{"type":"Gene","color":"#0000FF","font":{"color":"#ffffff"},"groupName":"Node","shape":"ellipse"}, "gene":{"type":"Gene","color":"#CD5C5C","font":{"color":"#000000"},"groupName":"Gene","shape":"ellipse"}}}'-->
-<!-- config='{"selfReferences": false, "licencedDatasets": false,"physicsOn":false,"identifier":"ensg","title":"Breast cancer example network","nodeShadow":true,"edgeShadow":false,"autofillEdges":true,"showLegend":true}'-->
-<!-- network='{"nodes":[{"id":"ENSG00000185379","group":"gene","label":"ENSG00000185379"},{"id":"ENSG00000108384","group":"gene","label":"ENSG00000108384"},{"id":"ENSG00000138376","group":"gene","label":"ENSG00000138376"},{"id":"ENSG00000284792","group":"gene","label":"ENSG00000284792"},{"id":"ENSG00000171862","group":"gene","label":"ENSG00000171862"},{"id":"ENSG00000141510","group":"gene","label":"ENSG00000141510"}],"edges":[]}'-->
+<!-- config='{"selfReferences": false, "licensedDatasets": false,"physicsOn":false,"identifier":"ensg","title":"Breast cancer example network","nodeShadow":true,"edgeShadow":false,"autofillEdges":true,"showLegend":true}'-->
+<!-- network='{"nodes":[{"id":"ENSG00000049768", "group": "gene", "label":"ENSG00000049768"},{"id":"ENSG00000185379","group":"gene","label":"ENSG00000185379"},{"id":"ENSG00000108384","group":"gene","label":"ENSG00000108384"},{"id":"ENSG00000138376","group":"gene","label":"ENSG00000138376"},{"id":"ENSG00000284792","group":"gene","label":"ENSG00000284792"},{"id":"ENSG00000171862","group":"gene","label":"ENSG00000171862"},{"id":"ENSG00000141510","group":"gene","label":"ENSG00000141510"}],"edges":[]}'-->
<!-- >-->
<!--</drugst-one>-->
</div>
@@ -187,7 +187,7 @@
}
function changeLicenced(licenced){
- setAttribute('licencedDatasets',licenced)
+ setAttribute('licensedDatasets',licenced)
}
function applyDataset(){
diff --git a/src/stylesheets/styles.scss b/src/stylesheets/styles.scss
index 09f37cf5..b2d949cb 100644
--- a/src/stylesheets/styles.scss
+++ b/src/stylesheets/styles.scss
@@ -41,6 +41,9 @@
nav.navbar {
height: 60px;
}
+ .modal-card {
+ max-height: 90% !important;
+ }
img.menu-icon.is-hoverable.navbar-item.logo {
height: 40px;
--
GitLab