Mercurial > bms / file diff

--- a/www/js/prod_edit.js	Fri Apr 17 11:29:37 2020 +0200
+++ b/www/js/prod_edit.js	Sat Apr 18 11:12:28 2020 +0200
@@ -1960,7 +1960,7 @@
 
   // Calculate the final svg if available use the real value.
   if ((dataRecord.stage >= 6) && (dataRecord.fg > 0.990) && (dataRecord.fg < dataRecord.brew_fermenter_sg)) {
-   svg = 100 * (dataRecord.brew_fermenter_sg - dataRecord.fg) / (dataRecord.brew_fermenter_sg - 1);
+   svg = calc_svg(dataRecord.brew_fermenter_sg, dataRecord.fg);
    org = dataRecord.brew_fermenter_sg;
    fig = dataRecord.fg;
   }
@@ -3390,13 +3390,13 @@
   if (dataRecord.brew_fermenter_sg < 1.020)
    return;
   if ((dataRecord.primary_end_sg > 0.990) && (dataRecord.primary_end_sg < dataRecord.brew_fermenter_sg)) {
-   primary_svg = Round(100 * (dataRecord.brew_fermenter_sg - dataRecord.primary_end_sg) / (dataRecord.brew_fermenter_sg - 1), 1);
+   primary_svg = Round(calc_svg(dataRecord.brew_fermenter_sg, dataRecord.primary_end_sg), 1);
    $('#primary_svg').val(primary_svg);
    if ((dataRecord.secondary_end_sg > 0.990) && (dataRecord.secondary_end_sg < dataRecord.brew_fermenter_sg)) {
-    secondary_svg = Round(100 * (dataRecord.brew_fermenter_sg - dataRecord.secondary_end_sg) / (dataRecord.brew_fermenter_sg - 1), 1);
+    secondary_svg = Round(calc_svg(dataRecord.brew_fermenter_sg, dataRecord.secondary_end_sg), 1);
     $('#secondary_svg').val(secondary_svg);
     if ((dataRecord.fg > 0.990) && (dataRecord.fg < dataRecord.brew_fermenter_sg)) {
-     final_svg = Round(100 * (dataRecord.brew_fermenter_sg - dataRecord.fg) / (dataRecord.brew_fermenter_sg - 1), 1);
+     final_svg = Round(calc_svg(dataRecord.brew_fermenter_sg, dataRecord.fg), 1);
      $('#final_svg').val(final_svg);
      ABV = Round(abvol(dataRecord.brew_fermenter_sg, dataRecord.fg), 2);
      $('#final_abv').val(ABV);