Some small fixes

Tue, 28 Aug 2018 11:30:42 +0200

author
Michiel Broek <mbroek@mbse.eu>
date
Tue, 28 Aug 2018 11:30:42 +0200
changeset 39
400aae9fb0c8
parent 38
b7d44c98d609
child 40
b825c675987d

Some small fixes

www/includes/db_inventory_fermentables.php file | annotate | diff | comparison | revisions
www/includes/global.inc.php file | annotate | diff | comparison | revisions
www/inv_yeasts.php file | annotate | diff | comparison | revisions
www/js/inv_mash_profiles.js file | annotate | diff | comparison | revisions
--- a/www/includes/db_inventory_fermentables.php	Mon Aug 27 22:58:20 2018 +0200
+++ b/www/includes/db_inventory_fermentables.php	Tue Aug 28 11:30:42 2018 +0200
@@ -121,8 +121,7 @@
 			'inventory' => $row['inventory'],
 			'cost' => $row['cost'],
 			'production_date' => $row['production_date'],
-			'tht_date' => $row['tht_date'],
-			'supplier_rec' => $row['supplier_rec']
+			'tht_date' => $row['tht_date']
 		);
 	}
 	echo json_encode($fermentables);
--- a/www/includes/global.inc.php	Mon Aug 27 22:58:20 2018 +0200
+++ b/www/includes/global.inc.php	Tue Aug 28 11:30:42 2018 +0200
@@ -51,11 +51,13 @@
   <script src="jqwidgets/jqxcore.js"></script>
   <script src="jqwidgets/jqxwindow.js"></script>
   <script src="jqwidgets/jqxmenu.js"></script>
-  <script src="jqwidgets/jqxwindow.js"></script>
   <script src="jqwidgets/jqxdata.js"></script>
+  <script src="jqwidgets/jqxdata.export.js"></script>
   <script src="jqwidgets/jqxbuttons.js"></script>
   <script src="jqwidgets/jqxscrollbar.js"></script>
   <script src="jqwidgets/jqxgrid.js"></script>
+  <script src="jqwidgets/jqxgrid.edit.js"></script>
+  <script src="jqwidgets/jqxgrid.sort.js"></script>
   <script src="jqwidgets/jqxgrid.pager.js"></script>
   <script src="jqwidgets/jqxgrid.filter.js"></script>
   <script src="jqwidgets/jqxgrid.selection.js"></script>
--- a/www/inv_yeasts.php	Mon Aug 27 22:58:20 2018 +0200
+++ b/www/inv_yeasts.php	Tue Aug 28 11:30:42 2018 +0200
@@ -76,5 +76,5 @@
 
 <?php
 confirm_delete();
-echo $outstr;
+page_footer();
 ?>
--- a/www/js/inv_mash_profiles.js	Mon Aug 27 22:58:20 2018 +0200
+++ b/www/js/inv_mash_profiles.js	Tue Aug 28 11:30:42 2018 +0200
@@ -262,7 +262,7 @@
 	// initialize the popup window and buttons.
 	$("#popupWindow").jqxWindow({
 		width: 860,
-		height: 600,
+		height: 550,
 		resizable: false,
 		theme: theme,
 		isModal: true,

mercurial