comparison: www/js/prod_edit.js
www/js/prod_edit.js
- changeset 497
- 0fe366d953ab
- parent 495
- fdbb6bfae569
- child 500
- 8d53ad389204
equal
deleted
inserted
replaced
| 496:2465dbc90ea4 | 497:0fe366d953ab |
|---|---|
| 303 { name: 'prop2_volume', type: 'float' }, | 303 { name: 'prop2_volume', type: 'float' }, |
| 304 { name: 'prop3_type', type: 'int' }, | 304 { name: 'prop3_type', type: 'int' }, |
| 305 { name: 'prop3_volume', type: 'float' }, | 305 { name: 'prop3_volume', type: 'float' }, |
| 306 { name: 'prop4_type', type: 'int' }, | 306 { name: 'prop4_type', type: 'int' }, |
| 307 { name: 'prop4_volume', type: 'float' }, | 307 { name: 'prop4_volume', type: 'float' }, |
| 308 { name: 'divide_type', type: 'int' }, | |
| 309 { name: 'divide_size', type: 'float' }, | |
| 310 { name: 'divide_parts', type: 'int' }, | |
| 311 { name: 'divide_from', type: 'string' }, | |
| 308 { name: 'fermentables', type: 'array' }, | 312 { name: 'fermentables', type: 'array' }, |
| 309 { name: 'hops', type: 'array' }, | 313 { name: 'hops', type: 'array' }, |
| 310 { name: 'miscs', type: 'array' }, | 314 { name: 'miscs', type: 'array' }, |
| 311 { name: 'yeasts', type: 'array' }, | 315 { name: 'yeasts', type: 'array' }, |
| 312 { name: 'mashs', type: 'array' } | 316 { name: 'mashs', type: 'array' } |
| 528 $('#prop2_volume').val(dataRecord.prop2_volume); | 532 $('#prop2_volume').val(dataRecord.prop2_volume); |
| 529 $('#prop3_type').val(dataRecord.prop3_type); | 533 $('#prop3_type').val(dataRecord.prop3_type); |
| 530 $('#prop3_volume').val(dataRecord.prop3_volume); | 534 $('#prop3_volume').val(dataRecord.prop3_volume); |
| 531 $('#prop4_type').val(dataRecord.prop4_type); | 535 $('#prop4_type').val(dataRecord.prop4_type); |
| 532 $('#prop4_volume').val(dataRecord.prop4_volume); | 536 $('#prop4_volume').val(dataRecord.prop4_volume); |
| 537 // hidden divide_type | |
| 538 // hidden divide_size | |
| 539 // hidden divide_parts | |
| 540 // hidden divide_from | |
| 533 editFermentable(dataRecord); | 541 editFermentable(dataRecord); |
| 534 editHop(dataRecord); | 542 editHop(dataRecord); |
| 535 editMisc(dataRecord); | 543 editMisc(dataRecord); |
| 536 editYeast(dataRecord); | 544 editYeast(dataRecord); |
| 537 editMash(dataRecord); | 545 editMash(dataRecord); |
| 4367 prop2_volume: parseFloat($('#prop2_volume').jqxNumberInput('decimal')), | 4375 prop2_volume: parseFloat($('#prop2_volume').jqxNumberInput('decimal')), |
| 4368 prop3_type: $('#prop3_type').val(), | 4376 prop3_type: $('#prop3_type').val(), |
| 4369 prop3_volume: parseFloat($('#prop3_volume').jqxNumberInput('decimal')), | 4377 prop3_volume: parseFloat($('#prop3_volume').jqxNumberInput('decimal')), |
| 4370 prop4_type: $('#prop4_type').val(), | 4378 prop4_type: $('#prop4_type').val(), |
| 4371 prop4_volume: parseFloat($('#prop4_volume').jqxNumberInput('decimal')), | 4379 prop4_volume: parseFloat($('#prop4_volume').jqxNumberInput('decimal')), |
| 4380 divide_type: dataRecord.divide_type, | |
| 4381 divide_size: dataRecord.divide_size, | |
| 4382 divide_parts: dataRecord.divide_parts, | |
| 4383 divide_from: dataRecord.divide_from, | |
| 4372 fermentables: $('#fermentableGrid').jqxGrid('getrows'), | 4384 fermentables: $('#fermentableGrid').jqxGrid('getrows'), |
| 4373 hops: $('#hopGrid').jqxGrid('getrows'), | 4385 hops: $('#hopGrid').jqxGrid('getrows'), |
| 4374 miscs: $('#miscGrid').jqxGrid('getrows'), | 4386 miscs: $('#miscGrid').jqxGrid('getrows'), |
| 4375 yeasts: $('#yeastGrid').jqxGrid('getrows'), | 4387 yeasts: $('#yeastGrid').jqxGrid('getrows'), |
| 4376 mashs: $('#mashGrid').jqxGrid('getrows') | 4388 mashs: $('#mashGrid').jqxGrid('getrows') |
| 4387 console.log('saveRecord(' + goback + ') success'); | 4399 console.log('saveRecord(' + goback + ') success'); |
| 4388 if (goback) | 4400 if (goback) |
| 4389 window.location.href = my_return; | 4401 window.location.href = my_return; |
| 4390 else | 4402 else |
| 4391 window.location.href = | 4403 window.location.href = |
| 4392 'prod_export.php?record=' + my_record + '&return=' + my_return + '&select=' + my_select + '&code=' + dataRecord.code + '&name=' + dataRecord.name; | 4404 'prod_export.php?record=' + my_record + '&return=' + my_return + '&select=' + my_select + '&code=' + dataRecord.code + '&name=' + dataRecord.name + |
| 4405 '&stage=' + dataRecord.stage + '&split=' + dataRecord.divide_type; | |
| 4393 }, | 4406 }, |
| 4394 error: function(jqXHR, textStatus, errorThrown) { | 4407 error: function(jqXHR, textStatus, errorThrown) { |
| 4395 console.log('saveRecord() ' + textStatus); | 4408 console.log('saveRecord() ' + textStatus); |
| 4396 } | 4409 } |
| 4397 }); | 4410 }); |
