From 226d3a41ed94ac7c00b34a6ebd6b2012f077a580 Mon Sep 17 00:00:00 2001
From: Juan Fuentes <juanf@bs-mbpr28.d.ethz.ch>
Date: Wed, 30 Jan 2019 10:51:36 +0100
Subject: [PATCH] Fixes on the ordering system from the review, having at least
one product on request and one request on order is now mandatory
---
.../webapps/eln-lims/html/js/plugins/GenericTechnology.js | 2 +-
.../html/js/views/SampleForm/SampleFormController.js | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/plugins/GenericTechnology.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/plugins/GenericTechnology.js
index c584143546b..0040c1e8a14 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/plugins/GenericTechnology.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/plugins/GenericTechnology.js
@@ -47,7 +47,7 @@ $.extend(GenericTechnology.prototype, ELNLIMSPlugin.prototype, {
"SAMPLE_PARENTS_HINT" : [{
"LABEL" : "Requests",
"TYPE": "REQUEST",
- "MIN_COUNT" : 0,
+ "MIN_COUNT" : 1,
"ANNOTATION_PROPERTIES" : []
}]
},
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
index 0807d14d68b..ce8566caaa2 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
@@ -184,17 +184,23 @@ function SampleFormController(mainController, mode, sample, paginationInfo) {
//
if(sample.sampleTypeCode === "REQUEST") {
var maxProducts;
+ var minProducts;
if(profile.sampleTypeDefinitionsExtension &&
profile.sampleTypeDefinitionsExtension["REQUEST"] &&
profile.sampleTypeDefinitionsExtension["REQUEST"]["SAMPLE_PARENTS_HINT"] &&
profile.sampleTypeDefinitionsExtension["REQUEST"]["SAMPLE_PARENTS_HINT"][0]) {
maxProducts = profile.sampleTypeDefinitionsExtension["REQUEST"]["SAMPLE_PARENTS_HINT"][0]["MAX_COUNT"];
+ minProducts = profile.sampleTypeDefinitionsExtension["REQUEST"]["SAMPLE_PARENTS_HINT"][0]["MIN_COUNT"];
}
if(maxProducts && (sampleParentsFinal.length + newSampleParents.length) > maxProducts) {
Util.showUserError("There is more than " + maxProducts + " product.");
return;
}
+ if(minProducts && (sampleParentsFinal.length + newSampleParents.length) < minProducts) {
+ Util.showUserError("There is less than " + maxProducts + " product.");
+ return;
+ }
}
//
--
GitLab