개정판 c00d0547
revised issue #999: fixed save logic
Change-Id: Ib7d414754fe0e14559b2fb1e6a612c537af5bde9
| KCOM/Events/SaveCommand.cs | ||
|---|---|---|
| 6 | 6 |
using MarkupToPDF.Controls.Parsing; |
| 7 | 7 |
using System; |
| 8 | 8 |
using System.Collections.Generic; |
| 9 |
using System.Collections.ObjectModel; |
|
| 9 | 10 |
using System.Linq; |
| 10 | 11 |
using System.Text; |
| 11 | 12 |
using System.Windows.Controls; |
| ... | ... | |
| 80 | 81 |
List<MARKUP_DATA> markupdata = new List<MARKUP_DATA>(); |
| 81 | 82 |
ViewerDataModel.Instance.MyMarkupList.Where(d => d.MarkupInfoID == UserState.MarkupInfoID).ToList().GroupBy(p => p.ID).Select(g => g.First()).ToList().ForEach(value => |
| 82 | 83 |
{
|
| 83 |
var control = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, value.Data, null, "#FFFF0000", "", |
|
| 84 |
value.MarkupInfoID, value.ID); |
|
| 85 |
markupdata.Add((control as CommentUserInfo).GetMarkupData(App.ViewInfo.UserID, value.PageNumber, UserState.MarkupVersionID)); |
|
| 84 |
markupdata.Add(new MARKUP_DATA() |
|
| 85 |
{
|
|
| 86 |
ID = value.ID, |
|
| 87 |
PAGENUMBER = value.PageNumber, |
|
| 88 |
DATA = value.Data, |
|
| 89 |
MARKUPINFO_VERSION_ID = UserState.MarkupVersionID, |
|
| 90 |
DATA_TYPE = value.Data_Type |
|
| 91 |
}); |
|
| 86 | 92 |
}); |
| 87 | 93 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveMarkupData(UserState, Project_No, document_id, user_id, markupdata); |
| 88 | 94 |
} |
내보내기 Unified diff
