Révision 42456640 GES_PAC/ViewModel/Controls/ChamberButtonViewModel.cs

Voir les différences:

GES_PAC/ViewModel/Controls/ChamberButtonViewModel.cs
20 20
        #endregion
21 21

  
22 22
        #region Propriétés
23
        public Serie CurrentSet
23
        public Serie? CurrentSet
24 24
        {
25 25
            get => _currentSet;
26 26
            set
......
82 82
                OnPropertyChanged();
83 83
            }
84 84
        }
85
        public SerieAnimal AnimalSet;
85
        public SerieAnimal? AnimalSet;
86 86
        private bool _isSubscribed = false;
87 87

  
88 88
        #endregion
......
111 111
            ButtonIsEnabled = true;
112 112
            ButtonLabel = "0";
113 113
            TimeIn = "";
114
            CurrentSet = JourneeViewModel.Instance.GetCurrentSet();
114
            CurrentSet = JourneeViewModel.Instance?.GetCurrentSet();
115 115

  
116 116
            UpdateChamberId(chamberId);
117 117
        }
......
126 126
        }
127 127
        public void UpdateProperties()
128 128
        {
129
            AnimalSet = CurrentSet.GetSerieAnimalByNumBoite(ChamberId);
129
            CurrentSet = JourneeViewModel.Instance?.GetCurrentSet();
130
            AnimalSet = CurrentSet?.GetSerieAnimalByNumBoite(ChamberId);
130 131
            ButtonText = ChamberId.ToString();
131 132

  
132 133
            int measureCount = AnimalSet?.GetMeasureCount() ?? 0;

Formats disponibles : Unified diff