bms: comparison www/js/inv_hops.js

comparison: www/js/inv_hops.js

www/js/inv_hops.js

changeset 701: 3ce3df681be0
parent 563: acdd54144838
child 702: f0896a6f9b64

equal deleted inserted replaced

-:89b7449d1fd9
+:3ce3df681be0
 /*****************************************************************************
-* Copyright (C) 2014-2019
+* Copyright (C) 2014-2020
 *
 * Michiel Broek <mbroek at mbse dot eu>
 *
-* This file is part of BrewCloud
+* This file is part of Brewery Management System
 *
 * This is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
 * Free Software Foundation; either version 2, or (at your option) any
 * later version.
 type: 'POST',
 success: function(data, status, xhr) {
 commit(true);
 location.reload(true);
 },
-error: function(jqXHR, textStatus, errorThrown) {
+error: function(jqXHR, textStatus, errorThrown) { commit(false); }
-commit(false);
-}
 });
 },
 addrow: function(rowid, rowdata, position, commit) {
 var data = 'insert=true&' + $.param(rowdata);
 $.ajax({
 type: 'POST',
 success: function(data, status, xhr) {
 commit(true);
 location.reload(true);
 },
-error: function(jqXHR, textStatus, errorThrown) {
+error: function(jqXHR, textStatus, errorThrown) { commit(false); }
-commit(false);
-}
 });
 },
 updaterow: function(rowid, rowdata, commit) {
 var data = 'update=true&' + $.param(rowdata);
 $.ajax({
 type: 'POST',
 success: function(data, status, xhr) {
 commit(true);
 location.reload(true);
 },
-error: function(jqXHR, textStatus, errorThrown) {
+error: function(jqXHR, textStatus, errorThrown) { commit(false); }
-commit(false);
-}
 });
 }
 },
 dataAdapter = new $.jqx.dataAdapter(source),
 editrow = -1;
 $('#cost').jqxNumberInput(Spin2dec);
 $('#tht_date').jqxDateTimeInput(Dateopts);
 $('#total_oil').jqxNumberInput(Perc1dec);
 $('#totval').jqxNumberInput(Show2dec);
+var  localizationobj = {};
+localizationobj.filterchoosestring= "Keuze:";
 // initialize jqxGrid
 $('#jqxgrid').jqxGrid({
 width: 1280,
 height: 630,
 source: dataAdapter,
 showstatusbar: true,
 renderstatusbar: function(statusbar) {
 var container, addButton, impButton;
 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;">Nieuw</span></div>');
+'src="images/add.png"/><span style="margin-left: 4px; position: relative; top: -4px;">Nieuw</span></div>');
 impButton = $('<div style="float: right; margin-right: 50px;"><img style="position: relative; margin-top: 2px;" ' +
-'src="images/add.png"/><span style="margin-left: 4px; position: relative; top: -3px;">Import</span></div>');
+'src="images/add.png"/><span style="margin-left: 4px; position: relative; top: -4px;">Import</span></div>');
 expButton = $('<div style="float: right; margin-right: 50px;"><img style="position: relative; margin-top: 2px;" ' +
-'src="images/database.png"/><span style="margin-left: 4px; position: relative; top: -3px;">Export</span></div>');
+'src="images/database.png"/><span style="margin-left: 4px; position: relative; top: -10px;">Export</span></div>');
 container.append(addButton);
 container.append(impButton);
 container.append(expButton);
 statusbar.append(container);
-addButton.jqxButton({ theme: theme, width: 90, height: 20 });
+addButton.jqxButton({ theme: theme, width: 90, height: 17 });
-impButton.jqxButton({ theme: theme, width: 90, height: 20 });
+impButton.jqxButton({ theme: theme, width: 90, height: 17 });
-expButton.jqxButton({ theme: theme, width: 90, height: 20 });
+expButton.jqxButton({ theme: theme, width: 90, height: 17 });
 // add new row.
 addButton.click(function(event) {
 editrow = -1;
 $('#popupWindow').jqxWindow({ position: { x: 110, y: 30 } });
 $('#name').val('Nieuwe hop');
 });
 expButton.click(function(event) {
 window.open('export_hops.php');
 });
 },
+ready: function () {
+$("#jqxgrid").jqxGrid('localizestrings', localizationobj);
+},
 filterable: true,
-filtermode: 'excel',
+showfilterrow: true,
 columns: [
-{ text: 'Herkomst', datafield: 'origin', width: 150 },
+{ text: 'Herkomst', datafield: 'origin', width: 150, filtertype: 'list' },
-{ text: 'Hop Naam', datafield: 'name', menu: false },
+{ text: 'Hop Naam', datafield: 'name', filtertype: 'textbox' },
-{ text: 'Soort', datafield: 'type', align: 'left', width: 90 },
+{ text: 'Soort', datafield: 'type', align: 'left', width: 90, filtertype: 'list' },
-{ text: 'Vorm', datafield: 'form', align: 'left', width: 90 },
+{ text: 'Vorm', datafield: 'form', align: 'left', width: 90, filtertype: 'list' },
-{ text: 'Alpha %', datafield: 'alpha', width: 80, align: 'right', cellsalign: 'right', menu: false, cellsformat: 'p1' },
+{ text: 'Alpha %', datafield: 'alpha', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'p1', filtertype: 'number' },
-{ text: 'Beta %', datafield: 'beta', width: 80, align: 'right', cellsalign: 'right', menu: false, cellsformat: 'p1' },
+{ text: 'Beta %', datafield: 'beta', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'p1', filtertype: 'number' },
-{ text: 'Cohumuloon %%', datafield: 'cohumulone', width: 80, align: 'right', cellsalign: 'right', menu: false, cellsformat: 'p1' },
+{ text: 'Cohumuloon %%', datafield: 'cohumulone', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'p1', filterable: false },
-{ text: 'HSI', datafield: 'hsi', width: 60, align: 'right', cellsalign: 'right', menu: false, cellsformat: 'f1' },
+{ text: 'HSI', datafield: 'hsi', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f1', filterable: false },
-{ text: 'Oogst datum', datafield: 'production_date', align: 'center', cellsalign: 'center', menu: false, width: 110 },
+{ text: 'Oogst datum', datafield: 'production_date', align: 'center', cellsalign: 'center', width: 110, filtertype: 'date' },
-{ text: 'Voorraad', datafield: 'inventory', width: 100, align: 'right', cellsalign: 'right', menu: false, cellsformat: 'f1',
+{ text: 'Voorraad', datafield: 'inventory', width: 100, align: 'right', filtertype: 'number', filtercondition: 'not_equal',
 cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) {
 var amount = '';
 if (value > 0) {
 if (value < 1000)
 amount = dataAdapter.formatNumber(value, 'f1') + ' gr';
 amount = dataAdapter.formatNumber(value / 1000.0, 'f1') + ' kg';
 }
 return '<span style="margin: 4px; margin-top: 6px; float: right;">' + amount + '</span>';
 }
 },
-{ text: '', datafield: 'Wijzig', columntype: 'button', width: 100, align: 'center', menu: false,
+{ text: '', datafield: 'Wijzig', columntype: 'button', width: 100, align: 'center', filterable: false,
 cellsrenderer: function() {
 return 'Wijzig';
 }, buttonclick: function(row) {
 // open the popup window when the user clicks a button.
 editrow = row;