Mercurial > bms / changeset

--- a/www/includes/db_recipes.php	Fri Aug 14 11:38:58 2020 +0200
+++ b/www/includes/db_recipes.php	Wed Aug 19 17:13:24 2020 +0200
@@ -396,7 +396,7 @@
 		$recipes .= '","st_name":"'  . str_replace($escapers, $replacements, $row['st_name']);
 		$recipes .= '","st_type":' . $row['st_type'];
 		$recipes .= ',"st_category":"' . str_replace($escapers, $replacements, $row['st_category']);
-		$recipes .= '","st_category_number":' . floatval($row['st_category_number']);
+		$recipes .= '","st_category_number":' . $row['st_category_number'];
 		$recipes .= ',"st_og_min":' . floatval($row['st_og_min']);
 		$recipes .= ',"st_og_max":' . floatval($row['st_og_max']);
 		$recipes .= ',"st_fg_min":' . floatval($row['st_fg_min']);

--- a/www/js/prod_divide.js	Fri Aug 14 11:38:58 2020 +0200
+++ b/www/js/prod_divide.js	Wed Aug 19 17:13:24 2020 +0200
@@ -186,7 +186,7 @@
    { name: 'st_letter', type: 'string' },
    { name: 'st_guide', type: 'string' },
    { name: 'st_category', type: 'string' },
-   { name: 'st_category_number', type: 'float' },
+   { name: 'st_category_number', type: 'int' },
    { name: 'st_type', type: 'int' },
    { name: 'st_og_min', type: 'float' },
    { name: 'st_og_max', type: 'float' },

--- a/www/js/rec_edit.js	Fri Aug 14 11:38:58 2020 +0200
+++ b/www/js/rec_edit.js	Wed Aug 19 17:13:24 2020 +0200
@@ -733,7 +733,7 @@
    { name: 'st_guide', type: 'string' },
    { name: 'st_type', type: 'int' },
    { name: 'st_category', type: 'string' },
-   { name: 'st_category_number', type: 'float' },
+   { name: 'st_category_number', type: 'int' },
    { name: 'st_og_min', type: 'float' },
    { name: 'st_og_max', type: 'float' },
    { name: 'st_fg_min', type: 'float' },
@@ -2770,7 +2770,7 @@
    st_guide: $('#st_guide').val(),
    st_type: dataRecord.st_type,
    st_category: $('#st_category').val(),
-   st_category_number: parseFloat($('#st_category_number').jqxNumberInput('decimal')),
+   st_category_number: $('#st_category_number').val(),
    st_og_min: parseFloat($('#st_og_min').jqxNumberInput('decimal')),
    st_og_max: parseFloat($('#st_og_max').jqxNumberInput('decimal')),
    st_fg_min: parseFloat($('#st_fg_min').jqxNumberInput('decimal')),

--- a/www/js/rec_new.js	Fri Aug 14 11:38:58 2020 +0200
+++ b/www/js/rec_new.js	Wed Aug 19 17:13:24 2020 +0200
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2018-2019
+ * Copyright (C) 2018-2020
  *
  * Michiel Broek <mbroek at mbse dot eu>
  *
@@ -48,7 +48,7 @@
      st_letter: $('#st_style_letter').val(),
      st_guide: $('#st_style_guide').val(),
      st_category: $('#st_category').val(),
-     st_category_number: parseFloat($('#st_category_number').jqxNumberInput('decimal')),
+     st_category_number: $('#st_category_number').val(),
      st_type: style_type,
      st_og_min: parseFloat($('#st_og_min').jqxNumberInput('decimal')),
      st_og_max: parseFloat($('#st_og_max').jqxNumberInput('decimal')),
@@ -84,7 +84,7 @@
      sparge_acid_type: 0, // Lactic acid
      sparge_acid_perc: 80,
      sparge_acid_amount: 0,
-     calc_acid: true,
+     calc_acid: 1,
      w1_name: 'Tap water',
      w1_amount: 15,
      w1_calcium: 0,
@@ -95,6 +95,21 @@
      w1_total_alkalinity: 0,
      w1_ph: 7.0,
      w1_cost: 0.0,
+     wg_amount: 15,
+     wg_calcium: 0,
+     wg_sulfate: 0,
+     wg_chloride: 0,
+     wg_sodium: 0,
+     wg_magnesium: 0,
+     wg_total_alkalinity: 0,
+     wg_ph: 7.0,
+     wb_calcium: 0,
+     wb_sulfate: 0,
+     wb_sodium: 0,
+     wb_chloride: 0,
+     wb_magnesium: 0,
+     wb_total_alkalinity: 0,
+     wb_ph: 0,
      wa_acid_name: 0, // Lactic acid
      wa_acid_perc: 80,
      wa_base_name: 0