Mercurial > bms / file diff

--- a/www/js/rec_edit.js	Fri Jun 18 21:26:28 2021 +0200
+++ b/www/js/rec_edit.js	Sun Jun 27 10:15:09 2021 +0200
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
  *
  * Michiel Broek <mbroek at mbse dot eu>
  *
@@ -931,9 +931,6 @@
  editFermentable = function(data) {
   var fermentableSource = {
    localdata: data.fermentables,
-   datatype: 'local',
-   cache: false,
-   async: false,
    datafields: [
     { name: 'f_name', type: 'string' },
     { name: 'f_origin', type: 'string' },
@@ -1143,9 +1140,6 @@
  var editHop = function(data) {
   var hopSource = {
    localdata: data.hops,
-   datatype: 'local',
-   cache: false,
-   async: false,
    datafields: [
     { name: 'h_name', type: 'string' },
     { name: 'h_origin', type: 'string' },
@@ -1342,9 +1336,6 @@
  var editMisc = function(data) {
   var miscSource = {
    localdata: data.miscs,
-   datatype: 'local',
-   cache: false,
-   async: false,
    datafields: [
     { name: 'm_name', type: 'string' },
     { name: 'm_amount', type: 'float' },
@@ -1523,9 +1514,8 @@
     },
     { text: 'Voorraad', datafield: 'm_inventory', width: 110, align: 'right',
      cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) {
-      var amount, color = '#ffffff', vstr = rowdata.m_amount_is_weight ? 'gr' : 'ml';
-      if (value < rowdata.m_amount)
-       color = '#ff4040';
+      var vstr = rowdata.m_amount_is_weight ? 'gr' : 'ml',
+      color = (value < rowdata.m_amount) ? '#ff4040':'#ffffff',
       amount = dataAdapter.formatNumber(value * 1000, 'f2') + ' ' + vstr;
       return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>';
      },
@@ -1563,9 +1553,6 @@
  var editYeast = function(data) {
   var yeastSource = {
    localdata: data.yeasts,
-   datatype: 'local',
-   cache: false,
-   async: false,
    datafields: [
     { name: 'y_name', type: 'string' },
     { name: 'y_laboratory', type: 'string' },
@@ -1772,9 +1759,6 @@
  var editMash = function(data) {
   var mashSource = {
    localdata: data.mashs,
-   datatype: 'local',
-   cache: false,
-   async: false,
    datafields: [
     { name: 'step_name', type: 'string' },
     { name: 'step_type', type: 'int' },