Mercurial > bms / changeset

--- a/www/includes/global.inc.php	Fri Sep 06 13:51:16 2019 +0200
+++ b/www/includes/global.inc.php	Fri Sep 06 14:11:56 2019 +0200
@@ -122,25 +122,15 @@
   <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_factor_cryohop = "<?php echo $my_factor_cryohop; ?>";
-	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="jqwidgets/jqxcore.js"></script>

--- a/www/js/prod_archive_code-min.js	Fri Sep 06 13:51:16 2019 +0200
+++ b/www/js/prod_archive_code-min.js	Fri Sep 06 14:11:56 2019 +0200
@@ -1,1 +1,1 @@
-$(document).ready(function(){var a={datatype:"json",cache:false,datafields:[{name:"record",type:"number"},{name:"name",type:"string"},{name:"code",type:"string"},{name:"date",type:"string"},{name:"style",type:"string"},{name:"og",type:"float"},{name:"fg",type:"float"},{name:"batch_size",type:"float"},],id:"record",url:"includes/db_product.php?select=archcode"};var b=new $.jqx.dataAdapter(a);$("#jqxgrid").jqxGrid({width:1280,height:630,source:b,theme:theme,columns:[{text:"Code",datafield:"code",width:100},{text:"Naam",datafield:"name"},{text:"Stijl",datafield:"style",width:250},{text:"OG",datafield:"og",width:80,cellsformat:"f3"},{text:"FG",datafield:"fg",width:80,cellsformat:"f3"},{text:"Datum",datafield:"date",width:120},{text:"Liters",datafield:"batch_size",width:80,align:"right",cellsalign:"right",cellsformat:"f1"},{text:"",datafield:"Edit",width:80,align:"center",columntype:"button",cellsrenderer:function(){return"Bekijk"},buttonclick:function(e){var d=b.records[e];var c="prod_edit.php?record="+d.record+"&select=archcode&return=prod_archive_code.php";window.location.href=c}}],})});
\ No newline at end of file
+$(document).ready(function(){var a={datatype:"json",cache:false,datafields:[{name:"record",type:"number"},{name:"name",type:"string"},{name:"code",type:"string"},{name:"date",type:"string"},{name:"style",type:"string"},{name:"og",type:"float"},{name:"fg",type:"float"},{name:"batch_size",type:"float"},],id:"record",url:"includes/db_product.php?select=archcode"},b=new $.jqx.dataAdapter(a);$("#jqxgrid").jqxGrid({width:1280,height:630,source:b,theme:theme,columns:[{text:"Code",datafield:"code",width:100},{text:"Naam",datafield:"name"},{text:"Stijl",datafield:"style",width:250},{text:"OG",datafield:"og",width:80,cellsformat:"f3"},{text:"FG",datafield:"fg",width:80,cellsformat:"f3"},{text:"Datum",datafield:"date",width:120},{text:"Liters",datafield:"batch_size",width:80,align:"right",cellsalign:"right",cellsformat:"f1"},{text:"",datafield:"Edit",width:80,align:"center",columntype:"button",cellsrenderer:function(){return"Bekijk"},buttonclick:function(d){var c=b.records[d];window.location.href="prod_edit.php?record="+c.record+"&select=archcode&return=prod_archive_code.php"}}],})});
\ No newline at end of file

--- a/www/js/prod_archive_code.js	Fri Sep 06 13:51:16 2019 +0200
+++ b/www/js/prod_archive_code.js	Fri Sep 06 14:11:56 2019 +0200
@@ -37,8 +37,9 @@
 		],
 		id: 'record',
 		url: "includes/db_product.php?select=archcode"
-	};
-	var dataAdapter = new $.jqx.dataAdapter(source);
+	},
+	dataAdapter = new $.jqx.dataAdapter(source);
+
 	// initialize jqxGrid
 	$("#jqxgrid").jqxGrid({
 		width: 1280,
@@ -57,8 +58,7 @@
 				return "Bekijk";
 				}, buttonclick: function (row) {
 					var datarecord = dataAdapter.records[row];
-					var url= "prod_edit.php?record=" + datarecord.record + "&select=archcode&return=prod_archive_code.php";
-					window.location.href = url;
+					window.location.href = "prod_edit.php?record=" + datarecord.record + "&select=archcode&return=prod_archive_code.php";
 				}
 			}
 		],

--- a/www/js/prod_archive_date-min.js	Fri Sep 06 13:51:16 2019 +0200
+++ b/www/js/prod_archive_date-min.js	Fri Sep 06 14:11:56 2019 +0200
@@ -1,1 +1,1 @@
-$(document).ready(function(){var a={datatype:"json",cache:false,datafields:[{name:"record",type:"number"},{name:"name",type:"string"},{name:"code",type:"string"},{name:"year",type:"string"},{name:"date",type:"string"},{name:"style",type:"string"},{name:"og",type:"float"},{name:"fg",type:"float"},{name:"batch_size",type:"float"},],id:"record",url:"includes/db_product.php?select=archdate"};var b=new $.jqx.dataAdapter(a);$("#jqxgrid").jqxGrid({width:1280,height:630,source:b,groupable:true,theme:theme,columns:[{text:"Jaar",datafield:"year",width:80},{text:"Datum",datafield:"date",width:120,menu:false},{text:"Naam",datafield:"name",menu:false},{text:"Stijl",datafield:"style",width:250},{text:"OG",datafield:"og",width:80,cellsformat:"f3",menu:false},{text:"FG",datafield:"fg",width:80,cellsformat:"f3",menu:false},{text:"Code",datafield:"code",width:100,menu:false},{text:"Liters",datafield:"batch_size",width:80,align:"right",cellsalign:"right",cellsformat:"f1",menu:false},{text:"",datafield:"Edit",width:80,align:"center",columntype:"button",cellsrenderer:function(){return"Bekijk"},buttonclick:function(e){var d=b.records[e];var c="prod_edit.php?record="+d.record+"&select=archdate&return=prod_archive_date.php";window.location.href=c}}],groups:["year"]})});
\ No newline at end of file
+$(document).ready(function(){var a={datatype:"json",cache:false,datafields:[{name:"record",type:"number"},{name:"name",type:"string"},{name:"code",type:"string"},{name:"year",type:"string"},{name:"date",type:"string"},{name:"style",type:"string"},{name:"og",type:"float"},{name:"fg",type:"float"},{name:"batch_size",type:"float"},],id:"record",url:"includes/db_product.php?select=archdate"},b=new $.jqx.dataAdapter(a);$("#jqxgrid").jqxGrid({width:1280,height:630,source:b,groupable:true,theme:theme,columns:[{text:"Jaar",datafield:"year",width:80},{text:"Datum",datafield:"date",width:120,menu:false},{text:"Naam",datafield:"name",menu:false},{text:"Stijl",datafield:"style",width:250},{text:"OG",datafield:"og",width:80,cellsformat:"f3",menu:false},{text:"FG",datafield:"fg",width:80,cellsformat:"f3",menu:false},{text:"Code",datafield:"code",width:100,menu:false},{text:"Liters",datafield:"batch_size",width:80,align:"right",cellsalign:"right",cellsformat:"f1",menu:false},{text:"",datafield:"Edit",width:80,align:"center",columntype:"button",cellsrenderer:function(){return"Bekijk"},buttonclick:function(d){var c=b.records[d];window.location.href="prod_edit.php?record="+c.record+"&select=archdate&return=prod_archive_date.php"}}],groups:["year"]})});
\ No newline at end of file

--- a/www/js/prod_archive_date.js	Fri Sep 06 13:51:16 2019 +0200
+++ b/www/js/prod_archive_date.js	Fri Sep 06 14:11:56 2019 +0200
@@ -38,8 +38,9 @@
 		],
 		id: 'record',
 		url: "includes/db_product.php?select=archdate"
