comparison: www/js/rec_edit.js
www/js/rec_edit.js
- changeset 332
- f0ca77097236
- parent 331
- 8d7fad771dde
- child 336
- 3323b02c1bbe
equal
deleted
inserted
replaced
| 331:8d7fad771dde | 332:f0ca77097236 |
|---|---|
| 2354 { name: 'y_min_temperature', type: 'float' }, | 2354 { name: 'y_min_temperature', type: 'float' }, |
| 2355 { name: 'y_max_temperature', type: 'float' }, | 2355 { name: 'y_max_temperature', type: 'float' }, |
| 2356 { name: 'y_attenuation', type: 'float' }, | 2356 { name: 'y_attenuation', type: 'float' }, |
| 2357 { name: 'y_use', type: 'int' }, | 2357 { name: 'y_use', type: 'int' }, |
| 2358 { name: 'y_cells', type: 'float' }, | 2358 { name: 'y_cells', type: 'float' }, |
| 2359 { name: 'y_tolerance', type: 'float' }, | |
| 2359 { name: 'y_inventory', type: 'float' }, | 2360 { name: 'y_inventory', type: 'float' }, |
| 2360 { name: 'y_avail', type: 'int' } | 2361 { name: 'y_avail', type: 'int' } |
| 2361 ], | 2362 ], |
| 2362 addrow: function (rowid, rowdata, position, commit) { | 2363 addrow: function (rowid, rowdata, position, commit) { |
| 2363 commit(true); | 2364 commit(true); |
| 2414 row["y_min_temperature"] = datarecord.min_temperature; | 2415 row["y_min_temperature"] = datarecord.min_temperature; |
| 2415 row["y_max_temperature"] = datarecord.max_temperature; | 2416 row["y_max_temperature"] = datarecord.max_temperature; |
| 2416 row["y_attenuation"] = datarecord.attenuation; | 2417 row["y_attenuation"] = datarecord.attenuation; |
| 2417 row["y_flocculation"] = datarecord.flocculation; | 2418 row["y_flocculation"] = datarecord.flocculation; |
| 2418 row["y_cells"] = datarecord.cells; | 2419 row["y_cells"] = datarecord.cells; |
| 2420 row["y_tolerance"] = datarecord.tolerance; | |
| 2419 row["y_inventory"] = datarecord.inventory; | 2421 row["y_inventory"] = datarecord.inventory; |
| 2420 var commit = $("#yeastGrid").jqxGrid('addrow', null, row); | 2422 var commit = $("#yeastGrid").jqxGrid('addrow', null, row); |
| 2421 } | 2423 } |
| 2422 $("#yaddrowbutton").jqxDropDownList('clearSelection'); | 2424 $("#yaddrowbutton").jqxDropDownList('clearSelection'); |
| 2423 }); | 2425 }); |
| 2450 return '<span style="margin: 4px; margin-top: 6px; float: left;">' + YeastFormData[value].nl + '</span>'; | 2452 return '<span style="margin: 4px; margin-top: 6px; float: left;">' + YeastFormData[value].nl + '</span>'; |
| 2451 } | 2453 } |
| 2452 }, | 2454 }, |
| 2453 { text: 'Min. °C', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_min_temperature' }, | 2455 { text: 'Min. °C', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_min_temperature' }, |
| 2454 { text: 'Max. °C', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_max_temperature' }, | 2456 { text: 'Max. °C', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_max_temperature' }, |
| 2457 { text: 'Tol. %', width: 60, align: 'right', cellsalign: 'right', datafield: 'y_tolerance', | |
| 2458 cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { | |
| 2459 var color = '#ffffff'; | |
| 2460 var amount = ""; | |
| 2461 if (value > 0) { | |
| 2462 amount = dataAdapter.formatNumber(value, "f1"); | |
| 2463 if (dataRecord.est_abv > value) | |
| 2464 color = '#ff4040'; | |
| 2465 } | |
| 2466 return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; | |
| 2467 } | |
| 2468 }, | |
| 2455 { text: 'Attn. %', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_attenuation', cellsformat: 'f1' }, | 2469 { text: 'Attn. %', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_attenuation', cellsformat: 'f1' }, |
| 2456 { text: 'Voor', width: 120, datafield: 'y_use', | 2470 { text: 'Voor', width: 120, datafield: 'y_use', |
| 2457 cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { | 2471 cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
| 2458 return '<span style="margin: 4px; margin-top: 6px; float: left;">' + YeastUseData[value].nl + '</span>'; | 2472 return '<span style="margin: 4px; margin-top: 6px; float: left;">' + YeastUseData[value].nl + '</span>'; |
| 2459 } | 2473 } |
| 2460 }, | 2474 }, |
| 2461 { text: 'Hoeveel', datafield: 'y_amount', width: 100, align: 'right', | 2475 { text: 'Hoeveel', datafield: 'y_amount', width: 90, align: 'right', |
| 2462 cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { | 2476 cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
| 2463 var amount = dataAdapter.formatNumber(value*1000, "f0")+" ml"; | 2477 var amount = dataAdapter.formatNumber(value*1000, "f0")+" ml"; |
| 2464 if (rowdata.y_form == 0) // Liquid | 2478 if (rowdata.y_form == 0) // Liquid |
| 2465 amount = dataAdapter.formatNumber(value, "f0")+" pk"; | 2479 amount = dataAdapter.formatNumber(value, "f0")+" pk"; |
| 2466 else if (rowdata.y_form == 1) // Dry | 2480 else if (rowdata.y_form == 1) // Dry |
| 2467 amount = dataAdapter.formatNumber(value*1000, "f1")+" gr"; | 2481 amount = dataAdapter.formatNumber(value*1000, "f1")+" gr"; |
| 2468 return '<span style="margin: 4px; margin-top: 6px; float: right;">' + amount + '</span>'; | 2482 return '<span style="margin: 4px; margin-top: 6px; float: right;">' + amount + '</span>'; |
| 2469 } | 2483 } |
| 2470 }, | 2484 }, |
| 2471 { text: 'Voorraad', datafield: 'y_inventory', width: 100, align: 'right', | 2485 { text: 'Voorraad', datafield: 'y_inventory', width: 90, align: 'right', |
| 2472 cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { | 2486 cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
| 2473 var color = '#ffffff'; | 2487 var color = '#ffffff'; |
| 2474 if (value < rowdata.y_amount) | 2488 if (value < rowdata.y_amount) |
| 2475 color = '#ff4040'; | 2489 color = '#ff4040'; |
| 2476 var amount = dataAdapter.formatNumber(value*1000, "f0")+" ml"; | 2490 var amount = dataAdapter.formatNumber(value*1000, "f0")+" ml"; |
| 2479 else if (rowdata.y_form == 1) // Dry | 2493 else if (rowdata.y_form == 1) // Dry |
| 2480 amount = dataAdapter.formatNumber(value*1000, "f1")+" gr"; | 2494 amount = dataAdapter.formatNumber(value*1000, "f1")+" gr"; |
| 2481 return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; | 2495 return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; |
| 2482 } | 2496 } |
| 2483 }, | 2497 }, |
| 2484 { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', cellsrenderer: function () { | 2498 { text: '', datafield: 'Edit', columntype: 'button', width: 90, align: 'center', cellsrenderer: function () { |
| 2485 return "Wijzig"; | 2499 return "Wijzig"; |
| 2486 }, buttonclick: function (row) { | 2500 }, buttonclick: function (row) { |
| 2487 yeastRow = row; | 2501 yeastRow = row; |
| 2488 yeastData = $("#yeastGrid").jqxGrid('getrowdata', yeastRow); | 2502 yeastData = $("#yeastGrid").jqxGrid('getrowdata', yeastRow); |
| 2489 if (yeastData.y_form == 0) { | 2503 if (yeastData.y_form == 0) { |
