--- a/www/js/prod_edit.js Fri Nov 30 22:11:47 2018 +0100
+++ b/www/js/prod_edit.js Sat Dec 01 22:24:46 2018 +0100
@@ -130,11 +130,11 @@
var dataReecord = {};
var url = "includes/db_product.php";
// tooltips
- $("#name").jqxTooltip({ content: 'De naam voor dit product.' });
+ $("#pname").jqxTooltip({ content: 'De naam voor dit product.' });
$("#code").jqxTooltip({ content: 'Product code nummer.' });
$("#birth").jqxTooltip({ content: 'De ontwerp datum van dit product.' });
$("#stage").jqxTooltip({ content: 'De productie fase van dit product.' });
- $("#notes").jqxTooltip({ content: 'De uitgebreide opmerkingen over dit product.' });
+ $("#pnotes").jqxTooltip({ content: 'De uitgebreide opmerkingen over dit product.' });
$("#eq_name").jqxTooltip({ content: 'De naam van deze brouw apparatuur.' });
$("#eq_notes").jqxTooltip({ content: 'Opmerkingen over deze apparatuur.' });
$("#eq_tun_volume").jqxTooltip({ content: 'Maisch ketel volume.' });
@@ -161,17 +161,18 @@
datatype: "json",
cache: false,
datafields: [
+ // From prod_main
{ name: 'record', type: 'number' },
- { name: 'uuid', type: 'string' },
- { name: 'name', type: 'string' },
+ { name: 'puuid', type: 'string' },
+ { name: 'pname', type: 'string' },
{ name: 'code', type: 'string' },
{ name: 'birth', type: 'string' },
{ name: 'stage', type: 'string' },
- { name: 'notes', type: 'string' },
+ { name: 'pnotes', type: 'string' },
{ name: 'log_brew', type: 'bool' },
{ name: 'log_fermentation', type: 'bool' },
{ name: 'inventory_reduced', type: 'bool' },
- { name: 'locked', type: 'bool' },
+ { name: 'plocked', type: 'bool' },
{ name: 'eq_name', type: 'string' },
{ name: 'eq_boil_size', type: 'float' },
{ name: 'eq_batch_size', type: 'float' },
@@ -198,13 +199,111 @@
{ name: 'brew_date_start', type: 'string' },
{ name: 'brew_mash_ph', type: 'float' },
{ name: 'brew_mash_sg', type: 'float' },
-
- { name: 'brew_date_end', type: 'string' }
+ { name: 'brew_sparge_temperature', type: 'float' },
+ { name: 'brew_sparge_volume', type: 'float' },
+ { name: 'brew_preboil_volume', type: 'float' },
+ { name: 'brew_preboil_sg', type: 'float' },
+ { name: 'brew_preboil_ph', type: 'float' },
+ { name: 'brew_aboil_volume', type: 'float' },
+ { name: 'brew_aboil_sg', type: 'float' },
+ { name: 'brew_aboil_ph', type: 'float' },
+ { name: 'brew_aboil_efficiency', type: 'float' },
+ { name: 'brew_cooling_method', type: 'string' },
+ { name: 'brew_cooling_time', type: 'float' },
+ { name: 'brew_cooling_to', type: 'float' },
+ { name: 'brew_whirlpool9', type: 'float' },
+ { name: 'brew_whirlpool7', type: 'float' },
+ { name: 'brew_whirlpool6', type: 'float' },
+ { name: 'brew_whirlpool2', type: 'float' },
+ { name: 'brew_fermenter_volume', type: 'float' },
+ { name: 'brew_fermenter_extrawater', type: 'float' },
+ { name: 'brew_aeration_time', type: 'float' },
+ { name: 'brew_aeration_speed', type: 'float' },
+ { name: 'brew_aeration_type', type: 'string' },
+ { name: 'brew_fermenter_sg', type: 'float' },
+ { name: 'brew_fermenter_ibu', type: 'float' },
+ { name: 'brew_date_end', type: 'string' },
+ { name: 'brew_log_available', type: 'bool' },
+ { name: 'primary_start_temp', type: 'float' },
+ { name: 'primary_max_temp', type: 'float' },
+ { name: 'primary_end_temp', type: 'float' },
+ { name: 'primary_end_sg', type: 'float' },
+ { name: 'primary_end_date', type: 'string' },
+ { name: 'secondary_temp', type: 'float' },
+ { name: 'secondary_end_date', type: 'string' },
+ { name: 'tertiary_temp', type: 'float' },
+ { name: 'package_date', type: 'string' },
+ { name: 'bottle_amount', type: 'float' },
+ { name: 'bottle_carbonation', type: 'float' },
+ { name: 'bottle_priming_sugar', type: 'string' },
+ { 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_sugar', type: 'string' },
+ { name: 'keg_priming_amount', type: 'float' },
+ { name: 'keg_carbonation_temp', type: 'float' },
+ { name: 'keg_forced_carb', type: 'bool' },
+ { name: 'keg_pressure', type: 'float' },
+ { name: 'keg_priming_factor', type: 'float' },
+ { name: 'taste_notes', type: 'string' },
+ { name: 'taste_rate', type: 'float' },
+ { name: 'taste_date', type: 'string' },
+ { name: 'taste_color', type: 'string' },
+ { name: 'taste_transparency', type: 'string' },
+ { name: 'taste_head', type: 'string' },
+ { name: 'taste_aroma', type: 'string' },
+ { name: 'taste_taste', type: 'string' },
+ { name: 'taste_mouthfeel', type: 'string' },
+ { name: 'taste_aftertaste', type: 'string' },
+ // From prod_recipes
+ { name: 'uuid', type: 'string' },
+ { name: 'locked', type: 'bool' },
+ { name: 'st_name', type: 'string' },
+ { name: 'st_letter', type: 'string' },
+ { name: 'st_guide', type: 'string' },
+ { name: 'st_category', type: 'string' },
+ { name: 'st_category_number', type: 'float' },
+ { name: 'st_type', type: 'string' },
+ { name: 'st_og_min', type: 'float' },
+ { name: 'st_og_max', type: 'float' },
+ { name: 'st_fg_min', type: 'float' },
+ { name: 'st_fg_max', type: 'float' },
+ { name: 'st_ibu_min', type: 'float' },
+ { name: 'st_ibu_max', type: 'float' },
+ { name: 'st_color_min', type: 'float' },
+ { name: 'st_color_max', type: 'float' },
+ { name: 'st_carb_min', type: 'float' },
+ { name: 'st_carb_max', type: 'float' },
+ { name: 'st_abv_min', type: 'float' },
+ { name: 'st_abv_max', type: 'float' },
+ { name: 'name', type: 'string' },
+ { 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' },
+ { name: 'est_fg', type: 'float' },
+ { name: 'est_abv', type: 'float' },
+ { name: 'est_color', type: 'float' },
+ { name: 'color_method', type: 'string' },
+ { name: 'est_ibu', type: 'float' },
+ { name: 'ibu_method', type: 'string' },
+ { name: 'est_carb', type: 'float' },
+ { name: 'mash_sparge_temp', type: 'float' },
+ { name: 'mash_ph', type: 'float' },
+ { name: 'mash_name', type: 'string' },
+ { name: 'fermentables', type: 'array' },
+ { name: 'hops', type: 'string' },
+ { name: 'miscs', type: 'string' },
+ { name: 'yeasts', type: 'string' },
+ { name: 'waters', type: 'array' },
+ { name: 'mashs', type: 'string' }
],
id: 'record',
-// data: "record=" + my_record,
- url: url
- // url: url + '?record=' + my_record,
+ url: url + '?record=' + my_record
};
// Load data and select one record.
var dataAdapter = new $.jqx.dataAdapter(source, {
@@ -212,16 +311,16 @@
var records = dataAdapter.records;
dataRecord = records[0];
// Hidden record uuid
- this_uuid = dataRecord.uuid;
- $("#name").val(dataRecord.name);
+ this_uuid = dataRecord.puuid;
+ $("#pname").val(dataRecord.pname);
$("#code").val(dataRecord.code);
$("#birth").val(dataRecord.birth);
$("#stage").val(dataRecord.stage);
- $("#notes").val(dataRecord.notes);
+ $("#pnotes").val(dataRecord.pnotes);
$("#log_brew").val(dataRecord.log_brew);
$("#log_fermentation").val(dataRecord.log_fermentation);
$("#inventory_reduced").val(dataRecord.inventory_reduced);
- $("#locked").val(dataRecord.locked);
+ $("#plocked").val(dataRecord.plocked);
$("#eq_name").val(dataRecord.eq_name);
$("#eq_notes").val(dataRecord.eq_notes);
$("#eq_boil_size").val(dataRecord.eq_boil_size);
@@ -245,9 +344,48 @@
$("#eq_kettle_height").val(dataRecord.eq_kettle_height);
$("#eq_mash_volume").val(dataRecord.eq_mash_volume);
$("#eq_efficiency").val(dataRecord.eq_efficiency);
+ // Brewdate
$("#brew_date_start").val(dataRecord.brew_date_start);
+
$("#brew_mash_ph").val(dataRecord.brew_mash_ph);
$("#brew_mash_sg").val(dataRecord.brew_mash_sg);
+ // brew_mash_efficiency to calculate on th fly.
+ // Header Spoelen en filteren
+ $("#brew_sparge_temperature").val(dataRecord.brew_sparge_temperature);
+ $("#brew_sparge_volume").val(dataRecord.brew_sparge_volume);
+ //$("#brew_sparge_ph").val(dataRecord.brew_sparge_ph);
+ // Header Beluchten
+ $("#brew_aeration_type").val(dataRecord.brew_aeration_type);
+ $("#brew_aeration_time").val(dataRecord.brew_aeration_time);
+ $("#brew_aeration_speed").val(dataRecord.brew_aeration_speed);
+
+ $("#brew_preboil_ph").val(dataRecord.brew_preboil_ph);
+ $("#brew_preboil_sg").val(dataRecord.brew_preboil_sg);
+ $("#brew_preboil_volume").val(dataRecord.brew_preboil_volume);
+ //$("#brew_preboil_efficiency").val(dataRecord.brew_preboil_efficiency);
+ // Header Koelen en whirlpoolen
+ $("#brew_whirlpool9").val(dataRecord.brew_whirlpool9);
+ $("#brew_whirlpool7").val(dataRecord.brew_whirlpool7);
+ $("#brew_whirlpool6").val(dataRecord.brew_whirlpool6);
+ $("#brew_whirlpool2").val(dataRecord.brew_whirlpool2);
+ // Header Naar gistvat
+ $("#brew_fermenter_volume").val(dataRecord.brew_fermenter_volume);
+ $("#brew_fermenter_sg").val(dataRecord.brew_fermenter_sg);
+ $("#brew_fermenter_ibu").val(dataRecord.brew_fermenter_ibu);
+
+ $("#brew_aboil_ph").val(dataRecord.brew_aboil_ph);
+ $("#brew_aboil_sg").val(dataRecord.brew_aboil_sg);
+ $("#brew_aboil_volume").val(dataRecord.brew_aboil_volume);
+ $("#brew_aboil_efficiency").val(dataRecord.brew_aboil_efficiency);
+ // Header Koelen en whirlpoolen
+ $("#brew_cooling_to").val(dataRecord.brew_cooling_to);
+ $("#brew_cooling_method").val(dataRecord.brew_cooling_method);
+ $("#brew_cooling_time").val(dataRecord.brew_cooling_time);
+ // Niks
+ // Header Naar gistvat
+ $("#brew_fermenter_extrawater").val(dataRecord.brew_fermenter_extrawater);
+ $("#brew_fermenter_extrasugar").val(dataRecord.brew_fermenter_extrasugar);
+ $("#brew_fermenter_color").val(dataRecord.brew_fermenter_color);
$("#brew_date_end").val(dataRecord.brew_date_end);
@@ -263,10 +401,10 @@
case 'Mature': brewstage = 8; break;
case 'Taste': brewstage = 9; break;
case 'Ready': brewstage = 10;
- $("#locked").jqxCheckBox({ disabled:false });
+ $("#plocked").jqxCheckBox({ disabled:false });
break;
case 'Closed': brewstage = 11;
- $("#locked").jqxCheckBox({ disabled:false });
+ $("#plocked").jqxCheckBox({ disabled:false });
break;
}
// Enable or Disable settings depending on the stage.
@@ -291,26 +429,20 @@
$("#inventory_reduced").jqxCheckBox({ disabled : true });
},
loadError: function (jqXHR, status, error) {
- },
- beforeLoadComplete: function (records) {
- var filteredRecords = [];
- for (var i = 0; i < records.length; i++) {
- if (records[i].record == my_record) {
- filteredRecords.push(records[i]);
- }
- }
- return filteredRecords;
}
});
dataAdapter.dataBind();
// initialize the input fields.
var srcMaterial= [ "RVS", "Aluminium", "Kunststof", "Koper" ];
- $("#name").jqxInput({ theme: theme, width: 640, height: 23 });
+ var srcAeration= [ 'None', 'Air', 'Oxygen' ];
+ var srcCooling= [ '-', 'Emersion chiller', 'Counterflow chiller', 'Au bain marie', 'Natural' ];
+ // '-', 'Dompelkoeler', 'Tegenstroomkoeler', 'Au bain marie', 'Laten afkoelen'
+ $("#pname").jqxInput({ theme: theme, width: 640, height: 23 });
$("#code").jqxInput({ theme: theme, width: 100, height: 23 });
$("#birth").jqxDateTimeInput({ theme: theme, width: 150, height: 23, formatString: 'yyyy-MM-dd' });
$("#stage").jqxInput({ theme: theme, width: 100, height: 23 });
- $("#notes").jqxInput({ theme: theme, width: 960, height: 200 });
+ $("#pnotes").jqxInput({ theme: theme, width: 960, height: 200 });
$("#log_brew").jqxCheckBox({ theme: theme, width: 120, height: 23, disabled : true });
$("#log_fermentation").jqxCheckBox({ theme: theme, width: 120, height: 23, disabled : true });
$("#inventory_reduced").jqxCheckBox({ theme: theme, width: 120, height: 23 });
@@ -320,14 +452,18 @@
// Call the script with the uuid.
$("#inventory_reduced").jqxCheckBox({ disabled : true });
});
- $("#locked").jqxCheckBox({ theme: theme, width: 120, height: 23, disabled : true });
- $('#locked').on('checked', function (event) {
- $("#stage").val('Closed');
- brewstage = 11;
+ $("#plocked").jqxCheckBox({ theme: theme, width: 120, height: 23, disabled : true });
+ $('#plocked').on('checked', function (event) {
+ if (brewstage >= 10) {
+ $("#stage").val('Closed');
+ brewstage = 11;
+ }
});
- $('#locked').on('unchecked', function (event) {
- $("#stage").val('Ready');
- brewstage = 10;
+ $('#plocked').on('unchecked', function (event) {
+ if (brewstage >= 10) {
+ $("#stage").val('Ready');
+ brewstage = 10;
+ }
});
$("#eq_name").jqxInput({ theme: theme, width: 250, height: 23 });
$("#eq_boil_size").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 1 });
@@ -352,12 +488,42 @@
$("#eq_kettle_height").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 1 });
$("#eq_mash_volume").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 1 });
$("#eq_efficiency").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 1 });
-
+ // Brewday
$("#brew_date_start").jqxDateTimeInput({ theme: theme, width: 230, height: 23, formatString: 'yyyy-MM-dd HH:mm:ss', showTimeButton: true });
- $("#brew_mash_ph").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+ $("#brew_mash_ph").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
$("#brew_mash_sg").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, decimalDigits: 3, spinButtons: true, spinButtonsStep: 0.001 });
-
+ $("#brew_mash_efficiency").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 1 });
+ $("#brew_sparge_temperature").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+ $("#brew_sparge_volume").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+ $("#brew_sparge_ph").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+ $("#brew_preboil_volume").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+ $("#brew_preboil_sg").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, decimalDigits: 3, spinButtons: true, spinButtonsStep: 0.001 });
+ $("#brew_preboil_ph").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+ $("#brew_preboil_efficiency").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 1 });
+ $("#brew_aboil_volume").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+ $("#brew_aboil_sg").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, decimalDigits: 3, spinButtons: true, spinButtonsStep: 0.001 });
+ $("#brew_aboil_ph").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+ $("#brew_aboil_efficiency").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 1 });
+ $("#brew_whirlpool9").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, max: 120, decimalDigits: 0, spinButtons: true });
+ $("#brew_whirlpool7").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, max: 120, decimalDigits: 0, spinButtons: true });
+ $("#brew_whirlpool6").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, max: 120, decimalDigits: 0, spinButtons: true });
+ $("#brew_whirlpool2").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, max: 120, decimalDigits: 0, spinButtons: true });
+ $("#brew_cooling_method").jqxDropDownList({ theme: theme, source: srcCooling, width: 170, height: 23, dropDownHeight: 153 });
+ $("#brew_cooling_to").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+ $("#brew_cooling_time").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, max: 1440, decimalDigits: 0, spinButtons: true });
+ $("#brew_aeration_type").jqxDropDownList({ theme: theme, source: srcAeration, width: 100, height: 23, dropDownHeight: 95 });
+ $("#brew_aeration_time").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, max: 1440, decimalDigits: 0, spinButtons: true });
+ $("#brew_aeration_speed").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, max: 1440, decimalDigits: 0, spinButtons: true });
+ $("#brew_fermenter_volume").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+ $("#brew_fermenter_extrawater").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+ $("#brew_fermenter_extrasugar").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+ $("#brew_fermenter_sg").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 3 });
+ $("#brew_fermenter_ibu").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 0 });
+ $("#brew_fermenter_color").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 0 });
$("#brew_date_end").jqxDateTimeInput({ theme: theme, width: 230, height: 23, formatString: 'yyyy-MM-dd HH:mm:ss', showTimeButton: true });
+ // Vergisting
+ // Packaging
+ // Tasting
$('#jqxTabs').jqxTabs({
theme: theme,
@@ -378,7 +544,7 @@
// Open a popup to confirm this action.
$('#eventWindow').jqxWindow('open');
$("#delOk").click(function () {
- var data = "delete=true&" + $.param({ record: my_record });
+ var data = "delete=true&" + $.param({ uuid: this_uuid });
$.ajax({
dataType: 'json',
url: url,
@@ -404,16 +570,16 @@
$("#Save").click(function () {
var row = {
record: my_record,
- uuid: this_uuid,
- name: $("#name").val(),
+ puuid: this_uuid,
+ pname: $("#pname").val(),
code: $("#code").val(),
birth: $("#birth").val(),
stage: $("#stage").val(),
- notes: $("#notes").val(),
+ pnotes: $("#pnotes").val(),
log_brew: $("#log_brew").val(),
log_fermentation: $("#log_fermentation").val(),
inventory_reduced: $("#inventory_reduced").val(),
- locked: $("#locked").val(),
+ plocked: $("#plocked").val(),
eq_name: $("#eq_name").val(),
eq_boil_size: parseFloat($("#eq_boil_size").jqxNumberInput('decimal')),
eq_batch_size: parseFloat($("#eq_batch_size").jqxNumberInput('decimal')),