Mercurial > bms / changeset

--- a/www/import/from_brouwhulp.php	Mon Nov 19 20:21:56 2018 +0100
+++ b/www/import/from_brouwhulp.php	Tue Nov 20 14:39:15 2018 +0100
@@ -1101,6 +1101,7 @@
                 if (! $rresult = mysqli_query($db, $rsql)) {
                         printf("Error: %s\n", mysqli_error($db));
 		}
+		$psql .= "', code='" . mysqli_real_escape_string($db, $recipe->NR_RECIPE);
 
 		if ($recipe->EQUIPMENT) {
 			$psql .= "', eq_name='" . mysqli_real_escape_string($db, $recipe->EQUIPMENT->NAME);
@@ -1127,6 +1128,96 @@
 			$psql .= "', eq_efficiency='" . floatval($recipe->EQUIPMENT->EFFICIENCY);
 		}
 
+		if (($recipe->DATE) && ($recipe->TIME_STARTED) && ($recipe->TIME_ENDED)) {
+			/* We have brew data */
+			$date_start = substr($recipe->DATE, 6, 4).substr($recipe->DATE,2,4).substr($recipe->DATE,0,2).' '.$recipe->TIME_STARTED;
+			$date_end = substr($recipe->DATE, 6, 4).substr($recipe->DATE,2,4).substr($recipe->DATE,0,2).' '.$recipe->TIME_ENDED;
+			$psql .= "', brew_date_start='" . $date_start;
+
+			if ($recipe->PH_ADJUSTED)
+				$psql .= "', brew_mash_ph='" . floatval($recipe->PH_ADJUSTED);
+			if (floatval($recipe->SG_END_MASH) != 1.0)
+				$psql .= "', brew_mash_sg='" . floatval($recipe->SG_END_MASH);
+			if ($recipe->MASH->SPARGE_TEMP)
+				$psql .= "', brew_sparge_temperature='" . floatval($recipe->MASH->SPARGE_TEMP);
+			if ($recipe->VOLUME_HLT)
+				$psql .= "', brew_sparge_volume='" . floatval($recipe->VOLUME_HLT);
+			if ($recipe->VOLUME_BEFORE_BOIL)
+				$psql .= "', brew_preboil_volume='" . floatval($recipe->VOLUME_BEFORE_BOIL);
+			if (floatval($recipe->OG_BEFORE_BOIL) != 1.0)
+				$psql .= "', brew_preboil_sg='" . floatval($recipe->OG_BEFORE_BOIL);
+			if ($recipe->PH_BEFORE_BOIL)
+				$psql .= "', brew_preboil_ph='" . floatval($recipe->PH_BEFORE_BOIL);
+			if ($recipe->VOLUME_AFTER_BOIL)
+				$psql .= "', brew_aboil_volume='" . floatval($recipe->VOLUME_AFTER_BOIL);
+			$psql .= "', brew_aboil_sg='" . floatval($recipe->OG);
+			if ($recipe->PH_AFTER_BOIL)
+				$psql .= "', brew_aboil_ph='" . floatval($recipe->PH_AFTER_BOIL);
+			if ($recipe->ACTUAL_EFFICIENCY)
+				$psql .= "', brew_aboil_efficiency='" . floatval($recipe->ACTUAL_EFFICIENCY);
+			$psql .= "', brew_whirlpool2='" . floatval($recipe->WHIRLPOOL_TIME);
+			$psql .= "', brew_cooling_method='" . mysqli_real_escape_string($db, $recipe->COOLING_METHOD);
+			$psql .= "', brew_cooling_time='" . floatval($recipe->COOLING_TIME);
+			$psql .= "', brew_cooling_to='" . floatval($recipe->COOLING_TO);
+			if ($recipe->VOLUME_FERMENTER)
+				$psql .= "', brew_fermenter_volume='" . floatval($recipe->VOLUME_FERMENTER);
+			if ($recipe->EQUIPMENT->TOP_UP_WATER_BREWDAY)
+				$psql .= "', brew_fermenter_extrawater='" . floatval($recipe->EQUIPMENT->TOP_UP_WATER_BREWDAY);
+			$psql .= "', brew_fermenter_sg='" . floatval($recipe->OG_FERMENTER);
+			$psql .= "', brew_fermenter_ibu='" . floatval($recipe->IBU);
+			$psql .= "', brew_aeration_type='" . mysqli_real_escape_string($db, $recipe->AERATION_TYPE);
+			if ($recipe->AERATION_TYPE != "None") {
+				$psql .= "', brew_aeration_speed='" . floatval($recipe->AERATION_SPEED);
+				$psql .= "', brew_aeration_time='" . floatval($recipe->AERATION_TIME);
+			}
+			$psql .= "', brew_date_end='" . $date_end;
+			echo  $date_start . PHP_EOL;
+		}
+		/*
+		 *  AGE = onduidelijk
+		 *  INVENTORY_REDUCED
+		 *  LOCKED
+		 *  ABV
+		 */
+
+		/*
+		 * FERMENTATION_STAGES
+		 * PRIMARY_AGE
+		 * PRIMARY_TEMP
+		 * SECONDARY_AGE
+		 * SECONDARY_TEMP
+		 * TERTIARY_AGE
+		 * TERTIARY_TEMP
+		 * SG_END_PRIMARY
+		 * START_TEMP_PRIMARY
+		 * MAX_TEMP_PRIMARY
+		 * END_TEMP_PRIMARY
+		 */
+
+		/*
+		 * DATE_BOTTLING
+		 * AMOUNT_BOTTLING
+		 * CARBONATION
+		 * FORCED_CARB_KEGS
+		 * AMOUNT_PRIMING
+		 * AMOUNT_PRIMING_KEGS
+		 * KEG_PRESSURE
+		 * PRIMING_SUGAR_BOTTLES
+		 * PRIMING_SUGAR_KEGS
+		 */
+		/*
+		 * TASTE
+		 * TASTE_NOTES
+		 * TASTING_RATE
+		 * TASTE_DATE
+		 * TASTE_COLOR
+		 * TASTE_TRANSPARENCY
+		 * TASTE_HEAD
+		 * TASTE_AROMA
+		 * TASTE_TASTE
+		 * TASTE_MOUTHFEEL
+		 * TASTE_AFTERTASTE
+		 */
 		$psql .= "';";
 		if (! $presult = mysqli_query($db, $psql)) {
 			printf("Error: %s\n", mysqli_error($db));