From fff00c05c4e06b8f4ffc43ef6b68888f0b4d848a Mon Sep 17 00:00:00 2001
From: nnpvaan <phuongvan0609@gmail.com>
Date: Tue, 2 Jun 2026 17:48:05 +1000
Subject: [PATCH 1/2] Allow manual volume entry for bottles widget

---
 ....css => bes.lims.55845b52992a0a82b4bb.css} |  0
 .../bundles/bes.lims.55845b52992a0a82b4bb.js  |  1 +
 .../bundles/bes.lims.a435ec7c6ea1d88e080c.js  |  1 -
 src/bes/lims/browser/static/resources.pt      |  2 +-
 .../components/sampletype_container.coffee    | 26 ++++++++++++++++---
 5 files changed, 25 insertions(+), 5 deletions(-)
 rename src/bes/lims/browser/static/bundles/{bes.lims.a435ec7c6ea1d88e080c.css => bes.lims.55845b52992a0a82b4bb.css} (100%)
 create mode 100644 src/bes/lims/browser/static/bundles/bes.lims.55845b52992a0a82b4bb.js
 delete mode 100644 src/bes/lims/browser/static/bundles/bes.lims.a435ec7c6ea1d88e080c.js

diff --git a/src/bes/lims/browser/static/bundles/bes.lims.a435ec7c6ea1d88e080c.css b/src/bes/lims/browser/static/bundles/bes.lims.55845b52992a0a82b4bb.css
similarity index 100%
rename from src/bes/lims/browser/static/bundles/bes.lims.a435ec7c6ea1d88e080c.css
rename to src/bes/lims/browser/static/bundles/bes.lims.55845b52992a0a82b4bb.css
diff --git a/src/bes/lims/browser/static/bundles/bes.lims.55845b52992a0a82b4bb.js b/src/bes/lims/browser/static/bundles/bes.lims.55845b52992a0a82b4bb.js
new file mode 100644
index 0000000..a46ee4c
--- /dev/null
+++ b/src/bes/lims/browser/static/bundles/bes.lims.55845b52992a0a82b4bb.js
@@ -0,0 +1 @@
+(()=>{"use strict";var t={669(t){t.exports=jQuery}},e={};function i(n){var o=e[n];if(void 0!==o)return o.exports;var r=e[n]={exports:{}};return t[n](r,r.exports,i),r.exports}(()=>{var t=i(669);function e(t){return e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},e(t)}function n(t,e){for(var i=0;i<e.length;i++){var n=e[i];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,o(n.key),n)}}function o(t){var i=function(t){if("object"!=e(t)||!t)return t;var i=t[Symbol.toPrimitive];if(void 0!==i){var n=i.call(t,"string");if("object"!=e(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(t);return"symbol"==e(i)?i:i+""}var r=[].indexOf;const a=function(){return e=function e(){var i,n,o,a,l;if(function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,e),this.is_required=this.is_required.bind(this),this.bind_event_handler=this.bind_event_handler.bind(this),this.on_template_selected=this.on_template_selected.bind(this),this.on_bottle_weight_change=this.on_bottle_weight_change.bind(this),this.on_bottle_container_blur=this.on_bottle_container_blur.bind(this),this.on_sample_type_selected=this.on_sample_type_selected.bind(this),this.get_sample_index=this.get_sample_index.bind(this),this.update_container=this.update_container.bind(this),this.toggle_container_visibility=this.toggle_container_visibility.bind(this),this.uses_automatic_bottle_volume=this.uses_automatic_bottle_volume.bind(this),this.set_volume_readonly=this.set_volume_readonly.bind(this),this.calculate_volume=this.calculate_volume.bind(this),this.get_float_value=this.get_float_value.bind(this),this.round=this.round.bind(this),this.set_visible=this.set_visible.bind(this),this.fetch=this.fetch.bind(this),this.ajax_submit=this.ajax_submit.bind(this),this.get_portal_url=this.get_portal_url.bind(this),this.debug=this.debug.bind(this),this.get_add_controller=this.get_add_controller.bind(this),this.is_required()){if(this.debug("load"),this.sample_type_selector="div.uidreferencefield textarea[name^='SampleType']",this.template_selector="div.uidreferencefield textarea[name^='Template']",this.bottle_weights_selector="input[id^='Bottles-'][id*='-Weight-']",this.bottle_containers_selector="input[id^='Bottles-'][id*='-Container-']",this.bind_event_handler(),r.call(document.body.classList,"template-ar_add")>=0)for(n=0,o=(a=document.querySelectorAll(this.sample_type_selector)).length;n<o;n++)i=a[n],l=t("#".concat(i.id)).attr("uid"),this.trigger_event(i,"select",{uids:[l]});else document.querySelector("div[data-fieldname='Bottles']")&&((i=document.querySelector("input[id='Volume']"))&&this.uses_automatic_bottle_volume()?i.setAttribute("readonly","readonly"):i&&i.removeAttribute("readonly"));return this}},i=[{key:"is_required",value:function(){var t,e,i,n,o,r;for(r=["template-ar_add","portaltype-analysisrequest"],e=i=0,n=(o=document.body.classList).length;i<n;e=++i)if(t=o[e],r.includes(t))return!0;return!1}},{key:"bind_event_handler",value:function(){return this.debug("bind_event_handler"),t("body").on("select",this.sample_type_selector,this.on_sample_type_selected),t("body").on("select",this.template_selector,this.on_template_selected),t("body").on("blur",this.bottle_containers_selector,this.on_bottle_container_blur),t("body").on("change",this.bottle_weights_selector,this.on_bottle_weight_change)}},{key:"trigger_event",value:function(t,e,i){var n;return n=new CustomEvent(e,{detail:i,bubbles:!0}),t.dispatchEvent(n)}},{key:"on_template_selected",value:function(t){var e,i,n;if(this.debug("on_template_selected"),e=t.currentTarget,i=this.get_sample_index(e),n=e.value)return this.fetch(n,[]).done(function(t){var e,n;if(t)return e="SampleType-".concat(i),n=t.sampletype_uid,window.senaite.core.widgets[e].set_values([n]),this.update_container(i,n)})}},{key:"on_bottle_weight_change",value:function(t){var e,i;if(this.debug("on_bottle_weight_change"),e=t.currentTarget,i=this.get_sample_index(e),this.uses_automatic_bottle_volume(i))return this.calculate_volume(i)}},{key:"on_bottle_container_blur",value:function(t){var e,i;if(this.debug("on_bottle_container_blur"),e=t.currentTarget,i=this.get_sample_index(e),this.uses_automatic_bottle_volume(i))return this.calculate_volume(i)}},{key:"on_sample_type_selected",value:function(t){var e,i;return this.debug("on_sample_type_selected"),e=t.currentTarget,i=this.get_sample_index(e),this.update_container(i,e.value)}},{key:"get_sample_index",value:function(e){var i;return this.debug("get_sample_index:element=".concat(e.id)),(i=e.closest("td[arnum]"))?t(i).attr("arnum"):null}},{key:"update_container",value:function(t,e){var i;return this.debug("update_container:sample_index=".concat(t,",sample_type_uid=").concat(e)),e?(i="container_widget",this.fetch(e,i).done(function(e){var n,o;if(o=!1,e&&(o="container"===e[i]),this.toggle_container_visibility(t,o),n=!o&&this.uses_automatic_bottle_volume(t),this.set_volume_readonly(t,n),n)return this.calculate_volume(t)})):(this.toggle_container_visibility(t,!0),this.set_volume_readonly(t,!1))}},{key:"toggle_container_visibility",value:function(t,e){return this.debug("toggle_container_visibility:sample_index=".concat(t,",show_container=").concat(e)),this.set_visible("Container",t,e),this.set_visible("Bottles",t,!e)}},{key:"uses_automatic_bottle_volume",value:function(t){var e,i;return i="#Bottles-Volume-0",t&&(i="#Bottles-".concat(t,"-Volume-0")),!!(e=document.querySelector(i))&&e.hasAttribute("readonly")}},{key:"set_volume_readonly",value:function(t,e){var i,n;if(this.debug("set_volume_readonly:sample_index=".concat(t,",readonly=").concat(e)),n="#Volume",t&&(n="#Volume-".concat(t)),i=document.querySelector(n))return e?i.setAttribute("readonly","readonly"):i.removeAttribute("readonly")}},{key:"calculate_volume",value:function(e){var i,n,o,r,a,l;if(this.debug("calculate_volume:sample_index=".concat(e)),this.uses_automatic_bottle_volume(e)&&(r=0,n="tr.records_row_Bottles",e&&(n="tr.records_row_Bottles-".concat(e)),i=document.querySelectorAll(n),o=this,t.each(i,function(t,i){var n,a,l,s,u,c;return c="#Bottles-Weight-".concat(t),e&&(c="#Bottles-".concat(e,"-Weight-").concat(t)),u=i.querySelector(c),u=o.get_float_value(u),o.debug("Not a valid volume: ".concat(u)),a="#Bottles-DryWeight-".concat(t),e&&(a="#Bottles-".concat(e,"-DryWeight-").concat(t)),n=i.querySelector(a),n=o.get_float_value(n),o.debug("Not a valid volume: ".concat(n)),(l=u-n)<=0?(o.debug("Not a valid bottle volume: ".concat(l)),l=""):(l=o.round(1.05*l,3),r+=l),s="#Bottles-Volume-".concat(t),e&&(s="#Bottles-".concat(e,"-Volume-").concat(t)),i.querySelector(s).value=l}),r=parseFloat(r),(r=this.round(r,4))<=0?(this.debug("Not a valid volume: ".concat(r)),r=""):r+=" ml",l="#Volume",e&&(l="#Volume-".concat(e)),a=document.querySelector(l)))return a.value=r}},{key:"get_float_value",value:function(t){var e,i=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0;return e=parseFloat(t.value),isNaN(e)&&(e=parseFloat(i)),e}},{key:"round",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:2;return Number(Math.round(t+"e"+e)+"e-"+e)}},{key:"set_visible",value:function(e,i,n){var o,r;return this.debug("set_visible:field_name=".concat(e,",sample_index=").concat(i,",visible=").concat(n)),r="div[data-fieldname='".concat(e,"']"),i&&(r="div[data-fieldname='".concat(e,"-").concat(i,"']")),"0"===i&&"1"===document.querySelector("#ar_count").value&&(r="tr[fieldname=".concat(e,"]")),o=document.querySelector(r),n?t(o).show():t(o).hide()}},{key:"fetch",value:function(e,i){var n,o;return this.debug("fetch:uid=".concat(e,",field_names=").concat(i)),n=t.Deferred(),o={url:this.get_portal_url()+"/@@API/read",data:{catalog_name:"senaite_catalog_setup",UID:e,include_fields:i,page_size:1}},this.ajax_submit(o).done(function(t){var e;return e={},t.objects&&(e=t.objects[0]),n.resolveWith(this,[e])}),n.promise()}},{key:"ajax_submit",value:function(){var e,i=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return this.debug("ajax_submit"),null==i.type&&(i.type="POST"),null==i.url&&(i.url=this.get_portal_url()),null==i.context&&(i.context=this),null==i.dataType&&(i.dataType="json"),null==i.data&&(i.data={}),null==i._authenticator&&(i._authenticator=t("input[name='_authenticator']").val()),this.debug(">>> ajax_submit::options=",i),t(this).trigger("ajax:submit:start"),e=function(){return t(this).trigger("ajax:submit:end")},t.ajax(i).done(e)}},{key:"get_portal_url",value:function(){return t("input[name=portal_url]").val()||window.portal_url}},{key:"debug",value:function(t){}},{key:"get_add_controller",value:function(){return window.bika.lims.AnalysisRequestAdd}}],i&&n(e.prototype,i),Object.defineProperty(e,"prototype",{writable:!1}),e;var e,i}();var l=i(669);function s(t){return s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},s(t)}function u(t,e){for(var i=0;i<e.length;i++){var n=e[i];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,c(n.key),n)}}function c(t){var e=function(t){if("object"!=s(t)||!t)return t;var e=t[Symbol.toPrimitive];if(void 0!==e){var i=e.call(t,"string");if("object"!=s(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(t);return"symbol"==s(e)?e:e+""}const _=function(){return t=function t(){var e,i,n,o;if(function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.is_required=this.is_required.bind(this),this.on_toggle_selector_clicked=this.on_toggle_selector_clicked.bind(this),this.init_toggle=this.init_toggle.bind(this),this.init_sections_visibility=this.init_sections_visibility.bind(this),this.debug=this.debug.bind(this),this.is_required()){for(this.debug("load"),e=0,i=(o=[["#content h1","#senaite-sampleheader","palau-lims-sample-header"],["#content h1","div[id=ar-attachments]","-sample-header"],["div.remarks-widget h3","div.remarks-widget div","-sample-remarks-section"],["div.analysis-listing-table h3","div.analysis-listing-table form","-sample-analyses-section"],["div[id=results-interpretation] h3","div[id=results-interpretation] form","-sample-results-interpretation-section"]]).length;e<i;e++)n=o[e],this.init_toggle(n[0],n[1],n[2]);return l("body").on("click",".toggle_selector",this.on_toggle_selector_clicked),this.init_sections_visibility(),this}},(e=[{key:"is_required",value:function(){var t,e,i,n,o,r;for(r=["portaltype-analysisrequest"],e=i=0,n=(o=document.body.classList).length;i<n;e=++i)if(t=o[e],r.includes(t))return!0;return!1}},{key:"on_toggle_selector_clicked",value:function(t){var e,i,n,o,r,a;for(this.debug("on_toggle_selector_clicked"),o=t.currentTarget.getAttribute("target-section"),e=0,i=(r=document.querySelectorAll("[section$=".concat(o,"]"))).length;e<i;e++)(n=r[e])&&((a=this.is_visible(n))?l(n).hide():l(n).show());return site.set_cookie(o,!a)}},{key:"init_toggle",value:function(t,e,i){var n,o;if(this.debug("init_toggle:anchor_selector='".concat(t,"',section_selector='").concat(e,"',section_id='").concat(i,"'")),(n=document.querySelector(t))&&(n.classList.add("toggle_selector"),n.setAttribute("target-section",i),o=document.querySelector(e)))return o.setAttribute("section",i)}},{key:"is_visible",value:function(t){return"none"!==l(t).css("display")}},{key:"init_sections_visibility",value:function(){var t,e,i,n,o,r,a,s;for(this.debug("set_visibility"),n=[],e=0,i=(t=document.querySelectorAll(".toggle_selector")).length;e<i;e++)r=t[e].getAttribute("target-section"),s=site.read_cookie(r)||"true",this.debug("section_id=".concat(r,", visible=").concat(s)),s="true"===s,a=document.querySelectorAll("[section=".concat(r,"]")),n.push(function(){var t,e,i;for(i=[],t=0,e=a.length;t<e;t++)o=a[t],s?i.push(l(o).show()):i.push(l(o).hide());return i}());return n}},{key:"debug",value:function(t){}}])&&u(t.prototype,e),Object.defineProperty(t,"prototype",{writable:!1}),t;var t,e}();document.addEventListener("DOMContentLoaded",function(){return window.sampletype_container=new a,window.sampleview_layout=new _})})()})();
\ No newline at end of file
diff --git a/src/bes/lims/browser/static/bundles/bes.lims.a435ec7c6ea1d88e080c.js b/src/bes/lims/browser/static/bundles/bes.lims.a435ec7c6ea1d88e080c.js
deleted file mode 100644
index 37aeac2..0000000
--- a/src/bes/lims/browser/static/bundles/bes.lims.a435ec7c6ea1d88e080c.js
+++ /dev/null
@@ -1 +0,0 @@
-(()=>{"use strict";var e={669:e=>{e.exports=jQuery}},t={};function i(n){var o=t[n];if(void 0!==o)return o.exports;var r=t[n]={exports:{}};return e[n](r,r.exports,i),r.exports}(()=>{var e=i(669);function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},t(e)}function n(e,t){for(var i=0;i<t.length;i++){var n=t[i];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,o(n.key),n)}}function o(e){var i=function(e){if("object"!=t(e)||!e)return e;var i=e[Symbol.toPrimitive];if(void 0!==i){var n=i.call(e,"string");if("object"!=t(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(e)}(e);return"symbol"==t(i)?i:i+""}var r=[].indexOf;const a=function(){return t=function t(){var i,n,o,a,l;if(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t),this.is_required=this.is_required.bind(this),this.bind_event_handler=this.bind_event_handler.bind(this),this.on_template_selected=this.on_template_selected.bind(this),this.on_bottle_weight_change=this.on_bottle_weight_change.bind(this),this.on_bottle_container_blur=this.on_bottle_container_blur.bind(this),this.on_sample_type_selected=this.on_sample_type_selected.bind(this),this.get_sample_index=this.get_sample_index.bind(this),this.update_container=this.update_container.bind(this),this.toggle_container_visibility=this.toggle_container_visibility.bind(this),this.set_volume_readonly=this.set_volume_readonly.bind(this),this.calculate_volume=this.calculate_volume.bind(this),this.get_float_value=this.get_float_value.bind(this),this.round=this.round.bind(this),this.set_visible=this.set_visible.bind(this),this.fetch=this.fetch.bind(this),this.ajax_submit=this.ajax_submit.bind(this),this.get_portal_url=this.get_portal_url.bind(this),this.debug=this.debug.bind(this),this.get_add_controller=this.get_add_controller.bind(this),this.is_required()){if(this.debug("load"),this.sample_type_selector="div.uidreferencefield textarea[name^='SampleType']",this.template_selector="div.uidreferencefield textarea[name^='Template']",this.bottle_weights_selector="input[id^='Bottles-'][id*='-Weight-']",this.bottle_containers_selector="input[id^='Bottles-'][id*='-Container-']",this.bind_event_handler(),r.call(document.body.classList,"template-ar_add")>=0)for(n=0,o=(a=document.querySelectorAll(this.sample_type_selector)).length;n<o;n++)i=a[n],l=e("#".concat(i.id)).attr("uid"),this.trigger_event(i,"select",{uids:[l]});else document.querySelector("div[data-fieldname='Bottles']")&&(i=document.querySelector("input[id='Volume']")).setAttribute("readonly","readonly");return this}},i=[{key:"is_required",value:function(){var e,t,i,n,o,r;for(r=["template-ar_add","portaltype-analysisrequest"],t=i=0,n=(o=document.body.classList).length;i<n;t=++i)if(e=o[t],r.includes(e))return!0;return!1}},{key:"bind_event_handler",value:function(){return this.debug("bind_event_handler"),e("body").on("select",this.sample_type_selector,this.on_sample_type_selected),e("body").on("select",this.template_selector,this.on_template_selected),e("body").on("blur",this.bottle_containers_selector,this.on_bottle_container_blur),e("body").on("change",this.bottle_weights_selector,this.on_bottle_weight_change)}},{key:"trigger_event",value:function(e,t,i){var n;return n=new CustomEvent(t,{detail:i,bubbles:!0}),e.dispatchEvent(n)}},{key:"on_template_selected",value:function(e){var t,i,n;if(this.debug("on_template_selected"),t=e.currentTarget,i=this.get_sample_index(t),n=t.value)return this.fetch(n,[]).done((function(e){var t,n;if(e)return t="SampleType-".concat(i),n=e.sampletype_uid,window.senaite.core.widgets[t].set_values([n]),this.update_container(i,n)}))}},{key:"on_bottle_weight_change",value:function(e){var t,i;return this.debug("on_bottle_weight_change"),t=e.currentTarget,i=this.get_sample_index(t),this.calculate_volume(i)}},{key:"on_bottle_container_blur",value:function(e){var t,i;return this.debug("on_bottle_container_blur"),t=e.currentTarget,i=this.get_sample_index(t),this.calculate_volume(i)}},{key:"on_sample_type_selected",value:function(e){var t,i;return this.debug("on_sample_type_selected"),t=e.currentTarget,i=this.get_sample_index(t),this.update_container(i,t.value)}},{key:"get_sample_index",value:function(t){var i;return this.debug("get_sample_index:element=".concat(t.id)),(i=t.closest("td[arnum]"))?e(i).attr("arnum"):null}},{key:"update_container",value:function(e,t){var i;return this.debug("update_container:sample_index=".concat(e,",sample_type_uid=").concat(t)),t?(i="container_widget",this.fetch(t,i).done((function(t){var n;if(n=!1,t&&(n="container"===t[i]),this.toggle_container_visibility(e,n),this.set_volume_readonly(e,!n),!n)return this.calculate_volume(e)}))):(this.toggle_container_visibility(e,!0),this.set_volume_readonly(e,!1))}},{key:"toggle_container_visibility",value:function(e,t){return this.debug("toggle_container_visibility:sample_index=".concat(e,",show_container=").concat(t)),this.set_visible("Container",e,t),this.set_visible("Bottles",e,!t)}},{key:"set_volume_readonly",value:function(e,t){var i,n;if(this.debug("set_volume_readonly:sample_index=".concat(e,",readonly=").concat(t)),n="#Volume",e&&(n="#Volume-".concat(e)),i=document.querySelector(n))return t?i.setAttribute("readonly","readonly"):i.removeAttribute("readonly")}},{key:"calculate_volume",value:function(t){var i,n,o,r,a,l;if(this.debug("calculate_volume:sample_index=".concat(t)),r=0,n="tr.records_row_Bottles",t&&(n="tr.records_row_Bottles-".concat(t)),i=document.querySelectorAll(n),o=this,e.each(i,(function(e,i){var n,a,l,s,u,c;return c="#Bottles-Weight-".concat(e),t&&(c="#Bottles-".concat(t,"-Weight-").concat(e)),u=i.querySelector(c),u=o.get_float_value(u),o.debug("Not a valid volume: ".concat(u)),a="#Bottles-DryWeight-".concat(e),t&&(a="#Bottles-".concat(t,"-DryWeight-").concat(e)),n=i.querySelector(a),n=o.get_float_value(n),o.debug("Not a valid volume: ".concat(n)),(l=u-n)<=0?(o.debug("Not a valid bottle volume: ".concat(l)),l=""):(l=o.round(1.05*l,3),r+=l),s="#Bottles-Volume-".concat(e),t&&(s="#Bottles-".concat(t,"-Volume-").concat(e)),i.querySelector(s).value=l})),r=parseFloat(r),(r=this.round(r,4))<=0?(this.debug("Not a valid volume: ".concat(r)),r=""):r+=" ml",l="#Volume",t&&(l="#Volume-".concat(t)),a=document.querySelector(l))return a.value=r}},{key:"get_float_value",value:function(e){var t,i=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0;return t=parseFloat(e.value),isNaN(t)&&(t=parseFloat(i)),t}},{key:"round",value:function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:2;return Number(Math.round(e+"e"+t)+"e-"+t)}},{key:"set_visible",value:function(t,i,n){var o,r;return this.debug("set_visible:field_name=".concat(t,",sample_index=").concat(i,",visible=").concat(n)),r="div[data-fieldname='".concat(t,"']"),i&&(r="div[data-fieldname='".concat(t,"-").concat(i,"']")),"0"===i&&"1"===document.querySelector("#ar_count").value&&(r="tr[fieldname=".concat(t,"]")),o=document.querySelector(r),n?e(o).show():e(o).hide()}},{key:"fetch",value:function(t,i){var n,o;return this.debug("fetch:uid=".concat(t,",field_names=").concat(i)),n=e.Deferred(),o={url:this.get_portal_url()+"/@@API/read",data:{catalog_name:"senaite_catalog_setup",UID:t,include_fields:i,page_size:1}},this.ajax_submit(o).done((function(e){var t;return t={},e.objects&&(t=e.objects[0]),n.resolveWith(this,[t])})),n.promise()}},{key:"ajax_submit",value:function(){var t,i=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return this.debug("ajax_submit"),null==i.type&&(i.type="POST"),null==i.url&&(i.url=this.get_portal_url()),null==i.context&&(i.context=this),null==i.dataType&&(i.dataType="json"),null==i.data&&(i.data={}),null==i._authenticator&&(i._authenticator=e("input[name='_authenticator']").val()),this.debug(">>> ajax_submit::options=",i),e(this).trigger("ajax:submit:start"),t=function(){return e(this).trigger("ajax:submit:end")},e.ajax(i).done(t)}},{key:"get_portal_url",value:function(){return e("input[name=portal_url]").val()||window.portal_url}},{key:"debug",value:function(e){}},{key:"get_add_controller",value:function(){return window.bika.lims.AnalysisRequestAdd}}],i&&n(t.prototype,i),Object.defineProperty(t,"prototype",{writable:!1}),t;var t,i}();var l=i(669);function s(e){return s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},s(e)}function u(e,t){for(var i=0;i<t.length;i++){var n=t[i];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,c(n.key),n)}}function c(e){var t=function(e){if("object"!=s(e)||!e)return e;var t=e[Symbol.toPrimitive];if(void 0!==t){var i=t.call(e,"string");if("object"!=s(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(e)}(e);return"symbol"==s(t)?t:t+""}const d=function(){return e=function e(){var t,i,n,o;if(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this.is_required=this.is_required.bind(this),this.on_toggle_selector_clicked=this.on_toggle_selector_clicked.bind(this),this.init_toggle=this.init_toggle.bind(this),this.init_sections_visibility=this.init_sections_visibility.bind(this),this.debug=this.debug.bind(this),this.is_required()){for(this.debug("load"),t=0,i=(o=[["#content h1","#senaite-sampleheader","palau-lims-sample-header"],["#content h1","div[id=ar-attachments]","-sample-header"],["div.remarks-widget h3","div.remarks-widget div","-sample-remarks-section"],["div.analysis-listing-table h3","div.analysis-listing-table form","-sample-analyses-section"],["div[id=results-interpretation] h3","div[id=results-interpretation] form","-sample-results-interpretation-section"]]).length;t<i;t++)n=o[t],this.init_toggle(n[0],n[1],n[2]);return l("body").on("click",".toggle_selector",this.on_toggle_selector_clicked),this.init_sections_visibility(),this}},(t=[{key:"is_required",value:function(){var e,t,i,n,o,r;for(r=["portaltype-analysisrequest"],t=i=0,n=(o=document.body.classList).length;i<n;t=++i)if(e=o[t],r.includes(e))return!0;return!1}},{key:"on_toggle_selector_clicked",value:function(e){var t,i,n,o,r,a;for(this.debug("on_toggle_selector_clicked"),o=e.currentTarget.getAttribute("target-section"),t=0,i=(r=document.querySelectorAll("[section$=".concat(o,"]"))).length;t<i;t++)(n=r[t])&&((a=this.is_visible(n))?l(n).hide():l(n).show());return site.set_cookie(o,!a)}},{key:"init_toggle",value:function(e,t,i){var n,o;if(this.debug("init_toggle:anchor_selector='".concat(e,"',section_selector='").concat(t,"',section_id='").concat(i,"'")),(n=document.querySelector(e))&&(n.classList.add("toggle_selector"),n.setAttribute("target-section",i),o=document.querySelector(t)))return o.setAttribute("section",i)}},{key:"is_visible",value:function(e){return"none"!==l(e).css("display")}},{key:"init_sections_visibility",value:function(){var e,t,i,n,o,r,a,s;for(this.debug("set_visibility"),n=[],t=0,i=(e=document.querySelectorAll(".toggle_selector")).length;t<i;t++)r=e[t].getAttribute("target-section"),s=site.read_cookie(r)||"true",this.debug("section_id=".concat(r,", visible=").concat(s)),s="true"===s,a=document.querySelectorAll("[section=".concat(r,"]")),n.push(function(){var e,t,i;for(i=[],e=0,t=a.length;e<t;e++)o=a[e],s?i.push(l(o).show()):i.push(l(o).hide());return i}());return n}},{key:"debug",value:function(e){}}])&&u(e.prototype,t),Object.defineProperty(e,"prototype",{writable:!1}),e;var e,t}();document.addEventListener("DOMContentLoaded",(function(){return window.sampletype_container=new a,window.sampleview_layout=new d}))})()})();
\ No newline at end of file
diff --git a/src/bes/lims/browser/static/resources.pt b/src/bes/lims/browser/static/resources.pt
index 5922853..35462a6 100644
--- a/src/bes/lims/browser/static/resources.pt
+++ b/src/bes/lims/browser/static/resources.pt
@@ -1 +1 @@
-<script tal:attributes="src string:${view/site_url}/++plone++bes.lims.static/bundles/bes.lims.a435ec7c6ea1d88e080c.js"></script><link href="#" rel="stylesheet" tal:attributes="href string:${view/site_url}/++plone++bes.lims.static/bundles/bes.lims.a435ec7c6ea1d88e080c.css"/>
\ No newline at end of file
+<script tal:attributes="src string:${view/site_url}/++plone++bes.lims.static/bundles/bes.lims.55845b52992a0a82b4bb.js"></script><link href="#" rel="stylesheet" tal:attributes="href string:${view/site_url}/++plone++bes.lims.static/bundles/bes.lims.55845b52992a0a82b4bb.css"/>
\ No newline at end of file
diff --git a/webpack/app/components/sampletype_container.coffee b/webpack/app/components/sampletype_container.coffee
index 1b99ee6..211a7ba 100644
--- a/webpack/app/components/sampletype_container.coffee
+++ b/webpack/app/components/sampletype_container.coffee
@@ -38,7 +38,10 @@ class SampleTypeContainerController
       bottles = document.querySelector("div[data-fieldname='Bottles']")
       if bottles
         el = document.querySelector "input[id='Volume']"
-        el.setAttribute("readonly", "readonly")
+        if el and @uses_automatic_bottle_volume()
+          el.setAttribute("readonly", "readonly")
+        else if el
+          el.removeAttribute "readonly"
 
     return @
 
@@ -116,6 +119,8 @@ class SampleTypeContainerController
     # Get the index of the column (each column represents a Sample)
     sample_idx = @get_sample_index el
 
+    return unless @uses_automatic_bottle_volume sample_idx
+
     # Recalculate the volume of the bottles and sample
     @calculate_volume sample_idx
 
@@ -131,6 +136,8 @@ class SampleTypeContainerController
     # Get the index of the column (each column represents a Sample)
     sample_idx = @get_sample_index el
 
+    return unless @uses_automatic_bottle_volume sample_idx
+
     # Recalculate the volume of the bottles and sample
     @calculate_volume sample_idx
 
@@ -187,9 +194,10 @@ class SampleTypeContainerController
         @toggle_container_visibility sample_index, show_container
 
         # Enable/Disable Volume depending on the visibility of Container
-        @set_volume_readonly sample_index, not show_container
+        automatic_volume = not show_container and @uses_automatic_bottle_volume sample_index
+        @set_volume_readonly sample_index, automatic_volume
 
-        if not show_container
+        if automatic_volume
           # Volume field is calculated automatically
           @calculate_volume sample_index
 
@@ -204,6 +212,17 @@ class SampleTypeContainerController
     @set_visible "Bottles", sample_index, not show_container
 
 
+  ###
+  Returns whether bottle volume is auto-calculated for the current sample
+  ###
+  uses_automatic_bottle_volume: (sample_index) =>
+    selector = "#Bottles-Volume-0"
+    if sample_index
+      selector = "#Bottles-#{ sample_index }-Volume-0"
+    el = document.querySelector selector
+    return false unless el
+    return el.hasAttribute "readonly"
+
   ###
   Sets the readonly mode of the Volume field
   ###
@@ -224,6 +243,7 @@ class SampleTypeContainerController
   ###
   calculate_volume: (sample_index) =>
     @debug "calculate_volume:sample_index=#{ sample_index }"
+    return unless @uses_automatic_bottle_volume sample_index
     total_volume = 0
 
     # Walk-through all record rows from Bottles Widget

From c76b29e4dd3a3a04ac40f394031759990eda5581 Mon Sep 17 00:00:00 2001
From: nnpvaan <phuongvan0609@gmail.com>
Date: Tue, 2 Jun 2026 18:27:38 +1000
Subject: [PATCH 2/2] Changelog

---
 CHANGES.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index f2176e1..ad57afe 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,7 @@ Changelog
 1.0.0
 -----
 
+- #151 Allow manual volume entry for bottles widget
 - #136 Add ProfileAnalyses column to Analysis Profiles listing
 - #148 Only send verified or published analyses to Tamanu
 - #142 Replace Tamanu tasks queue PersistentList with OOBTree