Mercurial > bms / changeset

--- a/www/js/rec_edit.js	Thu Nov 15 14:27:37 2018 +0100
+++ b/www/js/rec_edit.js	Thu Nov 15 17:17:33 2018 +0100
@@ -159,6 +159,10 @@
 	$("#name").jqxTooltip({ content: 'De naam voor dit recept.' });
 	$("#notes").jqxTooltip({ content: 'De uitgebreide opmerkingen over dit recept.' });
 	$("#type").jqxTooltip({ content: 'Het brouw type van dit recept.' });
+	$("#batch_size").jqxTooltip({ content: 'Het volume van het gekoelde wort na het koken.' });
+	$("#boil_time").jqxTooltip({ content: 'De kooktijd in minuten.' });
+	$("#boil_size").jqxTooltip({ content: 'Het volume van het wort voor het koken.' });
+	$("#efficiency").jqxTooltip({ content: 'Het rendement van maischen en koken.' });
 	$("#est_og").jqxTooltip({ content: 'Het begin SG wat je wilt bereiken. De moutstort wordt automatisch herberekend.' });
 	$("#est_fg").jqxTooltip({ content: 'Het eind SG. Dit wordt automatisch berekend.' });
 	$("#est_color").jqxTooltip({ content: 'De kleur in EBC. Dit wordt automatisch berekend.' });
@@ -213,6 +217,7 @@
 			{ name: 'notes', type: 'string' },
 			{ name: 'type', type: 'string' },
 			{ name: 'batch_size', type: 'float' },
+			{ name: 'boil_size', type: 'float' },
 			{ name: 'boil_time', type: 'float' },
 			{ name: 'efficiency', type: 'float' },
 			{ name: 'est_og', type: 'float' },
@@ -251,6 +256,7 @@
 			$("#st_type").val(dataRecord.st_type);
 			$("#type").val(dataRecord.type);
 			$("#batch_size").val(dataRecord.batch_size);
+			$("#boil_size").val(dataRecord.boil_size);
 			$("#boil_time").val(dataRecord.boil_time);
 			$("#efficiency").val(dataRecord.efficiency);
 			$("#est_og").val(dataRecord.est_og);
@@ -1192,6 +1198,7 @@
 	$("#st_type").jqxInput({ theme: theme, width: 90, height: 23 });
 	$("#type").jqxDropDownList({ theme: theme, source: srcType, width: 125, height: 23, dropDownHeight: 95 });
 	$("#batch_size").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 100, height: 23, min: 4, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1, symbol: 'L', symbolPosition: 'right' });
+	$("#boil_size").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 100, height: 23, decimalDigits: 1, readOnly: true, symbol: 'L', symbolPosition: 'right' });
 	$("#boil_time").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 100, height: 23, min: 4, max: 360, decimalDigits: 0, spinButtons: true });
 	$("#efficiency").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 100, height: 23, min: 40, max: 100, decimalDigits: 0, spinButtons: true, symbol: '%', symbolPosition: 'right'  });
 
@@ -1302,6 +1309,7 @@
 			st_abv_max: parseFloat($("#st_abv_max").jqxNumberInput('decimal')),
 			type: $("#type").val(),
 			batch_size: parseFloat($("#batch_size").jqxNumberInput('decimal')),
+			boil_size: parseFloat($("#boil_size").jqxNumberInput('decimal')),
 			boil_time: parseFloat($("#boil_time").jqxNumberInput('decimal')),
 			efficiency: parseFloat($("#efficiency").jqxNumberInput('decimal')),
 			est_og: parseFloat($("#est_og").jqxNumberInput('decimal')),

--- a/www/js/rec_main.js	Thu Nov 15 14:27:37 2018 +0100
+++ b/www/js/rec_main.js	Thu Nov 15 17:17:33 2018 +0100
@@ -34,6 +34,7 @@
 			{ name: 'est_og', type: 'float' },
 			{ name: 'est_color', type: 'float' },
 			{ name: 'est_ibu', type: 'float' },
+			{ name: 'est_abv', type: 'float' },
 		],
 		id: 'record',
 		url: "includes/db_recipes.php"
@@ -65,11 +66,12 @@
 		columns: [
 			{ text: 'Stijlgids', datafield: 'st_guide', width: 120 },
 			{ text: 'Letter', datafield: 'st_letter', width: 60 },
-			{ text: 'Stijl', datafield: 'st_name', width: 150 },
+			{ text: 'Stijl', datafield: 'st_name', width: 160 },
 			{ text: 'Naam', datafield: 'name' },
 			{ text: 'OG', datafield: 'est_og', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f3' },
 			{ text: 'EBC', datafield: 'est_color', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f0' },
 			{ text: 'IBU', datafield: 'est_ibu', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f0' },
+			{ text: 'ABV', datafield: 'est_abv', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'p1' },
 			{ text: 'Wijzig', datafield: 'Edit', width: 120, align: 'center', columntype: 'button', cellsrenderer: function () {
 				return "Wijzig";
 				}, buttonclick: function (row) {

--- a/www/rec_edit.php	Thu Nov 15 14:27:37 2018 +0100
+++ b/www/rec_edit.php	Thu Nov 15 17:17:33 2018 +0100
@@ -29,15 +29,17 @@
 	</tr>
         <tr>
 	 <td style="vertical-align: top; float: right; padding: 3px;">Brouw type:</td>
-	 <td align="left" colspan="5" style="padding: 3px;"><div id="type"></div></td>
+	 <td align="left" style="padding: 3px;"><div id="type"></div></td>
+         <td style="vertical-align: top; float: right; padding: 3px;">Brouwzaal rendement:</td>
+         <td colspan="3" style="padding: 3px;"><div id="efficiency"></div></td>
         </tr>
         <tr>
          <td style="vertical-align: top; float: right; padding: 3px;">Brouw volume:</td>
          <td style="padding: 3px;"><div id="batch_size"></div></td>
          <td style="vertical-align: top; float: right; padding: 3px;">Kooktijd minuten:</td>
 	 <td style="padding: 3px;"><div id="boil_time"></div></td>
-         <td style="vertical-align: top; float: right; padding: 3px;">Brouwzaal rendement:</td>
-         <td style="padding: 3px;"><div id="efficiency"></div></td>
+         <td style="vertical-align: top; float: right; padding: 3px;">Kook volume:</td>
+         <td style="padding: 3px;"><div id="boil_size"></div></td>
 	</tr>
         <tr>
          <td colspan="6"><hr></td>