From 53ba74b28f6c72287d0b3c0cb85c4ac177d2f30d Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 1 Sep 2017 10:26:05 +0000
Subject: [PATCH] SSDM-5553 : Code generation for the UI done on the server
side
SVN: 38690
---
.../eln-lims/html/js/server/ServerFacade.js | 37 +------------------
1 file changed, 2 insertions(+), 35 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
index cbaaeb0b224..897f9282a76 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
@@ -355,43 +355,10 @@ function ServerFacade(openbisServer) {
}
- //
- //OLD METHOD
- /*this.generateCode = function(sampleType, action) {
+ this.generateCode = function(sampleType, action) {
this.openbisServer.countNumberOfSamplesForType(sampleType.code, function(response) {
- if(response.result || response.result === 0) {
- action(sampleType.codePrefix + (parseInt(response.result) + 1));
- }
+ action(sampleType.codePrefix + (parseInt(response.result) + 1));
});
- }*/
-
- this.generateCode = function(sampleType, action) {
- var prefix = sampleType.codePrefix;
- this.searchWithType(
- sampleType.code,
- prefix+"*",
- false,
- function(results) {
- var nextCode;
- if(results.length == 0){
- nextcode = prefix + "1";
- } else{
- var codes = [];
- for(var idx=0; idx<results.length; idx++){
- numeric_code = results[idx].code.substring(prefix.length);
- numeric_code = parseInt(numeric_code);
- if(!isNaN(numeric_code)) {
- codes.push(numeric_code);
- }
- }
- codes = codes.sort(function (a, b) {
- return a - b;
- });
- var nextid = codes[codes.length-1] + 1;
- nextcode = prefix + nextid;
- }
- action(nextcode);
- });
}
this.deleteDataSets = function(datasetIds, reason, callback) {
--
GitLab