Mercurial > bms / changeset

--- a/www/js/prod_inprod-min.js	Fri Sep 06 13:35:18 2019 +0200
+++ b/www/js/prod_inprod-min.js	Fri Sep 06 13:51:16 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:"birth",type:"string"},{name:"stage",type:"int"},{name:"brew_date",type:"string"},{name:"package_date",type:"string"},],id:"record",url:"includes/db_product.php?select=inprod"};var b=new $.jqx.dataAdapter(a);$("#jqxgrid").jqxGrid({width:1280,height:630,source:b,theme:theme,showstatusbar:true,renderstatusbar:function(e){var c=$("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");var d=$("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Add</span></div>");c.append(d);e.append(c);d.jqxButton({theme:theme,width:90,height:20});d.click(function(g){var f="prod_new.php?return=prod_inprod.php";window.location.href=f})},columns:[{text:"Datum",datafield:"birth",width:120},{text:"Code",datafield:"code",width:120},{text:"Naam",datafield:"name"},{text:"Fase",datafield:"stage",width:200,cellsrenderer:function(i,f,k,m,g,n){var c=StageData[k].nl;if(k==2){c=StageData[k].nl+" op "+n.brew_date}if(k==7||k==8){var j=new Date();var l=n.package_date;l=l.split("-");date1=new Date(j.getFullYear(),j.getMonth(),j.getDate());l=new Date(l[0],l[1]-1,l[2]);date1_unixtime=parseInt(date1.getTime()/1000);date2_unixtime=parseInt(l.getTime()/1000);var h=date1_unixtime-date2_unixtime;var e=Math.round(h/60/60/24);if(e>=14){c=StageData[k].nl+" dag "+(e-14)+" van 28"}else{c=StageData[k].nl+" dag "+e+" van 14"}}return"<span style='margin: 3px; margin-top: 6px; float: left;'>"+c+"</span>"}},{text:"",datafield:"Edit",width:100,align:"center",columntype:"button",cellsrenderer:function(){return"Wijzig"},buttonclick:function(e){var d=b.records[e];var c="prod_edit.php?record="+d.record+"&select=inprod&return=prod_inprod.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:"birth",type:"string"},{name:"stage",type:"int"},{name:"brew_date",type:"string"},{name:"package_date",type:"string"},],id:"record",url:"includes/db_product.php?select=inprod"},b=new $.jqx.dataAdapter(a);$("#jqxgrid").jqxGrid({width:1280,height:630,source:b,theme:theme,showstatusbar:true,renderstatusbar:function(e){var c,d;c=$("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");d=$("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Add</span></div>");c.append(d);e.append(c);d.jqxButton({theme:theme,width:90,height:20});d.click(function(f){window.location.href="prod_new.php?return=prod_inprod.php"})},columns:[{text:"Datum",datafield:"birth",width:120},{text:"Code",datafield:"code",width:120},{text:"Naam",datafield:"name"},{text:"Fase",datafield:"stage",width:200,cellsrenderer:function(k,f,m,o,g,q){var c,l,p,n,h,j,i,e;c=StageData[m].nl;if(m==2){c=StageData[m].nl+" op "+q.brew_date}if(m==7||m==8){l=new Date();n=q.package_date;n=n.split("-");p=new Date(l.getFullYear(),l.getMonth(),l.getDate());n=new Date(n[0],n[1]-1,n[2]);h=parseInt(p.getTime()/1000);j=parseInt(n.getTime()/1000);i=h-j;e=Math.round(i/60/60/24);if(e>=14){c=StageData[m].nl+" dag "+(e-14)+" van 28"}else{c=StageData[m].nl+" dag "+e+" van 14"}}return"<span style='margin: 3px; margin-top: 6px; float: left;'>"+c+"</span>"}},{text:"",datafield:"Edit",width:100,align:"center",columntype:"button",cellsrenderer:function(){return"Wijzig"},buttonclick:function(d){var c=b.records[d];window.location.href="prod_edit.php?record="+c.record+"&select=inprod&return=prod_inprod.php"}}],})});
\ No newline at end of file

--- a/www/js/prod_inprod.js	Fri Sep 06 13:35:18 2019 +0200
+++ b/www/js/prod_inprod.js	Fri Sep 06 13:51:16 2019 +0200
@@ -36,8 +36,9 @@
 		],
 		id: 'record',
 		url: "includes/db_product.php?select=inprod"
-	};
-	var dataAdapter = new $.jqx.dataAdapter(source);
+	},
+	dataAdapter = new $.jqx.dataAdapter(source);
+
 	// initialize jqxGrid
 	$("#jqxgrid").jqxGrid({
 		width: 1280,
@@ -46,15 +47,15 @@
 		theme: theme,
 		showstatusbar: true,
 		renderstatusbar: function (statusbar) {
-			var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
-			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Add</span></div>");
+			var container, addButton;
+			container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
+			addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Add</span></div>");
 			container.append(addButton);
 			statusbar.append(container);
 			addButton.jqxButton({ theme: theme, width: 90, height: 20 });
 			// add new recipe.
 			addButton.click(function (event) {
-				var url= "prod_new.php?return=prod_inprod.php";
-				window.location.href = url;
+				window.location.href = "prod_new.php?return=prod_inprod.php";
 			});
 		},
 		columns: [
@@ -63,14 +64,15 @@
 			{ text: 'Naam', datafield: 'name' },
 			{ text: 'Fase', datafield: 'stage', width: 200,
 			  cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
+				var fase, d, date1, date2, date1_unixtime, date2_unixtime, timeDifference, timeDifferenceInDays;
 				// 2 = brew, 6 = package, 7 = carbonation, 8 = mature, 9 = taste
-				var fase = StageData[value].nl;
+				fase = StageData[value].nl;
 				if (value == 2) {
 					fase = StageData[value].nl + " op " + rowdata.brew_date;
 				}
 				if (value == 7 || value == 8) {
-					var d = new Date();
-					var date2 = rowdata.package_date;
+					d = new Date();
+					date2 = rowdata.package_date;
 					date2 = date2.split('-');
 					// Now we convert the array to a Date object
 					date1 = new Date(d.getFullYear(), d.getMonth(), d.getDate());
@@ -79,9 +81,9 @@
 					date1_unixtime = parseInt(date1.getTime() / 1000);
 					date2_unixtime = parseInt(date2.getTime() / 1000);
 					// This is the calculated difference in seconds
-					var timeDifference = date1_unixtime - date2_unixtime;
+					timeDifference = date1_unixtime - date2_unixtime;
 					// Round the result for brews that overlap summer/wintertime changes.
-					var timeDifferenceInDays = Math.round(timeDifference / 60 / 60 / 24);
+					timeDifferenceInDays = Math.round(timeDifference / 60 / 60 / 24);
 					if (timeDifferenceInDays >= 14)
 						fase = StageData[value].nl + " dag " + (timeDifferenceInDays - 14) + " van 28";
 					else
@@ -94,8 +96,7 @@
 				return "Wijzig";
 				}, buttonclick: function (row) {
 					var datarecord = dataAdapter.records[row];
-					var url= "prod_edit.php?record=" + datarecord.record + "&select=inprod&return=prod_inprod.php";
-					window.location.href = url;
+					window.location.href = "prod_edit.php?record=" + datarecord.record + "&select=inprod&return=prod_inprod.php";
 				}
 			}
 		],