From 86c9196967565199973457349c72ffd9e1f2dc22 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Thu, 16 Mar 2017 08:39:42 +0000
Subject: [PATCH] SSDM-4184 : Show only valid operators for the property type,
polishing
SVN: 37914
---
.../AdvancedSearch/AdvancedSearchView.js | 42 ++++++++++++-------
1 file changed, 28 insertions(+), 14 deletions(-)
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 263a141e03c..40a6eb8f57f 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
@@ -319,20 +319,34 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
delete _this._advancedSearchModel.criteria.rules[uuid].operator;
if(selectedValue && selectedValue.startsWith("PROP.")) {
- var operatorOptions = [
- { value : "thatEqualsString", label : "thatEquals (String)" },
- { value : "thatEqualsNumber", label : "thatEquals (Number)" },
- { value : "thatEqualsDate", label : "thatEquals (Date)" },
- { value : "thatContainsString", label : "thatContains (String)", selected : true },
- { value : "thatStartsWithString", label : "thatStartsWith (String)" },
- { value : "thatEndsWithString", label : "thatEndsWith (String)" },
- { value : "thatIsLessThanNumber", label : "thatIsLessThan (Number)" },
- { value : "thatIsLessThanOrEqualToNumber", label : "thatIsLessThanOrEqualTo (Number)" },
- { value : "thatIsGreaterThanNumber", label : "thatIsGreaterThan (Number)" },
- { value : "thatIsGreaterThanOrEqualToNumber", label : "thatIsGreaterThanOrEqualTo (Number)" },
- { value : "thatIsLaterThanOrEqualToDate", label : "thatIsLaterThanOrEqualTo (Date)" },
- { value : "thatIsEarlierThanOrEqualToDate", label : "thatIsEarlierThanOrEqualTo (Date)" },
- ];
+ var propertyTypeCode = selectedValue.substring(5);
+ var propertyType = profile.getPropertyType(propertyTypeCode);
+
+ var operatorOptions = null;
+
+ if (propertyType.dataType === "INTEGER" || propertyType.dataType === "NUMBER") {
+ operatorOptions = [
+ { value : "thatEqualsNumber", label : "thatEquals (Number)", selected : true },
+ { value : "thatIsLessThanNumber", label : "thatIsLessThan (Number)" },
+ { value : "thatIsLessThanOrEqualToNumber", label : "thatIsLessThanOrEqualTo (Number)" },
+ { value : "thatIsGreaterThanNumber", label : "thatIsGreaterThan (Number)" },
+ { value : "thatIsGreaterThanOrEqualToNumber", label : "thatIsGreaterThanOrEqualTo (Number)" }
+ ];
+ } else if(propertyType.dataType === "TIMESTAMP") {
+ operatorOptions = [
+ { value : "thatEqualsDate", label : "thatEquals (Date)", selected : true },
+ { value : "thatIsLaterThanOrEqualToDate", label : "thatIsLaterThanOrEqualTo (Date)" },
+ { value : "thatIsEarlierThanOrEqualToDate", label : "thatIsEarlierThanOrEqualTo (Date)" }
+ ];
+ } else {
+ operatorOptions = [
+ { value : "thatContainsString", label : "thatContains (String)", selected : true },
+ { value : "thatEqualsString", label : "thatEquals (String)" },
+ { value : "thatStartsWithString", label : "thatStartsWith (String)" },
+ { value : "thatEndsWithString", label : "thatEndsWith (String)" }
+ ];
+ }
+
var comparisonDropdown = FormUtil.getDropdown(operatorOptions, "Select Comparison operator");
comparisonDropdown.change(function() {
--
GitLab