개정판 036650a0
issue #999: Add serialize method to all of controls
Change-Id: I74e404885e8cd107b48ad1921e768137ed14a3da
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 15 | 15 |
using System.Windows; |
| 16 | 16 |
using System.Windows.Controls; |
| 17 | 17 |
using Telerik.Windows.Controls; |
| 18 |
using MarkupToPDF.Controls.Parsing; |
|
| 18 | 19 |
|
| 19 | 20 |
namespace KCOM.Views |
| 20 | 21 |
{
|
| ... | ... | |
| 458 | 459 |
MarkupInfoItem instanceItem = e.AddedItems.FirstOrDefault() as MarkupInfoItem; |
| 459 | 460 |
var result = instanceItem.Consolidate; |
| 460 | 461 |
|
| 461 |
//dataSet.Where(data => data.UserID == "H2011357").ToList().ForEach(data => lstbox.SelectedItems.Remove(data)); |
|
| 462 | 462 |
if (ea.DialogResult.Value) |
| 463 | 463 |
{
|
| 464 | 464 |
ConsolidationMethod(); |
| ... | ... | |
| 488 | 488 |
{
|
| 489 | 489 |
if ((item.UserID == App.ViewInfo.UserID) && (this.pageNavigator.CurrentPage != null)) |
| 490 | 490 |
{
|
| 491 |
|
|
| 492 | 491 |
var instance = ViewerDataModel.Instance.MarkupList_USER.Where(d => d.PageNumber == pageNavigator.CurrentPage.PageNumber && d.MarkupInfoID == item.MarkupInfoID).ToList(); |
| 493 | 492 |
var my_item = Common.ViewerDataModel.Instance.MarkupControls_USER.FirstOrDefault(); |
| 494 | 493 |
Common.ViewerDataModel.Instance.current_page_commentcnt = Common.ViewerDataModel.Instance.MarkupList_USER.Where(data => data.PageNumber == pageNavigator.CurrentPage.PageNumber && data.MarkupInfoID == item.MarkupInfoID).ToList().Count; |
| ... | ... | |
| 539 | 538 |
markupitem.Visibility = Visibility.Hidden; |
| 540 | 539 |
if (markupitem.IsNew) |
| 541 | 540 |
{
|
| 542 |
var root = layerControl.MarkupToString(markupitem, App.ViewInfo.UserID);
|
|
| 541 |
var root = MarkupParser.MarkupToString(markupitem, App.ViewInfo.UserID);
|
|
| 543 | 542 |
ViewerDataModel.Instance.MarkupList_USER.Add(new MarkupItemEx |
| 544 | 543 |
{
|
| 545 | 544 |
ID = markupitem.CommentID, |
내보내기 Unified diff
