Révision 5 UnitFeedCharts.pas

Voir les différences:

UnitFeedCharts.pas
318 318
                Value := ClientDataSetIngredientsdPphy.Value / 100 * ClientDataSetIngredientsP.Value * Ratio
319 319
              else // Granul?s (dP)
320 320
                Value := ClientDataSetIngredientsdP.Value / 100 * ClientDataSetIngredientsP.Value * Ratio;
321
            6: // Bilan ?lectrolytique
322
              Value := ClientDataSetIngredientsBE.Value * Ratio;
321 323
            else
322 324
              Value := 0;
323 325
          end;
......
414 416
      else // sur mati?re s?che
415 417
        Chart0.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), FormOptions.AADecimals, Total, FormOptions.ComboBoxAA.Items[FormOptions.AA], _('DM')]));
416 418
    4: // Min?raux
417
      if FormOptions.Expression = 0
418
      then // sur frais
419
        Chart0.SubTitle.Text.Add(Format('%s %1.*f %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals]]))
420
      else // sur mati?re s?che
421
        Chart0.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals], _('DM')]));
419
      if ComboBoxMinerals0.ItemIndex = 6
420
      then // Bilan ?lectrolytique
421
        if FormOptions.Expression = 0
422
        then // sur frais
423
          Chart0.SubTitle.Text.Add(Format('%s %1.*f %s', [_('Total:'), 1, Total, _('mEq/kg')]))
424
        else // sur mati?re s?che
425
          Chart0.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), 1, Total, _('mEq/kg'), _('DM')]))
426
      else
427
        if FormOptions.Expression = 0
428
        then // sur frais
429
          Chart0.SubTitle.Text.Add(Format('%s %1.*f %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals]]))
430
        else // sur mati?re s?che
431
          Chart0.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals], _('DM')]));
422 432
  end;
423 433
end;
424 434

  
......
597 607
            Cumul := ClientDataSetFeedsCl.Value;
598 608
          5: // Phosphore digestible
599 609
            Cumul := ClientDataSetFeedsPd.Value;
610
          6: // Bilan ?lectrolytique
611
            Cumul := ClientDataSetFeedsBE.Value;
600 612
          else
601 613
            Cumul := 0;
602 614
        end;
......
781 793
                Value := ClientDataSetIngredientsdPphy.Value / 100 * ClientDataSetIngredientsP.Value * Ratio
782 794
              else // Granul?s (dP)
783 795
                Value := ClientDataSetIngredientsdP.Value / 100 * ClientDataSetIngredientsP.Value * Ratio;
796
            6: // Bilan ?lectrolytique
797
              Value := ClientDataSetIngredientsBE.Value * Ratio;
784 798
            else
785 799
              Value := 0;
786 800
          end;
......
911 925
        else // sur mati?re s?che
912 926
          Chart1.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), FormOptions.AADecimals, Total, FormOptions.ComboBoxAA.Items[FormOptions.AA], _('DM')]));
913 927
      4: // Min?raux
914
        if FormOptions.Expression = 0
915
        then // sur frais
916
          Chart1.SubTitle.Text.Add(Format('%s %1.*f %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals]]))
917
        else // sur mati?re s?che
918
          Chart1.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals], _('DM')]));
928
        if ComboBoxMinerals1.ItemIndex = 6
929
        then // Bilan ?lectrolytique
930
          if FormOptions.Expression = 0
931
          then // sur frais
932
            Chart1.SubTitle.Text.Add(Format('%s %1.*f %s', [_('Total:'), 1, Total, _('mEq/kg')]))
933
          else // sur mati?re s?che
934
            Chart1.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), 1, Total, _('mEq/kg'), _('DM')]))
935
        else
936
          if FormOptions.Expression = 0
937
          then // sur frais
938
            Chart1.SubTitle.Text.Add(Format('%s %1.*f %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals]]))
939
          else // sur mati?re s?che
940
            Chart1.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals], _('DM')]));
919 941
    end;
920 942
  end;
921 943
end;
......
1095 1117
            Cumul := ClientDataSetFeedsCl.Value;
1096 1118
          5: // Phosphore digestible
1097 1119
            Cumul := ClientDataSetFeedsPd.Value;
1120
          6: // Bilan ?lectrolytique
1121
            Cumul := ClientDataSetFeedsBE.Value;
1098 1122
          else
1099 1123
            Cumul := 0;
1100 1124
        end;
......
1279 1303
                Value := ClientDataSetIngredientsdPphy.Value / 100 * ClientDataSetIngredientsP.Value * Ratio
1280 1304
              else // Granul?s (dP)
1281 1305
                Value := ClientDataSetIngredientsdP.Value / 100 * ClientDataSetIngredientsP.Value * Ratio;
1306
            6: // Bilan ?lectrolytique
1307
              Value := ClientDataSetIngredientsBE.Value * Ratio;
1282 1308
            else
1283 1309
              Value := 0;
1284 1310
          end;
......
1409 1435
        else // sur mati?re s?che
1410 1436
          Chart2.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), FormOptions.AADecimals, Total, FormOptions.ComboBoxAA.Items[FormOptions.AA], _('DM')]));
1411 1437
      4: // Min?raux
1412
        if FormOptions.Expression = 0
1413
        then // sur frais
1414
          Chart2.SubTitle.Text.Add(Format('%s %1.*f %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals]]))
1415
        else // sur mati?re s?che
1416
          Chart2.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals], _('DM')]));
1438
        if ComboBoxMinerals2.ItemIndex = 6
