diff --git a/.vs/CoExp_Web/v16/.suo b/.vs/CoExp_Web/v16/.suo index cfe0613..36a1fa7 100644 Binary files a/.vs/CoExp_Web/v16/.suo and b/.vs/CoExp_Web/v16/.suo differ diff --git a/Program.cs b/Program.cs index d192fb3..0eddf48 100644 --- a/Program.cs +++ b/Program.cs @@ -16,7 +16,7 @@ public static void Main(string[] args) { CreateWebHostBuilder(args) //Change here the environment. Possible values: "Production", "Development", "Private", "Docker" - .UseEnvironment("Development") + .UseEnvironment("Production") .Build() .Run(); } diff --git a/Views/Run/Catalogue.cshtml b/Views/Run/Catalogue.cshtml index 0aa9c26..273d55e 100644 --- a/Views/Run/Catalogue.cshtml +++ b/Views/Run/Catalogue.cshtml @@ -200,7 +200,13 @@ ] }); intro.onbeforechange(function (targetElement) { - + + if (targetElement.id == "step1") { + $('#category_dropdown').val('10UKBEC').change(); + $('#category_dropdown') + .prop("disabled", false) + .selectpicker('refresh'); + } if (targetElement.id == "step2" && $("#category_dropdown").val() == "10UKBEC") { $('#network_dropdown').val('SNIG').change(); $('#network_dropdown') @@ -216,6 +222,10 @@ var doneTourCatalogue = sessionStorage.getItem('EventTourCatalogue') === 'Completed'; if (doneTourCatalogue) { + $('#category_dropdown').val('10UKBEC').change(); + $('#category_dropdown') + .prop("disabled", false) + .selectpicker('refresh'); return; } else { diff --git a/Views/Run/Help_Plot.cshtml b/Views/Run/Help_Plot.cshtml index 9eed939..09a468f 100644 --- a/Views/Run/Help_Plot.cshtml +++ b/Views/Run/Help_Plot.cshtml @@ -33,7 +33,7 @@ Available categories

-

Previous tutorial: Gene Set Annotation


+

Previous tutorial: Gene Set Annotation


diff --git a/Views/Run/Plot.cshtml b/Views/Run/Plot.cshtml index c55f50d..2b76518 100644 --- a/Views/Run/Plot.cshtml +++ b/Views/Run/Plot.cshtml @@ -164,7 +164,12 @@ ] }); intro.onbeforechange(function (targetElement) { - + if (targetElement.id == "step1") { + $('#category_dropdown').val('10UKBEC').change(); + $('#category_dropdown') + .prop("disabled", false) + .selectpicker('refresh'); + } if (targetElement.id == "step2" && $("#category_dropdown").val() == "10UKBEC") { $('#network_dropdown').val('SNIG').change(); $('#network_dropdown') @@ -194,6 +199,10 @@ }); var doneTourPlot = sessionStorage.getItem('EventTourPlot') === 'Completed'; if (doneTourPlot) { + $('#category_dropdown').val('10UKBEC').change(); + $('#category_dropdown') + .prop("disabled", false) + .selectpicker('refresh'); return; } else { diff --git a/obj/Debug/netcoreapp2.1/CoExp_Web.Views.dll b/obj/Debug/netcoreapp2.1/CoExp_Web.Views.dll index 851c4f0..9630e69 100644 Binary files a/obj/Debug/netcoreapp2.1/CoExp_Web.Views.dll and b/obj/Debug/netcoreapp2.1/CoExp_Web.Views.dll differ diff --git a/obj/Debug/netcoreapp2.1/CoExp_Web.csprojAssemblyReference.cache b/obj/Debug/netcoreapp2.1/CoExp_Web.csprojAssemblyReference.cache index 55a2a2c..2fe36e3 100644 Binary files a/obj/Debug/netcoreapp2.1/CoExp_Web.csprojAssemblyReference.cache and b/obj/Debug/netcoreapp2.1/CoExp_Web.csprojAssemblyReference.cache differ diff --git a/obj/Debug/netcoreapp2.1/CoExp_Web.dll b/obj/Debug/netcoreapp2.1/CoExp_Web.dll index ffbb920..14bde9a 100644 Binary files a/obj/Debug/netcoreapp2.1/CoExp_Web.dll and b/obj/Debug/netcoreapp2.1/CoExp_Web.dll differ diff --git a/obj/Debug/netcoreapp2.1/CoExp_Web.pdb b/obj/Debug/netcoreapp2.1/CoExp_Web.pdb index 031165d..b8fdbb9 100644 Binary files a/obj/Debug/netcoreapp2.1/CoExp_Web.pdb and b/obj/Debug/netcoreapp2.1/CoExp_Web.pdb differ diff --git a/wwwroot/js/api.js b/wwwroot/js/api.js index 58f63d3..99e3c69 100644 --- a/wwwroot/js/api.js +++ b/wwwroot/js/api.js @@ -336,8 +336,9 @@ API.prototype.getNetworkCategories = function (category) { $('#category_dropdown') .append(option); } - $('#category_dropdown').val('10UKBEC').change(); $('#category_dropdown') + .val('10UKBEC') + .change() .selectpicker('refresh') startIntro() }