Révision 12ddf7ef GES_PAC/Model/Serie.cs

Voir les différences:

GES_PAC/Model/Serie.cs
51 51
                return false;
52 52
            return sa.HasBehaviour();
53 53
        }
54

  
55
        public ObservableCollection<bool> GetIsOutDatas()
54
        public bool GetIsInByNumeroBoite(int numeroBoite)
56 55
        {
57
            var isOutDatas = new ObservableCollection<bool>();
58
            for (int i = 1; i <= 12; i++)
59
            {
60
                var serieAnimal = SeriesAnimales.FirstOrDefault(sa => sa.NumeroBoite == i);
61
                isOutDatas.Add(!serieAnimal?.IsOut ?? true);
62
            }
63
            return isOutDatas;
56
            var serieAnimal = SeriesAnimales.FirstOrDefault(sa => sa.NumeroBoite == numeroBoite);
57
            if (serieAnimal == null || !serieAnimal.Mesures.Any())
58
                return true;
59
            return !serieAnimal?.IsOut ?? true;
64 60
        }
65 61

  
66 62
        public Mesure? GetLastMeasureByNumeroBoite(int numeroBoite)
......
71 67
            return serieAnimal.GetLastMeasure();
72 68
        }
73 69

  
74
        internal void AddMeasure(Mesure newMeasure, int numBoite)
70
        internal void AddMeasure(Mesure newMeasure, int numBoite, bool isAnimalOut)
75 71
        {
76
            SeriesAnimales.Select(sa => sa).Where(sa => sa.NumeroBoite == numBoite).First().AddMeasure(newMeasure);
72
            var sa = SeriesAnimales.Select(sa => sa).Where(sa => sa.NumeroBoite == numBoite).First();
73
            sa.AddMeasure(newMeasure);
74
            if (isAnimalOut)
75
                sa.IsOut = true;
77 76
        }
78 77

  
79 78
        internal void AddBehaviour(Comportement newBehaviour, int numBoite, bool isAnimalOut)

Formats disponibles : Unified diff