From db9459fceb5fdf807e1b243324e1ada962b6dea6 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Mon, 15 Jan 2018 15:19:24 +0000
Subject: [PATCH] SSDM-6003 : ELN Storage positions UI, hidden from children,
shown on their own column as links.
SVN: 39098
---
.../html/js/views/DataGrid/SampleDataGridUtil.js | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
index 48e9966cfea..df0a22b8605 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
@@ -110,6 +110,19 @@ var SampleDataGridUtil = new function() {
if(data['$object'].children[cIdx].sampleTypeCode == "STORAGE_POSITION") {
storageData = data['$object'].children[cIdx].properties;
var storagePropertyGroup = profile.getStoragePropertyGroup();
+
+ var codeProperty = storageData[storagePropertyGroup.nameProperty];
+ if(!codeProperty) {
+ codeProperty = "NoCode";
+ }
+ var rowProperty = storageData[storagePropertyGroup.rowProperty];
+ if(!rowProperty) {
+ rowProperty = "NoRow";
+ }
+ var colProperty = storageData[storagePropertyGroup.columnProperty];
+ if(!colProperty) {
+ colProperty = "NoCol";
+ }
var boxProperty = storageData[storagePropertyGroup.boxProperty];
if(!boxProperty) {
boxProperty = "NoBox";
@@ -118,7 +131,7 @@ var SampleDataGridUtil = new function() {
if(!positionProperty) {
positionProperty = "NoPos";
}
- var displayName = boxProperty + " : " + positionProperty;
+ var displayName = codeProperty + " [ " + rowProperty + " , " + colProperty + " ] " + boxProperty + " : " + positionProperty;
if(!isFirst) {
storage.append(",<br>");
}
--
GitLab