개정판 129ca191
issue #923: fixed save changed controls logic
Change-Id: I434adb979a8adcf0407d75504e0ecfc48085f988
| KCOM/Events/SaveCommand.cs | ||
|---|---|---|
| 71 | 71 |
/// </summary> |
| 72 | 72 |
/// <param name="UserState"></param> |
| 73 | 73 |
/// <param name="iPageNo"></param> |
| 74 |
public void Execute(ICollection<MarkupInfoItem> UserStates, int iPageNo)
|
|
| 74 |
public void Execute(ICollection<MarkupInfoItem> UserStates) |
|
| 75 | 75 |
{
|
| 76 | 76 |
try |
| 77 | 77 |
{
|
| 78 | 78 |
foreach (var UserState in UserStates) |
| 79 | 79 |
{
|
| 80 | 80 |
List<MARKUP_DATA> markupdata = new List<MARKUP_DATA>(); |
| 81 |
ViewerDataModel.Instance.MarkupControls_USER.Where(d => d.MarkupInfoID == UserState.MarkupInfoID).ToList().GroupBy(p => p.CommentID).Select(g => g.First()).ToList().ForEach(value =>
|
|
| 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 |
markupdata.Add(value.GetMarkupData(App.ViewInfo.UserID, iPageNo, UserState.MarkupVersionID)); |
|
| 83 |
var control = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, value.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, "#FFFF0000", "", |
|
| 84 |
value.MarkupInfoID, value.ID); |
|
| 85 |
markupdata.Add((control as CommentUserInfo).GetMarkupData(App.ViewInfo.UserID, value.PageNumber, UserState.MarkupVersionID)); |
|
| 84 | 86 |
}); |
| 85 | 87 |
|
| 86 |
Logger.sendReqLog("GetMarkupDataListperPage: ", UserState + "," + Project_No + "," + document_id + "," + user_id + "," + markupdata, 1);
|
|
| 87 | 88 |
Logger.sendResLog("GetMarkupDataListperPage", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveMarkupData(UserState, Project_No, document_id, user_id, markupdata).ToString(), 1);
|
| 88 | 89 |
} |
| 89 | 90 |
TempFile.Remove(); //임시파일삭제 |
| ... | ... | |
| 136 | 137 |
throw; |
| 137 | 138 |
} |
| 138 | 139 |
} |
| 140 |
|
|
| 139 | 141 |
public void PageAngleSave(string project_no, List<DOCPAGE> _mldocpage) |
| 140 | 142 |
{
|
| 141 | 143 |
try |
| 142 | 144 |
{
|
| 143 |
|
|
| 144 | 145 |
Logger.sendReqLog("SavePageAngle: ", project_no + "," + _mldocpage, 1);
|
| 145 | 146 |
Logger.sendResLog("SavePageAngle", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SavePageAngle(project_no, _mldocpage).ToString(), 1);
|
| 146 | 147 |
Common.ViewerDataModel.Instance.RotationDocs.Clear(); |
내보내기 Unified diff
