Révision 5 UnitIngredientDetail.pas

Voir les différences:

UnitIngredientDetail.pas
209 209 
    LabelCl: TLabel;
210 210 
    DBEditBE: TDBEdit;
211 211 
    LabelBE: TLabel;
212 
    LabelBEUnit: TLabel;
212 213 
    procedure FormCreate(Sender: TObject);
213 214 
    procedure FormShow(Sender: TObject);
214 215 
    procedure ActionModifyExecute(Sender: TObject);
......
333 334 
                  CellData(Row, FloatToStrF(ClientDataSetIngredients.Fields[i].AsFloat, ffFixed, 15, FormOptions.MineralsDecimals, USFormatSettings), 'Number')
334 335 
                else
335 336 
                  CellData(Row, '', 'String');
336 
              125:
337 
              125..127:
337 338 
                if not ClientDataSetIngredients.Fields[i].IsNull
338 339 
                then
339 
                  CellData(Row, FloatToStrF(ClientDataSetIngredients.Fields[i].AsFloat, ffFixed, 15, 2, USFormatSettings), 'Number')
340 
                else
341 
                  CellData(Row, '', 'String');
342 
              126..127:
343 
                if not ClientDataSetIngredients.Fields[i].IsNull
344 
                then
345 340 
                  CellData(Row, FloatToStrF(ClientDataSetIngredients.Fields[i].AsFloat, ffFixed, 15, 1, USFormatSettings), 'Number')
346 341 
                else
347 342 
                  CellData(Row, '', 'String');
......
382 377 
                  CellData(Row, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals], 'String')
383 378 
                else // sur mati?re s?che
384 379 
                  CellData(Row, Format('%s %s', [FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals], _('DM')]), 'String');
385 
              125: // %
380 
              125: // Bilan ?lectrolytique
386 381 
                if FormOptions.Expression = 0
387 382 
                then // sur frais
388 383 
                  CellData(Row, _('mEq/kg'), 'String')
......
848 843 
  GroupBoxMinerals.Caption := Format('%s (%s)', [GroupBoxMinerals.Caption, MineralsUnit]);
849 844 
  if FormOptions.Expression = 0
850 845 
  then // sur frais
851 
    LabelBE.Caption := Format('%s (%s)', [LabelBE.Caption, _('mEq/kg')])
846 
    LabelBEUnit.Caption := Format('(%s)', [_('mEq/kg')])
852 847 
  else // sur mati?re s?che
853 
    LabelBE.Caption := Format('%s (%s %s)', [LabelBE.Caption, _('mEq/kg'), _('DM')]);
848 
    LabelBEUnit.Caption := Format('(%s %s)', [_('mEq/kg'), _('DM')]);
854 849 
  LabelDigP.Caption := Format('%s (%%)', [LabelDigP.Caption]);
855 850 
  GroupBoxEnergy.Caption := Format('%s (%s)', [GroupBoxEnergy.Caption, EnergyUnit]);
856 851 
  LabelRatio.Caption := Format('%s (%%)', [LabelRatio.Caption]);

Formats disponibles : Unified diff