1439
        then // Bilan ?lectrolytique
1440
          if FormOptions.Expression = 0
1441
          then // sur frais
1442
            Chart2.SubTitle.Text.Add(Format('%s %1.*f %s', [_('Total:'), 1, Total, _('mEq/kg')]))
1443
          else // sur mati?re s?che
1444
            Chart2.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), 1, Total, _('mEq/kg'), _('DM')]))
1445
        else
1446
          if FormOptions.Expression = 0
1447
          then // sur frais
1448
            Chart2.SubTitle.Text.Add(Format('%s %1.*f %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals]]))
1449
          else // sur mati?re s?che
1450
            Chart2.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals], _('DM')]));
1417 1451
    end;
1418 1452
  end;
1419 1453
end;
......
1593 1627
            Cumul := ClientDataSetFeedsCl.Value;
1594 1628
          5: // Phosphore digestible
1595 1629
            Cumul := ClientDataSetFeedsPd.Value;
1630
          6: // Bilan ?lectrolytique
1631
            Cumul := ClientDataSetFeedsBE.Value;
1596 1632
          else
1597 1633
            Cumul := 0;
1598 1634
        end;
......
1777 1813
                Value := ClientDataSetIngredientsdPphy.Value / 100 * ClientDataSetIngredientsP.Value * Ratio
1778 1814
              else // Granul?s (dP)
1779 1815
                Value := ClientDataSetIngredientsdP.Value / 100 * ClientDataSetIngredientsP.Value * Ratio;
1816
            6: // Bilan ?lectrolytique
1817
              Value := ClientDataSetIngredientsBE.Value * Ratio;
1780 1818
            else
1781 1819
              Value := 0;
1782 1820
          end;
......
1907 1945
        else // sur mati?re s?che
1908 1946
          Chart3.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), FormOptions.AADecimals, Total, FormOptions.ComboBoxAA.Items[FormOptions.AA], _('DM')]));
1909 1947
      4: // Min?raux
1910
        if FormOptions.Expression = 0
1911
        then // sur frais
1912
          Chart3.SubTitle.Text.Add(Format('%s %1.*f %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals]]))
1913
        else // sur mati?re s?che
1914
          Chart3.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals], _('DM')]));
1948
        if ComboBoxMinerals3.ItemIndex = 6
1949
        then // Bilan ?lectrolytique
1950
          if FormOptions.Expression = 0
1951
          then // sur frais
1952
            Chart3.SubTitle.Text.Add(Format('%s %1.*f %s', [_('Total:'), 1, Total, _('mEq/kg')]))
1953
          else // sur mati?re s?che
1954
            Chart3.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), 1, Total, _('mEq/kg'), _('DM')]))
1955
        else
1956
          if FormOptions.Expression = 0
1957
          then // sur frais
1958
            Chart3.SubTitle.Text.Add(Format('%s %1.*f %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals]]))
1959
          else // sur mati?re s?che
1960
            Chart3.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals], _('DM')]));
1915 1961
    end;
1916 1962
  end;
1917 1963
end;
......
2091 2137
            Cumul := ClientDataSetFeedsCl.Value;
2092 2138
          5: // Phosphore digestible
2093 2139
            Cumul := ClientDataSetFeedsPd.Value;
2140
          6: // Bilan ?lectrolytique
2141
            Cumul := ClientDataSetFeedsBE.Value;
2094 2142
          else
2095 2143
            Cumul := 0;
2096 2144
        end;
......
2275 2323
                Value := ClientDataSetIngredientsdPphy.Value / 100 * ClientDataSetIngredientsP.Value * Ratio
2276 2324
              else // Granul?s (dP)
2277 2325
                Value := ClientDataSetIngredientsdP.Value / 100 * ClientDataSetIngredientsP.Value * Ratio;
2326
            6: // Bilan ?lectrolytique
2327
              Value := ClientDataSetIngredientsBE.Value * Ratio;
2278 2328
            else
2279 2329
              Value := 0;
2280 2330
          end;
......
2405 2455
        else // sur mati?re s?che
2406 2456
          Chart4.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), FormOptions.AADecimals, Total, FormOptions.ComboBoxAA.Items[FormOptions.AA], _('DM')]));
2407 2457
      4: // Min?raux
2408
        if FormOptions.Expression = 0
2409
        then // sur frais
2410
          Chart4.SubTitle.Text.Add(Format('%s %1.*f %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals]]))
2411
        else // sur mati?re s?che
2412
          Chart4.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals], _('DM')]));
2458
        if ComboBoxMinerals4.ItemIndex = 6
2459
        then // Bilan ?lectrolytique
2460
          if FormOptions.Expression = 0
2461
          then // sur frais
2462
            Chart4.SubTitle.Text.Add(Format('%s %1.*f %s', [_('Total:'), 1, Total, _('mEq/kg')]))
2463
          else // sur mati?re s?che
2464
            Chart4.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), 1, Total, _('mEq/kg'), _('DM')]))
2465
        else
2466
          if FormOptions.Expression = 0
2467
          then // sur frais
2468
            Chart4.SubTitle.Text.Add(Format('%s %1.*f %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals]]))
2469
          else // sur mati?re s?che
2470
            Chart4.SubTitle.Text.Add(Format('%s %1.*f %s %s', [_('Total:'), FormOptions.MineralsDecimals, Total, FormOptions.ComboBoxMinerals.Items[FormOptions.Minerals], _('DM')]));
2413 2471
    end;
2414 2472
  end;
2415 2473
end;

Formats disponibles : Unified diff