Skip to content
Snippets Groups Projects
Commit 47388199 authored by cramakri's avatar cramakri
Browse files

MINOR: Small cosmetic fixes to the strain browser

SVN: 24009
parent 3c50c330
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
<!-- <script type="text/javascript" src="openbis-request-cache.js"></script> --> <!-- <script type="text/javascript" src="openbis-request-cache.js"></script> -->
<script> <script>
basynthec = new openbis_basynthec('https://basynthec.ethz.ch/openbis/openbis', 'https://basynthec.ethz.ch/datastore_server'); //basynthec = new openbis_basynthec('https://basynthec.ethz.ch/openbis/openbis', 'https://basynthec.ethz.ch/datastore_server');
basynthec = new openbis_basynthec('http://localhost:8888/openbis/openbis', 'http://localhost:8889/datastore_server');
var w = 1024; var w = 1024;
...@@ -26,10 +27,13 @@ var dataSetsByStrain = { }; ...@@ -26,10 +27,13 @@ var dataSetsByStrain = { };
// prefixes of strain names to be grouped togehter // prefixes of strain names to be grouped togehter
var STRAIN_GROUP_PREFIXES = [ "JJS-DIN", "JJS-MGP" ]; var STRAIN_GROUP_PREFIXES = [ "JJS-DIN", "JJS-MGP" ];
// The names to show the user for the strain groups
var STRAIN_GROUP_PREFIXES_DISPLAY_NAME = {"JJS-DIN" : "JJS-Din", "JJS-MGP" : "JJS-MGP" };
// groups of strains to be displayed // groups of strains to be displayed
var strainGroups = []; var strainGroups = [];
var IGNORED_DATASET_TYPES = [ "EXCEL_ORIGINAL", "TSV_EXPORT", "UNKNOWN" ]; var IGNORED_DATASET_TYPES = [ "EXCEL_ORIGINAL", "UNKNOWN" ];
//The inspected strains //The inspected strains
var inspected = []; var inspected = [];
...@@ -92,7 +96,7 @@ function createStrainGroups(strains) { ...@@ -92,7 +96,7 @@ function createStrainGroups(strains) {
return { name : strain, label : strain.substring(strainPrefix.length)}; return { name : strain, label : strain.substring(strainPrefix.length)};
}); });
return {groupName : strainPrefix, strains : groupStrains}; return {groupName : STRAIN_GROUP_PREFIXES_DISPLAY_NAME[strainPrefix], strains : groupStrains};
}); });
var otherStrains = strains.filter(function(strain) { var otherStrains = strains.filter(function(strain) {
...@@ -413,10 +417,9 @@ function groupBy(numElts) ...@@ -413,10 +417,9 @@ function groupBy(numElts)
$(document).ready(function() { $(document).ready(function() {
$("#main").hide() $("#main").hide()
$('#logout-button').click(function() { basynthec.server.logout(function(data) {}) }); $('#logout-button').click(function() { basynthec.server.logout(function(data) {
window.location.reload();
$('#login-form').submit(function() { })
basynthec.server.login( $('#username').val(), $('#password').val(), function(data) { enterApp() })
}); });
$('#login-form').submit(function() { $('#login-form').submit(function() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment