comparison: www/js/prod_edit.js
www/js/prod_edit.js
- changeset 772
- f9d266eb0ec6
- parent 769
- 5a2ec06e00d4
- child 774
- 92e1e8f175a2
equal
deleted
inserted
replaced
| 771:9856238e9217 | 772:f9d266eb0ec6 |
|---|---|
| 723 $('#wb_magnesium').val(dataRecord.wb_magnesium); | 723 $('#wb_magnesium').val(dataRecord.wb_magnesium); |
| 724 $('#wb_total_alkalinity').val(dataRecord.wb_total_alkalinity); | 724 $('#wb_total_alkalinity').val(dataRecord.wb_total_alkalinity); |
| 725 $('#wb_ph').val(dataRecord.wb_ph); | 725 $('#wb_ph').val(dataRecord.wb_ph); |
| 726 $('#wa_acid_name').val(dataRecord.wa_acid_name); | 726 $('#wa_acid_name').val(dataRecord.wa_acid_name); |
| 727 $('#wa_acid_perc').val(dataRecord.wa_acid_perc); | 727 $('#wa_acid_perc').val(dataRecord.wa_acid_perc); |
| 728 // $('#wa_base_name').val(dataRecord.wa_base_name); | |
| 729 $('#starter_type').val(dataRecord.starter_type); | 728 $('#starter_type').val(dataRecord.starter_type); |
| 730 $('#starter_sg').val(dataRecord.starter_sg); | 729 $('#starter_sg').val(dataRecord.starter_sg); |
| 731 $('#starter_viability').val(dataRecord.starter_viability); | 730 $('#starter_viability').val(dataRecord.starter_viability); |
| 732 $('#yeast_prod_date').val(dataRecord.yeast_prod_date); | 731 $('#yeast_prod_date').val(dataRecord.yeast_prod_date); |
| 733 $('#yeast_pitchrate').val(dataRecord.yeast_pitchrate); | 732 $('#yeast_pitchrate').val(dataRecord.yeast_pitchrate); |
| 917 } | 916 } |
| 918 calcFermentables(); | 917 calcFermentables(); |
| 919 calcIBUs(); | 918 calcIBUs(); |
| 920 }); | 919 }); |
| 921 }, | 920 }, |
| 922 ready: function() { $('#jqxTabs').jqxTabs('next'); }, | 921 ready: function() { calcFermentables(); $('#jqxTabs').jqxTabs('next'); }, |
| 923 columns: [ | 922 columns: [ |
| 924 { text: 'Vergistbaar ingrediënt', datafield: 'f_name', | 923 { text: 'Vergistbaar ingrediënt', datafield: 'f_name', |
| 925 cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | 924 cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
| 926 return '<span style="margin: 3px; margin-top: 6px; float: left;">' + rowdata.f_supplier + ' / ' + | 925 return '<span style="margin: 3px; margin-top: 6px; float: left;">' + rowdata.f_supplier + ' / ' + |
| 927 rowdata.f_name + ' (' + rowdata.f_color + ' EBC)</span>'; | 926 rowdata.f_name + ' (' + rowdata.f_color + ' EBC)</span>'; |
| 1142 return '<span style="margin: 4px; margin-top: 6px; float: right;">' + duration + '</span>'; | 1141 return '<span style="margin: 4px; margin-top: 6px; float: right;">' + duration + '</span>'; |
| 1143 } | 1142 } |
| 1144 }, | 1143 }, |
| 1145 { text: 'IBU', datafield: 'ibu', width: 80, align: 'right', | 1144 { text: 'IBU', datafield: 'ibu', width: 80, align: 'right', |
| 1146 cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | 1145 cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
| 1147 var ibu = toIBU(rowdata.h_useat, rowdata.h_form, preboil_sg, parseFloat($('#batch_size').jqxNumberInput('decimal')), | 1146 var ibu = toIBU(rowdata.h_useat, rowdata.h_form, preboil_sg, parseFloat(dataRecord.batch_size), |
| 1148 parseFloat(rowdata.h_amount), parseFloat(rowdata.h_time), parseFloat(rowdata.h_alpha), $('#ibu_method').val(), | 1147 parseFloat(rowdata.h_amount), parseFloat(rowdata.h_time), parseFloat(rowdata.h_alpha), $('#ibu_method').val(), |
| 1149 dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6); | 1148 dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6); |
| 1150 return '<span style="margin: 4px; margin-top: 6px; float: right;">' + dataAdapter.formatNumber(ibu, 'f1') + '</span>'; | 1149 return '<span style="margin: 4px; margin-top: 6px; float: right;">' + dataAdapter.formatNumber(ibu, 'f1') + '</span>'; |
| 1151 } | 1150 } |
| 1152 }, | 1151 }, |