-	};
-	var dataAdapter = new $.jqx.dataAdapter(source);
+	},
+	dataAdapter = new $.jqx.dataAdapter(source);
+
 	// initialize jqxGrid
 	$("#jqxgrid").jqxGrid({
 		width: 1280,
@@ -60,8 +61,7 @@
 				return "Bekijk";
 				}, buttonclick: function (row) {
 					var datarecord = dataAdapter.records[row];
-					var url= "prod_edit.php?record=" + datarecord.record + "&select=archdate&return=prod_archive_date.php";
-					window.location.href = url;
+					window.location.href = "prod_edit.php?record=" + datarecord.record + "&select=archdate&return=prod_archive_date.php";
 				}
 			}
 		],

--- a/www/js/prod_archive_name-min.js	Fri Sep 06 13:51:16 2019 +0200
+++ b/www/js/prod_archive_name-min.js	Fri Sep 06 14:11:56 2019 +0200
@@ -1,1 +1,1 @@
-$(document).ready(function(){var a={datatype:"json",cache:false,datafields:[{name:"record",type:"number"},{name:"name",type:"string"},{name:"code",type:"string"},{name:"date",type:"string"},{name:"style",type:"string"},{name:"og",type:"float"},{name:"fg",type:"float"},{name:"batch_size",type:"float"},],id:"record",url:"includes/db_product.php?select=archname"};var b=new $.jqx.dataAdapter(a);$("#jqxgrid").jqxGrid({width:1280,height:630,source:b,theme:theme,columns:[{text:"Naam",datafield:"name"},{text:"Stijl",datafield:"style",width:250},{text:"OG",datafield:"og",width:80,cellsformat:"f3"},{text:"FG",datafield:"fg",width:80,cellsformat:"f3"},{text:"Datum",datafield:"date",width:120},{text:"Code",datafield:"code",width:100},{text:"Liters",datafield:"batch_size",width:80,align:"right",cellsalign:"right",cellsformat:"f1"},{text:"",datafield:"Edit",width:80,align:"center",columntype:"button",cellsrenderer:function(){return"Bekijk"},buttonclick:function(e){var d=b.records[e];var c="prod_edit.php?record="+d.record+"&select=archname&return=prod_archive_name.php";window.location.href=c}}],})});
\ No newline at end of file
+$(document).ready(function(){var a={datatype:"json",cache:false,datafields:[{name:"record",type:"number"},{name:"name",type:"string"},{name:"code",type:"string"},{name:"date",type:"string"},{name:"style",type:"string"},{name:"og",type:"float"},{name:"fg",type:"float"},{name:"batch_size",type:"float"},],id:"record",url:"includes/db_product.php?select=archname"},b=new $.jqx.dataAdapter(a);$("#jqxgrid").jqxGrid({width:1280,height:630,source:b,theme:theme,columns:[{text:"Naam",datafield:"name"},{text:"Stijl",datafield:"style",width:250},{text:"OG",datafield:"og",width:80,cellsformat:"f3"},{text:"FG",datafield:"fg",width:80,cellsformat:"f3"},{text:"Datum",datafield:"date",width:120},{text:"Code",datafield:"code",width:100},{text:"Liters",datafield:"batch_size",width:80,align:"right",cellsalign:"right",cellsformat:"f1"},{text:"",datafield:"Edit",width:80,align:"center",columntype:"button",cellsrenderer:function(){return"Bekijk"},buttonclick:function(d){var c=b.records[d];window.location.href="prod_edit.php?record="+c.record+"&select=archname&return=prod_archive_name.php"}}],})});
\ No newline at end of file

--- a/www/js/prod_archive_name.js	Fri Sep 06 13:51:16 2019 +0200
+++ b/www/js/prod_archive_name.js	Fri Sep 06 14:11:56 2019 +0200
@@ -37,8 +37,9 @@
 		],
 		id: 'record',
 		url: "includes/db_product.php?select=archname"
