diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css index 6e1f62cb940807a1c8f421b0e699a926ec6e0068..b521bda51d665ca57d00a7980ed771d2f989981e 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css @@ -294,19 +294,23 @@ h1, h2, legend { width:300px; } +div.inspectorWhiteFont { + color: white !important; +} + div.inspectorCondensed { text-decoration: none; color: #000; display: block; overflow: hidden; padding: 20px; - border-radius: 90px; + border-radius: 10px; } div.inspectorCondensed > .table th, div.inspectorCondensed > .table td { border-top: none; - line-height: 14px; + line-height: 12px; } div.inspector > table { @@ -361,13 +365,13 @@ div.inspector:hover,div.inspector:focus{ } .property { - font-size: 10px; + font-size: 12px; font-weight: normal; } .properties { padding-top:10px; - width: 100%; + width: 100%; } .properties td:nth-child(odd) { diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js index de511d586bbdf25a1dec72e31eaf443974a51108..05eaa29f90535f6f01dff06a588da527b86108e4 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js @@ -560,7 +560,7 @@ function ServerFacade(openbisServer) { }; var localReference = this; - this.openbisServer.searchForSamplesWithFetchOptions(sampleCriteria, ["PROPERTIES"], function(data) { + this.openbisServer.searchForSamplesWithFetchOptions(sampleCriteria, ["PROPERTIES", "PARENTS", "CHILDREN"], function(data) { callbackFunction(localReference.getInitializedSamples(data.result)); }); } diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/PrintUtil.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/PrintUtil.js index d83163f2fb08af9e334e6d7929f96ef0a8132edb..69d65a31dc4a5959b0971af38b0f8536c5e5f46b 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/PrintUtil.js +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/PrintUtil.js @@ -71,11 +71,11 @@ var PrintUtil = new function() { return allParentCodesAsText; } - this.getTable = function(entity, showClose, withColors, withLinks, optionalTitle, isCondensed) { + this.getTable = function(entity, showClose, withColors, withLinks, optionalTitle, isCondensed, customClass) { var defaultColor = null; if(!withColors) { - defaultColor = "#ffffff" + defaultColor = "transparent" } else { defaultColor = profile.getColorForInspectors(entity.sampleTypeCode); } @@ -90,6 +90,9 @@ var PrintUtil = new function() { inspectorClass = 'inspector'; } + if(customClass) { + inspectorClass += ' ' + customClass; + } inspector += "<div id='"+divID+"' class='" + inspectorClass + "' style='background-color:" + defaultColor + ";' >"; if(showClose) { diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/PlateView.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/PlateView.js index 7eb6d9860e59130eef1dbe3c39d95f3f2251c13e..5a9b42d5f006649ce889cc736ebfd164d6750c2c 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/PlateView.js +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/PlateView.js @@ -37,6 +37,11 @@ function PlateView(plateController, plateModel) { $cell = $("<td>").append(" "); if(well) { $cell.addClass('well'); + var tooltip = PrintUtil.getTable(well, false, false, false, well.code, true, 'inspectorWhiteFont'); + $cell.tooltipster({ + content: $(tooltip), + interactive: true + }); } } $row.append($cell); diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/legacy/SampleHierarchy.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/legacy/SampleHierarchy.js index a597d669adf1b869ec130a095e6b356e04fcf643..bc02319eba603a7dc9a31ff80b73bf9b54d0bddf 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/legacy/SampleHierarchy.js +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/legacy/SampleHierarchy.js @@ -280,7 +280,7 @@ function SampleHierarchy(serverFacade, containerId, profile, sample) { 'padding' : '10px', 'margin' : '10px', 'background-color' : (sample.permId === rootPermId)?'lightgreen':'transparent', - 'border-radius' : '90px' + 'border-radius' : '10px' }); var $hideLink = $('<a>', {