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 55edb1ac713259a5f76562df169d7d447da3fa5b..3762da1766c149a499e311c2f7aa67787d68287c 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); }