Skip to content
Snippets Groups Projects
Commit c3ac7b1e authored by ribeaudc's avatar ribeaudc
Browse files

change: - 'generatedFrom' -> 'Parent X', 'partOf' -> 'Container X'. 

SVN: 9009
parent 663b492b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/public/generic-dictionary.js
+ 2
− 2
View file @ c3ac7b1e
...@@ -51,8 +51,8 @@ var generic = { ...@@ -51,8 +51,8 @@ var generic = {
experiment: "Experiment", experiment: "Experiment",
experiment_identifier: "Experiment Identifier", experiment_identifier: "Experiment Identifier",
generated_samples: "Generated Samples", generated_samples: "Generated Samples",
generated_from: "Parent (gener.) {0}", generated_from: "Parent {0}",
part_of: "Parent (cont.) {0}", part_of: "Container {0}",
// //
// Invalidation // Invalidation
......
openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
+ 2
− 7
View file @ c3ac7b1e
...@@ -57,7 +57,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.Mode ...@@ -57,7 +57,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.Mode
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.SampleModel; import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.SampleModel;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.ColumnConfigFactory; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.ColumnConfigFactory;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.PropertyValueRenderers; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.PropertyValueRenderers;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property.ObjectArrayPropertyValueRenderer;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property.PropertyGrid; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property.PropertyGrid;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider; import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExternalData; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExternalData;
...@@ -280,7 +279,7 @@ public final class GenericSampleViewer extends LayoutContainer ...@@ -280,7 +279,7 @@ public final class GenericSampleViewer extends LayoutContainer
Sample generatedFrom = sample.getGeneratedFrom(); Sample generatedFrom = sample.getGeneratedFrom();
for (int i = 0; i < sampleType.getGeneratedFromHierarchyDepth() && generatedFrom != null; i++) for (int i = 0; i < sampleType.getGeneratedFromHierarchyDepth() && generatedFrom != null; i++)
{ {
properties.put(generatedFrom.getSampleType().getDescription(), generatedFrom); properties.put(messageProvider.getMessage("generated_from", i + 1), generatedFrom);
generatedFrom = generatedFrom.getGeneratedFrom(); generatedFrom = generatedFrom.getGeneratedFrom();
} }
for (final SampleProperty property : sample.getProperties()) for (final SampleProperty property : sample.getProperties())
...@@ -311,12 +310,8 @@ public final class GenericSampleViewer extends LayoutContainer ...@@ -311,12 +310,8 @@ public final class GenericSampleViewer extends LayoutContainer
.createPersonPropertyValueRenderer(messageProvider)); .createPersonPropertyValueRenderer(messageProvider));
propertyGrid.registerPropertyValueRenderer(SampleType.class, PropertyValueRenderers propertyGrid.registerPropertyValueRenderer(SampleType.class, PropertyValueRenderers
.createSampleTypePropertyValueRenderer(messageProvider)); .createSampleTypePropertyValueRenderer(messageProvider));
propertyGrid.registerPropertyValueRenderer(Sample[].class,
new ObjectArrayPropertyValueRenderer<Sample>(messageProvider,
PropertyValueRenderers.createSamplePropertyValueRenderer(messageProvider,
true)));
propertyGrid.registerPropertyValueRenderer(Sample.class, PropertyValueRenderers propertyGrid.registerPropertyValueRenderer(Sample.class, PropertyValueRenderers
.createSamplePropertyValueRenderer(messageProvider, false)); .createSamplePropertyValueRenderer(messageProvider, true));
propertyGrid.registerPropertyValueRenderer(Invalidation.class, PropertyValueRenderers propertyGrid.registerPropertyValueRenderer(Invalidation.class, PropertyValueRenderers
.createInvalidationPropertyValueRenderer(messageProvider)); .createInvalidationPropertyValueRenderer(messageProvider));
propertyGrid.registerPropertyValueRenderer(SampleProperty.class, PropertyValueRenderers propertyGrid.registerPropertyValueRenderer(SampleProperty.class, PropertyValueRenderers
......
openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ScreeningSampleViewer.java
+ 3
− 9
View file @ c3ac7b1e
...@@ -29,7 +29,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAs ...@@ -29,7 +29,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAs
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants; import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext; import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.PropertyValueRenderers; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.PropertyValueRenderers;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property.ObjectArrayPropertyValueRenderer;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property.PropertyGrid; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property.PropertyGrid;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider; import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.Invalidation; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.Invalidation;
...@@ -74,8 +73,7 @@ public final class ScreeningSampleViewer extends LayoutContainer ...@@ -74,8 +73,7 @@ public final class ScreeningSampleViewer extends LayoutContainer
properties.put(messageProvider.getMessage("sample"), sample); properties.put(messageProvider.getMessage("sample"), sample);
properties.put(messageProvider.getMessage("sample_type"), sampleType); properties.put(messageProvider.getMessage("sample_type"), sampleType);
properties.put(messageProvider.getMessage(REGISTRATOR), sample.getRegistrator()); properties.put(messageProvider.getMessage(REGISTRATOR), sample.getRegistrator());
properties.put(messageProvider.getMessage(REGISTRATION_DATE), sample properties.put(messageProvider.getMessage(REGISTRATION_DATE), sample.getRegistrationDate());
.getRegistrationDate());
if (generated.length > 0) if (generated.length > 0)
{ {
properties.put(messageProvider.getMessage("generated_samples"), generated); properties.put(messageProvider.getMessage("generated_samples"), generated);
...@@ -87,7 +85,7 @@ public final class ScreeningSampleViewer extends LayoutContainer ...@@ -87,7 +85,7 @@ public final class ScreeningSampleViewer extends LayoutContainer
Sample generatedFrom = sample.getGeneratedFrom(); Sample generatedFrom = sample.getGeneratedFrom();
for (int i = 0; i < sampleType.getGeneratedFromHierarchyDepth() && generatedFrom != null; i++) for (int i = 0; i < sampleType.getGeneratedFromHierarchyDepth() && generatedFrom != null; i++)
{ {
properties.put(generatedFrom.getSampleType().getDescription(), generatedFrom); properties.put(messageProvider.getMessage("generated_from", i + 1), generatedFrom);
generatedFrom = generatedFrom.getGeneratedFrom(); generatedFrom = generatedFrom.getGeneratedFrom();
} }
for (final SampleProperty property : sample.getProperties()) for (final SampleProperty property : sample.getProperties())
...@@ -108,12 +106,8 @@ public final class ScreeningSampleViewer extends LayoutContainer ...@@ -108,12 +106,8 @@ public final class ScreeningSampleViewer extends LayoutContainer
.createPersonPropertyValueRenderer(messageProvider)); .createPersonPropertyValueRenderer(messageProvider));
propertyGrid.registerPropertyValueRenderer(SampleType.class, PropertyValueRenderers propertyGrid.registerPropertyValueRenderer(SampleType.class, PropertyValueRenderers
.createSampleTypePropertyValueRenderer(messageProvider)); .createSampleTypePropertyValueRenderer(messageProvider));
propertyGrid.registerPropertyValueRenderer(Sample[].class,
new ObjectArrayPropertyValueRenderer<Sample>(messageProvider,
PropertyValueRenderers.createSamplePropertyValueRenderer(messageProvider,
true)));
propertyGrid.registerPropertyValueRenderer(Sample.class, PropertyValueRenderers propertyGrid.registerPropertyValueRenderer(Sample.class, PropertyValueRenderers
.createSamplePropertyValueRenderer(messageProvider, false)); .createSamplePropertyValueRenderer(messageProvider, true));
propertyGrid.registerPropertyValueRenderer(Invalidation.class, PropertyValueRenderers propertyGrid.registerPropertyValueRenderer(Invalidation.class, PropertyValueRenderers
.createInvalidationPropertyValueRenderer(messageProvider)); .createInvalidationPropertyValueRenderer(messageProvider));
propertyGrid.registerPropertyValueRenderer(SampleProperty.class, PropertyValueRenderers propertyGrid.registerPropertyValueRenderer(SampleProperty.class, PropertyValueRenderers
......
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