Révision 5 UnitFeedDetail.pas

Voir les différences:

UnitFeedDetail.pas
211 211
    DBEditK: TDBEdit;
212 212
    DBEditCl: TDBEdit;
213 213
    DBEditBE: TDBEdit;
214
    LabelBEUnit: TLabel;
214 215
    procedure FormCreate(Sender: TObject);
215 216
    procedure FormShow(Sender: TObject);
216 217
    procedure ActionModifyExecute(Sender: TObject);
......
317 318
                  CellData(Row, FloatToStrF(ClientDataSetFeeds.Fields[i].AsFloat, ffFixed, 15, FormOptions.EnergyDecimals, USFormatSettings), 'Number')
318 319
                else
319 320
                  CellData(Row, '', 'String');
320
              4, 5, 18, 20, 22, 24, 26, 28, 30..34, 103:
321
              4, 5, 18, 20, 22, 24, 26, 28, 30..34, 101:
321 322
                if not ClientDataSetFeeds.Fields[i].IsNull
322 323
                then
323 324
                  CellData(Row, FloatToStrF(ClientDataSetFeeds.Fields[i].AsFloat, ffFixed, 15, 1, USFormatSettings), 'Number')
......
329 330
                  CellData(Row, FloatToStrF(ClientDataSetFeeds.Fields[i].AsFloat, ffFixed, 15, FormOptions.AADecimals, USFormatSettings), 'Number')
330 331
                else
331 332
                  CellData(Row, '', 'String');
332
              75..76, 104..105:
333
              75..76, 103..105:
333 334
                if not ClientDataSetFeeds.Fields[i].IsNull
334 335
                then
335 336
                  CellData(Row, FloatToStrF(ClientDataSetFeeds.Fields[i].AsFloat, ffFixed, 15, 2, USFormatSettings), 'Number')
......
347 348
                  CellData(Row, FloatToStrF(ClientDataSetFeeds.Fields[i].AsFloat, ffFixed, 15, FormOptions.MineralsDecimals, USFormatSettings), 'Number')
348 349
                else
349 350
                  CellData(Row, '', 'String');
350
              101:
351
                if not ClientDataSetIngredients.Fields[i].IsNull
352
                then
353
                  CellData(Row, FloatToStrF(ClientDataSetIngredients.Fields[i].AsFloat, ffFixed, 15, 2, USFormatSettings), 'Number')
354
                else
355
                  CellData(Row, '', 'String');
356 351
            end;
357 352
            // Unit
358 353
            case i of
......
390 385
                  CellData(Row, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals], 'String')
391 386
                else // sur mati?re s?che
392 387
                  CellData(Row, Format('%s %s', [FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals], _('DM')]), 'String');
393
              101: // %
388
              101: // Bilan ?lectrolytique
394 389
                if FormOptions.Expression = 0
395 390
                then // sur frais
396 391
                  CellData(Row, _('mEq/kg'), 'String')
397 392
                else // sur mati?re s?che
398 393
                  CellData(Row, Format('%s %s', [_('mEq/kg'), _('DM')]), 'String');
399
              109:
394
              109: // Phytase
400 395
                CellData(Row, _('IU/kg'), 'String');
401 396
            end;
402 397
          end;
......
788 783
//  LabelCa_Pd.Caption := Format('%s (%%)', [LabelCa_Pd.Caption]);
789 784
  if FormOptions.Expression = 0
790 785
  then // sur frais
791
    LabelBE.Caption := Format('%s (%s)', [LabelBE.Caption, _('mEq/kg')])
786
    LabelBEUnit.Caption := Format('(%s)', [_('mEq/kg')])
792 787
  else // sur mati?re s?che
793
    LabelBE.Caption := Format('%s (%s %s)', [LabelBE.Caption, _('mEq/kg'), _('DM')]);
788
    LabelBEUnit.Caption := Format('(%s %s)', [_('mEq/kg'), _('DM')]);
794 789
//  GroupBoxAzote.Caption := Format('%s (%%)', [GroupBoxAzote.Caption]);
795 790
  LabeldN.Caption := Format('%s (%%)', [LabeldN.Caption]);
796 791
  if FormOptions.Energy = 0

Formats disponibles : Unified diff