--- a/www/js/rec_edit.js Tue Aug 02 20:35:00 2022 +0200
+++ b/www/js/rec_edit.js Wed Aug 03 15:16:07 2022 +0200
@@ -57,27 +57,6 @@
eq_tun_specific_heat = 0.110, // Stainless Steel
data_loaded = 0;
-function createDelElements() {
- $('#eventWindow').jqxWindow({
- theme: theme,
- position: { x: 490, y: 210 },
- width: 300,
- height: 175,
- resizable: false,
- isModal: true,
- modalOpacity: 0.4,
- okButton: $('#delOk'),
- cancelButton: $('#delCancel'),
- initContent: function() {
- $('#delOk').jqxButton({ template: 'danger', width: '65px', theme: theme });
- $('#delCancel').jqxButton({ template: 'success', width: '65px', theme: theme });
- $('#delCancel').focus();
- }
- });
- $('#eventWindow').jqxWindow('hide');
-}
-
-
function hopFlavourContribution(bt, vol, use, amount) {
var result;
@@ -124,17 +103,6 @@
w100 = 90;
w80 = 60;
}
- $('#batch_size').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 });
- $('#boil_size').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 });
- $('#boil_time').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 });
- $('#efficiency').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 });
- $('#est_og').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 });
- // id="st_fg_min" margin-left 15/35 maken
- $('#type').jqxDropDownList({ disabled: ro });
- $('#styleSelect').jqxDropDownList({ disabled: ro });
- $('#color_method').jqxDropDownList({ disabled: ro });
- $('#ibu_method').jqxDropDownList({ disabled: ro });
- $('#Delete').jqxButton({ disabled: ro });
$('#fermentableGrid').jqxGrid({ editable: rw });
$('#faddrowbutton').jqxDropDownList({ disabled: ro });
$('#finstockbutton').jqxCheckBox({ disabled: ro });
@@ -831,7 +799,7 @@
$('#st_category').val(dataRecord.st_category);
$('#st_category_number').val(dataRecord.st_category_number);
$('#st_type').val(StyleTypeData[dataRecord.st_type].nl);
- $('#type').val(dataRecord.type);
+ $('#type').val(RecipeTypeData[dataRecord.type].nl);
$('#batch_size').val(dataRecord.batch_size);
$('#boil_size').val(dataRecord.boil_size);
$('#boil_time').val(dataRecord.boil_time);
@@ -856,12 +824,12 @@
$('#st_abv_max').val(dataRecord.st_abv_max);
$('#st_color_min').val(dataRecord.st_color_min);
$('#st_color_max').val(dataRecord.st_color_max);
- $('#color_method').val(dataRecord.color_method);
+ $('#color_method').val(ColorMethodData[dataRecord.color_method].nl);
$('#est_ibu').val(dataRecord.est_ibu);
$('#est_ibu2').val(dataRecord.est_ibu);
$('#st_ibu_min').val(dataRecord.st_ibu_min);
$('#st_ibu_max').val(dataRecord.st_ibu_max);
- $('#ibu_method').val(dataRecord.ibu_method);
+ $('#ibu_method').val(IBUmethodData[dataRecord.ibu_method].nl);
$('#est_carb').val(dataRecord.est_carb);
$('#st_carb_min').val(dataRecord.st_carb_min);
$('#st_carb_max').val(dataRecord.st_carb_max);
@@ -2499,60 +2467,6 @@
calcWater();
});
- $('#color_method').on('select', function(event) {
- dataRecord.color_method = event.args.index;
- calcFermentables();
- });
- $('#ibu_method').on('select', function(event) {
- dataRecord.ibu_method = event.args.index;
- calcFermentables();
- calcIBUs();
- });
- $('#batch_size').on('change', function(event) {
- console.log('batch_size change:' + event.args.value + ' old:' + dataRecord.batch_size);
- var evap = (0.1 * parseFloat(event.args.value)) * dataRecord.boil_time / 60;
- dataRecord.boil_size = parseFloat(event.args.value) + evap;
- var factor = parseFloat(event.args.value) / dataRecord.batch_size;
- $('#boil_size').val(Round(dataRecord.boil_size, 2));
- dataRecord.sparge_volume *= factor;
- $('#sparge_volume').val(dataRecord.sparge_volume);
- dataRecord.batch_size = parseFloat(event.args.value);
- calcFermentablesFromOG(parseFloat($('#est_og').jqxNumberInput('decimal'))); // Keep the OG
- adjustWaters(factor);
- calcFermentables();
- adjustHops(factor);
- adjustMiscs(factor);
- adjustYeasts(factor);
- calcIBUs();
- calcWater();
- calcSparge();
- calcMash();
- });
- $('#boil_time').on('change', function(event) {
- console.log('boil_time change:' + parseFloat(event.args.value) + ' old:' + dataRecord.boil_time);
- var new_evap = (0.1 * parseFloat(dataRecord.batch_size)) * parseFloat(event.args.value) / 60;
- dataRecord.boil_size = parseFloat(dataRecord.batch_size) + new_evap;
- dataRecord.boil_time = parseFloat(event.args.value);
- $('#boil_size').val(Round(dataRecord.boil_size, 2));
- calcFermentables();
- calcIBUs();
- });
- $('#efficiency').on('change', function(event) {
- var estog = parseFloat($('#est_og').jqxNumberInput('decimal'));
- dataRecord.efficiency = parseFloat(event.args.value);
- console.log('efficiency change:' + dataRecord.efficiency);
- calcFermentablesFromOG(estog); // Keep the OG
- calcFermentables();
- calcIBUs();
- });
- $('#est_og').on('change', function(event) {
- dataRecord.est_og = parseFloat(event.args.value);
- console.log('est_og change:' + dataRecord.est_og);
- calcFermentablesFromOG(dataRecord.est_og); // Adjust fermentables amounts
- calcFermentables(); // Update the recipe details
- calcIBUs();
- calcMash();
- });
$('#mash_ph').on('change', function(event) {
dataRecord.mash_ph = parseFloat(event.args.value);
calcWater();
@@ -2591,50 +2505,10 @@
});
$('#locked').on('unchecked', function(event) {
dataRecord.locked = 0;
- setReadonly(false);
+ setReadonly(true);
});
};
- $('#styleSelect').jqxDropDownList({
- placeHolder: 'Kies bierstijl:',
- theme: theme,
- source: styleslist,
- displayMember: 'name',
- width: 180,
- height: 23,
- dropDownVerticalAlignment: 'top',
- dropDownWidth: 500,
- dropDownHeight: 350,
- renderer: function(index, label, value) {
- var datarecord = styleslist.records[index];
- return datarecord.style_guide + ' ' + datarecord.style_letter + ' ' + datarecord.name;
- }
- });
- $('#styleSelect').on('select', function(event) {
- if (event.args) {
- var datarecord, index = event.args.index;
- datarecord = styleslist.records[index];
- $('#st_name').val(datarecord.name);
- $('#st_category').val(datarecord.category);
- $('#st_category_number').val(datarecord.category_number);
- $('#st_letter').val(datarecord.style_letter);
- $('#st_guide').val(datarecord.style_guide);
- $('#st_type').val(StyleTypeData[datarecord.type].nl);
- $('#st_og_min').val(datarecord.og_min);
- $('#st_og_max').val(datarecord.og_max);
- $('#st_fg_min').val(datarecord.fg_min);
- $('#st_fg_max').val(datarecord.fg_max);
- $('#st_ibu_min').val(datarecord.ibu_min);
- $('#st_ibu_max').val(datarecord.ibu_max);
- $('#st_color_min').val(datarecord.color_min);
- $('#st_color_max').val(datarecord.color_max);
- $('#st_carb_min').val(datarecord.carb_min);
- $('#st_carb_max').val(datarecord.carb_max);
- $('#st_abv_min').val(datarecord.abv_min);
- $('#st_abv_max').val(datarecord.abv_max);
- }
- });
-
function saveRecord(goback) {
var row = {
record: my_record,
@@ -2742,10 +2616,10 @@
} else {
console.log('saveRecord(' + goback + ') success');
}
- if (goback)
+// if (goback)
window.location.href = my_return;
- else
- window.location.href = 'rec_export.php?record=' + my_record + '&return=' + my_return + '&name=' + dataRecord.name;
+// else
+// window.location.href = 'rec_export.php?record=' + my_record + '&return=' + my_return + '&name=' + dataRecord.name;
},
error: function(jqXHR, textStatus, errorThrown) {
console.log('saveRecord() ' + textStatus);
@@ -2763,24 +2637,16 @@
$('#notes').jqxTooltip({ content: 'De uitgebreide opmerkingen over dit recept.' });
$('#notes').jqxInput({ theme: theme, width: 960, height: 200 });
$('#type').jqxTooltip({ content: 'Het brouw type van dit recept.' });
- $('#type').jqxDropDownList({
- theme: theme,
- source: RecipeTypeAdapter,
- valueMember: 'id',
- displayMember: 'nl',
- width: 180,
- height: 23,
- autoDropDownHeight: true
- });
+ $('#type').jqxInput({ theme: theme, width: 180, height: 23 });
$('#efficiency').jqxTooltip({ content: 'Het rendement van maischen en koken.' });
- $('#efficiency').jqxNumberInput(Perc1dec);
+ $('#efficiency').jqxNumberInput(Show1dec);
$('#batch_size').jqxTooltip({ content: 'Het volume van het gekoelde wort na het koken.' });
- $('#batch_size').jqxNumberInput(Spin1dec);
+ $('#batch_size').jqxNumberInput(Show1dec);
$('#batch_size').jqxNumberInput({ min: 4 });
$('#boil_size').jqxTooltip({ content: 'Het volume van het wort voor het koken.' });
$('#boil_size').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 90, height: 23, decimalDigits: 2, readOnly: true });
$('#boil_time').jqxTooltip({ content: 'De kooktijd in minuten.' });
- $('#boil_time').jqxNumberInput(PosInt);
+ $('#boil_time').jqxNumberInput(Show0dec);
$('#boil_time').jqxNumberInput({ min: 4, max: 360 });
$('#st_name').jqxTooltip({ content: 'De bierstijl naam voor dit recept.'});
@@ -2797,7 +2663,7 @@
$('#st_type').jqxInput({ theme: theme, width: 250, height: 23 });
$('#est_og').jqxTooltip({ content: 'Het begin SG wat je wilt bereiken. De moutstort wordt automatisch herberekend.' });
- $('#est_og').jqxNumberInput(SGopts);
+ $('#est_og').jqxNumberInput(Show3dec);
$('#st_og_min').jqxTooltip({ content: 'Het minimum begin SG voor deze bierstijl.'});
$('#st_og_min').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 3, readOnly: true });
$('#st_og_max').jqxTooltip({ content: 'Het maximum begin SG voor deze bierstijl.'});
@@ -2823,31 +2689,15 @@
$('#st_color_min').jqxNumberInput(Smal0dec);
$('#st_color_max').jqxTooltip({ content: 'De maximum kleur voor deze bierstijl.'});
$('#st_color_max').jqxNumberInput(Smal0dec);
- $('#color_method').jqxDropDownList({
- theme: theme,
- source: ColorMethodAdapter,
- valueMember: 'id',
- displayMember: 'nl',
- width: 180,
- height: 23,
- autoDropDownHeight: true
- });
+ $('#color_method').jqxInput({ theme: theme, width: 180, height: 23 });
$('#est_ibu').jqxTooltip({ content: 'De bitterheid in IBU. Dit wordt automatisch berekend.' });
$('#est_ibu').jqxNumberInput(Show0dec);
$('#st_ibu_min').jqxTooltip({ content: 'De minimum bitterheid voor deze bierstijl.'});
$('#st_ibu_min').jqxNumberInput(Smal0dec);
$('#st_ibu_max').jqxTooltip({ content: 'De maximum bitterheid voor deze bierstijl.'});
$('#st_ibu_max').jqxNumberInput(Smal0dec);
- $('#ibu_method').jqxDropDownList({
- theme: theme,
- source: IBUmethodAdapter,
- valueMember: 'id',
- displayMember: 'nl',
- width: 180,
- height: 23,
- autoDropDownHeight: true,
- dropDownVerticalAlignment: 'top'
- });
+
+ $('#ibu_method').jqxInput({ theme: theme, width: 180, height: 23 });
$('#kcal').jqxTooltip({ content: 'Energie-inhoud in kcal/liter.' });
$('#kcal').jqxNumberInput(Smal0dec);
$('#est_carb').jqxTooltip({ content: 'Koolzuur volume. Dit wordt automatisch berekend.' });
@@ -4020,32 +3870,6 @@
});
// Buttons below
- $('#Export').jqxButton({ template: 'info', width: '80px', theme: theme });
- $('#Export').bind('click', function() {
- saveRecord(0);
- });
-
- $('#Delete').jqxButton({ template: 'danger', width: '80px', theme: theme });
- $('#Delete').bind('click', function() {
- // Open a popup to confirm this action.
- $('#eventWindow').jqxWindow('open');
- $('#delOk').click(function() {
- var data = 'delete=true&' + $.param({ record: my_record });
- $.ajax({
- dataType: 'json',
- url: url,
- cache: false,
- data: data,
- type: 'POST',
- success: function(data, status, xhr) {
- // delete command is executed.
- window.location.href = my_return;
- },
- error: function(jqXHR, textStatus, errorThrown) {
- }
- });
- });
- });
$('#Cancel').jqxButton({ template: 'primary', width: '80px', theme: theme });
$('#Cancel').bind('click', function() {
@@ -4054,8 +3878,7 @@
$('#Save').jqxButton({ template: 'success', width: '80px', theme: theme });
$('#Save').bind('click', function() {
- saveRecord(1);
+ window.location.href = my_return;
});
- createDelElements();
});
