Skip to content
Snippets Groups Projects
Commit 71b58ff1 authored by kaloyane's avatar kaloyane
Browse files

[LMS-2269] in the "All Experiments" grid, point the "experiment" link to the... 

[LMS-2269] in the "All Experiments" grid, point the "experiment" link to the "show details" target and remove "show details" link

SVN: 21736
parent b033cdb8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 129 deletions
screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialFeaturesFromAllExperimentsGrid.java
+ 2
− 2
View file @ 71b58ff1
......@@ -38,8 +38,8 @@ import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.D
import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.ui.columns.specific.ScreeningLinkExtractor;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ExperimentReference;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.MaterialSimpleFeatureVectorSummary;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellSearchCriteria.ExperimentSearchCriteria;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellSearchCriteria.ExperimentSearchByProjectCriteria;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellSearchCriteria.ExperimentSearchCriteria;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.grids.MaterialFeatureVectorsFromAllExperimentsGridColumnIDs;
/**
......@@ -113,7 +113,7 @@ public class MaterialFeaturesFromAllExperimentsGrid extends
private void linkMaterialInExperiment()
{
registerListenerAndLinkGenerator(
MaterialFeatureVectorsFromAllExperimentsGridColumnIDs.MATERIAL,
MaterialFeatureVectorsFromAllExperimentsGridColumnIDs.EXPERIMENT,
new ICellListenerAndLinkGenerator<MaterialSimpleFeatureVectorSummary>()
{
public void handle(
......
screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/screening-dictionary.js
+ 0
− 1
View file @ 71b58ff1
......@@ -96,7 +96,6 @@ material_replica_feature_summary_MEDIAN: "Median",
material_replica_feature_summary_DEVIATION: "Deviation",
material_features_from_all_experiments_ASSAY: "Experiment",
material_features_from_all_experiments_MATERIAL: "Details",
MATERIAL_FEATURES_FROM_ALL_EXPERIMENTS_SECTION: "All Experiments",
EXACT_MATCH_ONLY: "Exact Matches Only",
......
screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/MaterialFeatureVectorsFromAllExperimentsProvider.java deleted 100644 → 0
+ 0
− 113
View file @ b033cdb8
/*
* Copyright 2011 ETH Zuerich, CISD
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package ch.systemsx.cisd.openbis.plugin.screening.client.web.server;
import static ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.grids.MaterialFeatureVectorsFromAllExperimentsGridColumnIDs.EXPERIMENT;
import java.util.List;
import ch.systemsx.cisd.openbis.generic.client.web.server.resultset.AbstractTableModelProvider;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityTableCell;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TypedTableModel;
import ch.systemsx.cisd.openbis.generic.shared.util.IColumnGroup;
import ch.systemsx.cisd.openbis.generic.shared.util.TypedTableModelBuilder;
import ch.systemsx.cisd.openbis.plugin.screening.shared.IScreeningServer;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ExperimentReference;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.MaterialSimpleFeatureVectorSummary;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellSearchCriteria.ExperimentSearchByProjectCriteria;
/**
* A provider for material replica feature summaries.
*
* @author Kaloyan Enimanev
*/
class MaterialFeatureVectorsFromAllExperimentsProvider extends
AbstractTableModelProvider<MaterialSimpleFeatureVectorSummary>
{
private final IScreeningServer server;
private final String sessionToken;
private final TechId materialId;
private final ExperimentSearchByProjectCriteria experimentSearchCriteria;
public MaterialFeatureVectorsFromAllExperimentsProvider(IScreeningServer server,
String sessionToken, TechId materialId,
ExperimentSearchByProjectCriteria experimentSearchCriteria)
{
this.server = server;
this.sessionToken = sessionToken;
this.materialId = materialId;
this.experimentSearchCriteria = experimentSearchCriteria;
}
@Override
public TypedTableModel<MaterialSimpleFeatureVectorSummary> createTableModel()
{
TypedTableModelBuilder<MaterialSimpleFeatureVectorSummary> builder =
new TypedTableModelBuilder<MaterialSimpleFeatureVectorSummary>();
List<MaterialSimpleFeatureVectorSummary> summaries =
server.getMaterialFeatureVectorsFromAllExperiments(sessionToken, materialId,
experimentSearchCriteria);
builder.addColumn(EXPERIMENT);
createFeatureColumns(builder, summaries);
for (MaterialSimpleFeatureVectorSummary row : summaries)
{
addRow(builder, row);
}
return builder.getModel();
}
private void createFeatureColumns(
TypedTableModelBuilder<MaterialSimpleFeatureVectorSummary> builder,
List<MaterialSimpleFeatureVectorSummary> summaries)
{
IColumnGroup columnGroup = builder.columnGroup("FEATURES");
for (MaterialSimpleFeatureVectorSummary summary : summaries)
{
for (CodeAndLabel codeAndLabel : summary.getFeatureDescriptions())
{
columnGroup.column(codeAndLabel.getCode()).withTitle(codeAndLabel.getLabel());
}
}
}
private void addRow(TypedTableModelBuilder<MaterialSimpleFeatureVectorSummary> builder,
MaterialSimpleFeatureVectorSummary row)
{
builder.addRow(row);
ExperimentReference exp = row.getExperiment();
EntityTableCell experimentCell =
new EntityTableCell(EntityKind.EXPERIMENT, exp.getPermId(), exp.getIdentifier());
experimentCell.setLinkText(exp.getCode());
builder.column(EXPERIMENT).withEntityKind(EntityKind.EXPERIMENT).addValue(experimentCell);
float[] features = row.getFeatureVectorSummary();
List<CodeAndLabel> descriptions = row.getFeatureDescriptions();
for (int i = 0; i < features.length; i++)
{
CodeAndLabel description = descriptions.get(i);
builder.column(description.getCode()).addDouble((double) features[i]);
}
}
}
screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/resultset/MaterialFeatureVectorsFromAllExperimentsProvider.java
+ 2
− 10
View file @ 71b58ff1
......@@ -17,15 +17,12 @@
package ch.systemsx.cisd.openbis.plugin.screening.client.web.server.resultset;
import static ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.grids.MaterialFeatureVectorsFromAllExperimentsGridColumnIDs.EXPERIMENT;
import static ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.grids.MaterialFeatureVectorsFromAllExperimentsGridColumnIDs.MATERIAL;
import java.util.List;
import ch.systemsx.cisd.openbis.generic.client.web.server.resultset.AbstractTableModelProvider;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityTableCell;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TypedTableModel;
import ch.systemsx.cisd.openbis.generic.shared.util.IColumnGroup;
import ch.systemsx.cisd.openbis.generic.shared.util.TypedTableModelBuilder;
......@@ -69,7 +66,6 @@ public class MaterialFeatureVectorsFromAllExperimentsProvider extends
server.getMaterialFeatureVectorsFromAllExperiments(sessionToken, materialId,
experimentSearchCriteria);
builder.addColumn(MATERIAL);
builder.addColumn(EXPERIMENT);
createFeatureColumns(builder, summaries);
......@@ -100,12 +96,8 @@ public class MaterialFeatureVectorsFromAllExperimentsProvider extends
{
builder.addRow(row);
ExperimentReference exp = row.getExperiment();
EntityTableCell experimentCell =
new EntityTableCell(EntityKind.EXPERIMENT, exp.getPermId(), exp.getIdentifier());
experimentCell.setLinkText(exp.getCode());
builder.column(MATERIAL).addString(ScreeningProviderMessages.SHOW_DETAILS_MSG);
builder.column(EXPERIMENT).addString(exp.getCode());
ExperimentReference experiment = row.getExperiment();
builder.column(EXPERIMENT).addString(experiment.getCode());
float[] features = row.getFeatureVectorSummary();
List<CodeAndLabel> descriptions = row.getFeatureDescriptions();
......
screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/grids/MaterialFeatureVectorsFromAllExperimentsGridColumnIDs.java
+ 0
− 3
View file @ 71b58ff1
......@@ -21,8 +21,5 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.grids;
*/
public class MaterialFeatureVectorsFromAllExperimentsGridColumnIDs
{
public static final String EXPERIMENT = "ASSAY";
public static final String MATERIAL = "MATERIAL";
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment