bms: comparison www/js/prod_edit.js

comparison: www/js/prod_edit.js

www/js/prod_edit.js

changeset 697: 367ae7ff52f0
parent 669: 1a1cf5430f43
child 706: 12f9316de113

equal deleted inserted replaced

-:f4de55f587c1
+:367ae7ff52f0
 * along with ThermFerm; see the file COPYING.  If not, write to the Free
 * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 *****************************************************************************/
-function createDelElements() {
+function createPopupElements() {
 $('#eventWindow').jqxWindow({
 theme: theme,
 position: { x: 490, y: 210 },
 width: 300,
 $('#delOk').jqxButton({ template: 'danger', width: '65px', theme: theme });
 $('#delCancel').jqxButton({ template: 'success', width: '65px', theme: theme });
 $('#delCancel').focus();
 }
 });
-$('#eventWindow').jqxWindow('hide');
 $('#volumeWindow').jqxWindow({
 theme: theme,
 position: { x: 380, y: 210 },
 width: 500,
 isModal: true,
 modalOpacity: 0.4,
 autoOpen: false,
 cancelButton: $('#volumeReady')
 });
-$('#volumeWindow').jqxWindow('hide');
+$('#pitchrateWindow').jqxWindow({
+theme: theme,
+position: { x: 330, y: 210 },
+width: 600,
+height: 200,
+resizable: false,
+isModal: true,
+modalOpacity: 0.4,
+autoOpen: false,
+cancelButton: $('#pitchrateReady')
+});
+$('#popupFermentable').jqxWindow({
+width: 800,
+height: 300,
+position: { x: 230, y: 100 },
+resizable: false,
+theme: theme,
+isModal: true,
+autoOpen: false,
+cancelButton: $('#FermentableReady'),
+modalOpacity: 0.40
+});
+$('#popupHop').jqxWindow({
+width: 800,
+height: 300,
+position: { x: 230, y: 100 },
+resizable: false,
+theme: theme,
+isModal: true,
+autoOpen: false,
+cancelButton: $('#HopReady'),
+modalOpacity: 0.40
+});
+$('#popupMisc').jqxWindow({
+width: 800,
+height: 275,
+position: { x: 230, y: 100 },
+resizable: false,
+theme: theme,
+isModal: true,
+autoOpen: false,
+cancelButton: $('#MiscReady'),
+modalOpacity: 0.40
+});
+$('#popupYeast').jqxWindow({
+width: 800,
+height: 300,
+position: { x: 230, y: 100 },
+resizable: false,
+theme: theme,
+isModal: true,
+autoOpen: false,
+cancelButton: $('#YeastReady'),
+modalOpacity: 0.40
+});
+$('#popupMash').jqxWindow({
+width: 800,
+height: 375,
+position: { x: 230, y: 100 },
+resizable: false,
+theme: theme,
+isModal: true,
+autoOpen: false,
+cancelButton: $('#MashReady'),
+modalOpacity: 0.40
+});
 }
 $(document).ready(function() {
 est_mash_sg = 0,
 psugar = 0,          // Percentage real sugars
 pcara = 0,           // Percentage cara/crystal malts
 svg = 77,            // Default attenuation
 mashkg = 0,          // Malt in mash weight
-pitchrate = 0.75,    // Yeast pitch rate default
 initcells = 0,       // Initial yeast cell count
 ok_fermentables = 1, // Fermentables are in stock
 ok_hops = 1,         // Hops are in stock
 ok_miscs = 1,        // Miscs are in stock
 { name: 'starter_enable', type: 'int' },
 { name: 'starter_type', type: 'int' },
 { name: 'starter_sg', type: 'float' },
 { name: 'starter_viability', type: 'int' },
 { name: 'yeast_prod_date', type: 'string' },
+{ name: 'yeast_pitchrate', type: 'float' },
 { name: 'prop1_type', type: 'int' },
 { name: 'prop1_volume', type: 'float' },
 { name: 'prop2_type', type: 'int' },
 { name: 'prop2_volume', type: 'float' },
 { name: 'prop3_type', type: 'int' },
 $('#wa_base_name').val(dataRecord.wa_base_name);
 $('#starter_type').val(dataRecord.starter_type);
 $('#starter_sg').val(dataRecord.starter_sg);
 $('#starter_viability').val(dataRecord.starter_viability);
 $('#yeast_prod_date').val(dataRecord.yeast_prod_date);
+$('#yeast_pitchrate').val(dataRecord.yeast_pitchrate);
 $('#prop1_type').val(dataRecord.prop1_type);
 $('#prop1_volume').val(dataRecord.prop1_volume);
 $('#prop2_type').val(dataRecord.prop2_type);
 $('#prop2_volume').val(dataRecord.prop2_volume);
 $('#prop3_type').val(dataRecord.prop3_type);
 volume = dataRecord.brew_fermenter_volume;
 if (volume <= 0)
 volume = dataRecord.batch_size - dataRecord.eq_trub_chiller_loss;
-return pitchrate * volume * plato;
+return dataRecord.yeast_pitchrate * volume * plato;
 }
 function hopFlavourContribution(bt, vol, use, amount) {
 var result;
 rowscount = $('#yeastGrid').jqxGrid('getdatainformation').rowscount;
 if (rowscount == 0)
 return; // no yeast in recipe
 var maybe_starter = 0;
+var pitchrate = 0.75;    // Yeast pitch rate default
 for (i = 0; i < rowscount; i++) {
 row = $('#yeastGrid').jqxGrid('getrowdata', i);
 if (row.y_use == 0) { // primary
 // pitchrate see https://www.brewersfriend.com/yeast-pitch-rate-and-starter-calculator/
 // and http://braukaiser.com/blog/blog/2012/11/03/estimating-yeast-growth/
 } else {
 pitchrate = 0.75;
 if (dataRecord.est_og > 1.060)
 pitchrate = 1.0;
 }
+if (dataRecord.yeast_pitchrate < 0.01) {
+dataRecord.yeast_pitchrate = pitchrate;
+$('#yeast_pitchrate').val(pitchrate);
+}
 if (row.y_form != 1) { // Not dry yeast
 maybe_starter = 1;
 }
 }
 }
-needed = Round(pitchrate * volume * plato, 1);
+needed = Round(dataRecord.yeast_pitchrate * volume * plato, 1);
 $('#need_cells').val(needed);
 use_cells = initcells;
 if (needed <= initcells)
 maybe_starter = 0;
-console.log('calcYeast() pitchrate:' + pitchrate + ' start:' + initcells + ' needed:' + needed + ' volume:' + volume + ' maybe_starter:' + maybe_starter);
+console.log('calcYeast() pitchrate:' + dataRecord.yeast_pitchrate + ' start:' + initcells + ' needed:' + needed + ' volume:' + volume + ' maybe_starter:' + maybe_starter);
 if (maybe_starter != dataRecord.starter_enable) {
 dataRecord.starter_enable = maybe_starter;
 showStarter();
 }
 $('#sparge_acid_perc').jqxNumberInput({ spinButtons: false, readOnly: true, width: false });
 $('#starter_type').jqxDropDownList({ disabled: true });
 $('#starter_try').jqxButton({ disabled: true });
 $('#starter_sg').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
 $('#yeast_prod_date').jqxDateTimeInput({ disabled: true });
+$('#yeast_pitchrate').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
+$('#but_pickpitchrate').jqxButton({ disabled: true });
 }
 if (dataRecord.stage > 3) { // Primary fermentation done
 $('#brew_date_start').jqxDateTimeInput({ disabled: true });
 $('#brew_date_end').jqxDateTimeInput({ disabled: true });
 $('#brew_mash_ph').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
 starter_enable: dataRecord.starter_enable,
 starter_type: $('#starter_type').val(),
 starter_sg: parseFloat($('#starter_sg').jqxNumberInput('decimal')),
 starter_viability: parseFloat($('#starter_viability').jqxNumberInput('decimal')),
 yeast_prod_date: $('#yeast_prod_date').val(),
+yeast_pitchrate: parseFloat($('#yeast_pitchrate').jqxNumberInput('decimal')),
 prop1_type: $('#prop1_type').val(),
 prop1_volume: parseFloat($('#prop1_volume').jqxNumberInput('decimal')),
 prop2_type: $('#prop2_type').val(),
 prop2_volume: parseFloat($('#prop2_volume').jqxNumberInput('decimal')),
 prop3_type: $('#prop3_type').val(),
 });
 $('#ferm_lintner').jqxProgressBar({
 width: 300, height: 23, theme: theme, showText: true, max: 200, animationDuration: 0,
 colorRanges: [{ stop: 30, color: '#FF0000' },{ stop: 40, color: '#EB7331' },{ stop: 200, color: '#008C00' }],
 renderText: function(text) { return (parseInt(text) * 2) + ' lintner'; }
-});
-$('#popupFermentable').jqxWindow({
-width: 800,
-height: 300,
-position: { x: 230, y: 100 },
-resizable: false,
-theme: theme,
-isModal: true,
-autoOpen: false,
-cancelButton: $('#FermentableReady'),
-modalOpacity: 0.40
 });
 $('#FermentableReady').jqxButton({ template: 'success', width: '90px', theme: theme });
 $('#FermentableReady').click(function() {
 var row, rowID = $('#fermentableGrid').jqxGrid('getrowid', fermentableRow);
 console.log('FermentableReady row:' + fermentableRow + ' ID:' + rowID);
 return 'Veel';
 else
 return 'Zeer veel';
 }
 });