-	};
-	var dataAdapter = new $.jqx.dataAdapter(source);
+	},
+	dataAdapter = new $.jqx.dataAdapter(source);
+
 	// initialize jqxGrid
 	$("#jqxgrid").jqxGrid({
 		width: 1280,
@@ -57,8 +58,7 @@
 				return "Bekijk";
 				}, buttonclick: function (row) {
 					var datarecord = dataAdapter.records[row];
-					var url= "prod_edit.php?record=" + datarecord.record + "&select=archname&return=prod_archive_name.php";
-					window.location.href = url;
+					window.location.href = "prod_edit.php?record=" + datarecord.record + "&select=archname&return=prod_archive_name.php";
 				}
 			}
 		],

--- a/www/js/prod_impbrew-min.js	Fri Sep 06 13:51:16 2019 +0200
+++ b/www/js/prod_impbrew-min.js	Fri Sep 06 14:11:56 2019 +0200
@@ -1,1 +1,1 @@
-$(document).ready(function(){$("#jqxFileUpload").jqxFileUpload({width:300,browseTemplate:"success",cancelTemplate:"inverse",uploadTemplate:"primary",theme:theme,multipleFilesUpload:false,accept:"application/json",uploadUrl:"upl_brew.php",fileInputName:"fileToUpload"});$("#eventsPanel").jqxPanel({width:800,height:200,theme:theme});$("#jqxFileUpload").on("select",function(c){var b=c.args;var d=b.file;var a=b.size;$("#eventsPanel").jqxPanel("clearcontent");$("#eventsPanel").jqxPanel("append","<strong>"+c.type+":</strong> "+d+"  size: "+a+"<br />")});$("#jqxFileUpload").on("uploadEnd",function(c){var b=c.args;var d=b.file;var a=b.response;$("#eventsPanel").jqxPanel("append","<strong>"+c.type+":</strong> ontvangen "+d+"<br />"+a+"<br />")})});
\ No newline at end of file
+$(document).ready(function(){$("#jqxFileUpload").jqxFileUpload({width:300,browseTemplate:"success",cancelTemplate:"inverse",uploadTemplate:"primary",theme:theme,multipleFilesUpload:false,accept:"application/json",uploadUrl:"upl_brew.php",fileInputName:"fileToUpload"});$("#eventsPanel").jqxPanel({width:800,height:200,theme:theme});$("#jqxFileUpload").on("select",function(c){var d,a,b=c.args;d=b.file;a=b.size;$("#eventsPanel").jqxPanel("clearcontent");$("#eventsPanel").jqxPanel("append","<strong>"+c.type+":</strong> "+d+"  size: "+a+"<br />")});$("#jqxFileUpload").on("uploadEnd",function(c){var d,a,b=c.args;d=b.file;a=b.response;$("#eventsPanel").jqxPanel("append","<strong>"+c.type+":</strong> ontvangen "+d+"<br />"+a+"<br />")})});
\ No newline at end of file

--- a/www/js/prod_impbrew.js	Fri Sep 06 13:51:16 2019 +0200
+++ b/www/js/prod_impbrew.js	Fri Sep 06 14:11:56 2019 +0200
@@ -40,16 +40,16 @@
 		theme: theme
 	});
 	$('#jqxFileUpload').on('select', function (event) {
-		var args = event.args;
-		var fileName = args.file;
-		var fileSize = args.size;
+		var fileName, fileSize, args = event.args;
+		fileName = args.file;
+		fileSize = args.size;
 		$('#eventsPanel').jqxPanel('clearcontent');
 		$('#eventsPanel').jqxPanel('append', '<strong>' + event.type + ':</strong> ' + fileName + '  size: ' + fileSize + '<br />');
 	});
 	$('#jqxFileUpload').on('uploadEnd', function (event) {
-		var args = event.args;
-		var fileName = args.file;
-		var serverResponce = args.response;
+		var fileName, serverResponce, args = event.args;
+		fileName = args.file;
+		serverResponce = args.response;
 		$('#eventsPanel').jqxPanel('append', '<strong>' + event.type + ':</strong> ontvangen ' + fileName + '<br />' + serverResponce + '<br />');
 	});