bms: comparison www/js/prod_edit.js

comparison: www/js/prod_edit.js

www/js/prod_edit.js

changeset 241: e95d2886f49f
parent 240: a85c1d4c4d12
child 244: 3755db604432

equal deleted inserted replaced

-:a85c1d4c4d12
+:e95d2886f49f
 	}
 	function calcStage() {
 		var	newstage = dataRecord.stage;
+		/* parseFloat$("#brew_date_start").val()) returns the year if it is a valid mysql style date. */
-		if (newstage < 1 && dataRecord.est_og > 1.005 && dataRecord.est_color > 3 && dataRecord.est_ibu > 3)
+		if (newstage == 0 && dataRecord.est_og > 1.005 && dataRecord.est_color > 3 && dataRecord.est_ibu > 3)
 			newstage = 1;
-		if (newstage < 2 && dataRecord.brew_date_start != '')
+		if (newstage == 1 && parseFloat($("#brew_date_start").val()) > 2000)
 			newstage = 2;	// Brewday
-		if (newstage < 3 && dataRecord.brew_date_end != '')
+		if (newstage == 2 && parseFloat($("#brew_date_end").val()) > 2000)
 			newstage = 3;	// Primary
-		if (newstage < 4 && dataRecord.primary_end_date != '')
+		if (newstage == 3 && parseFloat($("#primary_end_date").val()) > 2000)
 			newstage = 4;	// Secondary
-		if (newstage < 5 && dataRecord.secondary_end_date != '')
+		if (newstage == 4 && parseFloat($("#secondary_end_date").val()) > 2000)
 			newstage = 5;	// Tertiary
-		if (newstage < 6 && dataRecord.package_date != '')
+		if (newstage == 5 && parseFloat($("#package_date").val()) > 2000)
 			newstage = 6;	// Package
-		if (newstage >= 6 && newstage < 10) {
+		if (newstage >= 6 && newstage < 9) {
 			var d = new Date();
-			var date2 = dataRecord.package_date;
+			var date2 = $("#package_date").val();
 			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
 			date2_unixtime = parseInt(date2.getTime() / 1000);
 			// This is the calculated difference in seconds
 			var timeDifference = date1_unixtime - date2_unixtime;
 			var timeDifferenceInDays = timeDifference / 60 / 60 / 24;
 			console.log(date1+'  '+date2+' days: '+timeDifferenceInDays);
-			if (newstage < 7 && timeDifferenceInDays < 14)		// Carbonation period
+			if (timeDifferenceInDays > 0) {			// At least one day
-				newstage = 7;
+				if (timeDifferenceInDays >= 42)		// 6 weeks
-			else if (newstage < 8 && timeDifferenceInDays < 42)	// Mature 6 weeks
+					newstage = 9;			// Ready to taste
-				newstage = 8;
+				else if (timeDifferenceInDays >= 14)	// 14 days
-			else
+					newstage = 8;			// Mature
-				newstage = 9;
+				else
-		}
+					newstage = 7;			// Carbonation
-		if (newstage < 10 && dataRecord.taste_date != '')
+			}
+		}
+		if (newstage == 9 && parseFloat($("#taste_date").val()) > 2000)
 			newstage = 10;	// Ready
 		if (newstage > dataRecord.stage) {
 			console.log("calcStage() old: "+dataRecord.stage+" new: "+newstage);
 			dataRecord.stage = newstage;
 		if (dataRecord.stage < 3) {	// Primary
 			$('#jqxTabs').jqxTabs('disableAt', 9);	// Fermentation tab
 		} else {
 			$('#jqxTabs').jqxTabs('enableAt', 9);
 		}
-		if (dataRecord.stage < 4) { // At least primary
+		if (dataRecord.stage < 5) { // At least secondary
 			$('#jqxTabs').jqxTabs('disableAt', 10);	// Packaging tab
 		} else {
 			$('#jqxTabs').jqxTabs('enableAt', 10);
 		}
 		if (dataRecord.stage < 6) {	// Not yet packaged
 				var row = rows[i];
 				rowIDs.push(row.uid);
 			}
 			$("#mashGrid").jqxGrid('deleterow', rowIDs);
 			// Then add the new steps
+			var datarecord = mashlist.records[index];
 			$("#mash_name").val(datarecord.name);
 			for (var i = 0; i < datarecord.steps.length; i++) {
 				var data = datarecord.steps[i];
 				var row = {};
 				row["step_name"] = data.step_name;
 	});
 	$("#sparge_acid_perc").jqxNumberInput( Perc0 );
 	$("#sparge_acid_perc").jqxNumberInput({ symbol: '%', symbolPosition: 'right' });
 	// Tab 9, Brewday
-	$("#brew_date_start").jqxDateTimeInput({ theme: theme, width: 230, height: 23, formatString: 'yyyy-MM-dd HH:mm:ss', showTimeButton: true });
+	$("#brew_date_start").jqxTooltip({ content: 'Brouw datum en tijd. Voor planning laat de tijd op 00:00:00 staan.' });
-	$("#brew_date_end").jqxDateTimeInput({ theme: theme, width: 230, height: 23, formatString: 'yyyy-MM-dd HH:mm:ss', showTimeButton: true });
+	$("#brew_date_start").jqxDateTimeInput( DateTimeopts );
+	$('#brew_date_start').on('close', function (event) { calcStage(); });
+	$("#brew_date_end").jqxTooltip({ content: 'End datum en tijd van de brouw. Leeg laten als er nog niet gebrouwen is.' });
+	$("#brew_date_end").jqxDateTimeInput( DateTimeopts );
+	$('#brew_date_end').on('close', function (event) { calcStage(); });
+	$("#brew_mash_ph").jqxTooltip({ content: 'De gemeten pH tijdens het maischen eventueel na correctie.' });
 	$("#brew_mash_ph").jqxNumberInput( SpinpH );
+	$("#est_mash_ph").jqxTooltip({ content: 'De gewenste pH tijdens het maischen.' });
 	$("#est_mash_ph").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 1 });