-$('#popupHop').jqxWindow({
-width: 800,
-height: 300,
-position: { x: 230, y: 100 },
-resizable: false,
-theme: theme,
-isModal: true,
-autoOpen: false,
-cancelButton: $('#HopReady'),
-modalOpacity: 0.40
-});
 $('#HopReady').jqxButton({ template: 'success', width: '90px', theme: theme });
 $('#HopReady').click(function() {
 var row, rowID = $('#hopGrid').jqxGrid('getrowid', hopRow);
 row = {
 h_name: $('#wh_name').val(),
 $('#wh_pmpt_time').html('Tijd in minuten');
 }
 });
 // Tab 5, Miscs
-$('#popupMisc').jqxWindow({
-width: 800,
-height: 275,
-position: { x: 230, y: 100 },
-resizable: false,
-theme: theme,
-isModal: true,
-autoOpen: false,
-cancelButton: $('#MiscReady'),
-modalOpacity: 0.40
-});
 $('#MiscReady').jqxButton({ template: 'success', width: '90px', theme: theme });
 $('#MiscReady').click(function() {
 var row, rowID = $('#miscGrid').jqxGrid('getrowid', miscRow);
 console.log('MiscReady row:' + miscRow + ' ID:' + rowID);
 row = {
 $('#est_abv2').jqxTooltip({ content: 'Verwacht alcohol volume %. Dit wordt automatisch berekend.' });
 $('#yeast_cells').jqxTooltip({ content: 'Het aantal miljard beschikbare gistcellen zonder eventuele starter.' });
 $('#need_cells').jqxTooltip({ content: 'Het aantal miljard nodige cellen is afhankelijk van het begin SG, biertype en volume.' });
 $('#plato_cells').jqxTooltip({ content: 'De berekende pitchrate in miljard cellen per ml per graad Plato.' });
 $('#yeast_prod_date').jqxTooltip({ content: 'Bij korrelgisten is meestal "best voor" datum op het zakje gedrukt.<br>Gebruik die datum maar dan twee jaar eerder als productie datum.<br>Bij White Labs is de productie datum vier maanden voor de "Best by" datum die geprint op het buisje.<br>Bij Wyeast is dit de "manufacture date" die op het pak geprint is.<br>Voor schuine buis, slurry, opkweek en gedroogd is dit de datum dat je de gist geoogst hebt.' });
+$('#yeast_pitchrate').jqxTooltip({ content: 'De gewenste pitchrate in miljard cellen per ml per graad Plato voor de vergisting van dit bier.' });
 $('#est_fg2,#plato_cells').jqxNumberInput(Show3dec);
+$('#est_fg2').jqxNumberInput({ width: 70 });
 $('#est_abv2').jqxNumberInput(Show2dec);
+$('#est_abv2').jqxNumberInput({ width: 70, symbol: '%', symbolPosition: 'right' });
 $('#yeast_cells,#need_cells').jqxNumberInput(Show1dec);
 $('#yeast_prod_date').jqxDateTimeInput(Dateopts);
 $('#yeast_prod_date').on('close', function(event) {
 calcViability();
 calcFermentables();
 calcYeast();
 });
-$('#popupYeast').jqxWindow({
+$('#yeast_pitchrate').jqxNumberInput(Spin3dec);
-width: 800,
+$('#yeast_pitchrate').on('change', function(event) {
-height: 300,
+dataRecord.yeast_pitchrate = parseFloat(event.args.value);
-position: { x: 230, y: 100 },
+calcViability();
-resizable: false,
+calcFermentables();
+calcYeast();
+});
+$('#but_pickpitchrate').jqxButton({ template: 'success', width: '23px', height: 23, theme: theme });
+$('#but_pickpitchrate').bind('click', function() {
+$('#pick_pitchrate').val(0); // Set default pick incase no perfect match.
+$('#pick_pitchrate').val(dataRecord.yeast_pitchrate);
+$('#pitchrateWindow').jqxWindow('open');
+});
+$('#pick_pitchrate').jqxDropDownList({
 theme: theme,
-isModal: true,
+source: PitchrateAdapter,
-autoOpen: false,
+valueMember: 'rate',
-cancelButton: $('#YeastReady'),
+displayMember: 'nl',
-modalOpacity: 0.40
+width: 275,
+height: 23,
+autoDropDownHeight: true,
+dropDownVerticalAlignment: 'top'
+});
+$('#pitchrateReady').jqxButton({ template: 'success', width: '90px', theme: theme });
+$('#pitchrateReady').click(function() {
+console.log('pitchrateReady ' + $('#pick_pitchrate').val() );
+dataRecord.yeast_pitchrate = parseFloat($('#pick_pitchrate').val());
+$('#yeast_pitchrate').val(dataRecord.yeast_pitchrate);
+calcViability();
+calcFermentables();
+calcYeast();
 });
 $('#YeastReady').jqxButton({ template: 'success', width: '90px', theme: theme });
 $('#YeastReady').click(function() {
 var row, rowID = $('#yeastGrid').jqxGrid('getrowid', yeastRow);
 console.log('YeastReady row:' + yeastRow + ' ID:' + rowID);
 });
 $('#est_mashvol').jqxTooltip({ content: 'Het totale volume van het maishwater en de mout in de maish pan.' });
 $('#est_mashvol').jqxNumberInput(Show1dec);
 $('#est_mashtime').jqxTooltip({ content: 'De totale tijdsduur van het maischen.' });
 $('#est_mashtime').jqxInput({ theme: theme, width: 70, height: 23 });
-$('#popupMash').jqxWindow({
-width: 800,
-height: 375,
-position: { x: 230, y: 100 },
-resizable: false,
-theme: theme,
-isModal: true,
-autoOpen: false,
-cancelButton: $('#MashReady'),
-modalOpacity: 0.40
-});
 $('#MashReady').jqxButton({ template: 'success', width: '90px', theme: theme });
 $('#MashReady').click(function() {
 calcFermentables();
 calcWater();
 calcSparge();
 $('#Save').jqxButton({ template: 'success', width: '80px', theme: theme });
 $('#Save').bind('click', function() {
 saveRecord(1);
 });
-createDelElements();
+createPopupElements();
 });