# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1631471704 -7200
# Node ID daf55c944fb0c6208bad52ba5dffa9f857a082ca
# Parent  5189ee5445cd502d0f03a8ab11b3e3bc803b3fef
Recipes backport for new dry-yeast fields and SQL error handlers.

diff -r 5189ee5445cd -r daf55c944fb0 www/includes/db_recipes.php
--- a/www/includes/db_recipes.php	Thu Sep 09 15:40:06 2021 +0200
+++ b/www/includes/db_recipes.php	Sun Sep 12 20:35:04 2021 +0200
@@ -16,6 +16,11 @@
 $rreplacements = array("\\'");
 $disallowed = array('visibleindex','uniqueid','boundindex','uid','h_weight','m_weight');
 
+$response = array(
+   'error' => false,
+   'msg' => 'Ok',
+);
+
 if (isset($_POST['insert']) || isset($_POST['update'])) {
 	if (isset($_POST['insert'])) {
 		// INSERT COMMAND
@@ -353,15 +358,17 @@
 	$result = mysqli_query($connect, $sql);
 	if (! $result) {
 		syslog(LOG_NOTICE, "db_recipes: result: ".mysqli_error($connect));
+		$response['error'] = true;
+                $response['msg'] = "SQL fout: ".mysqli_error($connect);
 	} else {
 		if (isset($_POST['update'])) {
-			syslog(LOG_NOTICE, "db_recipes: updated record ".$_POST['record']);
+			//syslog(LOG_NOTICE, "db_recipes: updated record ".$_POST['record']);
 		} else {
 			$lastid = mysqli_insert_id($connect);
-			syslog(LOG_NOTICE, "db_recipes: inserted record ".$lastid);
+			//syslog(LOG_NOTICE, "db_recipes: inserted record ".$lastid);
 		}
 	}
-	echo $result;
+	echo json_encode($response);
 
 } else if (isset($_POST['delete'])) {
 	// DELETE COMMAND
@@ -369,10 +376,12 @@
 	$result = mysqli_query($connect, $sql);
 	if (! $result) {
 		syslog(LOG_NOTICE, "db_recipes: result: ".mysqli_error($connect));
+		$response['error'] = true;
+                $response['msg'] = "SQL delete fout: ".mysqli_error($connect);
 	} else {
 		syslog(LOG_NOTICE, "db_recipes: deleted record ".$_POST['record']);
 	}
-	echo $result;
+	echo json_encode($response);
 
 } else {
 	/*
@@ -562,7 +571,15 @@
                                                 if (! isset($yeasts[$i]['y_pofpos']))
                                                         $yeasts[$i]['y_pofpos'] = intval($obj->pofpos);
                                                 if (! isset($yeasts[$i]['y_zymocide']))
-                                                        $yeasts[$i]['y_zymocide'] = intval($obj->zymocide);
+							$yeasts[$i]['y_zymocide'] = intval($obj->zymocide);
+						if (! isset($yeasts[$i]['y_gr_hl_lo']))
+                                                        $yeasts[$i]['y_gr_hl_lo'] = intval($obj->gr_hl_lo);
+						if (! isset($yeasts[$i]['y_sg_lo']))
+                                                        $yeasts[$i]['y_sg_lo'] = floatval($obj->sg_lo);
+                                                if (! isset($yeasts[$i]['y_gr_hl_hi']))
+                                                        $yeasts[$i]['y_gr_hl_hi'] = intval($obj->gr_hl_hi);
+                                                if (! isset($yeasts[$i]['y_sg_hi']))
+                                                        $yeasts[$i]['y_sg_hi'] = floatval($obj->sg_hi);
 					} else {
                                                 if (! isset($yeasts[$i]['y_sta1']))
                                                         $yeasts[$i]['y_sta1'] = 0;
@@ -577,7 +594,15 @@
                                                 if (! isset($yeasts[$i]['y_pofpos']))
                                                         $yeasts[$i]['y_pofpos'] = 0;
                                                 if (! isset($yeasts[$i]['y_zymocide']))
-                                                        $yeasts[$i]['y_zymocide'] = 0;
+							$yeasts[$i]['y_zymocide'] = 0;
+						if (! isset($yeasts[$i]['y_gr_hl_lo']))
+                                                        $yeasts[$i]['y_gr_hl_lo'] = 50;
+                                                if (! isset($yeasts[$i]['y_sg_lo']))
+                                                        $yeasts[$i]['y_sg_lo'] = 1.04;
+                                                if (! isset($yeasts[$i]['y_gr_hl_hi']))
+                                                        $yeasts[$i]['y_gr_hl_hi'] = 80;
+                                                if (! isset($yeasts[$i]['y_sg_hi']))
+                                                        $yeasts[$i]['y_sg_hi'] = 1.08;
 					}
 					mysqli_free_result($result2);
 				}
diff -r 5189ee5445cd -r daf55c944fb0 www/js/rec_edit.js
--- a/www/js/rec_edit.js	Thu Sep 09 15:40:06 2021 +0200
+++ b/www/js/rec_edit.js	Sun Sep 12 20:35:04 2021 +0200
@@ -2735,8 +2735,13 @@
    async: false,
    data: data,
    type: 'POST',
-   success: function(data, status, xhr) {
-    console.log('saveRecord(' + goback + ') success');
+   success: function(data) {
+    if (data.error) {
+     console.log('saveRecord(' + goback + ') error ' + data.msg);
+     alert('SQL fout: ' + data.msg);
+    } else {
+     console.log('saveRecord(' + goback + ') success');
+    }
     if (goback)
      window.location.href = my_return;
     else