+	$("#brew_preboil_ph").jqxTooltip({ content: 'De gemeten pH in de kookketel na het spoelen en voor de kook.' });
 	$("#brew_preboil_ph").jqxNumberInput( SpinpH );
 	// est_preboil_ph
+	$("#brew_aboil_ph").jqxTooltip({ content: 'De gemeten pH na het koken.' });
 	$("#brew_aboil_ph").jqxNumberInput( SpinpH );
 	// est_aboil_ph
+	$("#brew_mash_sg").jqxTooltip({ content: 'Het bereikte SG na het maischen.' });
 	$("#brew_mash_sg").jqxNumberInput( SGopts );
 	$("#brew_mash_sg").on('valueChanged', function () { calcMashEfficiency(); });
+	$("#est_mash_sg").jqxTooltip({ content: 'Het berekende verwachte SG na het maischen.' });
 	$("#est_mash_sg").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 3 });
+	$("#brew_preboil_sg").jqxTooltip({ content: 'Het gemeten SG in de kookketel na het spoelen en voor het koken.' });
 	$("#brew_preboil_sg").jqxNumberInput( SGopts );
+	$("#brew_aboil_sg").jqxTooltip({ content: 'Het gemeten SG in de kookketel na het koken.' });
 	$("#brew_aboil_sg").jqxNumberInput( SGopts );
-	$("#est_og3").jqxTooltip({ content: 'Het geschatte begin SG van dit product.' });
+	$("#est_og3").jqxTooltip({ content: 'Het geschatte SG in de kookketel na het koken.' });
 	$("#est_og3").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 70, height: 23, decimalDigits: 3, readOnly: true });
