--- a/www/js/profile_styles.js Sun Jan 27 17:39:53 2019 +0100
+++ b/www/js/profile_styles.js Sun Jan 27 20:40:24 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,7 +43,10 @@
$(document).ready(function () {
+
+ var dataRecord = {};
var url = "includes/db_profile_styles.php";
+
// prepare the data
var source = {
datatype: "json",
@@ -55,7 +58,7 @@
{ name: 'category_number', type: 'number' },
{ name: 'style_letter', type: 'string' },
{ name: 'style_guide', type: 'string' },
- { name: 'type', type: 'string' },
+ { name: 'type', type: 'int' },
{ name: 'og_min', type: 'float' },
{ name: 'og_max', type: 'float' },
{ name: 'fg_min', type: 'float' },
@@ -83,6 +86,7 @@
url: url,
cache: false,
data: data,
+ type: "POST",
success: function (data, status, xhr) {
// delete command is executed.
commit(true);
@@ -99,6 +103,7 @@
url: url,
cache: false,
data: data,
+ type: "POST",
success: function (data, status, xhr) {
commit(true);
},
@@ -114,6 +119,7 @@
url: url,
cache: false,
data: data,
+ type: "POST",
success: function (data, status, xhr) {
// update command is executed.
commit(true);
@@ -126,29 +132,45 @@
};
var srcType = [ "Lager", "Ale", "Mead", "Wheat", "Mixed", "Cider" ];
// initialize the input fields.
- $("#name").jqxInput({ theme: theme, width: 250, height: 23 });
- $("#category").jqxInput({ theme: theme, width: 250, height: 23 });
- $("#category_number").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, max: 1000, decimalDigits: 0, spinButtons: true });
+ $("#name").jqxInput({ theme: theme, width: 320, height: 23 });
+ $("#category").jqxInput({ theme: theme, width: 320, height: 23 });
+ $("#category_number").jqxNumberInput( PosInt );
$("#style_letter").jqxInput({ theme: theme, width: 250, height: 23 });
- $("#style_guide").jqxInput({ theme: theme, width: 250, height: 23 });
- $("#type").jqxDropDownList({ theme: theme, source: srcType, width: 90, height: 23, dropDownHeight: 185 });
- $("#og_min").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 1.000, max: 1.200, decimalDigits: 3, spinButtons: true, spinButtonsStep: 0.001 });
- $("#og_max").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 1.000, max: 1.200, decimalDigits: 3, spinButtons: true, spinButtonsStep: 0.001 });
- $("#fg_min").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0.990, max: 1.100, decimalDigits: 3, spinButtons: true, spinButtonsStep: 0.001 });
- $("#fg_max").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 1.000, max: 1.100, decimalDigits: 3, spinButtons: true, spinButtonsStep: 0.001 });
- $("#ibu_min").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, max: 200, decimalDigits: 0, spinButtons: true });
- $("#ibu_max").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, max: 200, decimalDigits: 0, spinButtons: true });
- $("#color_min").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 1, max: 200, decimalDigits: 0, spinButtons: true });
- $("#color_max").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 1, max: 200, decimalDigits: 0, spinButtons: true });
- $("#carb_min").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, max: 5, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
- $("#carb_max").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, max: 5, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
- $("#abv_min").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, max: 20, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
- $("#abv_max").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, max: 20, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+ $("#style_guide").jqxInput({ theme: theme, width: 320, height: 23 });
+ $("#type").jqxDropDownList({
+ theme: theme,
+ source: StyleTypeAdapter,
+ valueMember: 'id',
+ displayMember: 'nl',
+ width: 180,
+ height: 23,
+ autoDropDownHeight: true
+ });
+ $("#og_min").jqxNumberInput( SGopts );
+ $("#og_max").jqxNumberInput( SGopts );
+ $("#fg_min").jqxNumberInput( SGopts );
+ $("#fg_max").jqxNumberInput( SGopts );
+ $("#ibu_min").jqxNumberInput( PosInt );
+ $("#ibu_min").jqxNumberInput({ max: 200 });
+ $("#ibu_max").jqxNumberInput( PosInt );
+ $("#ibu_max").jqxNumberInput({ max: 200 });
+ $("#color_min").jqxNumberInput( PosInt );
+ $("#color_min").jqxNumberInput({ max: 200 });
+ $("#color_max").jqxNumberInput( PosInt );
+ $("#color_max").jqxNumberInput({ max: 200 });
+ $("#carb_min").jqxNumberInput( Spin1dec1 );
+ $("#carb_min").jqxNumberInput({ max: 5 });
+ $("#carb_max").jqxNumberInput( Spin1dec1 );
+ $("#carb_max").jqxNumberInput({ max: 5 });
+ $("#abv_min").jqxNumberInput( Spin1dec1 );
+ $("#abv_min").jqxNumberInput({ max: 20 });
+ $("#abv_max").jqxNumberInput( Spin1dec1 );
+ $("#abv_max").jqxNumberInput({ max: 20 });
+ $("#notes").jqxInput({ theme: theme, width: 800, height: 100 });
+ $("#profile").jqxInput({ theme: theme, width: 800, height: 48 });
+ $("#ingredients").jqxInput({ theme: theme, width: 800, height: 23 });
+ $("#examples").jqxInput({ theme: theme, width: 800, height: 48 });
- $("#notes").jqxInput({ theme: theme, width: 640, height: 100 });
- $("#profile").jqxInput({ theme: theme, width: 640, height: 48 });
- $("#ingredients").jqxInput({ theme: theme, width: 640, height: 23 });
- $("#examples").jqxInput({ theme: theme, width: 640, height: 48 });
var dataAdapter = new $.jqx.dataAdapter(source);
var editrow = -1;
// initialize jqxGrid
@@ -164,29 +186,28 @@
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: 130, y: 20 } });
- $("#name").val('');
+ $("#name").val('Nieuwe stijl');
$("#category").val('');
$("#category_number").val('');
$("#style_letter").val('');
- $("#style_guide").val('');
- $("#type").val('');
- $("#og_min").val('');
- $("#og_max").val('');
- $("#fg_min").val('');
- $("#fg_max").val('');
- $("#ibu_min").val('');
- $("#ibu_max").val('');
- $("#color_min").val('');
- $("#color_max").val('');
- $("#carb_min").val('');
- $("#carb_max").val('');
- $("#abv_min").val('');
- $("#abv_max").val('');
+ $("#style_guide").val('BKG 2015');
+ $("#type").val(0);
+ $("#og_min").val(1.030);
+ $("#og_max").val(1.050);
+ $("#fg_min").val(1.005);
+ $("#fg_max").val(1.010);
+ $("#ibu_min").val(20);
+ $("#ibu_max").val(30);
+ $("#color_min").val(52);
+ $("#color_max").val(79);
+ $("#carb_min").val(2.0);
+ $("#carb_max").val(2.5);
+ $("#abv_min").val(4.0);
+ $("#abv_max").val(5.0);
$("#notes").val('');
$("#profile").val('');
$("#ingredients").val('');
@@ -198,25 +219,24 @@
filtermode: 'excel',
columns: [
{ text: 'Groep', datafield: 'style_letter', width: 30 },
- { text: 'Style Name', datafield: 'name' },
- { text: 'OG', datafield: 'og_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f3' },
- { text: 'OG', datafield: 'og_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f3' },
- { text: 'FG', datafield: 'fg_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f3' },
- { text: 'FG', datafield: 'fg_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f3' },
- { text: 'IBU', datafield: 'ibu_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f0' },
- { text: 'IBU', datafield: 'ibu_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f0' },
- { text: 'EBC', datafield: 'color_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f0' },
- { text: 'EBC', datafield: 'color_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f0' },
- { text: 'Co2', datafield: 'carb_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
- { text: 'Co2', datafield: 'carb_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
- { text: 'ABV', datafield: 'abv_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
- { text: 'ABV', datafield: 'abv_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
- { text: 'Wijzig', datafield: 'Edit', width: 120, align: 'center', columntype: 'button', cellsrenderer: function () {
+ { text: 'Style Name', menu: false, datafield: 'name' },
+ { text: 'OG', menu: false, datafield: 'og_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f3' },
+ { text: 'OG', menu: false, datafield: 'og_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f3' },
+ { text: 'FG', menu: false, datafield: 'fg_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f3' },
+ { text: 'FG', menu: false, datafield: 'fg_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f3' },
+ { text: 'IBU', menu: false, datafield: 'ibu_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f0' },
+ { text: 'IBU', menu: false, datafield: 'ibu_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f0' },
+ { text: 'EBC', menu: false, datafield: 'color_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f0' },
+ { text: 'EBC', menu: false, datafield: 'color_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f0' },
+ { text: 'Co2', menu: false, datafield: 'carb_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+ { text: 'Co2', menu: false, datafield: 'carb_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+ { text: 'ABV', menu: false, datafield: 'abv_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+ { text: 'ABV', menu: false, datafield: 'abv_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+ { text: 'Wijzig', menu: false, datafield: 'Edit', width: 100, align: 'center', columntype: 'button', cellsrenderer: function () {
return "Wijzig";
}, buttonclick: function (row) {
// open the popup window when the user clicks a button.
editrow = row;
- $("#popupWindow").jqxWindow({ position: { x: 130, y: 20 } });
// get the clicked row's data and initialize the input fields.
var dataRecord = $("#jqxgrid").jqxGrid('getrowdata', editrow);
$("#name").val(dataRecord.name);
@@ -249,12 +269,19 @@
});
// initialize the popup window and buttons.
$("#popupWindow").jqxWindow({
- width: 960, resizable: false, theme: theme, isModal: true, autoOpen: false, cancelButton: $("#Cancel"), modalOpacity: 0.40
+ width: 1050,
+ position: { x: 110, y: 30 },
+ 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.
@@ -266,69 +293,46 @@
}
$("#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(),
- category: $("#category").val(),
- category_number: parseFloat($("#category_number").jqxNumberInput('decimal')),
- style_letter: $("#style_letter").val(),
- style_guide: $("#style_guide").val(),
- type: $("#type").val(),
- og_min: parseFloat($("#og_min").jqxNumberInput('decimal')),
- og_max: parseFloat($("#og_max").jqxNumberInput('decimal')),
- fg_min: parseFloat($("#fg_min").jqxNumberInput('decimal')),
- fg_max: parseFloat($("#fg_max").jqxNumberInput('decimal')),
- ibu_min: parseFloat($("#ibu_min").jqxNumberInput('decimal')),
- ibu_max: parseFloat($("#ibu_max").jqxNumberInput('decimal')),
- color_min: parseFloat($("#color_min").jqxNumberInput('decimal')),
- color_max: parseFloat($("#color_max").jqxNumberInput('decimal')),
- carb_min: parseFloat($("#carb_min").jqxNumberInput('decimal')),
- carb_max: parseFloat($("#carb_max").jqxNumberInput('decimal')),
- abv_min: parseFloat($("#abv_min").jqxNumberInput('decimal')),
- abv_max: parseFloat($("#abv_max").jqxNumberInput('decimal')),
- notes: $("#notes").val(),
- profile: $("#profile").val(),
- ingredients: $("#ingredients").val(),
- examples: $("#examples").val()
- };
+ rowID = $('#jqxgrid').jqxGrid('getrowid', editrow);
+ }
+ var row = {
+ record: rowID,
+ name: $("#name").val(),
+ category: $("#category").val(),
+ category_number: parseFloat($("#category_number").jqxNumberInput('decimal')),
+ style_letter: $("#style_letter").val(),
+ style_guide: $("#style_guide").val(),
+ type: $("#type").val(),
+ og_min: parseFloat($("#og_min").jqxNumberInput('decimal')),
+ og_max: parseFloat($("#og_max").jqxNumberInput('decimal')),
+ fg_min: parseFloat($("#fg_min").jqxNumberInput('decimal')),
+ fg_max: parseFloat($("#fg_max").jqxNumberInput('decimal')),
+ ibu_min: parseFloat($("#ibu_min").jqxNumberInput('decimal')),
+ ibu_max: parseFloat($("#ibu_max").jqxNumberInput('decimal')),
+ color_min: parseFloat($("#color_min").jqxNumberInput('decimal')),
+ color_max: parseFloat($("#color_max").jqxNumberInput('decimal')),
+ carb_min: parseFloat($("#carb_min").jqxNumberInput('decimal')),
+ carb_max: parseFloat($("#carb_max").jqxNumberInput('decimal')),
+ abv_min: parseFloat($("#abv_min").jqxNumberInput('decimal')),
+ abv_max: parseFloat($("#abv_max").jqxNumberInput('decimal')),
+ notes: $("#notes").val(),
+ profile: $("#profile").val(),
+ ingredients: $("#ingredients").val(),
+ examples: $("#examples").val()
+ };
+ if (editrow >= 0) {
$('#jqxgrid').jqxGrid('updaterow', rowID, row);
- $("#popupWindow").jqxWindow('hide');
} else {
- // Insert a record
- var newrow = {
- record: -1,
- name: $("#name").val(),
- category: $("#category").val(),
- category_number: parseFloat($("#category_number").jqxNumberInput('decimal')),
- style_letter: $("#style_letter").val(),
- style_guide: $("#style_guide").val(),
- type: $("#type").val(),
- og_min: parseFloat($("#og_min").jqxNumberInput('decimal')),
- og_max: parseFloat($("#og_max").jqxNumberInput('decimal')),
- fg_min: parseFloat($("#fg_min").jqxNumberInput('decimal')),
- fg_max: parseFloat($("#fg_max").jqxNumberInput('decimal')),
- ibu_min: parseFloat($("#ibu_min").jqxNumberInput('decimal')),
- ibu_max: parseFloat($("#ibu_max").jqxNumberInput('decimal')),
- color_min: parseFloat($("#color_min").jqxNumberInput('decimal')),
- color_max: parseFloat($("#color_max").jqxNumberInput('decimal')),
- carb_min: parseFloat($("#carb_min").jqxNumberInput('decimal')),
- carb_max: parseFloat($("#carb_max").jqxNumberInput('decimal')),
- abv_min: parseFloat($("#abv_min").jqxNumberInput('decimal')),
- abv_max: parseFloat($("#abv_max").jqxNumberInput('decimal')),
- notes: $("#notes").val(),
- profile: $("#profile").val(),
- ingredients: $("#ingredients").val(),
- examples: $("#examples").val()
- };
- $('#jqxgrid').jqxGrid('addrow', null, newrow);
- $("#popupWindow").jqxWindow('hide');
+ $('#jqxgrid').jqxGrid('addrow', null, row);
}
+ $("#popupWindow").jqxWindow('hide');
+ location.reload( true ); // reload ourself.
});
createDelElements();
});