comparison: www/js/prod_edit.js
www/js/prod_edit.js
- changeset 612
- 576128de01e3
- parent 610
- 38b22ccb2bf8
- child 613
- 26a7a04acef3
equal
deleted
inserted
replaced
| 611:c583f446d6ca | 612:576128de01e3 |
|---|---|
| 2525 return; | 2525 return; |
| 2526 mash_infuse = 0; | 2526 mash_infuse = 0; |
| 2527 for (i = 0; i < rowscount; i++) { | 2527 for (i = 0; i < rowscount; i++) { |
| 2528 row = $('#mashGrid').jqxGrid('getrowdata', i); | 2528 row = $('#mashGrid').jqxGrid('getrowdata', i); |
| 2529 if (row.step_type == 0) { // Infusion | 2529 if (row.step_type == 0) { // Infusion |
| 2530 amount = Round(row.step_infuse_amount * factor, 1); | 2530 amount = Round(parseFloat(row.step_infuse_amount) * factor, 1); |
| 2531 $('#mashGrid').jqxGrid('setcellvalue', i, 'step_infuse_amount', amount); | 2531 $('#mashGrid').jqxGrid('setcellvalue', i, 'step_infuse_amount', amount); |
| 2532 mash_infuse += amount; | 2532 mash_infuse += amount; |
| 2533 } | 2533 } |
| 2534 } | 2534 } |
| 2535 if (dataRecord.w2_amount == 0) { | 2535 if (dataRecord.w2_amount == 0) { |
| 2536 dataRecord.w1_amount = mash_infuse; | 2536 dataRecord.w1_amount = mash_infuse; |
| 2537 $('#w1_amount').val(mash_infuse); | 2537 $('#w1_amount').val(mash_infuse); |
| 2538 } else { | 2538 } else { |
| 2539 dataRecord.w1_amount = (dataRecord.w1_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; | 2539 var w1_amount = (dataRecord.w1_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; |
| 2540 dataRecord.w2_amount = (dataRecord.w2_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; | 2540 var w2_amount = (dataRecord.w2_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; |
| 2541 dataRecord.w1_amount = Round(w1_amount, 3); | |
| 2542 dataRecord.w2_amount = Round(w2_amount, 3); | |
| 2541 $('#w1_amount').val(dataRecord.w1_amount); | 2543 $('#w1_amount').val(dataRecord.w1_amount); |
| 2542 $('#w2_amount').val(dataRecord.w2_amount); | 2544 $('#w2_amount').val(dataRecord.w2_amount); |
| 2543 } | 2545 } |
| 2544 $('#wg_amount').val(mash_infuse); | 2546 $('#wg_amount').val(mash_infuse); |
| 2545 }; | 2547 }; |
| 5532 } | 5534 } |
| 5533 if (dataRecord.w2_amount == 0) { | 5535 if (dataRecord.w2_amount == 0) { |
| 5534 dataRecord.w1_amount = mash_infuse; | 5536 dataRecord.w1_amount = mash_infuse; |
| 5535 $('#w1_amount').val(mash_infuse); | 5537 $('#w1_amount').val(mash_infuse); |
| 5536 } else { | 5538 } else { |
| 5537 dataRecord.w1_amount = (dataRecord.w1_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; | 5539 var w1_amount = (dataRecord.w1_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; |
| 5538 dataRecord.w2_amount = (dataRecord.w2_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; | 5540 var w2_amount = (dataRecord.w2_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; |
| 5541 dataRecord.w1_amount = Round(w1_amount, 3); | |
| 5542 dataRecord.w2_amount = Round(w2_amount, 3); | |
| 5539 $('#w1_amount').val(dataRecord.w1_amount); | 5543 $('#w1_amount').val(dataRecord.w1_amount); |
| 5540 $('#w2_amount').val(dataRecord.w2_amount); | 5544 $('#w2_amount').val(dataRecord.w2_amount); |
| 5541 } | 5545 } |
| 5542 $('#wg_amount').val(mash_infuse); | 5546 $('#wg_amount').val(mash_infuse); |
| 5543 calcFermentables(); | 5547 calcFermentables(); |
| 5623 } | 5627 } |
| 5624 }); | 5628 }); |
| 5625 $('#w2_amount').jqxTooltip({ content: 'De verdeling van het hoofd en meng water. Het totale maisch water volume blijft gelijk.'}); | 5629 $('#w2_amount').jqxTooltip({ content: 'De verdeling van het hoofd en meng water. Het totale maisch water volume blijft gelijk.'}); |
| 5626 $('#w2_amount').jqxNumberInput({ | 5630 $('#w2_amount').jqxNumberInput({ |
| 5627 inputMode: 'simple', spinMode: 'simple', theme: theme, width: 94, height: 23, min: 0, max: 0, decimalDigits: 1, | 5631 inputMode: 'simple', spinMode: 'simple', theme: theme, width: 94, height: 23, min: 0, max: 0, decimalDigits: 1, |
| 5628 spinButtons: true, spinButtonsStep: 0.5, readOnly: true | 5632 spinButtons: true, spinButtonsStep: 0.1, readOnly: true |
| 5629 }); | 5633 }); |
| 5630 $('#w2_calcium,#w2_magnesium,#w2_sodium,#w2_total_alkalinity,#w2_chloride,#w2_sulfate,#w2_ph').jqxNumberInput(Show1wat); | 5634 $('#w2_calcium,#w2_magnesium,#w2_sodium,#w2_total_alkalinity,#w2_chloride,#w2_sulfate,#w2_ph').jqxNumberInput(Show1wat); |
| 5631 // Water mixed | 5635 // Water mixed |
| 5632 $('#wg_amount,#wg_calcium,#wg_magnesium,#wg_sodium,#wg_total_alkalinity,#wg_chloride,#wg_sulfate,#wg_ph').jqxNumberInput(Show1wat); | 5636 $('#wg_amount,#wg_calcium,#wg_magnesium,#wg_sodium,#wg_total_alkalinity,#wg_chloride,#wg_sulfate,#wg_ph').jqxNumberInput(Show1wat); |
| 5633 // Water treated | 5637 // Water treated |
