diff --git a/DataManager/ModelMapperProfile.cs b/DataManager/ModelMapperProfile.cs index 39ce7f9..0b1a521 100644 --- a/DataManager/ModelMapperProfile.cs +++ b/DataManager/ModelMapperProfile.cs @@ -423,7 +423,8 @@ public ModelMapperProfile(IModelCache modelCache) } var mapper = context.Mapper; - var destMultiScorings = src.Scorings.Select((x, i) => new MyKeyValuePair(mapper.Map(x), factors.ElementAt(i))); + //var destMultiScorings = src.Scorings.Select((x, i) => new MyKeyValuePair(mapper.Map(x), factors.ElementAt(i))); + var destMultiScorings = src.ScoringIds.Select((x, i) => new MyKeyValuePair(mapper.Map(modelCache.PutOrGetModel(new ScoringInfo(x))), factors.ElementAt(i))); return new ObservableCollection>(destMultiScorings); })) .ForMember(dest => dest.Scorings, opt => opt.UseDestinationValue()) diff --git a/iRLeagueManager/ViewModels/IncidentReviewViewModel.cs b/iRLeagueManager/ViewModels/IncidentReviewViewModel.cs index 9f358e9..2a938b9 100644 --- a/iRLeagueManager/ViewModels/IncidentReviewViewModel.cs +++ b/iRLeagueManager/ViewModels/IncidentReviewViewModel.cs @@ -121,9 +121,9 @@ public ObservableViewModelCollection } } - //private SessionViewModel session; - //public SessionViewModel Session { get => session; set => SetValue(ref session, value); } - public long SessionId => SessionId; + private SessionViewModel session; + public SessionViewModel Session { get => session; set => SetValue(ref session, value); } + //public long SessionId => SessionId; private MemberListViewModel memberList; public MemberListViewModel MemberList { get => memberList; set => SetValue(ref memberList, value); }