# HG changeset patch # User Michiel Broek # Date 1625138659 -7200 # Node ID 0218893a5b7f72246bf56a275139dd0ce12d0273 # Parent e95744b6b31d078ca40bb4d3b7086483dabfdfd3 Added some tooltips to inventory yeasts. Added POF+ and STA1 columns to inventory yeasts list. diff -r e95744b6b31d -r 0218893a5b7f README.design --- a/README.design Wed Jun 30 23:09:31 2021 +0200 +++ b/README.design Thu Jul 01 13:24:19 2021 +0200 @@ -17,10 +17,6 @@ Extra: -Gisten: = Cultures? -Extra vlaggen: - glucoamlylase+ - beta glucosidase Gist typen: Wild yeast, Spontaneous. @@ -55,6 +51,3 @@ Maischen: Dubbel maischen? Of is 2e maisch een grondstof (Ingo). - -https://github.com/beerjson/beerjson - diff -r e95744b6b31d -r 0218893a5b7f www/js/inv_yeasts.js --- a/www/js/inv_yeasts.js Wed Jun 30 23:09:31 2021 +0200 +++ b/www/js/inv_yeasts.js Thu Jul 01 13:24:19 2021 +0200 @@ -220,9 +220,11 @@ $('#tht_date').jqxDateTimeInput(Dateopts); $('#totval').jqxNumberInput(Show2dec); $('#cells').jqxNumberInput(Spin1dec); + $('#tolerance').jqxTooltip({ content: 'Alcohol tolerantie van de gist' }); $('#tolerance').jqxNumberInput(Perc1dec); $('#tolerance').jqxNumberInput({ max: 25 }); $('#sta1').jqxCheckBox({ theme: theme, width: 120, height: 23 }); + $('#sta1').jqxTooltip({ position: 'top-left', content: 'STA1 gen (var diastaticus), ook wel glucoamlylase+ genoemd.' }); $('#sta1').on('checked', function(event) { dataRecord.sta1 = 1; }); $('#sta1').on('unchecked', function(event) { dataRecord.sta1 = 0; }); $('#bacteria').jqxCheckBox({ theme: theme, width: 120, height: 23 }); @@ -234,6 +236,7 @@ $('#harvest_time').jqxNumberInput(PosInt); $('#pitch_temperature').jqxNumberInput(YeastT); $('#pofpos').jqxCheckBox({ theme: theme, width: 120, height: 23 }); + $('#pofpos').jqxTooltip({ position: 'top-left', content: 'POF+ gist' }); $('#pofpos').on('checked', function(event) { dataRecord.pofpos = 1; }); $('#pofpos').on('unchecked', function(event) { dataRecord.pofpos = 0; }); $('#zymocide').jqxDropDownList({ @@ -326,8 +329,8 @@ { text: 'Laboratorium', datafield: 'laboratory', width: 150, filtertype: 'list' }, { text: 'Product ID', datafield: 'product_id', width: 120, filtertype: 'textbox' }, { text: 'Gist naam', datafield: 'name', filtertype: 'textbox' }, - { text: 'Type', datafield: 'type', align: 'center', cellsalign: 'center', width: 110, filtertype: 'list' }, - { text: 'Vorm', datafield: 'form', align: 'center', cellsalign: 'center', width: 110, filtertype: 'list' }, + { text: 'Type', datafield: 'type', align: 'center', cellsalign: 'center', width: 105, filtertype: 'list' }, + { text: 'Vorm', datafield: 'form', align: 'center', cellsalign: 'center', width: 105, filtertype: 'list' }, { text: 'SVG', datafield: 'attenuation', width: 70, align: 'right', cellsalign: 'right', cellsformat: 'p1', filtertype: 'number' }, { text: 'Tol%', datafield: 'tolerance', width: 60, align: 'right', cellsalign: 'right', filtertype: 'number', cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { @@ -337,6 +340,20 @@ return '' + amount + ''; } }, + { text: 'POF+', datafield: 'pofpos', width: 60, align: 'center', cellsalign: 'center', + cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { + if (value == 0) + return ''; + return ''; + } + }, + { text: 'STA1', datafield: 'sta1', width: 60, align: 'center', cellsalign: 'center', + cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { + if (value == 0) + return ''; + return ''; + } + }, { text: 'Voorraad', datafield: 'inventory', width: 100, align: 'right', filtertype: 'number', filtercondition: 'not_equal', cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { var amount = ''; @@ -353,7 +370,7 @@ return '' + amount + ''; } }, - { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', filterable: false, cellsrenderer: function() { + { text: '', datafield: 'Edit', columntype: 'button', width: 80, align: 'center', filterable: false, cellsrenderer: function() { return 'Wijzig'; }, buttonclick: function(row) { // open the popup window when the user clicks a button.