# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1625492914 -7200
# Node ID 5a2ec06e00d43f5843d525418a15710d89ee1b41
# Parent  ae1195153fa2016b98443dae2ae1bb92bd0e2f98
Fixed skipping brew stages due to better data handling

diff -r ae1195153fa2 -r 5a2ec06e00d4 www/js/prod_edit.js
--- a/www/js/prod_edit.js	Sun Jul 04 20:01:13 2021 +0200
+++ b/www/js/prod_edit.js	Mon Jul 05 15:48:34 2021 +0200
@@ -3902,17 +3902,17 @@
    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());
@@ -3932,7 +3932,7 @@
      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) {
@@ -6215,7 +6215,14 @@
 
  $('#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);
@@ -6251,7 +6258,10 @@
  $('#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);
@@ -6380,7 +6390,10 @@
  // 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 });