--- a/www/js/inv_yeasts.js Wed Jan 23 19:43:55 2019 +0100
+++ b/www/js/inv_yeasts.js Wed Jan 23 22:36:31 2019 +0100
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2014-2018
+ * Copyright (C) 2014-2019
*
* Michiel Broek <mbroek at mbse dot eu>
*
@@ -33,8 +33,8 @@
okButton: $('#delOk'),
cancelButton: $('#delCancel'),
initContent: function () {
- $('#delOk').jqxButton({ width: '65px', theme: theme });
- $('#delCancel').jqxButton({ width: '65px', theme: theme });
+ $('#delOk').jqxButton({ template: "danger", width: '65px', theme: theme });
+ $('#delCancel').jqxButton({ template: "success", width: '65px', theme: theme });
$('#delCancel').focus();
}
});
@@ -43,6 +43,14 @@
$(document).ready(function () {
+
+ var dataRecord = {};
+
+ function calcTotal(cost, inventory) {
+
+ $('#totval').val(cost * (inventory / 1000));
+ }
+
var url = "includes/db_inventory_yeasts.php";
// prepare the data
var source = {
@@ -51,17 +59,17 @@
datafields: [
{ name: 'record', type: 'number' },
{ name: 'name', type: 'string' },
- { name: 'type', type: 'string' },
- { name: 'form', type: 'string' },
+ { name: 'type', type: 'int' },
+ { name: 'form', type: 'int' },
{ name: 'laboratory', type: 'string' },
{ name: 'product_id', type: 'string' },
- { name: 'min_temperature', type: 'number' },
- { name: 'max_temperature', type: 'number' },
- { name: 'flocculation', type: 'string' },
+ { name: 'min_temperature', type: 'float' },
+ { name: 'max_temperature', type: 'float' },
+ { name: 'flocculation', type: 'int' },
{ name: 'attenuation', type: 'float' },
{ name: 'notes', type: 'string' },
{ name: 'best_for', type: 'string' },
- { name: 'max_reuse', type: 'number' },
+ { name: 'max_reuse', type: 'int' },
{ name: 'inventory', type: 'float' },
{ name: 'cost', type: 'float' },
{ name: 'production_date', type: 'string' },
@@ -77,6 +85,7 @@
url: url,
cache: false,
data: data,
+ type: "POST",
success: function (data, status, xhr) {
// delete command is executed.
commit(true);
@@ -93,6 +102,7 @@
url: url,
cache: false,
data: data,
+ type: "POST",
success: function (data, status, xhr) {
commit(true);
},
@@ -108,6 +118,7 @@
url: url,
cache: false,
data: data,
+ type: "POST",
success: function (data, status, xhr) {
// update command is executed.
commit(true);
@@ -118,28 +129,51 @@
});
}
};
- var srcType = [ "Ale", "Lager", "Wheat", "Wine", "Champagne" ];
- var srcForm = [ "Liquid", "Dry", "Slant", "Culture", "Bottle", "Frozen" ];
- var srcFlocculation = [ "Low", "Medium", "High", "Very High" ];
// initialize the input fields.
- $("#name").jqxInput({ theme: theme, width: 250, height: 23 });
- $("#laboratory").jqxInput({ theme: theme, width: 150, height: 23 });
- $("#product_id").jqxInput({ theme: theme, width: 120, height: 23 });
- $("#type").jqxDropDownList({ theme: theme, source: srcType, width: 90, height: 23, dropDownHeight: 170 });
- $("#form").jqxDropDownList({ theme: theme, source: srcForm, selectedIndex: 0, width: 90, height: 23, dropDownHeight: 195 });
- $("#notes").jqxInput({ theme: theme, width: 640, height: 120 });
- $("#best_for").jqxInput({ theme: theme, width: 640, height: 23 });
- $("#inventory").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
- $("#production_date").jqxDateTimeInput({ theme: theme, width: 100, height: 23, formatString: 'yyyy-MM-dd' });
-
- $("#min_temperature").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, max: 35, decimalDigits: 0, spinButtons: true });
- $("#max_temperature").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, max: 35, decimalDigits: 0, spinButtons: true });
- $("#flocculation").jqxDropDownList({ theme: theme, source: srcFlocculation, width: 90, height: 23, dropDownHeight: 130 });
- $("#attenuation").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 50, max: 100, decimalDigits: 1, spinButtons: true });
-
- $("#max_reuse").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, max: 10, decimalDigits: 0, spinButtons: true });
- $("#cost").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 2, spinButtons: true });
- $("#tht_date").jqxDateTimeInput({ theme: theme, width: 100, height: 23, formatString: 'yyyy-MM-dd' });
+ $("#name").jqxInput({ theme: theme, width: 640, height: 23 });
+ $("#laboratory").jqxInput({ theme: theme, width: 320, height: 23 });
+ $("#product_id").jqxInput({ theme: theme, width: 320, height: 23 });
+ $("#type").jqxDropDownList({
+ theme: theme,
+ source: YeastTypeAdapter,
+ valueMember: 'id',
+ displayMember: 'nl',
+ width: 180,
+ height: 23,
+ autoDropDownHeight: true
+ });
+ $("#form").jqxDropDownList({
+ theme: theme,
+ source: YeastFormAdapter,
+ valueMember: 'id',
+ displayMember: 'nl',
+ selectedIndex: 0,
+ width: 180,
+ height: 23,
+ autoDropDownHeight: true
+ });
+ $("#notes").jqxInput({ theme: theme, width: 800, height: 120 });
+ $("#best_for").jqxInput({ theme: theme, width: 320, height: 50 });
+ $("#inventory").jqxNumberInput( Spin1dec1 );
+ $("#production_date").jqxDateTimeInput( Dateopts );
+ $("#min_temperature").jqxNumberInput( YeastT );
+ $("#max_temperature").jqxNumberInput( YeastT );
+ $("#flocculation").jqxDropDownList({
+ theme: theme,
+ source: FlocculationAdapter,
+ valueMember: 'id',
+ displayMember: 'nl',
+ width: 180,
+ height: 23,
+ autoDropDownHeight: true
+ });
+ $("#attenuation").jqxNumberInput( Perc1dec1 );
+ $("#max_reuse").jqxNumberInput( PosInt );
+ $("#max_reuse").jqxNumberInput({ max: 10 });
+ $("#cost").jqxNumberInput( Spin2dec1 );
+ $("#tht_date").jqxDateTimeInput( Dateopts );
+ $("#totval").jqxNumberInput( Spin2dec1 );
+ $("#totval").jqxNumberInput({ width: 90, readOnly: true, spinButtons: false });
var dataAdapter = new $.jqx.dataAdapter(source);
var editrow = -1;
@@ -156,25 +190,25 @@
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('');
$("#laboratory").val('');
$("#product_id").val('');
- $("#type").val('Ale');
- $("#form").val('Liquid');
- $("#min_temperature").val('');
- $("#max_temperature").val('');
- $("#flocculation").val('Low');
- $("#attenuation").val('75.0');
+ $("#type").val(0);
+ $("#form").val(0);
+ $("#min_temperature").val(18);
+ $("#max_temperature").val(22);
+ $("#flocculation").val(0);
+ $("#attenuation").val(77);
$("#notes").val('');
$("#best_for").val('');
- $("#max_reuse").val('');
- $("#inventory").val('');
- $("#cost").val('');
+ $("#max_reuse").val(10);
+ $("#inventory").val(0);
+ $("#cost").val(0);
$("#production_date").val('');
$("#tht_date").val('');
$("#popupWindow").jqxWindow('open');
@@ -186,19 +220,27 @@
{ text: 'Laboratorium', datafield: 'laboratory', width: 150 },
{ text: 'Product ID', datafield: 'product_id', width: 120 },
{ text: 'Gist naam', datafield: 'name' },
- { text: 'Type', datafield: 'type', align: 'center', cellsalign: 'center', width: 90 },
- { text: 'Vorm', datafield: 'form', align: 'center', cellsalign: 'center', width: 90 },
+ { text: 'Type', datafield: 'type', align: 'center', cellsalign: 'center', width: 90,
+ cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
+ return "<div style='margin: 4px;' class='jqx-center-align'>" + YeastTypeData[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'>" + YeastFormData[value].nl + "</div>";
+ }
+ },
{ text: 'Vergistingsgraad', datafield: 'attenuation', width: 120, align: 'right', cellsalign: 'right', cellsformat: 'p0' },
{ text: 'Voor. gr/ml', datafield: 'inventory', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
{ text: 'Prijs kg/l', datafield: 'cost', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'c2' },
- { text: 'Wijzig', datafield: 'Edit', columntype: 'button', width: 120, align: 'center', cellsrenderer: function () {
+ { text: 'Wijzig', datafield: 'Edit', 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);
+ dataRecord = $("#jqxgrid").jqxGrid('getrowdata', editrow);
$("#name").val(dataRecord.name);
$("#laboratory").val(dataRecord.laboratory);
$("#product_id").val(dataRecord.product_id);
@@ -215,20 +257,38 @@
$("#cost").val(dataRecord.cost);
$("#production_date").val(dataRecord.production_date);
$("#tht_date").val(dataRecord.tht_date);
+ calcTotal(dataRecord.cost, dataRecord.inventory);
// show the popup window.
$("#popupWindow").jqxWindow('open');
}
}
]
});
+
+ $("#cost").on('change', function (event) {
+ dataRecord.cost = parseFloat(event.args.value);
+ calcTotal(dataRecord.cost, dataRecord.inventory);
+ });
+ $("#inventory").on('change', function (event) {
+ dataRecord.inventory = parseFloat(event.args.value);
+ calcTotal(dataRecord.cost, dataRecord.inventory);
+ });
+
// 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.
@@ -240,57 +300,40 @@
}
$("#popupWindow").jqxWindow('hide');
});
- $("#Cancel").jqxButton({ theme: theme });
- $("#Save").jqxButton({ theme: theme });
+ $("#Cancel").jqxButton({ template: "primary", width: '90px', 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,
- name: $("#name").val(),
- type: $("#type").val(),
- form: $("#form").val(),
- laboratory: $("#laboratory").val(),
- product_id: $("#product_id").val(),
- min_temperature: parseInt($("#min_temperature").jqxNumberInput('decimal')),
- max_temperature: parseInt($("#max_temperature").jqxNumberInput('decimal')),
- flocculation: $("#flocculation").val(),
- attenuation: parseFloat($("#attenuation").jqxNumberInput('decimal')),
- notes: $("#notes").val(),
- best_for: $("#best_for").val(),
- max_reuse: parseInt($("#max_reuse").jqxNumberInput('decimal')),
- inventory: parseFloat($("#inventory").jqxNumberInput('decimal')),
- cost: parseFloat($("#cost").jqxNumberInput('decimal')),
- production_date: $("#production_date").val(),
- tht_date: $("#tht_date").val()
- };
+ rowID = $('#jqxgrid').jqxGrid('getrowid', editrow);
+ }
+ var row = {
+ record: rowID,
+ name: $("#name").val(),
+ type: $("#type").val(),
+ form: $("#form").val(),
+ laboratory: $("#laboratory").val(),
+ product_id: $("#product_id").val(),
+ min_temperature: parseInt($("#min_temperature").jqxNumberInput('decimal')),
+ max_temperature: parseInt($("#max_temperature").jqxNumberInput('decimal')),
+ flocculation: $("#flocculation").val(),
+ attenuation: parseFloat($("#attenuation").jqxNumberInput('decimal')),
+ notes: $("#notes").val(),
+ best_for: $("#best_for").val(),
+ max_reuse: parseInt($("#max_reuse").jqxNumberInput('decimal')),
+ inventory: parseFloat($("#inventory").jqxNumberInput('decimal')),
+ cost: parseFloat($("#cost").jqxNumberInput('decimal')),
+ production_date: $("#production_date").val(),
+ tht_date: $("#tht_date").val()
+ };
+ if (editrow >= 0) {
$('#jqxgrid').jqxGrid('updaterow', rowID, row);
- $("#popupWindow").jqxWindow('hide');
} else {
- // Insert a record
- var newrow = {
- record: -1,
- name: $("#name").val(),
- type: $("#type").val(),
- form: $("#form").val(),
- laboratory: $("#laboratory").val(),
- product_id: $("#product_id").val(),
- min_temperature: parseInt($("#min_temperature").jqxNumberInput('decimal')),
- max_temperature: parseInt($("#max_temperature").jqxNumberInput('decimal')),
- flocculation: $("#flocculation").val(),
- attenuation: parseFloat($("#attenuation").jqxNumberInput('decimal')),
- notes: $("#notes").val(),
- best_for: $("#best_for").val(),
- max_reuse: parseInt($("#max_reuse").jqxNumberInput('decimal')),
- inventory: parseFloat($("#inventory").jqxNumberInput('decimal')),
- cost: parseFloat($("#cost").jqxNumberInput('decimal')),
- production_date: $("#production_date").val(),
- tht_date: $("#tht_date").val()
- };
- $('#jqxgrid').jqxGrid('addrow', null, newrow);
- $("#popupWindow").jqxWindow('hide');
+ $('#jqxgrid').jqxGrid('addrow', null, row);
}
+ $("#popupWindow").jqxWindow('hide');
+ location.reload( true ); // reload ourself.
});
createDelElements();
});