--- a/www/includes/global.inc.php Mon Jul 15 15:06:17 2019 +0200
+++ b/www/includes/global.inc.php Sat Sep 14 10:30:26 2019 +0200
@@ -1,6 +1,6 @@
<?php
/*****************************************************************************
- * Copyright (C) 2014-2018
+ * Copyright (C) 2014-2019
*
* Michiel Broek <mbroek at mbse dot eu>
*
@@ -66,7 +66,7 @@
}
mysqli_set_charset($connect, "utf8" );
$my_default_water = $my_brewery_name = $my_ibu_method = $my_color_method = '';
-$my_factor_mashhop = $my_factor_fwh = $my_factor_pellet = $my_factor_plug = $my_factor_wethop = 0;
+$my_factor_mashhop = $my_factor_fwh = $my_factor_pellet = $my_factor_plug = $my_factor_wethop = $my_factor_cryohop = 0;
$my_brix_correction = $my_grain_absorbtion = 1.0;
$result = mysqli_query($connect, "SELECT * FROM profile_setup WHERE record='1'") or die("SQL Error 1: " . mysqli_error($connect));
@@ -81,6 +81,7 @@
$my_factor_pellet= floatval($row['factor_pellet']);
$my_factor_plug= floatval($row['factor_plug']);
$my_factor_wethop = floatval($row['factor_wethop']);
+ $my_factor_cryohop = floatval($row['factor_cryohop']);
$my_ibu_method = $row['ibu_method'];
$my_color_method = $row['color_method'];
$my_brix_correction = floatval($row['brix_correction']);
@@ -104,6 +105,7 @@
global $my_factor_pellet;
global $my_factor_plug;
global $my_factor_wethop;
+ global $my_factor_cryohop;
global $my_ibu_method;
global $my_color_method;
global $my_brix_correction;
@@ -115,31 +117,22 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>BMS v<?php echo $my_version;?> - <?php echo $title;?></title>
- <link type="text/css" href="css/style.css" rel="stylesheet" media="all" />
+ <link type="text/css" href="css/style-min.css" rel="stylesheet" media="all" />
<link type="text/css" href="jqwidgets/styles/jqx.base.css" rel="stylesheet" />
<link type="text/css" href="jqwidgets/styles/jqx.<?php echo $my_style; ?>.css" rel="stylesheet" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script>
- var theme = "<?php echo $my_style; ?>";
- var my_record = "<?php echo $my_record; ?>";
- var my_return = "<?php echo $my_return; ?>";
- var my_name = "<?php echo $my_name; ?>";
- var my_code = "<?php echo $my_code; ?>";
- var my_uuid = "<?php echo $my_uuid; ?>";
- var my_select = "<?php echo $my_select; ?>";
- var my_brewery_name = "<?php echo $my_brewery_name; ?>";
- var my_factor_mashhop = "<?php echo $my_factor_mashhop; ?>";
- var my_factor_fwh = "<?php echo $my_factor_fwh; ?>";
- var my_factor_pellet = "<?php echo $my_factor_pellet; ?>";
- var my_factor_plug = "<?php echo $my_factor_plug; ?>";
- var my_factor_wethop = "<?php echo $my_factor_wethop; ?>";
- var my_ibu_method = "<?php echo $my_ibu_method; ?>";
- var my_color_method = "<?php echo $my_color_method; ?>";
- var my_brix_correction = "<?php echo $my_brix_correction; ?>";
- var my_grain_absorbtion = "<?php echo $my_grain_absorbtion; ?>";
- var my_default_water = "<?php echo $my_default_water; ?>";
+ var theme = "<?php echo $my_style; ?>", my_record = "<?php echo $my_record; ?>",
+ my_return = "<?php echo $my_return; ?>", my_name = "<?php echo $my_name; ?>",
+ my_code = "<?php echo $my_code; ?>", my_uuid = "<?php echo $my_uuid; ?>",
+ my_select = "<?php echo $my_select; ?>", my_brewery_name = "<?php echo $my_brewery_name; ?>", my_factor_mashhop = "<?php echo $my_factor_mashhop; ?>",
+ my_factor_fwh = "<?php echo $my_factor_fwh; ?>", my_factor_pellet = "<?php echo $my_factor_pellet; ?>",
+ my_factor_plug = "<?php echo $my_factor_plug; ?>", my_factor_wethop = "<?php echo $my_factor_wethop; ?>",
+ my_factor_cryohop = "<?php echo $my_factor_cryohop; ?>", my_ibu_method = "<?php echo $my_ibu_method; ?>",
+ my_color_method = "<?php echo $my_color_method; ?>", my_brix_correction = "<?php echo $my_brix_correction; ?>",
+ my_grain_absorbtion = "<?php echo $my_grain_absorbtion; ?>", my_default_water = "<?php echo $my_default_water; ?>";
</script>
- <script src="js/jquery-1.11.1.min.js"></script>
+ <script src="js/jquery-1.11.1-min.js"></script>
<script src="jqwidgets/jqxcore.js"></script>
<script src="jqwidgets/jqxwindow.js"></script>
<script src="jqwidgets/jqxmenu.js"></script>
@@ -176,10 +169,10 @@
<script src="jqwidgets/jqxfileupload.js"></script>
<script src="jqwidgets/jqxpanel.js"></script>
<script src="jqwidgets/globalization/globalize.js"></script>
- <script src="js/global.js"></script>
+ <script src="js/global-min.js"></script>
<?php
if (strlen($loadjs))
- echo ' <script src="js/'.$loadjs.'.js"></script>'.PHP_EOL;
+ echo ' <script src="js/'.$loadjs.'-min.js"></script>'.PHP_EOL;
?>
</head>
@@ -246,6 +239,13 @@
<li><img style='float: left; margin-right: 5px;' src='images/insert-image.png' />Etiket</li>
</ul>
</li>
+ <li><img style='float: left; margin-right: 5px;' src='images/printer.png' />Rapporten
+ <ul style='width: 200px;'>
+ <li><a href="prod_r_totals.php" target="_blank">Totaal productie</a></li>
+ <li><a href="prod_r_efficiency.php" target="_blank">Rendementen</a></li>
+ <li><a href="prod_r_yeast.php" target="_blank">Vergisting</a></li>
+ </ul>
+ </li>
<li><img style='float: left; margin-right: 7px;' src='images/calendar.png' />Kalender</li>
</ul>
</li>