bms: comparison www/js/prod_edit.js

comparison: www/js/prod_edit.js

www/js/prod_edit.js

changeset 769: 5a2ec06e00d4
parent 764: e95744b6b31d
child 772: f9d266eb0ec6

equal deleted inserted replaced

-:ae1195153fa2
+:5a2ec06e00d4
 newstage = 1;
 if (newstage == 1 && parseFloat($('#brew_date_start').val()) > 2000)
 newstage = 2;   // Brewday
 if (newstage == 2 && ($('#brew_date_start').val() == ''))
 newstage = 1;   // No brewday
-if (newstage == 2 && parseFloat($('#brew_date_end').val()) > 2000)
+if (newstage == 2 && parseFloat(dataRecord.brew_date_end) > 2000)
 newstage = 3;   // Primary
-if (newstage == 3 && parseFloat($('#primary_end_date').val()) > 2000)
+if (newstage == 3 && parseFloat(dataRecord.primary_end_date) > 2000)
 newstage = 4;   // Secondary
-if (newstage == 4 && parseFloat($('#secondary_end_date').val()) > 2000)
+if (newstage == 4 && parseFloat(dataRecord.secondary_end_date) > 2000)
 newstage = 5;   // Tertiary
-if (newstage == 5 && parseFloat($('#package_date').val()) > 2000)
+if (newstage == 5 && parseFloat(dataRecord.package_date) > 2000)
 newstage = 6;   // Package
 if (newstage >= 6 && newstage < 9) {
 d = new Date();
-date2 = $('#package_date').val();
+date2 = dataRecord.package_date;
 date2 = date2.split('-');
 // Now we convert the array to a Date object
 date1 = new Date(d.getFullYear(), d.getMonth(), d.getDate());
 date2 = new Date(date2[0], date2[1] - 1, date2[2]);
 // We use the getTime() method and get the unixtime
 newstage = 8;                   // Mature
 else
 newstage = 7;                   // Carbonation
 }
 }
-if (newstage == 9 && parseFloat($('#taste_date').val()) > 2000)
+if (newstage == 9 && parseFloat(dataRecord.taste_date) > 2000)
 newstage = 10;  // Ready
 if (newstage != dataRecord.stage) {
 console.log('calcStage() old: ' + dataRecord.stage + ' new: ' + newstage);
 dataRecord.stage = newstage;
 $('#secondary_end_date').jqxTooltip({ content: 'De eind datum van de navergisting en het begin van het lageren.' });
 $('#est_fg3').jqxTooltip({ content: 'Het verwachte eind SG. Dit wordt automatisch berekend.' });
 $('#primary_end_sg,#secondary_end_sg').jqxNumberInput(SGopts);
 $('#primary_end_date,#secondary_end_date').jqxDateTimeInput(Dateopts);
-$('#primary_end_date,#secondary_end_date').on('close', function(event) { calcStage(); });
+$('#primary_end_date').on('close', function(event) {
+dataRecord.primary_end_date = $('#primary_end_date').val();
+calcStage();
+});
+$('#secondary_end_date').on('close', function(event) {
+dataRecord.secondary_end_date = $('#secondary_end_date').val();
+calcStage();
+});
 $('#primary_start_temp,#primary_max_temp,#primary_end_temp,#secondary_temp,#tertiary_temp').jqxNumberInput(YeastT);
 $('#fg').jqxNumberInput(Spin3dec);
 $('#brew_fermenter_sg2,#est_fg3').jqxNumberInput(Show3dec);
 $('#primary_end_brix,#secondary_end_brix,#final_brix').jqxNumberInput(Spin1dec);
 $('#final_abv').jqxNumberInput(Show2dec);
 $('#bottle_carbonation').jqxTooltip({ content: 'Het gewenste CO2 volume in de flessen.' });
 $('#keg_carbonation').jqxTooltip({ content: 'Het gewenste CO2 volume door de suiker in de fusten.' });
 $('#bottle_priming_water,#keg_priming_water').jqxTooltip({ content: 'De hoeveelheid water om de suiker op te lossen.' });
 $('#bottle_pressure').jqxTooltip({ content: 'De maximaal te verwachten druk tijdens het hergisten.' });
 $('#package_date').jqxDateTimeInput(Dateopts);
-$('#package_date').on('close', function(event) { calcStage(); });
+$('#package_date').on('close', function(event) {
+dataRecord.package_date = $('#package_date').val();
+calcStage();
+});
 $('#package_infuse_amount').jqxNumberInput(Spin3dec);
 $('#package_infuse_notes').jqxInput({ theme: theme, width: 640, height: 23 });
 $('#package_abv').jqxNumberInput(Show2dec);
 $('#package_ph').jqxNumberInput(SpinpH);
 $('#st_carb_min2,#st_carb_max2').jqxNumberInput(Smal1dec);
 });
 // Tab 12, Tasting
 $('#taste_date').jqxTooltip({ content: 'De proef datum van dit bier.' });
 $('#taste_date').jqxDateTimeInput(Dateopts);
-$('#taste_date').on('close', function(event) { calcStage(); });
+$('#taste_date').on('close', function(event) {
+dataRecord.taste_date = $('#taste_date').val();
+calcStage();
+});
 $('#taste_rate').jqxTooltip({ content: 'Het cijfer voor dit bier van 1 tot 10.' });
 $('#taste_rate').jqxNumberInput(Spin1dec);
 $('#taste_rate').jqxNumberInput({ max: 10 });
 $('#taste_color').jqxTooltip({ content: 'De kleur van het bier.' });
 $('#taste_transparency').jqxTooltip({ content: 'De helderheid van het bier.' });