comparison: www/js/prod_edit.js
www/js/prod_edit.js
- changeset 636
- f7201dc4c142
- parent 635
- 37c2ac4c2118
- child 637
- 65ca985fe789
equal
deleted
inserted
replaced
| 635:37c2ac4c2118 | 636:f7201dc4c142 |
|---|---|
| 2900 RA = 2 * parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCl / MMCaCl2 + | 2900 RA = 2 * parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCl / MMCaCl2 + |
| 2901 parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMCl / MMNaCl; | 2901 parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMCl / MMNaCl; |
| 2902 chloride += 1000 * RA / liters; | 2902 chloride += 1000 * RA / liters; |
| 2903 // Einde noot. | 2903 // Einde noot. |
| 2904 | 2904 |
| 2905 if ($('#wa_acid_name').val() < 0 || $('#wa_acid_name').val() > 3) { | 2905 if (parseFloat($('#wa_acid_name').val()) < 0 || parseFloat($('#wa_acid_name').val()) > 3) { |
| 2906 $('#wa_acid_name').val(0); | 2906 $('#wa_acid_name').val(0); |
| 2907 dataRecord.wa_acid_name = 0; | 2907 dataRecord.wa_acid_name = 0; |
| 2908 } | 2908 } |
| 2909 console.log('#wa_acid_name: ' + $('#wa_acid_name').val()); | 2909 console.log('#wa_acid_name: ' + $('#wa_acid_name').val()); |
| 2910 if (last_acid == '') | 2910 if (last_acid == '') |
| 2911 last_acid = AcidTypeData[$('#wa_acid_name').val()].nl; | 2911 last_acid = AcidTypeData[$('#wa_acid_name').val()].nl; |
| 2912 | 2912 |
| 2913 if ($('#wa_base_name').val() < 0 || $('#wa_base_name').val() > 3) { | 2913 if (parseFloat($('#wa_base_name').val()) < 0 || parseFloat($('#wa_base_name').val()) > 3) { |
| 2914 $('#wa_base_name').val(0); | 2914 $('#wa_base_name').val(0); |
| 2915 dataRecord.wa_base_name = 0; | 2915 dataRecord.wa_base_name = 0; |
| 2916 } | 2916 } |
| 2917 if (last_base == '') | 2917 if (last_base == '') |
| 2918 last_base = BaseTypeData[$('#wa_base_name').val()].nl; | 2918 last_base = BaseTypeData[$('#wa_base_name').val()].nl; |