+	$("#brew_mash_efficiency").jqxTooltip({ content: 'Het behaalde maisch rendement.' });
 	$("#brew_mash_efficiency").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 90, height: 23, decimalDigits: 1 });
+	$("#brew_preboil_volume").jqxTooltip({ content: 'Het volume van het wort voor het koken.' });
 	$("#brew_preboil_volume").jqxNumberInput( Spin1dec5 );
+	$("#brew_aboil_volume").jqxTooltip({ content: 'Het volume van het wort na het koken.' });
 	$("#brew_aboil_volume").jqxNumberInput( Spin1dec5 );
+	$("#brew_preboil_efficiency").jqxTooltip({ content: 'Het berekende rendement voor het koken.' });
 	$("#brew_preboil_efficiency").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 90, height: 23, decimalDigits: 1 });
+	$("#brew_aboil_efficiency").jqxTooltip({ content: 'Het bereikte rendement na het koken.' });
 	$("#brew_aboil_efficiency").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 90, height: 23, decimalDigits: 1 });
 	$("#brew_sparge_temperature").jqxNumberInput( Spin1dec5 );
 	$("#brew_sparge_volume").jqxNumberInput( Spin1dec5 );
 	$("#brew_whirlpool9").jqxNumberInput( PosInt );
 	$("#brew_whirlpool9").jqxNumberInput({ max: 120 });
 	$("#primary_end_temp").jqxNumberInput( YeastT );
 	$("#primary_end_sg").jqxNumberInput( SGopts );
 	$("#primary_svg").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 1 });
 	$("#primary_end_date").jqxTooltip({ content: 'De eind datum van de hoofdvergisting en eventueel overhevelen.' });
 	$("#primary_end_date").jqxDateTimeInput( Dateopts );
+	$('#primary_end_date').on('close', function (event) { calcStage(); });
 	$("#secondary_temp").jqxNumberInput( YeastT );
 	$("#secondary_end_date").jqxTooltip({ content: 'De eind datum van de navergisting en het begin van het lageren.' });
 	$("#secondary_end_date").jqxDateTimeInput( Dateopts );
+	$('#secondary_end_date').on('close', function (event) { calcStage(); });
 	$("#tertiary_temp").jqxNumberInput( YeastT );
 	$("#fg").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 90, height: 23, min: 0, decimalDigits: 3, spinButtons: true, spinButtonsStep: 0.001 });
 	$("#final_abv").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 1 });
 	$("#final_svg").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 1 });
 	$("#FLog").jqxButton({ template: "info", width: '150px', theme: theme });
 	// Tab 11, Packaging
 	// TODO: high gravity packaging, extra water and recalc abv, color and ibu.
 	$("#package_date").jqxTooltip({ content: 'De verpakkings datum van dit bier.' });
 	$("#package_date").jqxDateTimeInput( Dateopts );
+	$('#package_date').on('close', function (event) { calcStage(); });
 	$("#st_carb_min2").jqxTooltip({ content: 'Het minimum aanbevolen koolzuur volume voor deze bierstijl.'});
 	$("#st_carb_min2").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 1, readOnly: true });
 	$("#st_carb_max2").jqxTooltip({ content: 'Het maximum aamnevolen koolzuur volume voor deze bierstijl.'});
 	$("#st_carb_max2").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 1, readOnly: true });
 	$("#bottle_amount").jqxTooltip({ content: 'De totale hoeveelheid te bottelen bier.' });
 	$("#keg_carbonation_temp").jqxNumberInput( YeastT );
 	// 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_rate").jqxTooltip({ content: 'Het cijfer voor dit bier van 1 tot 10.' });
 	$("#taste_rate").jqxNumberInput( Spin1dec5 );
 	$("#taste_rate").jqxNumberInput({ max: 10 });
 	$("#taste_color").jqxTooltip({ content: 'De kleur van het bier.' });
 	$("#taste_color").jqxInput({ theme: theme, width: 320, height: 23 });