From 9f9015e414b37c8efabd37a4491fb017682a2adc Mon Sep 17 00:00:00 2001
From: barillac <barillac>
Date: Wed, 16 Apr 2014 12:52:58 +0000
Subject: [PATCH] Dilution factor and Calculated volume changed
SVN: 31379
---
.../webapps/newbrowser/html/js/widgets/DilutionWidget.js | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/DilutionWidget.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/DilutionWidget.js
index 55edb1ac713..3762da1766c 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/DilutionWidget.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/DilutionWidget.js
@@ -144,6 +144,9 @@ function DilutionWidget(containerId, serverFacade) {
break;
}
}
+
+ var dilutionVolume = parseFloat(data["conjugatedClone"].properties["CYTOF_STAINING_CONC"]) / parseFloat(data["conjugatedClone"].properties["CYTOF_CONCENTRATION"]);
+
if(conjugatedCloneSelected === "") {
_this._updateCell(rowNumber,4, "");
_this._updateCell(rowNumber,5, "");
@@ -152,7 +155,8 @@ function DilutionWidget(containerId, serverFacade) {
} else {
_this._updateCell(rowNumber,4, data["clone"].properties["REACTIVITY"]);
_this._updateCell(rowNumber,5, data["lot"].properties["SUPPLIER"]);
- _this._updateCell(rowNumber,6, data["conjugatedClone"].properties["CYTOF_CONCENTRATION"]);
+ _this._updateCell(rowNumber,6, dilutionVolume);
+
}
_this._updateCalculatedValues();
}
@@ -172,7 +176,7 @@ function DilutionWidget(containerId, serverFacade) {
var row = $(tBody.rows[rowNum]);
var concentration = row.children()[6].innerHTML;
if(concentration !== "") {
- var volumeToAdd = this._totalVolume / parseFloat(concentration);
+ var volumeToAdd = this._totalVolume * parseFloat(concentration);
totalVolumeToAdd += volumeToAdd;
this._updateCell(rowNum,7, volumeToAdd);
}
--
GitLab