diff --git a/openbis-ipad/source/core-plugins/ipad-ui-ylab/1/dss/reporting-plugins/ipad-read-service-v1/ipad_read.py b/openbis-ipad/source/core-plugins/ipad-ui-ylab/1/dss/reporting-plugins/ipad-read-service-v1/ipad_read.py
index fd0f0d9dc17e10fdd1542162733b3b66dd364d61..032113196ac54bef00b298b934b4aaf05fd2947a 100644
--- a/openbis-ipad/source/core-plugins/ipad-ui-ylab/1/dss/reporting-plugins/ipad-read-service-v1/ipad_read.py
+++ b/openbis-ipad/source/core-plugins/ipad-ui-ylab/1/dss/reporting-plugins/ipad-read-service-v1/ipad_read.py
@@ -122,45 +122,19 @@ class RequestHandler(IRequestHandler):
self.add_data_rows()
def sort_samples_by_type(self, allSamples):
-
- self.oligos = []
- self.antibodies = []
- self.chemicals = []
- self.protocols = []
- self.medias = []
- self.pcrs = []
- self.buffers = []
- self.plasmids = []
- self.yeasts = []
- self.bacterias = []
- self.enzymes = []
- self.westernBlottings = []
-
- for sample in allSamples:
- if 'OLIGO' == sample.getSampleType():
- self.oligos.append(sample)
- elif 'ANTIBODY' == sample.getSampleType():
- self.antibodies.append(sample)
- elif 'CHEMICAL' == sample.getSampleType():
- self.chemicals.append(sample)
- elif 'GENERAL_PROTOCOL' == sample.getSampleType():
- self.protocols.append(sample)
- elif 'MEDIA' == sample.getSampleType():
- self.medias.append(sample)
- elif 'PCR' == sample.getSampleType():
- self.pcrs.append(sample)
- elif 'SOLUTIONS_BUFFERS' == sample.getSampleType():
- self.buffers.append(sample)
- elif 'PLASMID' == sample.getSampleType():
- self.plasmids.append(sample)
- elif 'YEAST' == sample.getSampleType():
- self.yeasts.append(sample)
- elif 'BACTERIA' == sample.getSampleType():
- self.bacterias.append(sample)
- elif 'ENZYME' == sample.getSampleType():
- self.enzymes.append(sample)
- elif 'WESTERN_BLOTTING' == sample.getSampleType():
- self.westernBlottings.append(sample)
+ samplesByType = IpadServiceUtilities.groupSamplesByType(allSamples)
+ self.oligos = samplesByType.getSamples('OLIGO')
+ self.antibodies = samplesByType.getSamples('ANTIBODY')
+ self.chemicals = samplesByType.getSamples('CHEMICAL')
+ self.protocols = samplesByType.getSamples('GENERAL_PROTOCOL')
+ self.medias = samplesByType.getSamples('MEDIA')
+ self.pcrs = samplesByType.getSamples('PCR')
+ self.buffers = samplesByType.getSamples('SOLUTIONS_BUFFERS')
+ self.plasmids = samplesByType.getSamples('PLASMID')
+ self.yeasts = samplesByType.getSamples('YEAST')
+ self.bacterias = samplesByType.getSamples('BACTERIA')
+ self.enzymes = samplesByType.getSamples('ENZYME')
+ self.westernBlottings = samplesByType.getSamples('WESTERN_BLOTTING')
def processRequest(self):
self.process_request()
diff --git a/openbis-ipad/source/core-plugins/ipad-ui-ylab/1/dss/reporting-plugins/ipad-read-service-v1/lib/ipad-framework.jar b/openbis-ipad/source/core-plugins/ipad-ui-ylab/1/dss/reporting-plugins/ipad-read-service-v1/lib/ipad-framework.jar
index 6d1202283a8a4d4ace2bf876be1ac6491bb0f53c..6fbce3d86bb352986f3bb06e940aaad1e3fc9c23 100644
Binary files a/openbis-ipad/source/core-plugins/ipad-ui-ylab/1/dss/reporting-plugins/ipad-read-service-v1/lib/ipad-framework.jar and b/openbis-ipad/source/core-plugins/ipad-ui-ylab/1/dss/reporting-plugins/ipad-read-service-v1/lib/ipad-framework.jar differ
diff --git a/openbis-ipad/source/java/ch/systemsx/cisd/openbis/ipad/v2/server/IpadServiceUtilities.java b/openbis-ipad/source/java/ch/systemsx/cisd/openbis/ipad/v2/server/IpadServiceUtilities.java
index 1ecad923eb239285a2bde5631fcd8a572e990cdf..e161800dbb9ad676c8c704ee3998c8237126e890 100644
--- a/openbis-ipad/source/java/ch/systemsx/cisd/openbis/ipad/v2/server/IpadServiceUtilities.java
+++ b/openbis-ipad/source/java/ch/systemsx/cisd/openbis/ipad/v2/server/IpadServiceUtilities.java
@@ -17,10 +17,13 @@
package ch.systemsx.cisd.openbis.ipad.v2.server;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
+import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.ISampleImmutable;
import com.fasterxml.jackson.core.JsonGenerationException;
import com.fasterxml.jackson.databind.JsonMappingException;
@@ -78,4 +81,28 @@ public class IpadServiceUtilities
return null;
}
+ /**
+ * Group a collection of samples into groups by type.
+ *
+ * @return An object that provides access to the samples for a particular type.
+ */
+ public static SamplesByType groupSamplesByType(List<ISampleImmutable> allSamples)
+ {
+ HashMap<String, List<ISampleImmutable>> samplesByType = new HashMap<String, List<ISampleImmutable>>();
+ for (ISampleImmutable sample : allSamples)
+ {
+ String sampleType = sample.getSampleType();
+ List<ISampleImmutable> samples = samplesByType.get(sampleType);
+ if (null == samples)
+ {
+ samples = new ArrayList<ISampleImmutable>();
+ samples.add(sample);
+ samplesByType.put(sampleType, samples);
+ } else
+ {
+ samples.add(sample);
+ }
+ }
+ return new SamplesByType(samplesByType);
+ }
}
diff --git a/openbis-ipad/source/java/ch/systemsx/cisd/openbis/ipad/v2/server/SamplesByType.java b/openbis-ipad/source/java/ch/systemsx/cisd/openbis/ipad/v2/server/SamplesByType.java
new file mode 100644
index 0000000000000000000000000000000000000000..1d4a282506af6051fc2e95d2c6dd64d812e72df4
--- /dev/null
+++ b/openbis-ipad/source/java/ch/systemsx/cisd/openbis/ipad/v2/server/SamplesByType.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2013 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.ipad.v2.server;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.ISampleImmutable;
+
+/**
+ * Represents a collection of samples grouped by type.
+ *
+ * @author cramakri
+ */
+public class SamplesByType
+{
+ private final Map<String, List<ISampleImmutable>> samplesByType;
+
+ public SamplesByType(Map<String, List<ISampleImmutable>> samplesByType)
+ {
+ this.samplesByType = samplesByType;
+ }
+
+ public List<ISampleImmutable> getSamples(String sampleType)
+ {
+ List<ISampleImmutable> samples = samplesByType.get(sampleType);
+ if (null == samples)
+ {
+ samples = new ArrayList<ISampleImmutable>();
+ }
+ return samples;
+ }
+
+}