diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SideMenu/SideMenuWidgetController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SideMenu/SideMenuWidgetController.js index a7ad2068605981d02b4c12fa776c0639fa4da6c1..342e3c0ddcdc67811c3619de49140dc50742ddb1 100644 --- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SideMenu/SideMenuWidgetController.js +++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SideMenu/SideMenuWidgetController.js @@ -201,8 +201,8 @@ function SideMenuWidgetController(mainController) { var menuItemExperiment = new SideMenuWidgetComponent(true, false, displayName, experiment.identifier, projectNode, newMenuIfSelectedExperiment, "showExperimentPageFromIdentifier", experiment.identifier, "(Experiment)"); projectNode.newMenuIfSelected.children.push(menuItemExperiment); + projectNode.newMenuIfSelected.children.sort(naturalSortSideMenuWidgetComponent); //Sort Experiments } - projectNode.newMenuIfSelected.children.sort(naturalSortSideMenuWidgetComponent); //Sort Experiments } //Fill Sub Experiments diff --git a/plasmid/source/core-plugins/newbrowser/1/dss/reporting-plugins/newbrowserapi/script.py b/plasmid/source/core-plugins/newbrowser/1/dss/reporting-plugins/newbrowserapi/script.py index 92baf003108ead2a6a1d850f10e0cf73c2441eb2..3410abd4a6252caab113009ba3b7e2ffcd0d800e 100644 --- a/plasmid/source/core-plugins/newbrowser/1/dss/reporting-plugins/newbrowserapi/script.py +++ b/plasmid/source/core-plugins/newbrowser/1/dss/reporting-plugins/newbrowserapi/script.py @@ -66,29 +66,31 @@ def process(tr, parameters, tableBuilder): row.setCell("MESSAGE", "Operation Failed"); def init(tr, parameters, tableBuilder): - tr.createNewSpace("INVENTORY", None); - tr.createNewProject("/INVENTORY/MATERIALS"); - tr.createNewExperiment("/INVENTORY/MATERIALS/ANTIBODY", "ANTIBODY"); - tr.createNewExperiment("/INVENTORY/MATERIALS/BACTERIA", "BACTERIA"); - tr.createNewExperiment("/INVENTORY/MATERIALS/CHEMICAL", "CHEMICAL"); - tr.createNewExperiment("/INVENTORY/MATERIALS/ENZYME", "ENZYME"); - tr.createNewExperiment("/INVENTORY/MATERIALS/CELL_LINE", "CELL_LINE"); - tr.createNewExperiment("/INVENTORY/MATERIALS/FLY", "FLY"); - tr.createNewExperiment("/INVENTORY/MATERIALS/MEDIA", "MEDIA"); - tr.createNewExperiment("/INVENTORY/MATERIALS/OLIGO", "OLIGO"); - tr.createNewExperiment("/INVENTORY/MATERIALS/PLASMID", "PLASMID"); - tr.createNewExperiment("/INVENTORY/MATERIALS/YEAST", "YEAST"); - tr.createNewExperiment("/INVENTORY/MATERIALS/SOLUTION_BUFFER", "SOLUTION_BUFFER"); - tr.createNewExperiment("/INVENTORY/MATERIALS/RNA", "RNA"); - - tr.createNewProject("/INVENTORY/METHODS"); - tr.createNewExperiment("/INVENTORY/METHODS/GENERAL_PROTOCOL", "GENERAL_PROTOCOL"); - tr.createNewExperiment("/INVENTORY/METHODS/PCR_PROTOCOL", "PCR_PROTOCOL"); - tr.createNewExperiment("/INVENTORY/METHODS/WESTERN_BLOTTING_PROTOCOL", "WESTERN_BLOTTING_PROTOCOL"); - - tr.createNewSpace("DEFAULT_LAB_NOTEBOOK", None); - tr.createNewProject("/DEFAULT_LAB_NOTEBOOK/DEFAULT_PROJECT"); - tr.createNewExperiment("/DEFAULT_LAB_NOTEBOOK/DEFAULT_PROJECT/DEFAULT_EXPERIMENT", "DEFAULT_EXPERIMENT"); + inventorySpace = tr.getSpace("INVENTORY"); + if inventorySpace == None: + tr.createNewSpace("INVENTORY", None); + tr.createNewProject("/INVENTORY/MATERIALS"); + tr.createNewExperiment("/INVENTORY/MATERIALS/ANTIBODY", "ANTIBODY"); + tr.createNewExperiment("/INVENTORY/MATERIALS/BACTERIA", "BACTERIA"); + tr.createNewExperiment("/INVENTORY/MATERIALS/CHEMICAL", "CHEMICAL"); + tr.createNewExperiment("/INVENTORY/MATERIALS/ENZYME", "ENZYME"); + tr.createNewExperiment("/INVENTORY/MATERIALS/CELL_LINE", "CELL_LINE"); + tr.createNewExperiment("/INVENTORY/MATERIALS/FLY", "FLY"); + tr.createNewExperiment("/INVENTORY/MATERIALS/MEDIA", "MEDIA"); + tr.createNewExperiment("/INVENTORY/MATERIALS/OLIGO", "OLIGO"); + tr.createNewExperiment("/INVENTORY/MATERIALS/PLASMID", "PLASMID"); + tr.createNewExperiment("/INVENTORY/MATERIALS/YEAST", "YEAST"); + tr.createNewExperiment("/INVENTORY/MATERIALS/SOLUTION_BUFFER", "SOLUTION_BUFFER"); + tr.createNewExperiment("/INVENTORY/MATERIALS/RNA", "RNA"); + + tr.createNewProject("/INVENTORY/METHODS"); + tr.createNewExperiment("/INVENTORY/METHODS/GENERAL_PROTOCOL", "GENERAL_PROTOCOL"); + tr.createNewExperiment("/INVENTORY/METHODS/PCR_PROTOCOL", "PCR_PROTOCOL"); + tr.createNewExperiment("/INVENTORY/METHODS/WESTERN_BLOTTING_PROTOCOL", "WESTERN_BLOTTING_PROTOCOL"); + + tr.createNewSpace("DEFAULT_LAB_NOTEBOOK", None); + tr.createNewProject("/DEFAULT_LAB_NOTEBOOK/DEFAULT_PROJECT"); + tr.createNewExperiment("/DEFAULT_LAB_NOTEBOOK/DEFAULT_PROJECT/DEFAULT_EXPERIMENT", "DEFAULT_EXPERIMENT"); return True;