diff -r 2662720e1949 -r 2a6c00d325b2 www/js/global.js --- a/www/js/global.js Sun Dec 16 13:53:48 2018 +0100 +++ b/www/js/global.js Mon Dec 17 13:46:15 2018 +0100 @@ -58,7 +58,6 @@ var styleslist = new $.jqx.dataAdapter(stylesSource); // dropdownlist datasource from inventory_fermentables -var fermentableUrl = "getfermentablesources.php"; var fermentableInvSource = { datatype: "json", datafields: [ @@ -81,13 +80,26 @@ { name: 'inventory', type: 'float' }, { name: 'cost', type: 'float' } ], - url: fermentableUrl, + url: "getfermentablesources.php", async: true }; -var fermentablelist = new $.jqx.dataAdapter(fermentableInvSource); +var fermentableinstock = false; +var fermentablelist = new $.jqx.dataAdapter(fermentableInvSource, { + beforeLoadComplete: function (records) { + var data = new Array(); + for (var i = 0; i < records.length; i++) { + var row = records[i]; + if (row.inventory || ! fermentableinstock) + data.push(row); + } + return data; + }, + loadError: function(jqXHR, status, error) { + $('#err').text(status + ' ' + error); + }, +}); // dropdownlist datasource from inventory_hops -var hopUrl = "gethopsources.php"; var hopInvSource = { datatype: "json", datafields: [ @@ -105,15 +117,29 @@ { name: 'useat', type: 'string' }, { name: 'form', type: 'string' }, { name: 'total_oil', type: 'float' }, + { name: 'inventory', type: 'float' }, { name: 'cost', type: 'float' } ], - url: hopUrl, + url: "gethopsources.php", async: true }; -var hoplist = new $.jqx.dataAdapter(hopInvSource); +var hopinstock = false; +var hoplist = new $.jqx.dataAdapter(hopInvSource, { + beforeLoadComplete: function (records) { + var data = new Array(); + for (var i = 0; i < records.length; i++) { + var row = records[i]; + if (row.inventory || ! hopinstock) + data.push(row); + } + return data; + }, + loadError: function(jqXHR, status, error) { + $('#err').text(status + ' ' + error); + }, +}); // dropdownlist datasource from inventory_miscs -var miscUrl = "getmiscsources.php"; var miscInvSource = { datatype: "json", datafields: [ @@ -123,15 +149,29 @@ { name: 'use_use', type: 'string' }, { name: 'amount_is_weight', type: 'bool' }, { name: 'time', type: 'float' }, + { name: 'inventory', type: 'float' }, { name: 'cost', type: 'float' } ], - url: miscUrl, + url: "getmiscsources.php", async: true }; -var misclist = new $.jqx.dataAdapter(miscInvSource); +var miscinstock = false; +var misclist = new $.jqx.dataAdapter(miscInvSource, { + beforeLoadComplete: function (records) { + var data = new Array(); + for (var i = 0; i < records.length; i++) { + var row = records[i]; + if (row.inventory || ! miscinstock) + data.push(row); + } + return data; + }, + loadError: function(jqXHR, status, error) { + $('#err').text(status + ' ' + error); + }, +}); // dropdownlist datasource from inventory_yeasts -var yeastUrl = "getyeastsources.php"; var yeastInvSource = { datatype: "json", datafields: [ @@ -144,15 +184,29 @@ { name: 'min_temperature', type: 'float' }, { name: 'max_temperature', type: 'float' }, { name: 'attenuation', type: 'float' }, + { name: 'inventory', type: 'float' }, { name: 'cost', type: 'float' } ], - url: yeastUrl, + url: "getyeastsources.php", async: true }; -var yeastlist = new $.jqx.dataAdapter(yeastInvSource); +var yeastinstock = false; +var yeastlist = new $.jqx.dataAdapter(yeastInvSource, { + beforeLoadComplete: function (records) { + var data = new Array(); + for (var i = 0; i < records.length; i++) { + var row = records[i]; + if (row.inventory || ! yeastinstock) + data.push(row); + } + return data; + }, + loadError: function(jqXHR, status, error) { + $('#err').text(status + ' ' + error); + }, +}); // dropdownlist datasource from inventory_waters -var waterUrl = "getwatersources.php"; var waterInvSource = { datatype: "json", datafields: [ @@ -166,15 +220,29 @@ { name: 'magnesium', type: 'float' }, { name: 'ph', type: 'float' }, { name: 'total_alkalinity', type: 'float' }, + { name: 'inventory', type: 'float' }, { name: 'cost', type: 'float' }, ], - url: waterUrl, + url: "getwatersources.php", async: true }; -var waterlist = new $.jqx.dataAdapter(waterInvSource); +var waterinstock = false; +var waterlist = new $.jqx.dataAdapter(waterInvSource, { + beforeLoadComplete: function (records) { + var data = new Array(); + for (var i = 0; i < records.length; i++) { + var row = records[i]; + if (row.inventory || row.unlimited_stock || ! waterinstock) + data.push(row); + } + return data; + }, + loadError: function(jqXHR, status, error) { + $('#err').text(status + ' ' + error); + }, +}); // dropdownlist datasource from profile_mash -var mashUrl = "include/db_profile_mash.php"; var mashInvSource = { datatype: "json", datafields: [ @@ -182,7 +250,7 @@ { name: 'name', type: 'string' }, { name: 'steps', type: 'array' } ], - url: mashUrl, + url: "include/db_profile_mash.php", async: true }; var mashlist = new $.jqx.dataAdapter(mashInvSource);