개정판 e05fe8ab
issue #1138: SetCommentPages 조건문 수정.(본인 코멘트 반영안되는 현상 수정)
Change-Id: I8a4bc281963cf34ada2009960a1945417b9d37b4
| KCOM/Events/SaveCommand.cs | ||
|---|---|---|
| 93 | 93 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveMarkupData(UserState, Project_No, document_id, user_id, markupdata); |
| 94 | 94 |
} |
| 95 | 95 |
//User Information List Rebind |
| 96 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.gridViewMarkup.Rebind(); |
|
| 97 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SetCommentPages(); |
|
| 98 |
TempFile.Remove(); //임시파일삭제 |
|
| 96 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.gridViewMarkup.Rebind(); |
|
| 97 |
TempFile.Remove(); //임시파일삭제 |
|
| 99 | 98 |
} |
| 100 | 99 |
catch (Exception) |
| 101 | 100 |
{
|
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 752 | 752 |
instanceMain.dzTopMenu.rotateOffSet = 0; |
| 753 | 753 |
var pageinfo = this.CurrentDoc.docInfo.DOCPAGE.Where(p => p.PAGE_NUMBER == e.CurrentPage.PAGE_NUMBER).FirstOrDefault(); |
| 754 | 754 |
drawingPannelRotate(pageinfo.PAGE_ANGLE); |
| 755 |
|
|
| 755 |
|
|
| 756 | 756 |
SetCommentPages(true); |
| 757 | 757 |
} |
| 758 | 758 |
|
| ... | ... | |
| 761 | 761 |
Logger.sendCheckLog("pageNavigator_PageChanging_SetCommentPages Setting", 1);
|
| 762 | 762 |
List<UsersCommentPagesMember> _pages = new List<UsersCommentPagesMember>(); |
| 763 | 763 |
foreach (var item in ViewerDataModel.Instance._markupInfoList) |
| 764 |
{
|
|
| 765 |
//Comment 가 존재할 경우에만 Thumbnail 에 추가 |
|
| 766 |
if(item.MarkupList != null) |
|
| 764 |
{
|
|
| 765 |
UsersCommentPagesMember instance = new UsersCommentPagesMember(); |
|
| 766 |
instance.UserName = item.UserName; |
|
| 767 |
instance.Depart = item.Depatment; |
|
| 768 |
instance.MarkupInfoID = item.MarkupInfoID; |
|
| 769 |
instance.IsSelected = true; |
|
| 770 |
instance.isConSolidation = item.Consolidate; |
|
| 771 |
instance.SetColor = item.DisplayColor; |
|
| 772 |
if (item.UserID == App.ViewInfo.UserID && item.MarkupInfoID == item.MarkupInfoID) |
|
| 767 | 773 |
{
|
| 768 |
UsersCommentPagesMember instance = new UsersCommentPagesMember(); |
|
| 769 |
instance.UserName = item.UserName; |
|
| 770 |
instance.Depart = item.Depatment; |
|
| 771 |
instance.MarkupInfoID = item.MarkupInfoID; |
|
| 772 |
instance.IsSelected = true; |
|
| 773 |
instance.isConSolidation = item.Consolidate; |
|
| 774 |
instance.SetColor = item.DisplayColor; |
|
| 775 |
if (item.UserID == App.ViewInfo.UserID && item.MarkupInfoID == item.MarkupInfoID) |
|
| 776 |
{
|
|
| 777 |
instance.PageNumber = ViewerDataModel.Instance.MyMarkupList.Select(d => d.PageNumber).ToList(); |
|
| 778 |
} |
|
| 779 |
else |
|
| 780 |
{
|
|
| 781 |
instance.PageNumber = ViewerDataModel.Instance.MarkupList_Pre.Where(data => data.MarkupInfoID == item.MarkupInfoID).Select(d => d.PageNumber).ToList(); |
|
| 782 |
} |
|
| 783 |
_pages.Add(instance); |
|
| 784 |
} |
|
| 774 |
instance.PageNumber = ViewerDataModel.Instance.MyMarkupList.Select(d => d.PageNumber).ToList(); |
|
| 775 |
} |
|
| 776 |
else |
|
| 777 |
{
|
|
| 778 |
instance.PageNumber = ViewerDataModel.Instance.MarkupList_Pre.Where(data => data.MarkupInfoID == item.MarkupInfoID).Select(d => d.PageNumber).ToList(); |
|
| 779 |
} |
|
| 780 |
_pages.Add(instance); |
|
| 785 | 781 |
} |
| 782 |
|
|
| 786 | 783 |
this.pageNavigator.SetCommentList(_pages.ToList()); |
| 787 | 784 |
} |
| 788 | 785 |
|
내보내기 Unified diff
