# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1537955110 -7200
# Node ID ca25fdce3b853cd16b7c0712b20dd500beb74d79
# Parent  2ff83855d5745ff56eba5e5ec6b699e4d4311974
Improved hop selection dropdown

diff -r 2ff83855d574 -r ca25fdce3b85 www/gethopsources.php
--- a/www/gethopsources.php	Tue Sep 25 20:58:06 2018 +0200
+++ b/www/gethopsources.php	Wed Sep 26 11:45:10 2018 +0200
@@ -1,7 +1,7 @@
 <?php
 require_once('config.php');
 
-$query = "SELECT * FROM inventory_hops ORDER BY name";
+$query = "SELECT * FROM inventory_hops ORDER BY origin,name";
 $connect = mysqli_connect(DBASE_HOST,DBASE_USER,DBASE_PASS,DBASE_NAME);
 if (! $connect) {
 	echo "[]";
diff -r 2ff83855d574 -r ca25fdce3b85 www/import/from_brouwhulp.php
--- a/www/import/from_brouwhulp.php	Tue Sep 25 20:58:06 2018 +0200
+++ b/www/import/from_brouwhulp.php	Wed Sep 26 11:45:10 2018 +0200
@@ -106,7 +106,7 @@
 			$sql .= "', myrcene='" . $hop->MYCRENE;
 		if ($hop->HSI)
 			$sql .= "', hsi='" . $hop->HSI;
-		$sql .= "', useat='" . $hop->USE;
+		$sql .= "', useat='Boil";	// brouwhulp says Aroma always :)
 		$sql .= "', type='" . $hop->TYPE;
 		$sql .= "', form='" . $hop->FORM;
 		$sql .= "', notes='" . mysqli_real_escape_string($db, $hop->NOTES);
diff -r 2ff83855d574 -r ca25fdce3b85 www/js/rec_edit.js
--- a/www/js/rec_edit.js	Tue Sep 25 20:58:06 2018 +0200
+++ b/www/js/rec_edit.js	Wed Sep 26 11:45:10 2018 +0200
@@ -424,7 +424,12 @@
                                         displayMember: "name",
                                         width: 150,
                                         height: 27,
-                                        dropDownWidth: 300
+                                        dropDownWidth: 500,
+					dropDownHeight: 500,
+					renderer: function (index, label, value) {
+						var datarecord = hoplist.records[index];
+						return datarecord.origin+ " / " + datarecord.name + " (" + datarecord.alpha + "% &alpha;)";
+					}
                                 });
                                 $("#haddrowbutton").on('select', function (event) {
                                         if (event.args) {