diff -r 057a6256bd7b -r 22271f3598ac www/js/inv_yeasts.js --- a/www/js/inv_yeasts.js Thu Aug 16 16:38:20 2018 +0200 +++ b/www/js/inv_yeasts.js Thu Aug 16 17:17:40 2018 +0200 @@ -53,8 +53,6 @@ { name: 'name', type: 'string' }, { name: 'type', type: 'string' }, { name: 'form', type: 'string' }, - { name: 'amount', type: 'float' }, - { name: 'amount_is_weight', type: 'bool' }, { name: 'laboratory', type: 'string' }, { name: 'product_id', type: 'string' }, { name: 'min_temperature', type: 'number' }, @@ -63,9 +61,7 @@ { name: 'attenuation', type: 'float' }, { name: 'notes', type: 'string' }, { name: 'best_for', type: 'string' }, - { name: 'times_cultured', type: 'number' }, { name: 'max_reuse', type: 'number' }, - { name: 'add_to_secondary', type: 'bool' }, { name: 'inventory', type: 'float' }, { name: 'cost', type: 'float' }, { name: 'production_date', type: 'string' }, @@ -131,9 +127,6 @@ $("#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 }); - //$("#amount").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true }); - //$("#amount_is_weight").jqxCheckBox({ theme: theme, width: 120, height: 23 }); - $("#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: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true }); @@ -144,9 +137,7 @@ $("#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 }); - //$("#times_cultured").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, max: 10, decimalDigits: 0, spinButtons: true }); $("#max_reuse").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, max: 10, decimalDigits: 0, spinButtons: true }); - //$("#add_to_secondary").jqxCheckBox({ theme: theme, width: 120, height: 23 }); $("#cost").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 2, spinButtons: true }); $("#tht_date").jqxDateTimeInput({ theme: theme, width: 100, height: 23, formatString: 'yyyy-MM-dd' }); @@ -175,17 +166,13 @@ $("#product_id").val(''); $("#type").val('Ale'); $("#form").val('Liquid'); - $("#amount").val('0.0'); - $("#amount_is_weight").val('false'); $("#min_temperature").val(''); $("#max_temperature").val(''); $("#flocculation").val('Low'); $("#attenuation").val('75.0'); $("#notes").val(''); $("#best_for").val(''); - $("#times_cultured").val(''); $("#max_reuse").val(''); - $("#add_to_secondary").val('false'); $("#inventory").val(''); $("#cost").val(''); $("#production_date").val(''); @@ -216,17 +203,13 @@ $("#product_id").val(dataRecord.product_id); $("#type").val(dataRecord.type); $("#form").val(dataRecord.form); - $("#amount").val(dataRecord.amount); - $("#amount_is_weight").val(dataRecord.amount_is_weight); $("#min_temperature").val(dataRecord.min_temperature); $("#max_temperature").val(dataRecord.max_temperature); $("#flocculation").val(dataRecord.flocculation); $("#attenuation").val(dataRecord.attenuation); $("#notes").val(dataRecord.notes); $("#best_for").val(dataRecord.best_for); - $("#times_cultured").val(dataRecord.times_cultured); $("#max_reuse").val(dataRecord.max_reuse); - $("#add_to_secondary").val(dataRecord.add_to_secondary); $("#inventory").val(dataRecord.inventory); $("#cost").val(dataRecord.cost); $("#production_date").val(dataRecord.production_date); @@ -267,8 +250,6 @@ name: $("#name").val(), type: $("#type").val(), form: $("#form").val(), - amount: parseFloat($("#amount").jqxNumberInput('decimal')), - amount_is_weight: $("#amount_is_weight").val(), laboratory: $("#laboratory").val(), product_id: $("#product_id").val(), min_temperature: parseInt($("#min_temperature").jqxNumberInput('decimal')), @@ -277,9 +258,7 @@ attenuation: parseFloat($("#attenuation").jqxNumberInput('decimal')), notes: $("#notes").val(), best_for: $("#best_for").val(), - times_recultured: parseInt($("#times_cultured").jqxNumberInput('decimal')), max_reuse: parseInt($("#max_reuse").jqxNumberInput('decimal')), - add_to_secondary: $("#add_to_secondary").val(), inventory: parseFloat($("#inventory").jqxNumberInput('decimal')), cost: parseFloat($("#cost").jqxNumberInput('decimal')), production_date: $("#production_date").val(), @@ -294,8 +273,6 @@ name: $("#name").val(), type: $("#type").val(), form: $("#form").val(), - amount: parseFloat($("#amount").jqxNumberInput('decimal')), - amount_is_weight: $("#amount_is_weight").val(), laboratory: $("#laboratory").val(), product_id: $("#product_id").val(), min_temperature: parseInt($("#min_temperature").jqxNumberInput('decimal')), @@ -304,9 +281,7 @@ attenuation: parseFloat($("#attenuation").jqxNumberInput('decimal')), notes: $("#notes").val(), best_for: $("#best_for").val(), - times_recultured: parseInt($("#times_cultured").jqxNumberInput('decimal')), max_reuse: parseInt($("#max_reuse").jqxNumberInput('decimal')), - add_to_secondary: $("#add_to_secondary").val(), inventory: parseFloat($("#inventory").jqxNumberInput('decimal')), cost: parseFloat($("#cost").jqxNumberInput('decimal')), production_date: $("#production_date").val(),