comparison: www/js/prod_edit.js
www/js/prod_edit.js
- changeset 638
- 736c8d29bc87
- parent 637
- 65ca985fe789
- child 639
- 71c6bbd7d4e6
equal
deleted
inserted
replaced
| 637:65ca985fe789 | 638:736c8d29bc87 |
|---|---|
| 104 | 104 |
| 105 // Prepare the data | 105 // Prepare the data |
| 106 source = { | 106 source = { |
| 107 datatype: 'json', | 107 datatype: 'json', |
| 108 cache: false, | 108 cache: false, |
| 109 async: true, | |
| 109 datafields: [ | 110 datafields: [ |
| 110 // From prod_main | 111 // From prod_main |
| 111 { name: 'record', type: 'number' }, | 112 { name: 'record', type: 'number' }, |
| 112 { name: 'uuid', type: 'string' }, | 113 { name: 'uuid', type: 'string' }, |
| 113 { name: 'name', type: 'string' }, | 114 { name: 'name', type: 'string' }, |
| 1617 */ | 1618 */ |
| 1618 $('#jqxMenu').jqxMenu('destroy'); | 1619 $('#jqxMenu').jqxMenu('destroy'); |
| 1619 console.log('record:' + my_record + ' return:' + my_return + ' theme:' + theme); | 1620 console.log('record:' + my_record + ' return:' + my_return + ' theme:' + theme); |
| 1620 $('#jqxLoader').jqxLoader({ width: 250, height: 150, isModal: true, text: 'Laden product ...', theme: theme }); | 1621 $('#jqxLoader').jqxLoader({ width: 250, height: 150, isModal: true, text: 'Laden product ...', theme: theme }); |
| 1621 | 1622 |
| 1623 /* Moved to before all functions */ | |
| 1624 console.log('dataAdapter.dataBind() start'); | |
| 1625 dataAdapter.dataBind(); | |
| 1626 console.log('dataAdapter.dataBind() ready'); | |
| 1627 | |
| 1622 /* | 1628 /* |
| 1623 * Generic functions | 1629 * Generic functions |
| 1624 */ | 1630 */ |
| 1625 function calcViability() { | 1631 function calcViability() { |
| 1626 var vpm = 1.00; | 1632 var vpm = 1.00; |
| 2900 RA = 2 * parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCl / MMCaCl2 + | 2906 RA = 2 * parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCl / MMCaCl2 + |
| 2901 parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMCl / MMNaCl; | 2907 parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMCl / MMNaCl; |
| 2902 chloride += 1000 * RA / liters; | 2908 chloride += 1000 * RA / liters; |
| 2903 // Einde noot. | 2909 // Einde noot. |
| 2904 | 2910 |
| 2905 if (parseFloat($('#wa_acid_name').val()) < 0 || parseFloat($('#wa_acid_name').val()) > 3) { | 2911 if (parseInt($('#wa_acid_name').val()) < 0 || parseInt($('#wa_acid_name').val()) > 3) { |
| 2906 $('#wa_acid_name').val(0); | 2912 $('#wa_acid_name').val(0); |
| 2907 dataRecord.wa_acid_name = 0; | 2913 dataRecord.wa_acid_name = 0; |
| 2908 console.log('fixed #wa_acid_name'); | 2914 console.log('fixed #wa_acid_name'); |
| 2909 } | 2915 } |
| 2910 console.log('#wa_acid_name: ' + $('#wa_acid_name').val()); | 2916 console.log('#wa_acid_name: ' + $('#wa_acid_name').val() + ' / ' + parseInt($('#wa_acid_name').val())); |
| 2911 if (last_acid == '') | 2917 if (last_acid == '') |
| 2912 last_acid = AcidTypeData[$('#wa_acid_name').val()].nl; | 2918 last_acid = AcidTypeData[$('#wa_acid_name').val()].nl; |
| 2913 | 2919 |
| 2914 if (parseFloat($('#wa_base_name').val()) < 0 || parseFloat($('#wa_base_name').val()) > 3) { | 2920 if (parseInt($('#wa_base_name').val()) < 0 || parseInt($('#wa_base_name').val()) > 3) { |
| 2915 $('#wa_base_name').val(0); | 2921 $('#wa_base_name').val(0); |
| 2916 dataRecord.wa_base_name = 0; | 2922 dataRecord.wa_base_name = 0; |
| 2917 console.log('fixed #wa_base_name'); | 2923 console.log('fixed #wa_base_name'); |
| 2918 } | 2924 } |
| 2919 if (last_base == '') | 2925 if (last_base == '') |
| 4432 wb_chloride: parseFloat($('#wb_chloride').jqxNumberInput('decimal')), | 4438 wb_chloride: parseFloat($('#wb_chloride').jqxNumberInput('decimal')), |
| 4433 wb_sodium: parseFloat($('#wb_sodium').jqxNumberInput('decimal')), | 4439 wb_sodium: parseFloat($('#wb_sodium').jqxNumberInput('decimal')), |
| 4434 wb_magnesium: parseFloat($('#wb_magnesium').jqxNumberInput('decimal')), | 4440 wb_magnesium: parseFloat($('#wb_magnesium').jqxNumberInput('decimal')), |
| 4435 wb_total_alkalinity: parseFloat($('#wb_total_alkalinity').jqxNumberInput('decimal')), | 4441 wb_total_alkalinity: parseFloat($('#wb_total_alkalinity').jqxNumberInput('decimal')), |
| 4436 wb_ph: parseFloat($('#wb_ph').jqxNumberInput('decimal')), | 4442 wb_ph: parseFloat($('#wb_ph').jqxNumberInput('decimal')), |
| 4437 wa_acid_name: $('#wa_acid_name').val(), | 4443 wa_acid_name: parseInt($('#wa_acid_name').val()), |
| 4438 wa_acid_perc: parseFloat($('#wa_acid_perc').jqxNumberInput('decimal')), | 4444 wa_acid_perc: parseFloat($('#wa_acid_perc').jqxNumberInput('decimal')), |
| 4439 wa_base_name: $('#wa_base_name').val(), | 4445 wa_base_name: parseInt($('#wa_base_name').val()), |
| 4440 starter_enable: dataRecord.starter_enable, | 4446 starter_enable: dataRecord.starter_enable, |
| 4441 starter_type: $('#starter_type').val(), | 4447 starter_type: $('#starter_type').val(), |
| 4442 starter_sg: parseFloat($('#starter_sg').jqxNumberInput('decimal')), | 4448 starter_sg: parseFloat($('#starter_sg').jqxNumberInput('decimal')), |
| 4443 starter_viability: parseFloat($('#starter_viability').jqxNumberInput('decimal')), | 4449 starter_viability: parseFloat($('#starter_viability').jqxNumberInput('decimal')), |
| 4444 yeast_prod_date: $('#yeast_prod_date').val(), | 4450 yeast_prod_date: $('#yeast_prod_date').val(), |
| 4482 console.log('saveRecord() ' + textStatus); | 4488 console.log('saveRecord() ' + textStatus); |
| 4483 } | 4489 } |
| 4484 }); | 4490 }); |
| 4485 }; | 4491 }; |
| 4486 | 4492 |
| 4487 dataAdapter.dataBind(); | 4493 // dataAdapter.dataBind(); |
| 4488 | 4494 |
| 4489 // initialize the input fields. | 4495 // initialize the input fields. |
| 4490 // Tab 1, Algemeen | 4496 // Tab 1, Algemeen |
| 4491 $('#name').jqxTooltip({ content: 'De naam voor dit product.' }); | 4497 $('#name').jqxTooltip({ content: 'De naam voor dit product.' }); |
| 4492 $('#code').jqxTooltip({ content: 'Product code nummer.' }); | 4498 $('#code').jqxTooltip({ content: 'Product code nummer.' }); |
| 5346 $('#starter_sg').jqxNumberInput(SGopts); | 5352 $('#starter_sg').jqxNumberInput(SGopts); |
| 5347 $('#starter_viability').jqxTooltip({ content: 'De gist conditie.' }); | 5353 $('#starter_viability').jqxTooltip({ content: 'De gist conditie.' }); |
| 5348 $('#starter_viability').jqxNumberInput(Show0dec); | 5354 $('#starter_viability').jqxNumberInput(Show0dec); |
| 5349 $('#starter_try').jqxButton({ template: 'primary', width: '100px', height: 23, theme: theme }); | 5355 $('#starter_try').jqxButton({ template: 'primary', width: '100px', height: 23, theme: theme }); |
| 5350 | 5356 |
| 5351 | |
| 5352 // Tab 7, Mashing | 5357 // Tab 7, Mashing |
| 5353 $('#mash_name').jqxTooltip({ content: 'De omschrijving van dit maisch profiel.' }); | 5358 $('#mash_name').jqxTooltip({ content: 'De omschrijving van dit maisch profiel.' }); |
| 5354 $('#mash_name').jqxInput({ theme: theme, width: 320, height: 23 }); | 5359 $('#mash_name').jqxInput({ theme: theme, width: 320, height: 23 }); |
| 5355 $('#mash_select').jqxDropDownList({ | 5360 $('#mash_select').jqxDropDownList({ |
| 5356 placeHolder: 'Kies schema:', | 5361 placeHolder: 'Kies schema:', |
