개정판 62fa27ec
issue #1120: Comment 가 존재할 경우에만 Thumbnail 에 추가되도록 수정.
Change-Id: I9694a67fefda88f8fc4d4280ce7f0ff577ff9f3d
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 750 | 750 |
List<UsersCommentPagesMember> _pages = new List<UsersCommentPagesMember>(); |
| 751 | 751 |
foreach (var item in ViewerDataModel.Instance._markupInfoList) |
| 752 | 752 |
{
|
| 753 |
UsersCommentPagesMember instance = new UsersCommentPagesMember(); |
|
| 754 |
instance.UserName = item.UserName; |
|
| 755 |
instance.Depart = item.Depatment; |
|
| 756 |
instance.MarkupInfoID = item.MarkupInfoID; |
|
| 757 |
instance.IsSelected = true; |
|
| 758 |
instance.isConSolidation = item.Consolidate; |
|
| 759 |
instance.SetColor = item.DisplayColor; |
|
| 760 |
if (item.UserID == App.ViewInfo.UserID && item.MarkupInfoID == item.MarkupInfoID) |
|
| 753 |
//Comment 가 존재할 경우에만 Thumbnail 에 추가 |
|
| 754 |
if(item.MarkupList != null) |
|
| 761 | 755 |
{
|
| 762 |
instance.PageNumber = ViewerDataModel.Instance.MyMarkupList.Select(d => d.PageNumber).ToList(); |
|
| 763 |
} |
|
| 764 |
else |
|
| 765 |
{
|
|
| 766 |
instance.PageNumber = ViewerDataModel.Instance.MarkupList_Pre.Where(data => data.MarkupInfoID == item.MarkupInfoID).Select(d => d.PageNumber).ToList(); |
|
| 767 |
} |
|
| 768 |
_pages.Add(instance); |
|
| 756 |
UsersCommentPagesMember instance = new UsersCommentPagesMember(); |
|
| 757 |
instance.UserName = item.UserName; |
|
| 758 |
instance.Depart = item.Depatment; |
|
| 759 |
instance.MarkupInfoID = item.MarkupInfoID; |
|
| 760 |
instance.IsSelected = true; |
|
| 761 |
instance.isConSolidation = item.Consolidate; |
|
| 762 |
instance.SetColor = item.DisplayColor; |
|
| 763 |
if (item.UserID == App.ViewInfo.UserID && item.MarkupInfoID == item.MarkupInfoID) |
|
| 764 |
{
|
|
| 765 |
instance.PageNumber = ViewerDataModel.Instance.MyMarkupList.Select(d => d.PageNumber).ToList(); |
|
| 766 |
} |
|
| 767 |
else |
|
| 768 |
{
|
|
| 769 |
instance.PageNumber = ViewerDataModel.Instance.MarkupList_Pre.Where(data => data.MarkupInfoID == item.MarkupInfoID).Select(d => d.PageNumber).ToList(); |
|
| 770 |
} |
|
| 771 |
_pages.Add(instance); |
|
| 772 |
} |
|
| 769 | 773 |
} |
| 770 | 774 |
this.pageNavigator.SetCommentList(_pages.ToList()); |
| 771 | 775 |
} |
내보내기 Unified diff
