# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1561053503 -7200
# Node ID 7943afc0fcde045d3b326c20a3eee060edb562fc
# Parent  0bc45502144b4c34b46cd7e1219d570d2cbb221f
Added cron upgrade tasks to initialize the priming_water amounts. Fixed these to be a float instead of integer.

diff -r 0bc45502144b -r 7943afc0fcde www/crontasks.php
--- a/www/crontasks.php	Thu Jun 20 16:52:31 2019 +0200
+++ b/www/crontasks.php	Thu Jun 20 19:58:23 2019 +0200
@@ -23,7 +23,18 @@
 if ($changed > 0) {
         syslog(LOG_NOTICE, "Updated ".$changed." products to new package_volume value");
 }
-
+$query = "UPDATE products SET bottle_priming_water = bottle_amount * bottle_priming_amount / 500 WHERE bottle_priming_water = 0;";
+$result = mysqli_query($connect, $query);
+$changed = mysqli_affected_rows($connect);
+if ($changed > 0) {
+        syslog(LOG_NOTICE, "Updated ".$changed." products to new package_volume value");
+}
+$query = "UPDATE products SET keg_priming_water = keg_amount * keg_priming_amount / 500 WHERE keg_priming_water = 0;";
+$result = mysqli_query($connect, $query);
+$changed = mysqli_affected_rows($connect);
+if ($changed > 0) {
+        syslog(LOG_NOTICE, "Updated ".$changed." products to new package_volume value");
+}
 
 /*
  * Upgrade inventory_reduced value from old boolean to tiny integer value.
diff -r 0bc45502144b -r 7943afc0fcde www/includes/db_product.php
--- a/www/includes/db_product.php	Thu Jun 20 16:52:31 2019 +0200
+++ b/www/includes/db_product.php	Thu Jun 20 19:58:23 2019 +0200
@@ -723,12 +723,12 @@
 		$brew .= '","package_abv":' . floatval($row['package_abv']);
 		$brew .= ',"bottle_amount":' . floatval($row['bottle_amount']);
 		$brew .= ',"bottle_carbonation":' . floatval($row['bottle_carbonation']);
-		$brew .= ',"bottle_priming_water":' . $row['bottle_priming_water'];
+		$brew .= ',"bottle_priming_water":' . floatval($row['bottle_priming_water']);
 		$brew .= ',"bottle_priming_amount":' . floatval($row['bottle_priming_amount']);
 		$brew .= ',"bottle_carbonation_temp":' . floatval($row['bottle_carbonation_temp']);
 		$brew .= ',"keg_amount":' . floatval($row['keg_amount']);
 		$brew .= ',"keg_carbonation":' . floatval($row['keg_carbonation']);
-		$brew .= ',"keg_priming_water":' . $row['keg_priming_water'];
+		$brew .= ',"keg_priming_water":' . floatval($row['keg_priming_water']);
 		$brew .= ',"keg_priming_amount":' . floatval($row['keg_priming_amount']);
 		$brew .= ',"keg_carbonation_temp":' . floatval($row['keg_carbonation_temp']);
 		$brew .= ',"keg_forced_carb":' . floatval($row['keg_forced_carb']);
diff -r 0bc45502144b -r 7943afc0fcde www/js/prod_edit.js
--- a/www/js/prod_edit.js	Thu Jun 20 16:52:31 2019 +0200
+++ b/www/js/prod_edit.js	Thu Jun 20 19:58:23 2019 +0200
@@ -2772,12 +2772,12 @@
 			package_abv: parseFloat($("#package_abv").jqxNumberInput('decimal')),
 			bottle_amount: parseFloat($("#bottle_amount").jqxNumberInput('decimal')),
 			bottle_carbonation: parseFloat($("#bottle_carbonation").jqxNumberInput('decimal')),
-			bottle_priming_water: $("#bottle_priming_water").val(),
+			bottle_priming_water: parseFloat($("#bottle_priming_water").jqxNumberInput('decimal')),
 			bottle_priming_amount: parseFloat($("#bottle_priming_amount").jqxNumberInput('decimal')),
 			bottle_carbonation_temp: parseFloat($("#bottle_carbonation_temp").jqxNumberInput('decimal')),
 			keg_amount: parseFloat($("#keg_amount").jqxNumberInput('decimal')),
 			keg_carbonation: parseFloat($("#keg_carbonation").jqxNumberInput('decimal')),
-			keg_priming_water: $("#keg_priming_water").val(),
+			keg_priming_water: parseFloat($("#keg_priming_water").jqxNumberInput('decimal')),
 			keg_priming_amount: parseFloat($("#keg_priming_amount").jqxNumberInput('decimal')),
 			keg_carbonation_temp: parseFloat($("#keg_carbonation_temp").jqxNumberInput('decimal')),
 			keg_forced_carb: dataRecord.keg_forced_carb,
@@ -3000,12 +3000,12 @@
 			{ name: 'package_abv', type: 'float' },
 			{ name: 'bottle_amount', type: 'float' },
 			{ name: 'bottle_carbonation', type: 'float' },
-			{ name: 'bottle_priming_water', type: 'int' },
+			{ name: 'bottle_priming_water', type: 'float' },
 			{ name: 'bottle_priming_amount', type: 'float' },
 			{ name: 'bottle_carbonation_temp', type: 'float' },
 			{ name: 'keg_amount', type: 'float' },
 			{ name: 'keg_carbonation', type: 'float' },
-			{ name: 'keg_priming_water', type: 'int' },
+			{ name: 'keg_priming_water', type: 'float' },
 			{ name: 'keg_priming_amount', type: 'float' },
 			{ name: 'keg_carbonation_temp', type: 'float' },
 			{ name: 'keg_forced_carb', type: 'int' },