comparison: www/js/prod_edit.js
www/js/prod_edit.js
- changeset 759
- 89bcab49284a
- parent 758
- e6814bed4cb1
- child 760
- fce78f57a44d
equal
deleted
inserted
replaced
| 758:e6814bed4cb1 | 759:89bcab49284a |
|---|---|
| 270 MMSO4 = 96.0626, | 270 MMSO4 = 96.0626, |
| 271 MMHCO3 = 61.01684, | 271 MMHCO3 = 61.01684, |
| 272 MMCaSO4 = 172.171, | 272 MMCaSO4 = 172.171, |
| 273 MMCaCl2 = 147.015, | 273 MMCaCl2 = 147.015, |
| 274 MMCaCO3 = 100.087, | 274 MMCaCO3 = 100.087, |
| 275 MMMgCl2 = 95.211, /* Since 27-06-2021 */ | |
| 275 MMMgSO4 = 246.475, | 276 MMMgSO4 = 246.475, |
| 276 MMNaHCO3 = 84.007, | 277 MMNaHCO3 = 84.007, |
| 277 MMNa2CO3 = 105.996, | 278 MMNa2CO3 = 105.996, |
| 278 MMNaCl = 58.443, | 279 MMNaCl = 58.443, |
| 279 MMCaOH2 = 74.06268, | 280 MMCaOH2 = 74.06268, |
| 1239 $('#wa_mgso4').val(row.m_amount * 1000); | 1240 $('#wa_mgso4').val(row.m_amount * 1000); |
| 1240 break; | 1241 break; |
| 1241 case 'NaCl': | 1242 case 'NaCl': |
| 1242 $('#wa_nacl').val(row.m_amount * 1000); | 1243 $('#wa_nacl').val(row.m_amount * 1000); |
| 1243 break; | 1244 break; |
| 1245 case 'MgCl2': | |
| 1246 $('#wa_mgcl2').val(row.m_amount * 1000); | |
| 1247 break; | |
| 1244 case 'NaHCO3': | 1248 case 'NaHCO3': |
| 1245 $('#wa_nahco3').val(row.m_amount * 1000); | 1249 $('#wa_nahco3').val(row.m_amount * 1000); |
| 1246 break; | 1250 break; |
| 1247 case 'CaCO3': | 1251 case 'CaCO3': |
| 1248 $('#wa_caco3').val(row.m_amount * 1000); | 1252 $('#wa_caco3').val(row.m_amount * 1000); |
| 2921 $('#wa_mgso4').val(row.m_amount * 1000); | 2925 $('#wa_mgso4').val(row.m_amount * 1000); |
| 2922 break; | 2926 break; |
| 2923 case 'NaCl': | 2927 case 'NaCl': |
| 2924 $('#wa_nacl').val(row.m_amount * 1000); | 2928 $('#wa_nacl').val(row.m_amount * 1000); |
| 2925 break; | 2929 break; |
| 2930 case 'MgCl2': | |
| 2931 $('#wa_mgcl2').val(row.m_amount * 1000); | |
| 2932 break; | |
| 2926 case 'NaHCO3': | 2933 case 'NaHCO3': |
| 2927 $('#wa_nahco3').val(row.m_amount * 1000); | 2934 $('#wa_nahco3').val(row.m_amount * 1000); |
| 2928 break; | 2935 break; |
| 2929 case 'CaCO3': | 2936 case 'CaCO3': |
| 2930 $('#wa_caco3').val(row.m_amount * 1000); | 2937 $('#wa_caco3').val(row.m_amount * 1000); |
| 3291 /* Calculate Salt additions */ | 3298 /* Calculate Salt additions */ |
| 3292 if (liters > 0) { | 3299 if (liters > 0) { |
| 3293 calcium += (parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCa / MMCaCl2 * 1000 + | 3300 calcium += (parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCa / MMCaCl2 * 1000 + |
| 3294 parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa / MMCaSO4 * 1000 + | 3301 parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa / MMCaSO4 * 1000 + |
| 3295 parseFloat($('#wa_caco3').jqxNumberInput('decimal')) * MMCa / MMCaCO3 * 1000) / liters; | 3302 parseFloat($('#wa_caco3').jqxNumberInput('decimal')) * MMCa / MMCaCO3 * 1000) / liters; |
| 3296 magnesium += (parseFloat($('#wa_mgso4').jqxNumberInput('decimal')) * MMMg / MMMgSO4 * 1000) / liters; | 3303 magnesium += (parseFloat($('#wa_mgso4').jqxNumberInput('decimal')) * MMMg / MMMgSO4 * 1000 + |
| 3304 parseFloat($('#wa_mgcl2').jqxNumberInput('decimal')) * MMMg / MMMgCl2 * 1000) / liters; | |
| 3297 sodium += (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 1000 + | 3305 sodium += (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 1000 + |
| 3298 parseFloat($('#wa_nahco3').jqxNumberInput('decimal')) * MMNa / MMNaHCO3 * 1000) / liters; | 3306 parseFloat($('#wa_nahco3').jqxNumberInput('decimal')) * MMNa / MMNaHCO3 * 1000) / liters; |
| 3299 sulfate += (parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMSO4 / MMCaSO4 * 1000 + | 3307 sulfate += (parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMSO4 / MMCaSO4 * 1000 + |
| 3300 parseFloat($('#wa_mgso4').jqxNumberInput('decimal')) * MMSO4 / MMMgSO4 * 1000) / liters; | 3308 parseFloat($('#wa_mgso4').jqxNumberInput('decimal')) * MMSO4 / MMMgSO4 * 1000) / liters; |
| 3301 chloride += (2 * parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCl / MMCaCl2 * 1000 + | 3309 chloride += (2 * parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCl / MMCaCl2 * 1000 + |
| 3302 parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMCl / MMNaCl * 1000) / liters; | 3310 parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMCl / MMNaCl * 1000 + |
| 3311 parseFloat($('#wa_mgcl2').jqxNumberInput('decimal')) * MMCl / MMMgCl2 * 1000) / liters; | |
| 3303 bicarbonate += (parseFloat($('#wa_nahco3').jqxNumberInput('decimal')) * MMHCO3 / MMNaHCO3 * 1000 + | 3312 bicarbonate += (parseFloat($('#wa_nahco3').jqxNumberInput('decimal')) * MMHCO3 / MMNaHCO3 * 1000 + |
| 3304 parseFloat($('#wa_caco3').jqxNumberInput('decimal')) / 3 * MMHCO3 / MMCaCO3 * 1000) / liters; | 3313 parseFloat($('#wa_caco3').jqxNumberInput('decimal')) / 3 * MMHCO3 / MMCaCO3 * 1000) / liters; |
| 3305 } | 3314 } |
| 3306 | 3315 |
| 3307 if (dataRecord.wa_acid_name < 0 || dataRecord,wa_acid_name >= AcidTypeData.length) { | 3316 if (dataRecord.wa_acid_name < 0 || dataRecord,wa_acid_name >= AcidTypeData.length) { |
| 3875 $('#pr_name').jqxDropDownList(onval); | 3884 $('#pr_name').jqxDropDownList(onval); |
| 3876 $('#wa_cacl2').jqxNumberInput(spinstate); | 3885 $('#wa_cacl2').jqxNumberInput(spinstate); |
| 3877 $('#wa_caso4').jqxNumberInput(spinstate); | 3886 $('#wa_caso4').jqxNumberInput(spinstate); |
| 3878 $('#wa_mgso4').jqxNumberInput(spinstate); | 3887 $('#wa_mgso4').jqxNumberInput(spinstate); |
| 3879 $('#wa_nacl').jqxNumberInput(spinstate); | 3888 $('#wa_nacl').jqxNumberInput(spinstate); |
| 3889 $('#wa_mgcl2').jqxNumberInput(spinstate); | |
| 3880 $('#wa_nahco3').jqxNumberInput(spinstate); | 3890 $('#wa_nahco3').jqxNumberInput(spinstate); |
| 3881 $('#wa_caco3').jqxNumberInput(spinstate); | 3891 $('#wa_caco3').jqxNumberInput(spinstate); |
| 3882 $('#mash_ph').jqxNumberInput(spinstate); | 3892 $('#mash_ph').jqxNumberInput(spinstate); |
| 3883 $('#calc_acid').jqxCheckBox(onval); | 3893 $('#calc_acid').jqxCheckBox(onval); |
| 3884 $('#wa_base_name').jqxDropDownList(onval); | 3894 $('#wa_base_name').jqxDropDownList(onval); |
| 4222 }); | 4232 }); |
| 4223 $('#wa_nacl').on('change', function(event) { | 4233 $('#wa_nacl').on('change', function(event) { |
| 4224 if (event.args) { | 4234 if (event.args) { |
| 4225 setWaterAgent('NaCl', 0); | 4235 setWaterAgent('NaCl', 0); |
| 4226 setWaterAgent('NaCl', event.args.value); | 4236 setWaterAgent('NaCl', event.args.value); |
| 4237 calcWater(); | |
| 4238 } | |
| 4239 }); | |
| 4240 $('#wa_mgcl2').on('change', function(event) { | |
| 4241 if (event.args) { | |
| 4242 setWaterAgent('MgCl2', 0); | |
| 4243 setWaterAgent('MgCl2', event.args.value); | |
| 4227 calcWater(); | 4244 calcWater(); |
| 4228 } | 4245 } |
| 4229 }); | 4246 }); |
| 4230 $('#wa_nahco3').on('change', function(event) { | 4247 $('#wa_nahco3').on('change', function(event) { |
| 4231 if (event.args) { | 4248 if (event.args) { |
| 6141 $('#wa_mgso4').jqxTooltip({ content: 'Epsom zout. Voor het maken van een ander waterprofiel. Voegt magnesium en sulfaat toe. Gebruik spaarzaam!' }); | 6158 $('#wa_mgso4').jqxTooltip({ content: 'Epsom zout. Voor het maken van een ander waterprofiel. Voegt magnesium en sulfaat toe. Gebruik spaarzaam!' }); |
| 6142 $('#wa_nacl').jqxTooltip({ | 6159 $('#wa_nacl').jqxTooltip({ |
| 6143 content: 'Keukenzout. Voor het maken van een ander waterprofiel. Voegt natrium en chloride toe. ' + | 6160 content: 'Keukenzout. Voor het maken van een ander waterprofiel. Voegt natrium en chloride toe. ' + |
| 6144 'Voor het accentueren van zoetheid. Bij hoge dosering wordt het bier ziltig.' | 6161 'Voor het accentueren van zoetheid. Bij hoge dosering wordt het bier ziltig.' |
| 6145 }); | 6162 }); |
| 6163 $('#wa_mgcl2').jqxTooltip({ content: 'Magnesiumchloride'}); | |
| 6146 $('#wa_nahco3').jqxTooltip({ content: 'Baksoda'}); | 6164 $('#wa_nahco3').jqxTooltip({ content: 'Baksoda'}); |
| 6147 $('#wa_caco3').jqxTooltip({ content: 'Kalk'}); | 6165 $('#wa_caco3').jqxTooltip({ content: 'Kalk'}); |
| 6148 $('#wa_cacl2,#wa_caso4,#wa_mgso4,#wa_nacl,#wa_nahco3,#wa_caco3').jqxNumberInput(Spin1dec); | 6166 $('#wa_cacl2,#wa_caso4,#wa_mgso4,#wa_nacl,#wa_mgcl2,#wa_nahco3,#wa_caco3').jqxNumberInput(Spin1dec); |
| 6149 $('#mash_ph').jqxTooltip({ content: 'Maisch pH tussen 5.2 en 5.6. Gebruik 5.2 voor lichte en 5.5 voor donkere bieren.'}); | 6167 $('#mash_ph').jqxTooltip({ content: 'Maisch pH tussen 5.2 en 5.6. Gebruik 5.2 voor lichte en 5.5 voor donkere bieren.'}); |
| 6150 $('#mash_ph').jqxNumberInput(SpinpH); | 6168 $('#mash_ph').jqxNumberInput(SpinpH); |
| 6151 $('#calc_acid').jqxCheckBox({ theme: theme, width: 120, height: 23 }); | 6169 $('#calc_acid').jqxCheckBox({ theme: theme, width: 120, height: 23 }); |
| 6152 $('#wa_base_name').jqxDropDownList({ | 6170 $('#wa_base_name').jqxDropDownList({ |
| 6153 theme: theme, | 6171 theme: theme, |
