bms: comparison www/js/prod_edit.js

comparison: www/js/prod_edit.js

www/js/prod_edit.js

changeset 826: 4e681bc073bd
parent 825: 8b87ad5bd3c3
child 827: 5df0d11ca02b

equal deleted inserted replaced

-:8b87ad5bd3c3
+:4e681bc073bd
 $('#brew_sparge_temperature').val(dataRecord.sparge_temp);
 $('#brew_sparge_volume').val(dataRecord.sparge_volume);
 $('#brew_sparge_est').val(dataRecord.brew_sparge_est);
 $('#brew_sparge_ph').val(dataRecord.brew_sparge_ph);
 // Header Beluchten
-$('#brew_aeration_type').val(dataRecord.brew_aeration_type);
+$('#brew_aeration_type').val(AerationTypeData[dataRecord.brew_aeration_type].nl);
 $('#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_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_method').val(CoolingTypeData[dataRecord.brew_cooling_method].nl);
 $('#brew_cooling_time').val(dataRecord.brew_cooling_time);
 // Niks
 $('#brew_date_end').val(dataRecord.brew_date_end);
 $('#og').val(dataRecord.og);
 $('#fg').val(dataRecord.fg);
 calcMash();
 calcWater();
 calcIBUs();
 whirlpoolHops();
 calcMiscs();
-//    calcViability();
+calcViability();
-//    showStarter();
+calcYeast();
-//    calcYeast();
+kookTijd();
 //    calcInit();
