Make sure all boolean values are saved correctly in the database.

Thu, 07 Feb 2019 16:40:28 +0100

author
Michiel Broek <mbroek@mbse.eu>
date
Thu, 07 Feb 2019 16:40:28 +0100
changeset 252
b558f3dfcda3
parent 251
a7f25be71ba8
child 253
296caca18161

Make sure all boolean values are saved correctly in the database.

www/includes/db_product.php file | annotate | diff | comparison | revisions
www/js/prod_edit.js file | annotate | diff | comparison | revisions
--- a/www/includes/db_product.php	Thu Feb 07 15:35:32 2019 +0100
+++ b/www/includes/db_product.php	Thu Feb 07 16:40:28 2019 +0100
@@ -40,10 +40,10 @@
 	$sql .= "', birth='" . $_POST['birth'];
 	$sql .= "', stage='" . $_POST['stage'];
 	$sql .= "', notes='" . mysqli_real_escape_string($connect, $_POST['notes']);
-	($_POST['log_brew'] == 'true') ? $sql .= "', log_brew='1" : $sql .= "', log_brew='0";
-	($_POST['log_fermentation'] == 'true') ? $sql .= "', log_fermentation='1" : $sql .= "', log_fermentation='0";
-	($_POST['inventory_reduced'] == 'true') ? $sql .= "', inventory_reduced='1" : $sql .= "', inventory_reduced='0";
-	($_POST['locked'] == 'true') ? $sql .= "', locked='1" : $sql .= "', locked='0";
+	$sql .= "', log_brew='" . $_POST['log_brew'];
+	$sql .= "', log_fermentation='" . $_POST['log_fermentation'];
+	$sql .= "', inventory_reduced='" . $_POST['inventory_reduced'];
+	$sql .= "', locked='" . $_POST['locked'];
 	// Equipment
 	$sql .= "', eq_name='" . mysqli_real_escape_string($connect, $_POST['eq_name']);
 	$sql .= "', eq_boil_size='" . $_POST['eq_boil_size'];
@@ -106,7 +106,6 @@
 			syslog(LOG_NOTICE, "write brewdate data end");
 			$sql .= "', brew_date_end='" . $_POST['brew_date_end'];
 		}
-		($_POST['brew_log_available'] == 'true') ? $sql .= "', brew_log_available='1" : $sql .= "', brew_log_available='0";
 	}
 	$sql .= "', og='" . $_POST['og'];
 	$sql .= "', fg='" . $_POST['fg'];
@@ -140,7 +139,7 @@
 		$sql .= "', keg_priming_sugar='" . $_POST['keg_priming_sugar'];
 		$sql .= "', keg_priming_amount='" . $_POST['keg_priming_amount'];
 		$sql .= "', keg_carbonation_temp='" . $_POST['keg_carbonation_temp'];
-		($_POST['keg_forced_carb'] == 'true') ? $sql .= "', keg_forced_carb='1" : $sql .= "', keg_forced_carb='0";
+		$sql .= "', keg_forced_carb='" . $_POST['keg_forced_carb'];
 		$sql .= "', keg_pressure='" . $_POST['keg_pressure'];
 	}
 
@@ -201,7 +200,7 @@
 	$sql .= "', sparge_acid_amount='" . $_POST['sparge_acid_amount'];
 	$sql .= "', mash_ph='" . $_POST['mash_ph'];
 	$sql .= "', mash_name='" . $_POST['mash_name'];
-	($_POST['calc_acid'] == 'true') ? $sql .= "', calc_acid='1" : $sql .= "', calc_acid='0";
+	$sql .= "', calc_acid='" . $_POST['calc_acid'];
 	if (isset($_POST['w1_name'])) {
 		$sql .= "', w1_name='" . mysqli_real_escape_string($connect, $_POST['w1_name']);
 		$sql .= "', w1_amount='" . $_POST['w1_amount'];
@@ -532,8 +531,7 @@
 		$brew .= ',"brew_fermenter_sg":' . floatval($row['brew_fermenter_sg']);
 		$brew .= ',"brew_fermenter_ibu":' . floatval($row['brew_fermenter_ibu']);
 		$brew .= ',"brew_date_end":"' . $row['brew_date_end'];
-		$brew .= '","brew_log_available":' . $row['brew_log_available'];
-		$brew .= ',"og":' . floatval($row['og']);
+		$brew .= '","og":' . floatval($row['og']);
 		$brew .= ',"fg":' . floatval($row['fg']);
 		$brew .= ',"primary_start_temp":' . floatval($row['primary_start_temp']);
 		$brew .= ',"primary_max_temp":' . floatval($row['primary_max_temp']);
--- a/www/js/prod_edit.js	Thu Feb 07 15:35:32 2019 +0100
+++ b/www/js/prod_edit.js	Thu Feb 07 16:40:28 2019 +0100
@@ -1242,11 +1242,11 @@
 		calcEfficiencyAfterBoil();
 
 		$("#calc_acid").on('checked', function (event) {
-			dataRecord.calc_acid = true;
+			dataRecord.calc_acid = 1;
 			calcWater();
 		});
 		$("#calc_acid").on('unchecked', function (event) {
-			dataRecord.calc_acid = false;
+			dataRecord.calc_acid = 0;
 			calcWater();
 		});
 		$("#w1_name").jqxDropDownList('selectItem', dataRecord.w1_name);
@@ -1456,11 +1456,11 @@
 			calcCarbonation();
 		});
 		$("#keg_forced_carb").on('checked', function (event) {
-			dataRecord.keg_forced_carb = true;
+			dataRecord.keg_forced_carb = 1;
 			calcCarbonation();
 		});
 		$("#keg_forced_carb").on('unchecked', function (event) {
-			dataRecord.keg_forced_carb = false;
+			dataRecord.keg_forced_carb = 0;
 			calcCarbonation();
 		});
 		$('#keg_carbonation_temp').on('change', function (event) {
@@ -1647,7 +1647,6 @@
 			{ name: 'brew_fermenter_sg', type: 'float' },
 			{ name: 'brew_fermenter_ibu', type: 'float' },
 			{ name: 'brew_date_end', type: 'string' },
-			{ name: 'brew_log_available', type: 'int' },
 			{ name: 'og', type: 'float' },
 			{ name: 'fg', type: 'float' },
 			{ name: 'primary_start_temp', type: 'float' },
@@ -2899,18 +2898,21 @@
 		// Call a script to do the work and block this.
 		// Note that this script must set this flag too, so if the user doesn't Save it is still set.
 		// Call the script with the uuid.
+		// set dataRecord.inventory_reduced to 1
 		$("#inventory_reduced").jqxCheckBox({ disabled : true });
 	});
 	$("#locked").jqxCheckBox({ theme: theme, width: 120, height: 23, disabled : true });
 	$('#locked').on('checked', function (event) {
 		if (brewstage >= 10) {
 			$("#stage").val('Closed');
+			dataRecord.locked = 1;
 			brewstage = 11;
 		}
 	});
 	$('#locked').on('unchecked', function (event) {
 		if (brewstage >= 10) {
 			$("#stage").val('Ready');
+			dataRecord.locked = 0;
 			brewstage = 10;
 		}
 	});
@@ -4189,8 +4191,8 @@
 			notes: $("#notes").val(),
 			log_brew: dataRecord.log_brew,
 			log_fermentation: dataRecord.log_fermentation,
-			inventory_reduced: $("#inventory_reduced").val(),
-			locked: $("#locked").val(),
+			inventory_reduced: dataRecord.inventory_reduced,
+			locked: dataRecord.locked,
 			eq_name: $("#eq_name").val(),
 			eq_boil_size: parseFloat($("#eq_boil_size").jqxNumberInput('decimal')),
 			eq_batch_size: parseFloat($("#eq_batch_size").jqxNumberInput('decimal')),
@@ -4243,7 +4245,6 @@
 			brew_fermenter_sg: parseFloat($("#brew_fermenter_sg").jqxNumberInput('decimal')),
 			brew_fermenter_ibu: parseFloat($("#brew_fermenter_ibu").jqxNumberInput('decimal')),
 			brew_date_end: $("#brew_date_end").val(),
-			brew_log_available: $("#brew_log_available").val(),
 			og: dataRecord.og,
 			fg: parseFloat($("#fg").jqxNumberInput('decimal')),
 			primary_start_temp: parseFloat($("#primary_start_temp").jqxNumberInput('decimal')),
@@ -4265,7 +4266,7 @@
 			keg_priming_sugar: $("#keg_priming_sugar").val(),
 			keg_priming_amount: parseFloat($("#keg_priming_amount").jqxNumberInput('decimal')),
 			keg_carbonation_temp: parseFloat($("#keg_carbonation_temp").jqxNumberInput('decimal')),
-			keg_forced_carb: $("#keg_forced_carb").val(),
+			keg_forced_carb: dataRecord.keg_forced_carb,
 			keg_pressure: parseFloat($("#keg_pressure").jqxNumberInput('decimal')),
 			taste_notes: $("#taste_notes").val(),
 			taste_rate: parseFloat($("#taste_rate").jqxNumberInput('decimal')),
@@ -4317,7 +4318,7 @@
 			sparge_acid_type: $("#sparge_acid_type").val(),
 			sparge_acid_perc: parseFloat($("#sparge_acid_perc").jqxNumberInput('decimal')),
 			sparge_acid_amount: dataRecord.sparge_acid_amount,
-			calc_acid: $("#calc_acid").val(),
+			calc_acid: dataRecord.calc_acid,
 			w1_name: $("#w1_name").val(),
 			w1_amount: parseFloat($("#w1_amount").jqxNumberInput('decimal')),
 			w1_calcium: parseFloat($("#w1_calcium").jqxNumberInput('decimal')),

mercurial