From 3f562982e131d3f47f17f8f618cdcdc88d076486 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Wed, 10 Aug 2016 12:02:20 +0000
Subject: [PATCH] SSDM-3888: Advance search supporting selecting sample types
SVN: 36894
---
.../AdvancedSearch/AdvancedSearchModel.js | 1 +
.../AdvancedSearch/AdvancedSearchView.js | 20 ++++++++++++-------
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchModel.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchModel.js
index 5ba4c32f60b..009b017cb08 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchModel.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchModel.js
@@ -17,6 +17,7 @@
function AdvancedSearchModel(forceFreeTextSearch) {
this.forceFreeTextSearch = forceFreeTextSearch;
+ this.isSampleTypeForced = false;
this.criteria = {
entityKind : null,
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
index af3eb3b6048..4c992685c91 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
@@ -314,13 +314,16 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
{ value : "ATTR.MODIFICATION_DATE", label : "Modification Date" }];
break;
case "SAMPLE":
- model = [{ value : "ATTR.CODE", label: "Code" },
- { value : "ATTR.SAMPLE_TYPE", label: "" + ELNDictionary.Sample + " Type" },
- { value : "ATTR.PERM_ID", label: "Perm Id" },
- { value : "ATTR.SPACE", label: "Space" },
-// { value : "ATTR.METAPROJECT", label: "Tag" }, TO-DO Not supported by ELN yet
- { value : "ATTR.REGISTRATION_DATE", label: "Registration Date" },
- { value : "ATTR.MODIFICATION_DATE", label: "Modification Date" }];
+ model = [];
+ model.push({ value : "ATTR.CODE", label: "Code" });
+ if(!this._advancedSearchModel.isSampleTypeForced) {
+ model.push({ value : "ATTR.SAMPLE_TYPE", label: "" + ELNDictionary.Sample + " Type" });
+ }
+ model.push({ value : "ATTR.PERM_ID", label: "Perm Id" });
+ model.push({ value : "ATTR.SPACE", label: "Space" });
+// model.push({ value : "ATTR.METAPROJECT", label: "Tag" }); //TO-DO Not supported by ELN yet
+ model.push({ value : "ATTR.REGISTRATION_DATE", label: "Registration Date" });
+ model.push({ value : "ATTR.MODIFICATION_DATE", label: "Modification Date" });
break;
case "DATASET":
model = [{ value : "ATTR.CODE", label : "Code" },
@@ -376,6 +379,9 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
_this._advancedSearchModel.criteria.rules[uuidValue].type = 'Attribute';
_this._advancedSearchModel.criteria.rules[uuidValue].name = 'ATTR.SAMPLE_TYPE';
_this._advancedSearchModel.criteria.rules[uuidValue].value = kindAndType[1];
+ _this._advancedSearchModel.isSampleTypeForced = true;
+ } else {
+ _this._advancedSearchModel.isSampleTypeForced = false;
}
});
--
GitLab