comparison: www/js/prod_edit.js
www/js/prod_edit.js
- changeset 332
- f0ca77097236
- parent 331
- 8d7fad771dde
- child 333
- 2987e5bb830d
equal
deleted
inserted
replaced
| 331:8d7fad771dde | 332:f0ca77097236 |
|---|---|
| 3670 { name: 'y_min_temperature', type: 'float' }, | 3670 { name: 'y_min_temperature', type: 'float' }, |
| 3671 { name: 'y_max_temperature', type: 'float' }, | 3671 { name: 'y_max_temperature', type: 'float' }, |
| 3672 { name: 'y_attenuation', type: 'float' }, | 3672 { name: 'y_attenuation', type: 'float' }, |
| 3673 { name: 'y_use', type: 'int' }, | 3673 { name: 'y_use', type: 'int' }, |
| 3674 { name: 'y_cells', type: 'float' }, | 3674 { name: 'y_cells', type: 'float' }, |
| 3675 { name: 'y_tolerance', type: 'float' }, | |
| 3675 { name: 'y_inventory', type: 'float' }, | 3676 { name: 'y_inventory', type: 'float' }, |
| 3676 { name: 'y_avail', type: 'int' } | 3677 { name: 'y_avail', type: 'int' } |
| 3677 ], | 3678 ], |
| 3678 addrow: function (rowid, rowdata, position, commit) { | 3679 addrow: function (rowid, rowdata, position, commit) { |
| 3679 commit(true); | 3680 commit(true); |
| 3731 row["y_min_temperature"] = datarecord.min_temperature; | 3732 row["y_min_temperature"] = datarecord.min_temperature; |
| 3732 row["y_max_temperature"] = datarecord.max_temperature; | 3733 row["y_max_temperature"] = datarecord.max_temperature; |
| 3733 row["y_attenuation"] = datarecord.attenuation; | 3734 row["y_attenuation"] = datarecord.attenuation; |
| 3734 row["y_flocculation"] = datarecord.flocculation; | 3735 row["y_flocculation"] = datarecord.flocculation; |
| 3735 row["y_cells"] = datarecord.cells; | 3736 row["y_cells"] = datarecord.cells; |
| 3737 row["y_tolerance"] = datarecord.tolerance; | |
| 3736 row["y_inventory"] = datarecord.inventory; | 3738 row["y_inventory"] = datarecord.inventory; |
| 3737 var commit = $("#yeastGrid").jqxGrid('addrow', null, row); | 3739 var commit = $("#yeastGrid").jqxGrid('addrow', null, row); |
| 3738 } | 3740 } |
| 3739 calcYeast(); | 3741 calcYeast(); |
| 3740 $("#yaddrowbutton").jqxDropDownList('clearSelection'); | 3742 $("#yaddrowbutton").jqxDropDownList('clearSelection'); |
| 3771 return '<span style="margin: 4px; margin-top: 6px; float: left;">' + YeastFormData[value].nl + '</span>'; | 3773 return '<span style="margin: 4px; margin-top: 6px; float: left;">' + YeastFormData[value].nl + '</span>'; |
| 3772 } | 3774 } |
| 3773 }, | 3775 }, |
| 3774 { text: 'Min. °C', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_min_temperature' }, | 3776 { text: 'Min. °C', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_min_temperature' }, |
| 3775 { text: 'Max. °C', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_max_temperature' }, | 3777 { text: 'Max. °C', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_max_temperature' }, |
| 3778 { text: 'Tol. %', width: 60, align: 'right', cellsalign: 'right', datafield: 'y_tolerance', | |
| 3779 cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { | |
| 3780 var color = '#ffffff'; | |
| 3781 var amount = ""; | |
| 3782 if (value > 0) { | |
| 3783 amount = dataAdapter.formatNumber(value, "f1"); | |
| 3784 if (dataRecord.est_abv > value) | |
| 3785 color = '#ff4040'; | |
| 3786 } | |
| 3787 return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; | |
| 3788 } | |
| 3789 }, | |
| 3776 { text: 'Attn. %', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_attenuation', cellsformat: 'f1' }, | 3790 { text: 'Attn. %', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_attenuation', cellsformat: 'f1' }, |
| 3777 { text: 'Voor', width: 120, datafield: 'y_use', | 3791 { text: 'Voor', width: 120, datafield: 'y_use', |
| 3778 cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { | 3792 cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
| 3779 return '<span style="margin: 4px; margin-top: 6px; float: left;">' + YeastUseData[value].nl + '</span>'; | 3793 return '<span style="margin: 4px; margin-top: 6px; float: left;">' + YeastUseData[value].nl + '</span>'; |
| 3780 } | 3794 } |
| 3781 }, | 3795 }, |
| 3782 { text: 'Hoeveel', datafield: 'y_amount', width: 100, align: 'right', | 3796 { text: 'Hoeveel', datafield: 'y_amount', width: 90, align: 'right', |
| 3783 cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { | 3797 cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
| 3784 var amount = dataAdapter.formatNumber(value*1000, "f0")+" ml"; | 3798 var amount = dataAdapter.formatNumber(value*1000, "f0")+" ml"; |
| 3785 if (rowdata.y_form == 0) // Liquid | 3799 if (rowdata.y_form == 0) // Liquid |
| 3786 amount = dataAdapter.formatNumber(value, "f0")+" pk"; | 3800 amount = dataAdapter.formatNumber(value, "f0")+" pk"; |
| 3787 else if (rowdata.y_form == 1) // Dry | 3801 else if (rowdata.y_form == 1) // Dry |
| 3788 amount = dataAdapter.formatNumber(value*1000, "f1")+" gr"; | 3802 amount = dataAdapter.formatNumber(value*1000, "f1")+" gr"; |
| 3789 return '<span style="margin: 4px; margin-top: 6px; float: right;">' + amount + '</span>'; | 3803 return '<span style="margin: 4px; margin-top: 6px; float: right;">' + amount + '</span>'; |
| 3790 } | 3804 } |
| 3791 }, | 3805 }, |
| 3792 { text: 'Voorraad', datafield: 'y_inventory', width: 100, align: 'right', | 3806 { text: 'Voorraad', datafield: 'y_inventory', width: 90, align: 'right', |
| 3793 cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { | 3807 cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
| 3794 var color = '#ffffff'; | 3808 var color = '#ffffff'; |
| 3795 if (value < rowdata.y_amount) | 3809 if (value < rowdata.y_amount) |
| 3796 color = '#ff4040'; | 3810 color = '#ff4040'; |
| 3797 var amount = dataAdapter.formatNumber(value*1000, "f0")+" ml"; | 3811 var amount = dataAdapter.formatNumber(value*1000, "f0")+" ml"; |
| 3800 else if (rowdata.y_form == 1) // Dry | 3814 else if (rowdata.y_form == 1) // Dry |
| 3801 amount = dataAdapter.formatNumber(value*1000, "f1")+" gr"; | 3815 amount = dataAdapter.formatNumber(value*1000, "f1")+" gr"; |
| 3802 return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; | 3816 return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; |
| 3803 } | 3817 } |
| 3804 }, | 3818 }, |
| 3805 { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', cellsrenderer: function () { | 3819 { text: '', datafield: 'Edit', columntype: 'button', width: 90, align: 'center', cellsrenderer: function () { |
| 3806 return "Wijzig"; | 3820 return "Wijzig"; |
| 3807 }, buttonclick: function (row) { | 3821 }, buttonclick: function (row) { |
| 3808 if (dataRecord.stage <= 3) { | 3822 if (dataRecord.stage <= 3) { |
| 3809 yeastRow = row; | 3823 yeastRow = row; |
| 3810 yeastData = $("#yeastGrid").jqxGrid('getrowdata', yeastRow); | 3824 yeastData = $("#yeastGrid").jqxGrid('getrowdata', yeastRow); |