-//    kookTijd();
 console.log('calculations ready');
 $('#jqxLoader').jqxLoader('close');
 $('#jqxTabs').jqxTabs('first');
 },
 columns: [
 maybe_starter = 0;
 //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();
+}
-}
+if (maybe_starter)
+$('#propagator').show();
+else
+$('#propagator').hide();
 if (dataRecord.starter_enable) {
 calcSteps(dataRecord.starter_type, initcells, needed);
 if (rowscount == 0)
 return;
 for (i = 0; i < rowscount; i++) {
 row = dataRecord.miscs[i];
 if ((((dataRecord.inventory_reduced <= 2) && (row.m_use_use <= 2)) ||  // Starter, Mash, Boil
+	((dataRecord.inventory_reduced <= 2) && (row.m_use_use == 6)) ||  // Sparge
 ((dataRecord.inventory_reduced <= 3) && (row.m_use_use == 3)) ||  // Primary
 ((dataRecord.inventory_reduced <= 5) && (row.m_use_use == 4)) ||  // Secondary, Teriary
 ((dataRecord.inventory_reduced <= 6) && (row.m_use_use == 5))) && // Bottle
 (row.m_inventory < row.m_amount)) {
 ok_miscs = 0;
 $('#jqxTabs').jqxTabs((state) ? 'disableAt':'enableAt', 8);	// Brewday tab
 }
 function en_stage_afterbrew(state) {
 $('#jqxTabs').jqxTabs((state) ? 'enableAt':'disableAt', 9);	// Fermentation tab
-}
-function en_stage_afterprimary(istate) {
-var state = istate;
-var onval = { disabled: (state) ? true:false };
-var spinstate = { spinButtons: (state) ? false:true, readOnly: (state) ? true:false, width: (state) ? 90:110 };
-$('#brew_date_start').jqxDateTimeInput(onval);
-$('#brew_date_end').jqxDateTimeInput(onval);
-$('#brew_mash_ph').jqxNumberInput(spinstate);
-$('#brew_mash_sg').jqxNumberInput(spinstate);
-$('#brew_whirlpool9').jqxNumberInput(spinstate);
-$('#brew_cooling_to').jqxNumberInput(spinstate);
-$('#brew_whirlpool7').jqxNumberInput(spinstate);
-$('#brew_cooling_method').jqxDropDownList(onval);
-$('#brew_whirlpool6').jqxNumberInput(spinstate);
-$('#brew_cooling_time').jqxNumberInput(spinstate);
-$('#brew_sparge_ph').jqxNumberInput(spinstate);
-$('#brew_whirlpool2').jqxNumberInput(spinstate);
-$('#brew_aeration_type').jqxDropDownList(onval);
-$('#brew_fermenter_tcloss').jqxNumberInput(spinstate);
-$('#brew_aeration_time').jqxNumberInput(spinstate);
-$('#brew_fermenter_extrawater').jqxNumberInput(spinstate);
-$('#brew_aeration_speed').jqxNumberInput(spinstate);
-if (! state) {
-state = (dataRecord.boil_time == 0);
-}
-onval = { disabled: (state) ? true:false };
-spinstate = { spinButtons: (state) ? false:true, readOnly: (state) ? true:false, width: (state) ? 90:110 };
-$('#brew_preboil_ph').jqxNumberInput(spinstate);
-$('#brew_aboil_ph').jqxNumberInput(spinstate);
-$('#brew_preboil_sg').jqxNumberInput(spinstate);
-$('#brew_aboil_sg').jqxNumberInput(spinstate);
-$('#brew_preboil_volume').jqxNumberInput(spinstate);
-$('#brew_aboil_volume').jqxNumberInput(spinstate);
-$('#but_pre_boil').jqxButton(onval);
-$('#but_after_boil').jqxButton(onval);
 }
 function en_stage_tertiary(state) {
 $('#package_date').jqxDateTimeInput({ disabled: (state) ? false:true });
 }
 /*
 * Enable or disable parts of the screens.
 */
 en_stage_brewday(dataRecord.stage < 1);		// Planning, no ingredients
 en_stage_afterbrew(dataRecord.stage > 2);		// After the brew
-en_stage_afterprimary(dataRecord.stage > 3);		// Primary fermentation done
 en_stage_tertiary(dataRecord.stage == 5);		// Tertiary, allow packaging
 en_stage_aftertertiary(dataRecord.stage >= 5);	// After all fermentation steps
 en_stage_afterpackaging(dataRecord.stage >= 6);	// After packaging
 en_stage_b4taste(dataRecord.stage < 9);		// Taste when at least Mature.
 en_stage_locked(dataRecord.stage == 11);		// Locked.
-}
-function showStarter() {
-if (dataRecord.starter_enable) {
-$('#propagator').show();
-} else {
-$('#propagator').hide();
-}
 }
 function calcInit() {
 console.log('** calcInit() start');
 $('#brew_preboil_efficiency').jqxTooltip({ content: 'Het berekende rendement voor het koken.' });
 $('#brew_aboil_efficiency').jqxTooltip({ content: 'Het bereikte rendement na het koken.' });
 $('#brew_sparge_temperature').jqxTooltip({ content: 'De spoelwater temperatuur, in te stellen in de Water tab.' });
 $('#brew_sparge_volume').jqxTooltip({ content: 'Het spoelwater voorraad volume, in te stellen in de Water tab.' });
 $('#brew_date_start,#brew_date_end').jqxDateTimeInput(DateTimeopts);
-$('#brew_date_start,#brew_date_end').on('close', function(event) { calcStage(); });
+$('#brew_date_start,#brew_date_end').jqxDateTimeInput({ disabled: true });
 $('#est_mash_ph').jqxNumberInput(Show2wat);
-$('#brew_mash_ph,#brew_preboil_ph,#brew_aboil_ph').jqxNumberInput(Spin2pH);
+$('#brew_mash_ph,#brew_preboil_ph,#brew_aboil_ph').jqxNumberInput(Show2dec);
-$('#brew_mash_sg').on('valueChanged', function() { calcMashEfficiency(); });
+$('#brew_mash_sg,#brew_preboil_sg,#brew_aboil_sg').jqxNumberInput(Show3dec);
-$('#brew_preboil_sg').on('valueChanged', function(event) {
-dataRecord.brew_preboil_sg = event.args.value;
-calcEfficiencyBeforeBoil();
-});
-$('#brew_mash_sg,#brew_preboil_sg,#brew_aboil_sg').jqxNumberInput(SGopts);
 $('#est_mash_sg,#est_pre_sg,#est_og3').jqxNumberInput(Show3wat);
 $('#brew_mash_efficiency').jqxNumberInput(Show1dec);
-$('#brew_preboil_volume').on('valueChanged', function(event) {
+$('#brew_preboil_volume,#brew_aboil_volume').jqxNumberInput(Show1dec);
-dataRecord.brew_preboil_volume = event.args.value;
-calcEfficiencyBeforeBoil();
-});
-$('#brew_preboil_volume,#brew_aboil_volume').jqxNumberInput(Spin1dec);
 $('#ketel_volume').jqxNumberInput(Show1dec);
-$('#ketel_cm').jqxNumberInput(Spin1dec);
+$('#ketel_cm').jqxNumberInput(Show1dec);
-$('#volumeReady').jqxButton({ template: 'success', width: '90px', theme: theme });
-$('#volumeReady').click(function() {
-/* Is it pre or after boil */
-console.log('volumeReady ' + k_what + ' volume: ' + Round(k_vol, 1));
-if (k_what == 0) {
-dataRecord.brew_preboil_volume = Round(k_vol, 1);
-$('#brew_preboil_volume').val(Round(k_vol, 1));
-} else if (k_what == 1) {
-dataRecord.brew_aboil_volume = Round(k_vol, 1);
-$('#brew_aboil_volume').val(Round(k_vol, 1));
-}
-});
-$('#but_pre_boil').jqxButton({ template: 'success', width: '23px', height: 23, theme: theme });
-$('#but_pre_boil').bind('click', function() {
-/* If we already have measured a value, use that. Else use the estimated value. */
-if (dataRecord.brew_preboil_volume > 0)
-k_cm = kettle_cm(dataRecord.brew_preboil_volume, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height);
-else
-k_cm = kettle_cm(dataRecord.boil_size * 1.04, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height);
-k_vol = kettle_vol(k_cm, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height);
-k_what = 0;
-$('#ketel_cm').val(k_cm);
-$('#ketel_volume').val(k_vol);
-$('#volumeWindow').jqxWindow('open');
-});
-$('#but_after_boil').jqxButton({ template: 'success', width: 23, height: 23, theme: theme });
-$('#but_after_boil').bind('click', function() {
-if (dataRecord.brew_aboil_volume > 0)
-k_cm = kettle_cm(dataRecord.brew_aboil_volume, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height);
-else
-k_cm = kettle_cm(dataRecord.batch_size * 1.04, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height);
-k_vol = kettle_vol(k_cm, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height);
-k_what = 1;
-$('#ketel_cm').val(k_cm);
-$('#ketel_volume').val(k_vol);
-$('#volumeWindow').jqxWindow('open');
-});
 $('#est_pre_vol,#est_a_vol').jqxNumberInput(Show1wat);
 $('#brew_preboil_efficiency,#brew_aboil_efficiency,#brew_sparge_temperature,#brew_sparge_volume,#brew_sparge_est').jqxNumberInput(Show1dec);
-$('#brew_cooling_to').jqxNumberInput(Spin1dec);
+$('#brew_cooling_to').jqxNumberInput(Show1dec);
-$('#brew_sparge_ph').jqxNumberInput(Spin2pH);
+$('#brew_sparge_ph').jqxNumberInput(Show2dec);
-$('#brew_cooling_method').jqxDropDownList({
+$('#brew_cooling_method').jqxInput({ theme: theme, width: 180, height: 23 });
-theme: theme,
+$('#brew_cooling_time,#brew_whirlpool9,#brew_whirlpool7,#brew_whirlpool6,#brew_whirlpool2,#brew_aeration_time,#brew_aeration_speed').jqxNumberInput(Show0dec);
-source: CoolingTypeAdapter,
+$('#brew_aeration_type').jqxInput({ theme: theme, width: 180, height: 23 });
-valueMember: 'id',
-displayMember: 'nl',
-width: 180,
-height: 23,
-autoDropDownHeight: true
-});
-$('#brew_cooling_time,#brew_whirlpool9,#brew_whirlpool7,#brew_whirlpool6,#brew_whirlpool2,#brew_aeration_time,#brew_aeration_speed').jqxNumberInput(PosInt);
-$('#brew_cooling_time,#brew_aeration_time,#brew_aeration_speed').jqxNumberInput({ max: 1440 });
-$('#brew_whirlpool9,#brew_whirlpool7,#brew_whirlpool6,#brew_whirlpool2').jqxNumberInput({ max: 120 });
-$('#brew_aeration_type').jqxDropDownList({
-theme: theme,
-source: AerationTypeAdapter,
-valueMember: 'id',
-displayMember: 'nl',
-width: 180,
-height: 23,
-autoDropDownHeight: true
-});
 $('#brew_fermenter_volume').jqxNumberInput(Show1dec);
 $('#brew_fermenter_sg').jqxNumberInput(Show3dec);
-$('#brew_fermenter_extrawater,#brew_fermenter_tcloss').jqxNumberInput(Spin1dec);
+$('#brew_fermenter_extrawater,#brew_fermenter_tcloss').jqxNumberInput(Show1dec);
 $('#brew_fermenter_ibu,#brew_fermenter_color').jqxNumberInput(Show0dec);
-$('#BLog').jqxButton({ template: 'info', width: '150px', theme: theme });
-$('#BLog').click(function() {
-// Open log in a new tab.
-window.open('log_brew.php?code=' + dataRecord.code + '&name=' + dataRecord.name);
-});
 // Tab 10, Fermentation
 // Note, fermentation temps changes must do calcCarbonation()
 $('#brew_fermenter_sg2').jqxTooltip({ content: 'Het behaalde SG in het gistvat, overgenomen van de brouwdag.' });
 $('#primary_start_temp').jqxTooltip({ content: 'De begintemperatuur van de hoofdvergisting.' });