From 8ff1e34b8f235f106d10e95e5d08f26c12767c77 Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Tue, 13 Sep 2011 15:47:17 +0000
Subject: [PATCH] [LMS-2416] minor: render "Delete Sample" as "Delete Plate" or
"Delete Well" where appropriate screening
SVN: 22924
---
.../screening/client/web/client/application/Dict.java | 4 ++++
.../application/detailviewers/ImageSampleViewer.java | 8 ++++++++
.../application/detailviewers/PlateSampleViewer.java | 6 ++++++
.../screening/client/web/public/screening-dictionary.js | 2 ++
4 files changed, 20 insertions(+)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/Dict.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/Dict.java
index 8d8b043e29b..617180253e4 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/Dict.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/Dict.java
@@ -119,6 +119,10 @@ public final class Dict extends ch.systemsx.cisd.openbis.generic.client.web.clie
public static final String ANALYSIS_PROCEDURE = "ANALYSIS_PROCEDURE";
+ public static final String BUTTON_DELETE_PLATE = "button_delete_plate";
+
+ public static final String BUTTON_DELETE_WELL = "button_delete_well";
+
private Dict()
{
// Can not be instantiated.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ImageSampleViewer.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ImageSampleViewer.java
index 8fbf711d187..4df212c5383 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ImageSampleViewer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ImageSampleViewer.java
@@ -27,6 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.IIdAndCodeHolder;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleParentWithDerived;
import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample.GenericSampleViewer;
+import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.Dict;
import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.ScreeningViewContext;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellLocation;
@@ -86,4 +87,11 @@ public final class ImageSampleViewer extends GenericSampleViewer
sections.add(new ImageSampleSection(screeningViewContext, sampleId, wellLocationOrNull));
return sections;
}
+
+ @Override
+ protected String getDeleteButtonLabel()
+ {
+ return viewContext.getMessage(Dict.BUTTON_DELETE_WELL);
+ }
+
}
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateSampleViewer.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateSampleViewer.java
index 20ffd086600..a00abbc7911 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateSampleViewer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateSampleViewer.java
@@ -75,4 +75,10 @@ public final class PlateSampleViewer extends GenericSampleViewer
return screeningViewContext.getMessage(Dict.PLATE_VIEWER_TITLE, originalData.getCode());
}
+ @Override
+ protected String getDeleteButtonLabel()
+ {
+ return viewContext.getMessage(Dict.BUTTON_DELETE_PLATE);
+ }
+
}
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/screening-dictionary.js b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/screening-dictionary.js
index bd95cf3e51e..921601be865 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/screening-dictionary.js
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/screening-dictionary.js
@@ -47,6 +47,8 @@ generated_samples: "Children Samples",
openbis_plate_metadata_browser_CODE: "Code",
openbis_plate_metadata_browser_TYPE: "Type",
openbis_plate_metadata_browser_THUMBNAIL: "Thumbnail",
+button_delete_plate: "Delete Plate",
+button_delete_well: "Delete Well",
sample_properties_heading: "Properties",
--
GitLab