개정판 33df85e7
issue #999: fixed save logic
Change-Id: I59b725f31e4349245fe4f058b65894d7a2aae1e1
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 340 | 340 |
} |
| 341 | 341 |
} |
| 342 | 342 |
|
| 343 |
if (sender != null) |
|
| 344 |
{
|
|
| 345 |
if (ViewerDataModel.Instance.IsPressCtrl) ViewerDataModel.Instance.IsPressCtrl = false; |
|
| 346 |
this.ParentOfType<MainWindow>().DialogMessage_Alert("Save 가 완료되었습니다.", "Alert");
|
|
| 347 |
} |
|
| 348 |
|
|
| 349 | 343 |
ViewerDataModel.Instance.UndoDataList.Clear(); |
| 350 | 344 |
} |
| 351 | 345 |
catch (Exception ex) |
| KCOM/Events/SaveCommand.cs | ||
|---|---|---|
| 80 | 80 |
List<MARKUP_DATA> markupdata = new List<MARKUP_DATA>(); |
| 81 | 81 |
ViewerDataModel.Instance.MyMarkupList.Where(d => d.MarkupInfoID == UserState.MarkupInfoID).ToList().GroupBy(p => p.ID).Select(g => g.First()).ToList().ForEach(value => |
| 82 | 82 |
{
|
| 83 |
var control = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, value.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, "#FFFF0000", "",
|
|
| 83 |
var control = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, value.Data, null, "#FFFF0000", "",
|
|
| 84 | 84 |
value.MarkupInfoID, value.ID); |
| 85 | 85 |
markupdata.Add((control as CommentUserInfo).GetMarkupData(App.ViewInfo.UserID, value.PageNumber, UserState.MarkupVersionID)); |
| 86 | 86 |
}); |
| 87 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveMarkupData(UserState, Project_No, document_id, user_id, markupdata);
|
|
| 87 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveMarkupData(UserState, Project_No, document_id, user_id, markupdata); |
|
| 88 | 88 |
} |
| 89 | 89 |
//User Information List Rebind |
| 90 | 90 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.gridViewMarkup.Rebind(); |
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 375 | 375 |
gridViewMarkup.ItemsSource = ViewerDataModel.Instance._markupInfoList; |
| 376 | 376 |
SetCommentPages(); |
| 377 | 377 |
|
| 378 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.GotoPage(1); |
|
| 379 | 378 |
var SelectedItem = ViewerDataModel.Instance._markupInfoList.Where(info => info.UserID == App.ViewInfo.UserID).OrderByDescending(order => order.UpdateTime).FirstOrDefault(); |
| 380 | 379 |
this.gridViewMarkup.SelectedItem = (PreviewUserMarkupInfoItem != null) ? PreviewUserMarkupInfoItem : SelectedItem; |
| 381 | 380 |
|
| MarkupToPDF/Controls/Parsing/MarkupParse.cs | ||
|---|---|---|
| 289 | 289 |
{
|
| 290 | 290 |
if (!string.IsNullOrEmpty(commentId)) control.CommentID = commentId; |
| 291 | 291 |
if (!string.IsNullOrEmpty(markupInfoID)) control.MarkupInfoID = markupInfoID; |
| 292 |
baseLayer.Add(control); |
|
| 292 |
if(baseLayer != null) baseLayer.Add(control);
|
|
| 293 | 293 |
control.ApplyTemplate(); |
| 294 | 294 |
///control.SetValue(ToolTipService.ToolTipProperty, ToolTipMessage); |
| 295 | 295 |
|
내보내기 Unified diff
