Mercurial > bms / file diff

--- a/www/import/from_brouwhulp.php	Thu Jan 31 17:16:51 2019 +0100
+++ b/www/import/from_brouwhulp.php	Thu Jan 31 22:39:36 2019 +0100
@@ -971,15 +971,14 @@
 			$yeasts .= ',';
 		$comma = TRUE;
 		$yeasts .= '{"y_name":"' . mysqli_real_escape_string($db, $yeast->NAME) . '"';
-		$yeasts .= ',"y_amount":' . floatval($yeast->AMOUNT);
-		if ($yeast->COST) {
-			if (($yeast->FORM == "Liquid") && ($yeast->AMOUNT == "0.0588")) {	// Packs
-				$yeasts .= ',"y_cost":' . floatval($yeast->COST) / 58.8;
-			} else {
-				$yeasts .= ',"y_cost":' . floatval($yeast->COST);
-			}
-		} else
-			$yeasts .= ',"y_cost":0';
+		if ($yeast->FORM == "Liquid") {
+			$paks = floatval($yeast->AMOUNT) / 0.0588;
+			$yeasts .= ',"y_amount":' . $paks;
+		} else {
+			$yeasts .= ',"y_amount":' . floatval($yeast->AMOUNT);
+		}
+
+		$yeasts .= ',"y_cost":' . floatval($yeast->COST);
 		$yeasts .= ',"y_laboratory":"' . mysqli_real_escape_string($db, $yeast->LABORATORY) . '"';
 		$yeasts .= ',"y_product_id":"' . mysqli_real_escape_string($db, $yeast->PRODUCT_ID) . '"';
 
@@ -1014,7 +1013,17 @@
 		else
 			echo "Unknown FORM " . $yeast->FORM . PHP_EOL;
 
-		($yeast->AMOUNT_IS_WEIGHT== "TRUE") ? $yeasts .= ',"y_amount_is_weight":1' : $yeasts.= ',"y_amount_is_weight":0';
+		if ($yeast->FLOCCULATION == 'Low')
+			$yeasts .= ',"y_flocculation":0';
+		else if ($yeast->FLOCCULATION == 'Medium')
+			$yeasts .= ',"y_flocculation":1';
+		else if ($yeast->FLOCCULATION == 'High')
+			$yeasts .= ',"y_flocculation":2';
+		else if ($yeast->FLOCCULATION == 'Very high')
+			$yeasts .= ',"y_flocculation":3';
+		else
+			echo "Unknown FLOCCULATION " . $yeast->FLOCCULATION . PHP_EOL;
+
 		if ($yeast->ADD_TO_SECONDARY=="FALSE") {
 			$yeasts .= ',"y_use":0';	// Primary
 			$svg = floatval($yeast->ATTENUATION);