개정판 cb33ad14
issue #999: add GetMarkupData() to CommentUserInfo class
Change-Id: I03b06eb325c7cd19a08d3d9cab66dd2328b2a374
KCOM/Services/BaseServices.cs | ||
---|---|---|
487 | 487 |
{ |
488 | 488 |
if ((item.UserID == App.ViewInfo.UserID) && (this.pageNavigator.CurrentPage != null)) |
489 | 489 |
{ |
490 |
|
|
491 | 490 |
var instance = ViewerDataModel.Instance.MarkupList_USER.Where(d => d.PageNumber == pageNavigator.CurrentPage.PageNumber && d.MarkupInfoID == item.MarkupInfoID).ToList(); |
492 | 491 |
var my_item = Common.ViewerDataModel.Instance.MarkupControls_USER.FirstOrDefault(); |
493 | 492 |
Common.ViewerDataModel.Instance.current_page_commentcnt = Common.ViewerDataModel.Instance.MarkupList_USER.Where(data => data.PageNumber == pageNavigator.CurrentPage.PageNumber && data.MarkupInfoID == item.MarkupInfoID).ToList().Count; |
... | ... | |
537 | 536 |
Common.ViewerDataModel.Instance.MarkupControls_USER.ToList().ForEach(delegate (MarkupToPDF.Common.CommentUserInfo markupitem) |
538 | 537 |
{ |
539 | 538 |
markupitem.Visibility = Visibility.Hidden; |
540 |
if (markupitem.IsNew) |
|
541 |
{ |
|
542 |
var root = MarkupParser.MarkupToString(markupitem, App.ViewInfo.UserID); |
|
543 |
ViewerDataModel.Instance.MarkupList_USER.Add(new MarkupItemEx |
|
544 |
{ |
|
545 |
ID = markupitem.CommentID, |
|
546 |
Data = root.ConvertData, |
|
547 |
Data_Type = root.DATA_TYPE, |
|
548 |
MarkupInfoID = markupitem.MarkupInfoID, |
|
549 |
PageNumber = this.pageNavigator.CurrentPage.PageNumber, |
|
550 |
}); |
|
551 |
} |
|
552 | 539 |
}); |
553 | 540 |
} |
554 | 541 |
} |
내보내기 Unified diff