Skip to content
Snippets Groups Projects
Commit f8ff9baf authored by Florian Spreckelsen's avatar Florian Spreckelsen
Browse files

MAINT: Remove BIS from some variable and module names

parent 1c8aef71
No related branches found
No related tags found
1 merge request!1F awi sams
...@@ -23,7 +23,7 @@ BUILD_MODULE_EXT_SSS_MARKDOWN=ENABLED ...@@ -23,7 +23,7 @@ BUILD_MODULE_EXT_SSS_MARKDOWN=ENABLED
BUILD_MODULE_SHOW_ID_IN_LABEL=ENABLED BUILD_MODULE_SHOW_ID_IN_LABEL=ENABLED
# sample-management specific variables # sample-management specific variables
BUILD_MODULE_EXT_BIS_SAMPLEMANAGEMENT=ENABLED BUILD_MODULE_EXT_SAMPLEMANAGEMENT=ENABLED
BUILD_MODULE_EXT_STOCKMANAGEMENT=ENABLED BUILD_MODULE_EXT_STOCKMANAGEMENT=ENABLED
BUILD_MODULE_EXT_SAMPLEMANGEMENT_ID_LABEL="Sample ID" BUILD_MODULE_EXT_SAMPLEMANGEMENT_ID_LABEL="Sample ID"
BUILD_MODULE_EXT_STOCKMANAGEMENT_ID_LABEL="Container ID" BUILD_MODULE_EXT_STOCKMANAGEMENT_ID_LABEL="Container ID"
\ No newline at end of file
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
'use strict'; 'use strict';
/** /**
* This module adds to forms to BIS that relate to sample management. * This module adds to forms to LinkAhead that relate to sample
* One form allows to register samples. * management; there are forms for sample registration, upload, and
* The other allows to update registered samples. * export.
* *
* @module ext_flight_preview * @module ext_flight_preview
* @version 0.1 * @version 0.1
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* @requires nothing yet * @requires nothing yet
* (pass the dependencies as arguments) * (pass the dependencies as arguments)
*/ */
const ext_bis_samplemanagement = function($, navbar, log, form_elements, form_panel, bis_custom_reference_resolver) { const ext_samplemanagement = function($, navbar, log, form_elements, form_panel, bis_custom_reference_resolver) {
const logger = log.getLogger("samplemanagement_form"); const logger = log.getLogger("samplemanagement_form");
const tool_box = "Sample Management" const tool_box = "Sample Management"
const upload_sample_template_title = "Upload sample template"; // title of the form and text in the toolbox const upload_sample_template_title = "Upload sample template"; // title of the form and text in the toolbox
...@@ -424,7 +424,7 @@ $(document).ready(function() { ...@@ -424,7 +424,7 @@ $(document).ready(function() {
// use a variable starting with `BUILD_MODULE_` to enable your module // use a variable starting with `BUILD_MODULE_` to enable your module
// the build variable has to be enabled in the `build.properties.d/` directory. // the build variable has to be enabled in the `build.properties.d/` directory.
// Otherwise the module will not be activated. // Otherwise the module will not be activated.
if ("${BUILD_MODULE_EXT_BIS_SAMPLEMANAGEMENT}" === "ENABLED") { if ("${BUILD_MODULE_EXT_SAMPLEMANAGEMENT}" === "ENABLED") {
caosdb_modules.register(ext_bis_samplemanagement); caosdb_modules.register(ext_samplemanagement);
} }
}); });
...@@ -65,7 +65,6 @@ def get_column_names(data): ...@@ -65,7 +65,6 @@ def get_column_names(data):
def create_sample_entities(data): def create_sample_entities(data):
responsible_person_id = get_responsible_person_id(data) responsible_person_id = get_responsible_person_id(data)
number_of_samples = get_number_of_samples(data) number_of_samples = get_number_of_samples(data)
add_state = len(db.execute_query("FIND 'Sample life-cycle'"))
batch = db.Container() batch = db.Container()
for index in range(number_of_samples): for index in range(number_of_samples):
...@@ -73,9 +72,6 @@ def create_sample_entities(data): ...@@ -73,9 +72,6 @@ def create_sample_entities(data):
sample.add_parent(name="Sample") sample.add_parent(name="Sample")
sample.add_property(name="Main User", value=responsible_person_id) sample.add_property(name="Main User", value=responsible_person_id)
sample.add_property("Container") sample.add_property("Container")
sample.add_property("NagoyaCase")
if add_state:
sample.state = db.State(name="Registered", model="Sample life-cycle")
batch += [sample] batch += [sample]
batch = post_process_samples(batch) batch = post_process_samples(batch)
batch.insert() batch.insert()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment