Mercurial > bms / file diff

--- a/www/js/rec_edit.js	Sat May 11 23:13:40 2019 +0200
+++ b/www/js/rec_edit.js	Sun May 12 15:16:35 2019 +0200
@@ -1200,11 +1200,11 @@
 		console.log("calc.init()");
 
 		$("#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);
@@ -1384,9 +1384,11 @@
 			calcSparge();
 		});
 		$('#locked').on('checked', function (event) {
+			dataRecord.locked = 1;
 			setReadonly(true);
 		});
 		$('#locked').on('unchecked', function (event) {
+			dataRecord.locked = 0;
 			setReadonly(false);
 		});
 //		setReadonly(false);
@@ -1442,7 +1444,7 @@
 			record: my_record,
 			uuid: dataRecord.uuid,
 			name: $("#name").val(),
-			locked: $("#locked").val(),
+			locked: dataRecord.locked,
 			notes: $("#notes").val(),
 			st_name: $('#st_name').val(),
 			st_letter: $('#st_letter').val(),
@@ -1484,7 +1486,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')),
@@ -1541,7 +1543,7 @@
 		datafields: [
 			{ name: 'record', type: 'number' },
 			{ name: 'uuid', type: 'string' },
-			{ name: 'locked', type: 'bool' },
+			{ name: 'locked', type: 'int' },
 			{ name: 'st_name', type: 'string' },
 			{ name: 'st_letter', type: 'string' },
 			{ name: 'st_guide', type: 'string' },
@@ -1584,7 +1586,7 @@
 			{ name: 'sparge_acid_amount', type: 'float' },
 			{ name: 'mash_ph', type: 'float' },
 			{ name: 'mash_name', type: 'string' },
-			{ name: 'calc_acid', type: 'bool' },
+			{ name: 'calc_acid', type: 'int' },
 			{ name: 'w1_name', type: 'string' },
 			{ name: 'w1_amount', type: 'float' },
 			{ name: 'w1_calcium', type: 'float' },
@@ -3734,14 +3736,7 @@
 		position: 'top'
 	});
 
-	$("#Print").jqxButton({ template: "info", width: '80px', theme: theme });
-	$("#Print").bind('click', function () {
-		saveRecord();
-		// Open print in a new tab.
-		var url="rec_print.php?record=" + my_record;
-		window.open(url);
-	});
-
+	// Buttons below
 	$("#Export").jqxButton({ template: "info", width: '80px', theme: theme });
 	$("#Export").bind('click', function () {
 		saveRecord();