# HG changeset patch # User Michiel Broek # Date 1542922062 -3600 # Node ID 8c4ba91adf584543afd1bcfff0addf7cd2c8bba2 # Parent 0f128201a031883eafaa2b4e859bf6194654cf8d Basic screens for brew products. diff -r 0f128201a031 -r 8c4ba91adf58 www/Makefile --- a/www/Makefile Wed Nov 21 21:17:18 2018 +0100 +++ b/www/Makefile Thu Nov 22 22:27:42 2018 +0100 @@ -8,7 +8,8 @@ getyeastsources.php index.php inv_equipments.php inv_fermentables.php \ inv_hops.php inv_instock.php inv_miscs.php inv_suppliers.php \ inv_waters.php inv_yeasts.php mon_brewer.php mon_fermenter.php \ - mon_node.php profile_mash.php profile_setup.php profile_styles.php \ + mon_node.php prod_edit.php prod_inprod.php prod_new.php \ + profile_mash.php profile_setup.php profile_styles.php \ profile_water.php rec_edit.php rec_main.php rec_new.php rec_print.php \ version.php SUB = version.php.in images/* css/* jqwidgets/* jqwidgets/styles/* \ diff -r 0f128201a031 -r 8c4ba91adf58 www/import/from_brouwhulp.php --- a/www/import/from_brouwhulp.php Wed Nov 21 21:17:18 2018 +0100 +++ b/www/import/from_brouwhulp.php Thu Nov 22 22:27:42 2018 +0100 @@ -982,10 +982,13 @@ $psql .= "', name='" . mysqli_real_escape_string($db, $recipe->NAME); $rsql .= "', name='" . mysqli_real_escape_string($db, $recipe->NAME); - if ($recipe->NOTES) - $rsql .= "', notes='" . mysqli_real_escape_string($db, $recipe->NOTES); - else - $rsql .= "', notes='"; + if ($recipe->NOTES) { + $rsql .= "', notes='" . mysqli_real_escape_string($db, $recipe->NOTES); // Duplicate the notes + $psql .= "', notes='" . mysqli_real_escape_string($db, $recipe->NOTES); + } else { + $rsql .= "', notes='"; + $psql .= "', notes='"; + } if ($recipe->TYPE) $rsql .= "', type='" . mysqli_real_escape_string($db, $recipe->TYPE); else @@ -1149,6 +1152,7 @@ if ($recipe->EQUIPMENT) { $psql .= "', eq_name='" . mysqli_real_escape_string($db, $recipe->EQUIPMENT->NAME); + $psql .= "', eq_notes='" . mysqli_real_escape_string($db, $recipe->EQUIPMENT->NOTES); $psql .= "', eq_boil_size='" . floatval($recipe->EQUIPMENT->BOIL_SIZE); $psql .= "', eq_batch_size='" . floatval($recipe->EQUIPMENT->BATCH_SIZE); $psql .= "', eq_tun_volume='" . floatval($recipe->EQUIPMENT->TUN_VOLUME); diff -r 0f128201a031 -r 8c4ba91adf58 www/includes/db_product.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www/includes/db_product.php Thu Nov 22 22:27:42 2018 +0100 @@ -0,0 +1,233 @@ + $row['record'], + 'uuid' => $row['uuid'], + 'name' => $row['name'], + 'code' => $row['code'], + 'birth' => $row['birth'], + 'stage' => $row['stage'], + 'notes' => $row['notes'], + 'log_brew' => $row['log_brew'], + 'log_fermentation' => $row['log_fermentation'], + 'inventory_reduced' => $row['inventory_reduced'], + 'locked' => $row['locked'], + 'eq_name' => $row['eq_name'], + 'eq_notes' => $row['eq_notes'], + 'eq_boil_size' => $row['eq_boil_size'], + 'eq_batch_size' => $row['eq_batch_size'], + 'eq_tun_volume' => $row['eq_tun_volume'], + 'eq_tun_weight' => $row['eq_tun_weight'], + 'eq_tun_specific_heat' => $row['eq_tun_specific_heat'], + 'eq_tun_material' => $row['eq_tun_material'], + 'eq_tun_height' => $row['eq_tun_height'], + 'eq_top_up_water' => $row['eq_top_up_water'], + 'eq_trub_chiller_loss' => $row['eq_trub_chiller_loss'], + 'eq_evap_rate' => $row['eq_evap_rate'], + 'eq_boil_time' => $row['eq_boil_time'], + 'eq_calc_boil_volume' => $row['eq_calc_boil_volume'], + 'eq_top_up_kettle' => $row['eq_top_up_kettle'], + 'eq_hop_utilization' => $row['eq_hop_utilization'], + 'eq_lauter_volume' => $row['eq_lauter_volume'], + 'eq_lauter_height' => $row['eq_lauter_height'], + 'eq_lauter_deadspace' => $row['eq_lauter_deadspace'], + 'eq_kettle_volume' => $row['eq_kettle_volume'], + 'eq_kettle_height' => $row['eq_kettle_height'], + 'eq_mash_volume' => $row['eq_mash_volume'], + 'eq_efficiency' => $row['eq_efficiency'], + 'brew_date_start' => $row['brew_date_start'], + 'brew_mash_ph' => $row['brew_mash_ph'], + 'brew_mash_sg' => $row['brew_mash_sg'], + 'brew_sparge_temperature' => $row['brew_sparge_temperature'], + 'brew_sparge_volume' => $row['brew_sparge_volume'], + 'brew_preboil_volume' => $row['brew_preboil_volume'], + 'brew_preboil_sg' => $row['brew_preboil_sg'], + 'brew_preboil_ph' => $row['brew_preboil_ph'], + 'brew_aboil_volume' => $row['brew_aboil_volume'], + 'brew_aboil_sg' => $row['brew_aboil_sg'], + 'brew_aboil_ph' => $row['brew_aboil_ph'], + 'brew_aboil_efficiency' => $row['brew_aboil_efficiency'], + 'brew_cooling_method' => $row['brew_cooling_method'], + 'brew_cooling_time' => $row['brew_cooling_time'], + 'brew_cooling_to' => $row['brew_cooling_to'], + 'brew_whirlpool9' => $row['brew_whirlpool9'], + 'brew_whirlpool7' => $row['brew_whirlpool7'], + 'brew_whirlpool6' => $row['brew_whirlpool6'], + 'brew_whirlpool2' => $row['brew_whirlpool2'], + 'brew_fermenter_volume' => $row['brew_fermenter_volume'], + 'brew_fermenter_extrawater' => $row['brew_fermenter_extrawater'], + 'brew_aeration_time' => $row['brew_aeration_time'], + 'brew_aeration_speed' => $row['brew_aeration_speed'], + 'brew_aeration_type' => $row['brew_aeration_type'], + 'brew_fermenter_sg' => $row['brew_fermenter_sg'], + 'brew_fermenter_ibu' => $row['brew_fermenter_ibu'], + 'brew_date_end' => $row['brew_date_end'], + 'brew_log_available' => $row['brew_log_available'], + 'primary_start_temp' => $row['primary_start_temp'], + 'primary_max_temp' => $row['primary_max_temp'], + 'primary_end_temp' => $row['primary_end_temp'], + 'primary_end_sg' => $row['primary_end_sg'], + 'primary_end_date' => $row['primary_end_date'], + 'secondary_temp' => $row['secondary_temp'], + 'secondary_end_date' => $row['secondary_end_date'], + 'tertiary_temp' => $row['tertiary_temp'], + 'package_date' => $row['package_date'], + 'bottle_amount' => $row['bottle_amount'], + 'bottle_carbonation' => $row['bottle_carbonation'], + 'bottle_priming_sugar' => $row['bottle_priming_sugar'], + 'bottle_priming_amount' => $row['bottle_priming_amount'], + 'bottle_carbonation_temp' => $row['bottle_carbonation_temp'], + 'keg_amount' => $row['keg_amount'], + 'keg_carbonation' => $row['keg_carbonation'], + 'keg_priming_sugar' => $row['keg_priming_sugar'], + 'keg_priming_amount' => $row['keg_priming_amount'], + 'keg_carbonation_temp' => $row['keg_carbonation_temp'], + 'keg_forced_carb' => $row['keg_forced_carb'], + 'keg_pressure' => $row['keg_pressure'], + 'keg_priming_factor' => $row['keg_priming_factor'], + 'taste_notes' => $row['taste_notes'], + 'taste_rate' => $row['taste_rate'], + 'taste_date' => $row['taste_date'], + 'taste_color' => $row['taste_color'], + 'taste_transparency' => $row['taste_transparency'], + 'taste_head' => $row['taste_head'], + 'taste_aroma' => $row['taste_aroma'], + 'taste_taste' => $row['taste_taste'], + 'taste_mouthfeel' => $row['taste_mouthfeel'], + 'taste_aftertaste' => $row['taste_aftertaste'] + ); + } +// syslog(LOG_NOTICE, json_encode($brews)); + echo json_encode($brews); +} +?> diff -r 0f128201a031 -r 8c4ba91adf58 www/includes/global.inc.php --- a/www/includes/global.inc.php Wed Nov 21 21:17:18 2018 +0100 +++ b/www/includes/global.inc.php Thu Nov 22 22:27:42 2018 +0100 @@ -184,7 +184,7 @@
  • Productie