bms: comparison www/js/inv_hops.js

comparison: www/js/inv_hops.js

www/js/inv_hops.js

changeset 196: 531d5458782f
parent 37: 9362eb9e9e5b
child 199: dad62ec9af18

equal deleted inserted replaced

-:2ac491548d8d
+:531d5458782f
 /*****************************************************************************
-* Copyright (C) 2014-2018
+* Copyright (C) 2014-2019
 *
 * Michiel Broek <mbroek at mbse dot eu>
 *
 * This file is part of BrewCloud
 *
 		isModal: true,
 		modalOpacity: 0.4,
 		okButton: $('#delOk'),
 		cancelButton: $('#delCancel'),
 		initContent: function () {
-			$('#delOk').jqxButton({ width: '65px', theme: theme });
+			$('#delOk').jqxButton({ template: "danger", width: '65px', theme: theme });
-			$('#delCancel').jqxButton({ width: '65px', theme: theme });
+			$('#delCancel').jqxButton({ template: "success", width: '65px', theme: theme });
 			$('#delCancel').focus();
 		}
 	});
 	$('#eventWindow').jqxWindow('hide');
 }
 			{ name: 'humulene', type: 'float' },
 			{ name: 'caryophyllene', type: 'float' },
 			{ name: 'cohumulone', type: 'float' },
 			{ name: 'myrcene', type: 'float' },
 			{ name: 'hsi', type: 'float' },
-			{ name: 'type', type: 'string' },
+			{ name: 'type', type: 'int' },
-			{ name: 'form', type: 'string' },
+			{ name: 'form', type: 'int' },
 			{ name: 'notes', type: 'string' },
 			{ name: 'origin', type: 'string' },
 			{ name: 'substitutes', type: 'string' },
-			{ name: 'always_on_stock', type: 'bool' },
+			{ name: 'always_on_stock', type: 'int' },
 			{ name: 'inventory', type: 'float' },
 			{ name: 'cost', type: 'float' },
 			{ name: 'production_date', type: 'string' },
 			{ name: 'tht_date', type: 'string' },
 			{ name: 'total_oil', type: 'float' }
 			$.ajax({
 				dataType: 'json',
 				url: url,
 				cache: false,
 				data: data,
+				type: "POST",
 				success: function (data, status, xhr) {
 					// delete command is executed.
 					commit(true);
 				},
 				error: function (jqXHR, textStatus, errorThrown) {
 			$.ajax({
 				dataType: 'json',
 				url: url,
 				cache: false,
 				data: data,
+				type: "POST",
 				success: function (data, status, xhr) {
 					commit(true);
 				},
 				error: function(jqXHR, textStatus, errorThrown) {
 commit(false);
 			$.ajax({
 				dataType: 'json',
 				url: url,
 				cache: false,
 				data: data,
+				type: "POST",
 				success: function (data, status, xhr) {
 					// update command is executed.
 					commit(true);
 				},
 				error: function(jqXHR, textStatus, errorThrown) {
 					commit(false);
 				}
 			});
 		}
 	};
-//	var srcUse = [ "Boil", "Dry Hop", "Mash", "First Wort", "Aroma" ];	// Only in recipes
 	var srcType = [ "Bittering", "Aroma", "Both" ];
 	var srcForm = [ "Pellet", "Plug", "Leaf" ];
 	// initialize the input fields.
-	$("#name").jqxInput({ theme: theme, width: 250, height: 23 });
+	$("#name").jqxInput({ theme: theme, width: 640, height: 23 });
-	$("#alpha").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#alpha").jqxNumberInput( Perc1dec1 );
-	$("#beta").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#beta").jqxNumberInput( Perc1dec1 );
-	$("#humulene").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#humulene").jqxNumberInput( Perc1dec1 );
-	$("#caryophyllene").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#caryophyllene").jqxNumberInput( Perc1dec1 );
-	$("#cohumulone").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#cohumulone").jqxNumberInput( Perc1dec1 );
-	$("#myrcene").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#myrcene").jqxNumberInput( Perc1dec1 );
-	$("#hsi").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#hsi").jqxNumberInput( Perc1dec5 );
-	$("#type").jqxDropDownList({ theme: theme, source: srcType, width: 90, height: 23, dropDownHeight: 95 });
+	$("#type").jqxDropDownList({
-	$("#form").jqxDropDownList({ theme: theme, source: srcForm, width: 90, height: 23, dropDownHeight: 95 });
+		theme: theme,
+		source: HopTypeAdapter,
+		valueMember: 'id',
+		displayMember: 'nl',
+		width: 150,
+		height: 23,
+		autoDropDownHeight: true
+	});
+	$("#form").jqxDropDownList({
+		theme: theme,
+		source: HopFormAdapter,
+		valueMember: 'id',
+		displayMember: 'nl',
+		width: 150,
+		height: 23,
+		autoDropDownHeight: true
+	});
 	$("#notes").jqxInput({ theme: theme, width: 640, height: 100 });
-	$("#origin").jqxInput({ theme: theme, width: 250, height: 23 });
+	$("#origin").jqxInput({ theme: theme, width: 320, height: 23 });
-	$("#substitutes").jqxInput({ theme: theme, width: 250, height: 23 });
+	$("#substitutes").jqxInput({ theme: theme, width: 320, height: 23 });
 	$("#always_on_stock").jqxCheckBox({ theme: theme, width: 120, height: 23 });
-	$("#inventory").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#inventory").jqxNumberInput( Spin1dec1 );
-	$("#production_date").jqxDateTimeInput({ theme: theme, width: 100, height: 23, formatString: 'yyyy-MM-dd' });
+	$("#production_date").jqxDateTimeInput( Dateopts );
-	$("#cost").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 2, spinButtons: true });
+	$("#cost").jqxNumberInput( Spin2dec1 );
-	$("#tht_date").jqxDateTimeInput({ theme: theme, width: 100, height: 23, formatString: 'yyyy-MM-dd' });
+	$("#tht_date").jqxDateTimeInput( Dateopts );
-	$("#total_oil").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#total_oil").jqxNumberInput( Perc1dec1 );
 	var dataAdapter = new $.jqx.dataAdapter(source);
 	var editrow = -1;
 	// initialize jqxGrid
 	$("#jqxgrid").jqxGrid({
 		width: 1280,
 		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;'>Nieuw</span></div>");
 			container.append(addButton);
 			statusbar.append(container);
-			addButton.jqxButton({ theme: theme, width: 120, height: 20 });
+			addButton.jqxButton({ theme: theme, width: 90, height: 20 });
 			// add new row.
 			addButton.click(function (event) {
 				editrow = -1;
-				$("#popupWindow").jqxWindow({ position: { x: 230, y: 30 } });
+				$("#popupWindow").jqxWindow({ position: { x: 110, y: 30 } });
-				$("#name").val('');
+				$("#name").val('Nieuwe hop');
-				$("#alpha").val('');
+				$("#alpha").val(0);
-				$("#beta").val('');
+				$("#beta").val(0);
-				$("#humulene").val('');
+				$("#humulene").val(0);
-				$("#caryophyllene").val('');
+				$("#caryophyllene").val(0);
-				$("#cohumulone").val('');
+				$("#cohumulone").val(0);
-				$("#myrcene").val('');
+				$("#myrcene").val(0);
-				$("#hsi").val('');
+				$("#hsi").val(0);
-				$("#type").val('Bittering');
+				$("#type").val(0);
-				$("#form").val('Pellet');
+				$("#form").val(0);
 				$("#notes").val('');
 				$("#origin").val('');
 				$("#substitutes").val('');
-				$("#always_on_stock").val('');
+				$("#always_on_stock").val(0);
-				$("#inventory").val('');
+				$("#inventory").val(0);
-				$("#cost").val('');
+				$("#cost").val(0);
 				$("#production_date").val('');
 				$("#tht_date").val('');
-				$("#total_oil").val('');
+				$("#total_oil").val(0);
 				$("#popupWindow").jqxWindow('open');
 			});
 		},
 		filterable: true,
 		filtermode: 'excel',
 		columns: [
 			{ text: 'Herkomst', datafield: 'origin', align: 'center', cellsalign: 'center', width: 150 },
 			{ text: 'Hop Naam', datafield: 'name' },
-			{ text: 'Soort', datafield: 'type', align: 'center', cellsalign: 'center', width: 90 },
+			{ text: 'Soort', datafield: 'type', align: 'center', cellsalign: 'center', width: 90,
-			{ text: 'Vorm', datafield: 'form', align: 'center', cellsalign: 'center', width: 90 },
+			  cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
+				return "<div style='margin: 4px;' class='jqx-center-align'>" + HopTypeData[value].nl + "</div>";
+			  }
+			},
+			{ text: 'Vorm', datafield: 'form', align: 'center', cellsalign: 'center', width: 90,
+			  cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
+				return "<div style='margin: 4px;' class='jqx-center-align'>" + HopFormData[value].nl + "</div>";
+			  }
+		       	},
 			{ text: 'Alpha %', datafield: 'alpha', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'p1' },
 			{ text: 'Beta %', datafield: 'beta', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'p1' },
 			{ text: 'Cohumuloon %%', datafield: 'cohumulone', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'p1' },
 			{ text: 'HSI', datafield: 'hsi', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
 			{ text: 'Oogst datum', datafield: 'production_date', align: 'center', cellsalign: 'center', width: 100 },
 			{ text: 'Voor, gr.', datafield: 'inventory', width: 70, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
 			{ text: 'Prijs /kg', datafield: 'cost', width: 70, align: 'right', cellsalign: 'right', cellsformat: 'c2' },
-			{ text: 'Wijzig', datafield: 'Wijzig', columntype: 'button', width: 120, align: 'center', cellsrenderer: function () {
+			{ text: 'Wijzig', datafield: 'Wijzig', columntype: 'button', width: 100, align: 'center', cellsrenderer: function () {
 				return "Wijzig";
 				}, buttonclick: function (row) {
 					// open the popup window when the user clicks a button.
 					editrow = row;
-					$("#popupWindow").jqxWindow({ position: { x: 230, y: 30 } });
+					$("#popupWindow").jqxWindow({ position: { x: 110, y: 30 } });
 					// get the clicked row's data and initialize the input fields.
 					var dataRecord = $("#jqxgrid").jqxGrid('getrowdata', editrow);
 					$("#name").val(dataRecord.name);
 					$("#alpha").val(dataRecord.alpha);
 					$("#beta").val(dataRecord.beta);
 			}
 		]
 	});
 	// initialize the popup window and buttons.
 	$("#popupWindow").jqxWindow({
-		width: 860, resizable: false, theme: theme, isModal: true, autoOpen: false, cancelButton: $("#Cancel"), modalOpacity: 0.40
+		width: 1050,
+		height: 550,
+		resizable: false,
+		theme: theme,
+		isModal: true,
+		autoOpen: false,
+		cancelButton: $("#Cancel"),
+		modalOpacity: 0.40
 	});
 	$("#popupWindow").on('open', function () {
 		$("#name").jqxInput('selectAll');
 	});
-	$("#Delete").jqxButton({ theme: theme });
+	$("#Delete").jqxButton({ template: "danger", width: '90px', theme: theme });
 	$("#Delete").click(function () {
 		if (editrow >= 0) {
 			// Open a popup to confirm this action.
 			$('#eventWindow').jqxWindow('open');
 			$("#delOk").click(function () {
 				$("#jqxgrid").jqxGrid('deleterow', rowID);
 			});
 		}
 		$("#popupWindow").jqxWindow('hide');
 	});
-	$("#Cancel").jqxButton({ theme: theme });
+	$("#Cancel").jqxButton({ template: "primary", width: '90px', theme: theme });
-	$("#Save").jqxButton({ theme: theme });
+	$("#Save").jqxButton({ template: "success", width: '90px', theme: theme });
 	// update the edited row when the user clicks the 'Save' button.
 	$("#Save").click(function () {
+		var rowID = -1;
 		if (editrow >= 0) {
 			var rowID = $('#jqxgrid').jqxGrid('getrowid', editrow);
-			var row = {
+		}
-				record: rowID,
+		var row = {
-				name: $("#name").val(),
+			record: rowID,
-				alpha: parseFloat($("#alpha").jqxNumberInput('decimal')),
+			name: $("#name").val(),
-				beta: parseFloat($("#beta").jqxNumberInput('decimal')),
+			alpha: parseFloat($("#alpha").jqxNumberInput('decimal')),
-				humulene: parseFloat($("#humulene").jqxNumberInput('decimal')),
+			beta: parseFloat($("#beta").jqxNumberInput('decimal')),
-				caryophyllene: parseFloat($("#caryophyllene").jqxNumberInput('decimal')),
+			humulene: parseFloat($("#humulene").jqxNumberInput('decimal')),
-				cohumulone: parseFloat($("#cohumulone").jqxNumberInput('decimal')),
+			caryophyllene: parseFloat($("#caryophyllene").jqxNumberInput('decimal')),
-				myrcene: parseFloat($("#myrcene").jqxNumberInput('decimal')),
+			cohumulone: parseFloat($("#cohumulone").jqxNumberInput('decimal')),
-				hsi: parseFloat($("#hsi").jqxNumberInput('decimal')),
+			myrcene: parseFloat($("#myrcene").jqxNumberInput('decimal')),
-				type: $("#type").val(),
+			hsi: parseFloat($("#hsi").jqxNumberInput('decimal')),
-				form: $("#form").val(),
+			type: $("#type").val(),
-				notes: $("#notes").val(),
+			form: $("#form").val(),
-				origin: $("#origin").val(),
+			notes: $("#notes").val(),
-				substitutes: $("#substitutes").val(),
+			origin: $("#origin").val(),
-				always_on_stock: $("#always_on_stock").val(),
+			substitutes: $("#substitutes").val(),
-				inventory: parseFloat($("#inventory").jqxNumberInput('decimal')),
+			always_on_stock: $("#always_on_stock").val(),
-		                cost: parseFloat($("#cost").jqxNumberInput('decimal')),
+			inventory: parseFloat($("#inventory").jqxNumberInput('decimal')),
-		                production_date: $("#production_date").val(),
+	                cost: parseFloat($("#cost").jqxNumberInput('decimal')),
-		                tht_date: $("#tht_date").val(),
+	                production_date: $("#production_date").val(),
-				total_oil: parseFloat($("#total_oil").jqxNumberInput('decimal'))
+	                tht_date: $("#tht_date").val(),
-			};
+			total_oil: parseFloat($("#total_oil").jqxNumberInput('decimal'))
+		};
+		if (editrow >= 0) {
 			$('#jqxgrid').jqxGrid('updaterow', rowID, row);
-			$("#popupWindow").jqxWindow('hide');
 		} else {
-			// Insert a record
+			$('#jqxgrid').jqxGrid('addrow', null, row);
-			var newrow = {
+		}
-				record: -1,
+		$("#popupWindow").jqxWindow('hide');
-				name: $("#name").val(),
+		location.reload( true );        // reload ourself.
-				alpha: parseFloat($("#alpha").jqxNumberInput('decimal')),
-				beta: parseFloat($("#beta").jqxNumberInput('decimal')),
-				humulene: parseFloat($("#humulene").jqxNumberInput('decimal')),
-				caryophyllene: parseFloat($("#caryophyllene").jqxNumberInput('decimal')),
-				cohumulone: parseFloat($("#cohumulone").jqxNumberInput('decimal')),
-				myrcene: parseFloat($("#myrcene").jqxNumberInput('decimal')),
-				hsi: parseFloat($("#hsi").jqxNumberInput('decimal')),
-				type: $("#type").val(),
-				form: $("#form").val(),
-				notes: $("#notes").val(),
-				origin: $("#origin").val(),
-				substitutes: $("#substitutes").val(),
-				always_on_stock: $("#always_on_stock").val(),
-				inventory: parseFloat($("#inventory").jqxNumberInput('decimal')),
-				cost: parseFloat($("#cost").jqxNumberInput('decimal')),
-				production_date: $("#production_date").val(),
-				tht_date: $("#tht_date").val(),
-				total_oil: parseFloat($("#total_oil").jqxNumberInput('decimal'))
-			};
-			$('#jqxgrid').jqxGrid('addrow', null, newrow);
-			$("#popupWindow").jqxWindow('hide');
-		}
 	});
 	createDelElements();
 });