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

ENH: Make sample and container id label in export configurable

parent d467dbd5
Branches
Tags
1 merge request!1F awi sams
......@@ -22,6 +22,8 @@ BUILD_MODULE_EXT_SSS_MARKDOWN=ENABLED
# Showing id in labels helps for the container/sample id columns
BUILD_MODULE_SHOW_ID_IN_LABEL=ENABLED
# BIS specific variables
# sample-management specific variables
BUILD_MODULE_EXT_BIS_SAMPLEMANAGEMENT=ENABLED
BUILD_MODULE_EXT_BIS_STOCKMANAGEMENT=ENABLED
BUILD_MODULE_EXT_SAMPLEMANGEMENT_ID_LABEL="Sample ID"
BUILD_MODULE_EXT_STOCKMANAGEMENT_ID_LABEL="Container ID"
\ No newline at end of file
......@@ -29,6 +29,7 @@ const ext_bis_samplemanagement = function($, navbar, log, form_elements, form_pa
const upload_pdf_title = "Upload PDF file";
const export_csv_id = "export_sample_csv";
const export_csv_title = "Export Samples to CSV";
const sample_id_label = ("${BUILD_MODULE_EXT_SAMPLEMANGEMENT_ID_LABEL}" != "") ? "${BUILD_MODULE_EXT_SAMPLEMANGEMENT_ID_LABEL}" : "Sample ID";
const accepted_file_formats = [
".csv",
".CSV",
......@@ -36,7 +37,7 @@ const ext_bis_samplemanagement = function($, navbar, log, form_elements, form_pa
"text/csv",
];
const required_column_names = [
"BIS ID",
"LinkAhead ID",
"Date collected start",
"Main User",
"Gear",
......@@ -56,11 +57,11 @@ const ext_bis_samplemanagement = function($, navbar, log, form_elements, form_pa
"Sample Context",
];
const requiredColumnNamesChildren = [
"BIS ID",
"LinkAhead ID",
"Date sampled start",
"Fixation",
"Main User",
"Parent BIS ID",
"Parent LinkAhead ID",
"Sample Context",
"Sample container",
"SampleType",
......@@ -101,7 +102,7 @@ const ext_bis_samplemanagement = function($, navbar, log, form_elements, form_pa
"Date sampled stop",
"Time sampled start",
"Time sampled stop",
"Parent BIS ID"
"Parent LinkAhead ID"
]
const allColumnNames = non_sample_rt_column_names.concat(requiredColumnNamesChildren).concat(required_column_names);
......@@ -135,11 +136,11 @@ const ext_bis_samplemanagement = function($, navbar, log, form_elements, form_pa
fields: [{
type: "text",
name: "bis_ids",
label: "BIS IDS",
label: sample_id_label,
required: false,
pattern: "((([0-9]+\\s*-\\s*){0,1}[0-9]+)\\s*,\\s*)*(([0-9]+\\s*-\\s*){0,1}[0-9]+)",
cached: false,
help: "Comma-separated list of single BIS IDs or ranges, e.g. '124, 126-139, 242'",
help: `Comma-separated list of single ${sample_id_label}s or ranges, e.g. '124, 126-139, 242'`,
}, {
type: "text",
name: "query_string",
......
......@@ -18,6 +18,7 @@ const ext_bis_stockmanagement = function ($, navbar, log, form_elements, form_pa
///////////////// REGISTER NEW CONTAINERS START
const register_new_containers_title = "Register new Containers";
const register_new_containers_panel_id = "register_new_containers_form_panel";
const container_id_label = ("${BUILD_MODULE_EXT_STOCKMANAGEMENT_ID_LABEL}" != "") ? "${BUILD_MODULE_EXT_STOCKMANAGEMENT_ID_LABEL}" : "Container ID";
const register_new_containers_form_config = {
// the script can be found in profiles/default/custom/caosdb-server/scripting/bin/
// it is called like ./register_new_containers.py form.json where form.json
......@@ -115,11 +116,11 @@ const ext_bis_stockmanagement = function ($, navbar, log, form_elements, form_pa
fields: [{
type: "text",
name: "bis_ids",
label: "BIS IDS",
label: container_id_label,
required: true,
pattern: "((([0-9]+\\s*-\\s*){0,1}[0-9]+)\\s*,\\s*)*(([0-9]+\\s*-\\s*){0,1}[0-9]+)",
cached: false,
help: "Comma-separated list of single BIS IDs or ranges, e.g. '124, 126-139, 242'"
help: `Comma-separated list of single ${container_id_label}s or ranges, e.g. '124, 126-139, 242'`
}]
};
///////////////// EXPORT CONTAINER CSV END
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment