diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java index e963a57c2f5bfd2d4195797878b6b4068d7eac36..de12f55d782b7305d0b77b73091557b923bfb83e 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java @@ -618,6 +618,8 @@ public abstract class Dict public static final String ARCHIVING_STATUS = "archiving_status"; + public static final String PRESENT_IN_ARCHIVE = "present_in_archive"; + public static final String PRODUCTION_DATE = "production_date"; public static final String DATA_PRODUCER_CODE = "data_producer_code"; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/data/CommonExternalDataColDefKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/data/CommonExternalDataColDefKind.java index 4ff16662dec1f6df610d3e766b8d8a75471dcc07..37160f8b88a4baaf4190e4aa525dcc24846065de 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/data/CommonExternalDataColDefKind.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/data/CommonExternalDataColDefKind.java @@ -255,6 +255,15 @@ public enum CommonExternalDataColDefKind implements IColumnDefinitionKind<Extern } }), + PRESENT_IN_ARCHIVE(new AbstractDataSetColumnDefinitionKind(Dict.PRESENT_IN_ARCHIVE, true) + { + @Override + public String tryGetValue(DataSet entity) + { + return SimpleYesNoRenderer.render(entity.isPresentInArchive()); + } + }), + FILE_FORMAT_TYPE(new AbstractDataSetColumnDefinitionKind(Dict.FILE_FORMAT_TYPE, true) { @Override diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExternalDataGridColumnIDs.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExternalDataGridColumnIDs.java index 4d709a16c72967564978f321bd33122654be517b..b462224b079add408feae28a72282c473c7921d7 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExternalDataGridColumnIDs.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExternalDataGridColumnIDs.java @@ -58,6 +58,8 @@ public class ExternalDataGridColumnIDs public static final String ARCHIVING_STATUS = "ARCHIVING_STATUS"; + public static final String PRESENT_IN_ARCHIVE = "PRESENT_IN_ARCHIVE"; + public static final String FILE_FORMAT_TYPE = "FILE_FORMAT_TYPE"; public static final String PRODUCTION_DATE = "PRODUCTION_DATE"; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExternalDataProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExternalDataProvider.java index e05211870c1cd5b3c7d122d00b8a7942f0a625bd..6bc68ef908a88bd7ccf3201a93f7ba5af6d43732 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExternalDataProvider.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExternalDataProvider.java @@ -32,6 +32,7 @@ import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExternalDat import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExternalDataGridColumnIDs.LOCATION; import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExternalDataGridColumnIDs.ORDER_IN_CONTAINER; import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExternalDataGridColumnIDs.PERM_ID; +import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExternalDataGridColumnIDs.PRESENT_IN_ARCHIVE; import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExternalDataGridColumnIDs.PRODUCTION_DATE; import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExternalDataGridColumnIDs.PROJECT; import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExternalDataGridColumnIDs.PROPERTIES_PREFIX; @@ -145,6 +146,8 @@ public abstract class AbstractExternalDataProvider extends builder.column(LOCATION).addString(realDataSet.getFullLocation()); builder.column(ARCHIVING_STATUS) .addString(realDataSet.getStatus().getDescription()); + builder.column(PRESENT_IN_ARCHIVE).addString( + SimpleYesNoRenderer.render(realDataSet.isPresentInArchive())); FileFormatType fileFormatType = realDataSet.getFileFormatType(); builder.column(FILE_FORMAT_TYPE).addString( fileFormatType == null ? "" : fileFormatType.getCode()); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java index ba555ae800eb52672494bd4f24581d1ecb51673d..2f06fda99a647a9908211fdfb9701616438f9f63 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java @@ -691,6 +691,8 @@ public class DatasetLister extends AbstractLister implements IDatasetLister dataSet.setComplete(resolve(record.is_complete)); dataSet.setStatus(record.status == null ? null : DataSetArchivingStatus .valueOf(record.status)); + dataSet.setPresentInArchive(record.present_in_archive == null ? false + : record.present_in_archive); dataSet.setSpeedHint(record.speed_hint == null ? Constants.DEFAULT_SPEED_HINT : record.speed_hint); dataSet.setShareId(record.share_id); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetRecord.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetRecord.java index 542fa8937811c087b55d19452d83e2d2cb62d7ab..a009ab76844c82053742b590ed0673f0bb6bfd34 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetRecord.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetRecord.java @@ -60,5 +60,7 @@ public class DatasetRecord extends CodeRecord public String status; + public Boolean present_in_archive; + public Integer speed_hint; } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSet.java index 6e7acfbe637f6f09842c9673537bfde27f12e89f..54bd7dfceedabe09c995a966e68e75c63ce9f011 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSet.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSet.java @@ -28,6 +28,8 @@ public class DataSet extends ExternalData implements IDatasetLocation private Boolean complete; + private boolean presentInArchive; + private String shareId; private String location; @@ -101,6 +103,16 @@ public class DataSet extends ExternalData implements IDatasetLocation this.status = status; } + public boolean isPresentInArchive() + { + return presentInArchive; + } + + public void setPresentInArchive(boolean presentInArchive) + { + this.presentInArchive = presentInArchive; + } + @Override public int getSpeedHint() { diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslator.java index 03d7351720afbfc5134b3dc584b4558dccf0d23a..5e832fdeba74395c0b732fc230921d3a0166c913 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslator.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslator.java @@ -206,6 +206,7 @@ public class DataSetTranslator dataSet.setSize(externalDataPE.getSize()); dataSet.setComplete(BooleanOrUnknown.tryToResolve(externalDataPE.getComplete())); dataSet.setStatus(externalDataPE.getStatus()); + dataSet.setPresentInArchive(externalDataPE.isPresentInArchive()); dataSet.setSpeedHint(externalDataPE.getSpeedHint()); dataSet.setFileFormatType(TypeTranslator.translate(externalDataPE.getFileFormatType())); dataSet.setLocation(externalDataPE.getLocation()); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.java index 6cc33fb5e53ace6830dacb4297e4716c6b00a19b..2f1fa8041c068837b92e24886f104bcd370aa459 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.java @@ -113,6 +113,8 @@ public class DataSetPropertiesPanel extends ContentPanel { properties.put(messageProvider.getMessage(Dict.ARCHIVING_STATUS), concreteDataSet .getStatus().getDescription()); + properties.put(messageProvider.getMessage(Dict.PRESENT_IN_ARCHIVE), + concreteDataSet.isPresentInArchive()); } properties.put(messageProvider.getMessage(Dict.DATA_STORE), concreteDataSet.getDataStore()); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js index 5523b63b325fa5ff1514a27564f630a926fa5aec..589fb7547f4d2af9c721fc82598b514dd22be48a 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js +++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js @@ -681,6 +681,7 @@ var common = { is_complete: "Complete?", complete: "Complete", archiving_status: "Archiving Status", + present_in_archive: "Present in Archive", data_set_type: "Data Set Type", parent: "Parent", parent_code: "Parent Code",