diff --git a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_bis_samplemanagemet.js b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_samplemanagement.js similarity index 98% rename from sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_bis_samplemanagemet.js rename to sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_samplemanagement.js index 27a94946300025f6ca2219eb62da1cf402316b58..afa88dfc2fefd9551168500feee2dbbcb2af657a 100644 --- a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_bis_samplemanagemet.js +++ b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_samplemanagement.js @@ -16,7 +16,7 @@ * @requires nothing yet * (pass the dependencies as arguments) */ -const ext_samplemanagement = function($, navbar, log, form_elements, form_panel, bis_custom_reference_resolver) { +const ext_samplemanagement = function($, navbar, log, form_elements, form_panel, sample_management_reference_resolver) { const logger = log.getLogger("samplemanagement_form"); const tool_box = "Sample Management" const upload_sample_template_title = "Upload sample template"; // title of the form and text in the toolbox @@ -182,7 +182,7 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel, name: "responsible_person", label: "Main user", query: "FIND RECORD Person", - make_desc: bis_custom_reference_resolver.resolve_person_reference, + make_desc: sample_management_reference_resolver.resolve_person_reference, required: true }, { @@ -263,7 +263,7 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel, name: "main_user", label: "Main user", query: "FIND RECORD Person", - make_desc: bis_custom_reference_resolver.resolve_person_reference, + make_desc: sample_management_reference_resolver.resolve_person_reference, required: true }, { type: "select", @@ -417,7 +417,7 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel, return { init: init, }; -}($, navbar, log, form_elements, form_panel, bis_custom_reference_resolver); +}($, navbar, log, form_elements, form_panel, sample_management_reference_resolver); // this will be replaced by require.js in the future. $(document).ready(function() { diff --git a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_stockmanagement.js b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_stockmanagement.js index 8afbebbebc9150a5a57c808e7b8898e346dcd866..4775b9dff5327cf026106a530da05023f0858f8d 100644 --- a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_stockmanagement.js +++ b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_stockmanagement.js @@ -9,9 +9,9 @@ * @module ext_stockmanagement * @version 0.2 * - * @requires($, navbar, log, form_elements, form_panel, bis_custom_reference_resolver) + * @requires($, navbar, log, form_elements, form_panel, sample_management_reference_resolver) */ -const ext_stockmanagement = function($, navbar, log, form_elements, form_panel, bis_custom_reference_resolver) { +const ext_stockmanagement = function($, navbar, log, form_elements, form_panel, sample_management_reference_resolver) { const tool_box = "Storage Management" // The item that is shown in the top-navbar @@ -35,7 +35,7 @@ const ext_stockmanagement = function($, navbar, log, form_elements, form_panel, name: "responsible_entity", label: "Responsible entity", query: "FIND RECORD Responsible", - make_desc: bis_custom_reference_resolver.resolve_person_reference, + make_desc: sample_management_reference_resolver.resolve_person_reference, required: true }, { @@ -77,7 +77,7 @@ const ext_stockmanagement = function($, navbar, log, form_elements, form_panel, name: "parent_id", label: "Parent container", query: "FIND RECORD Container", - make_desc: bis_custom_reference_resolver.resolve_default, + make_desc: sample_management_reference_resolver.resolve_default, required: false }, ], @@ -203,7 +203,7 @@ const ext_stockmanagement = function($, navbar, log, form_elements, form_panel, return { init: init, }; -}($, navbar, log, form_elements, form_panel, bis_custom_reference_resolver); // this will be replaced by require.js in the future. +}($, navbar, log, form_elements, form_panel, sample_management_reference_resolver); // this will be replaced by require.js in the future. $(document).ready(function() { // use a variable starting with `BUILD_MODULE_` to this module diff --git a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/bis_custom_reference_resolver.js b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/sample_management_reference_resolver.js similarity index 96% rename from sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/bis_custom_reference_resolver.js rename to sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/sample_management_reference_resolver.js index 7059cb55c61fcb7921ced6ae19d3b70b1fb7f39b..ec82f14a904a0ba83b0f7f5eb6827b8c243ae5b8 100644 --- a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/bis_custom_reference_resolver.js +++ b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/sample_management_reference_resolver.js @@ -1,4 +1,4 @@ -var bis_custom_reference_resolver = new function (getEntityID, getEntityName, getParents, getProperty, query) { +var sample_management_reference_resolver = new function (getEntityID, getEntityName, getParents, getProperty, query) { const lastname_prop_name = "last_name"; const firstname_prop_name = "first_name";