개정판 4836261b
issue #813 markup list user selected change event modify
KCOM/Controls/Sample.xaml.cs | ||
---|---|---|
692 | 692 |
//gogogo.ItemsSource = ViewerDataModel.Instance._markupInfoList.Where(d=>d.UserName == sender as RadCombo |
693 | 693 |
|
694 | 694 |
var temp = e.AddedItems.Cast<MarkupInfoItem>().FirstOrDefault(); |
695 |
temp.MarkupList.ForEach(d => |
|
695 |
var markuplist = ViewerDataModel.Instance.MarkupList_USER.Where(d => d.MarkupInfoID == temp.MarkupInfoID).ToList(); |
|
696 |
markuplist.ForEach(d => |
|
696 | 697 |
{ |
697 | 698 |
MarkupInfoSmallList.Add(new MarkupInfoItemSmall |
698 | 699 |
{ |
... | ... | |
705 | 706 |
}); |
706 | 707 |
gogogo.ItemsSource = null; |
707 | 708 |
gogogo.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList(); |
709 |
|
|
708 | 710 |
} |
709 | 711 |
} |
710 | 712 |
else |
... | ... | |
712 | 714 |
MarkupInfoSmallList.Clear(); |
713 | 715 |
ViewerDataModel.Instance._markupInfoList.ToList().ForEach(d => |
714 | 716 |
{ |
715 |
d.MarkupList.ForEach(b => |
|
717 |
var markuplist = ViewerDataModel.Instance.MarkupList_USER.Where(u => u.MarkupInfoID == d.MarkupInfoID).ToList(); |
|
718 |
|
|
719 |
markuplist.ForEach(b => |
|
716 | 720 |
{ |
717 | 721 |
MarkupInfoSmallList.Add(new MarkupInfoItemSmall |
718 | 722 |
{ |
... | ... | |
724 | 728 |
UserName = d.UserName, |
725 | 729 |
}); |
726 | 730 |
}); |
731 |
|
|
727 | 732 |
}); |
728 | 733 |
gogogo.ItemsSource = null; |
729 | 734 |
gogogo.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList(); |
... | ... | |
890 | 895 |
} |
891 | 896 |
} |
892 | 897 |
} |
898 |
public void MarkupListReload() |
|
899 |
{ |
|
900 |
ViewerDataModel.Instance._markupInfoList.ToList().ForEach(d => |
|
901 |
{ |
|
902 |
if (d.MarkupList != null) |
|
903 |
{ |
|
904 |
d.MarkupList.ForEach(b => |
|
905 |
{ |
|
906 |
MarkupInfoSmallList.Add(new MarkupInfoItemSmall |
|
907 |
{ |
|
908 |
Id = b.ID, |
|
909 |
Data = b.Data, |
|
910 |
Data_Type = b.Data_Type, |
|
911 |
PageNumber = b.PageNumber, |
|
912 |
UserID = d.UserID, |
|
913 |
UserName = d.UserName, |
|
914 |
}); |
|
915 |
}); |
|
916 |
} |
|
917 |
}); |
|
918 |
gogogo.ItemsSource = null; |
|
919 |
gogogo.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList(); |
|
893 | 920 |
|
921 |
commentPage.ItemsSource = MarkupInfoSmallList.Select(d => d.PageNumber).Distinct().OrderBy(d => d).ToList(); |
|
922 |
commentType.ItemsSource = MarkupInfoSmallList.Select(d => d.Data_Type).Distinct().OrderBy(d => d).ToList(); |
|
923 |
} |
|
894 | 924 |
private void gogogo_Loaded(object sender, RoutedEventArgs e) |
895 | 925 |
{ |
896 | 926 |
if (MarkupInfoSmallList.Count == 0) |
... | ... | |
914 | 944 |
} |
915 | 945 |
}); |
916 | 946 |
gogogo.ItemsSource = null; |
917 |
gogogo.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList(); ;
|
|
947 |
gogogo.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList(); |
|
918 | 948 |
|
919 | 949 |
commentPage.ItemsSource = MarkupInfoSmallList.Select(d => d.PageNumber).Distinct().OrderBy(d=>d).ToList(); |
920 | 950 |
commentType.ItemsSource = MarkupInfoSmallList.Select(d => d.Data_Type).Distinct().OrderBy(d => d).ToList(); |
... | ... | |
1015 | 1045 |
gogogo.ItemsSource = small_list.OrderBy(d => d.PageNumber).ToList(); |
1016 | 1046 |
tbSearch.Text = string.Empty; |
1017 | 1047 |
} |
1048 |
|
|
1018 | 1049 |
} |
1019 | 1050 |
} |
내보내기 Unified diff