From c2f400fc6d1ba112a6cf669e064d871383d8573d Mon Sep 17 00:00:00 2001 From: vedina Date: Sat, 19 Oct 2024 11:23:57 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D1=82=D1=83=D0=B4=D1=8A=20=D1=86=D0=BE?= =?UTF-8?q?=D0=BD=D1=84=D0=B8=D0=B3=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ambit2/base/data/study/Protocol.java | 48 +++++++++++++++++++ .../src/main/webapp/scripts/config-study.js | 31 ++++++++++++ .../src/main/webapp/scripts/config/i5.js | 15 +++++- .../webapp/scripts/profile/enanomapper/bao.js | 11 ++++- .../webapp/scripts/profile/enanomapper/i5.js | 15 +++++- 5 files changed, 117 insertions(+), 3 deletions(-) diff --git a/ambit2-all/ambit2-base/src/main/java/ambit2/base/data/study/Protocol.java b/ambit2-all/ambit2-base/src/main/java/ambit2/base/data/study/Protocol.java index 0a951c59a7..cdeb63f706 100644 --- a/ambit2-all/ambit2-base/src/main/java/ambit2/base/data/study/Protocol.java +++ b/ambit2-all/ambit2-base/src/main/java/ambit2/base/data/study/Protocol.java @@ -3577,6 +3577,32 @@ public boolean deprecated() { return true; } }, + BAO_0003006_SECTION { + @Override + public String toString() { + return "Reporter gene assay"; + } + + @Override + public String getNumber() { + return "BAO_0003006"; + } + + @Override + public String getTopCategory() { + return "TOX"; + } + + @Override + public int getSortingOrder() { + return 1013; + } + + public String getOntologyURI() { + return "http://purl.obolibrary.org/obo/BAO_0003006"; + } + + }, // Immunotoxicity NPO_1339_SECTION { @Override @@ -3680,6 +3706,28 @@ public int getSortingOrder() { } }, + PROCESS_SECTION { + @Override + public String getNumber() { + return "99.0.0"; + } + + @Override + public String getTopCategory() { + return "MANUFACTURE"; + } + + @Override + public String toString() { + return "Manufacturing Process"; + } + + @Override + public int getSortingOrder() { + return 990000; + } + + }, EXPOSURE_SECTION { @Override public String getNumber() { diff --git a/ambit2-apps/ambit2-www/src/main/webapp/scripts/config-study.js b/ambit2-apps/ambit2-www/src/main/webapp/scripts/config-study.js index ea3c7ffb8c..c13bc1e382 100644 --- a/ambit2-apps/ambit2-www/src/main/webapp/scripts/config-study.js +++ b/ambit2-apps/ambit2-www/src/main/webapp/scripts/config-study.js @@ -233,6 +233,13 @@ var config_study = { "protocol" : config_npo["protocol"], "interpretation" : config_npo["interpretation"] }, + "BAO_0003006_SECTION" : { + "parameters" : config_bao["parameters"], + "effects" : config_bao["effects"], + "conditions" : config_bao["conditions"], + "protocol" : config_bao["protocol"], + "interpretation" : config_bao["interpretation"] + }, "BAO_0002189_SECTION" : { "parameters" : config_bao["parameters"], "effects" : config_bao["effects"], @@ -1177,6 +1184,30 @@ var config_study = { "conditions" : config_exposure["conditions"], "protocol" : config_exposure["protocol"], "interpretation" : config_exposure["interpretation"] + }, + "PROCESS_SECTION" : { + "parameters" : config_bao["parameters"], + "effects" : { + "endpoint" : { + "iOrder" : -9, + "bVisible" : false, + "inMatrix" : false + }, + "result" : { + "inMatrix" : false, + "bVisible" : false, + }, + "text" : { + "sTitle" : "Result", + "inMatrix" : false, + "bVisible" : false, + "iOrder" : -7 + } + + }, + "conditions" : config_bao["conditions"], + "protocol" : config_bao["protocol"], + "interpretation" : config_bao["interpretation"] } } diff --git a/ambit2-apps/ambit2-www/src/main/webapp/scripts/config/i5.js b/ambit2-apps/ambit2-www/src/main/webapp/scripts/config/i5.js index 8220d4d3fb..68a23c33a4 100644 --- a/ambit2-apps/ambit2-www/src/main/webapp/scripts/config/i5.js +++ b/ambit2-apps/ambit2-www/src/main/webapp/scripts/config/i5.js @@ -3487,7 +3487,20 @@ var config_i5 = { "protocol" : config_exposure["protocol"], "interpretation" : config_exposure["interpretation"] }, - + "TO_ACUTE_PULMONARY_INSTILLATION_SECTION" : { + "parameters" : config_bao["parameters"], + "effects" : config_bao["effects"], + "conditions" : config_bao["conditions"], + "protocol" : config_bao["protocol"], + "interpretation" : config_bao["interpretation"] + }, + "PROCESS_SECTION" : { + "parameters" : config_bao["parameters"], + "effects" : config_bao["effects"], + "conditions" : config_bao["conditions"], + "protocol" : config_bao["protocol"], + "interpretation" : config_bao["interpretation"] + }, "IMPURITY_SECTION" : { "parameters" : config_bao["parameters"], "effects" : config_bao["effects"], diff --git a/ambit2-apps/ambit2-www/src/main/webapp/scripts/profile/enanomapper/bao.js b/ambit2-apps/ambit2-www/src/main/webapp/scripts/profile/enanomapper/bao.js index 657f0c410c..0bac9a5077 100644 --- a/ambit2-apps/ambit2-www/src/main/webapp/scripts/profile/enanomapper/bao.js +++ b/ambit2-apps/ambit2-www/src/main/webapp/scripts/profile/enanomapper/bao.js @@ -434,7 +434,16 @@ var config_bao = { }, "total dose" : { "bVisible" : true - } + }, + + "activity_type" : { + "bVisible" : true, + "sTitle" : "Activity type" + }, + "temperature_range" : { + "bVisible" : true, + "sTitle" : "Temperature range" + } }, "interpretation" : { "result" : { diff --git a/ambit2-apps/ambit2-www/src/main/webapp/scripts/profile/enanomapper/i5.js b/ambit2-apps/ambit2-www/src/main/webapp/scripts/profile/enanomapper/i5.js index fd373edaca..73932ab30f 100644 --- a/ambit2-apps/ambit2-www/src/main/webapp/scripts/profile/enanomapper/i5.js +++ b/ambit2-apps/ambit2-www/src/main/webapp/scripts/profile/enanomapper/i5.js @@ -821,6 +821,19 @@ var config_i5 = { "conditions" : config_exposure["conditions"], "protocol" : config_exposure["protocol"], "interpretation" : config_exposure["interpretation"] + }, + "PROCESS_SECTION" : { + "parameters" : config_bao["parameters"], + "effects" : config_bao["effects"], + "conditions" : config_bao["conditions"], + "protocol" : config_bao["protocol"], + "interpretation" : config_bao["interpretation"] + }, + "TO_ACUTE_PULMONARY_INSTILLATION_SECTION" : { + "parameters" : config_bao["parameters"], + "effects" : config_bao["effects"], + "conditions" : config_bao["conditions"], + "protocol" : config_bao["protocol"], + "interpretation" : config_bao["interpretation"] } - } \ No newline at end of file