개정판 073f6118
issue #000: tempfile path combine 수정, Save 시 User List Rebind 추가, 초기 User List Update time 수정. Stamp 메뉴 Visible false 조건문 삭제.
Change-Id: I6831eb2435e3a376e83caf50f5dd97f0c1b07ce8
| KCOM/Common/TempFile.cs | ||
|---|---|---|
| 45 | 45 |
{
|
| 46 | 46 |
get |
| 47 | 47 |
{
|
| 48 |
return Path.Combine(Path.GetTempPath(), "MARKUS\\" + App.ViewInfo.DocumentItemID + ".tmp");
|
|
| 48 |
return Path.Combine(Path.GetTempPath(), "MARKUS",App.ViewInfo.DocumentItemID + ".tmp");
|
|
| 49 | 49 |
} |
| 50 | 50 |
} |
| 51 | 51 |
|
| KCOM/Events/SaveCommand.cs | ||
|---|---|---|
| 84 | 84 |
value.MarkupInfoID, value.ID); |
| 85 | 85 |
markupdata.Add((control as CommentUserInfo).GetMarkupData(App.ViewInfo.UserID, value.PageNumber, UserState.MarkupVersionID)); |
| 86 | 86 |
}); |
| 87 |
|
|
| 88 |
Logger.sendResLog("GetMarkupDataListperPage", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveMarkupData(UserState, Project_No, document_id, user_id, markupdata).ToString(), 1);
|
|
| 87 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveMarkupData(UserState, Project_No, document_id, user_id, markupdata); |
|
| 89 | 88 |
} |
| 89 |
//User Information List Rebind |
|
| 90 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.gridViewMarkup.Rebind(); |
|
| 90 | 91 |
TempFile.Remove(); //임시파일삭제 |
| 91 | 92 |
} |
| 92 | 93 |
catch (Exception) |
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 333 | 333 |
PreviewUserMarkupInfoItem = new MarkupInfoItem |
| 334 | 334 |
{
|
| 335 | 335 |
CreateTime = DateTime.Now, |
| 336 |
UpdateTime = DateTime.Now, |
|
| 336 | 337 |
Depatment = userData.DEPARTMENT, |
| 337 | 338 |
DisplayColor = "#FFFF0000", |
| 338 | 339 |
UserID = userData.ID, |
| ... | ... | |
| 377 | 378 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.GotoPage(1); |
| 378 | 379 |
var SelectedItem = ViewerDataModel.Instance._markupInfoList.Where(info => info.UserID == App.ViewInfo.UserID).OrderByDescending(order => order.UpdateTime).FirstOrDefault(); |
| 379 | 380 |
this.gridViewMarkup.SelectedItem = (PreviewUserMarkupInfoItem != null) ? PreviewUserMarkupInfoItem : SelectedItem; |
| 380 |
|
|
| 381 |
|
|
| 381 | 382 |
/// create a group descriptor |
| 382 | 383 |
gridViewMarkup.GroupDescriptors.Clear(); |
| 383 | 384 |
GroupDescriptor descriptor = new GroupDescriptor(); |
| ... | ... | |
| 665 | 666 |
{
|
| 666 | 667 |
this._ViewInfo.DocumentItemID = docid; |
| 667 | 668 |
} |
| 668 |
|
|
| 669 |
if (!(App.ViewInfo.ProjectNO == "000000" || App.ViewInfo.ProjectNO == "000001")) |
|
| 670 |
{
|
|
| 671 |
ViewerDataModel.Instance.SystemMain.dzTopMenu.btnTopStamp.Visibility = Visibility.Collapsed; |
|
| 672 |
} |
|
| 673 |
Logger.sendReqLog("GetSystemDataAsync", "", 1);
|
|
| 669 |
Logger.sendReqLog("GetSystemDataAsync", "", 1);
|
|
| 674 | 670 |
BaseClient.GetSystemDataAsync(); |
| 675 | 671 |
} |
| 676 | 672 |
|
내보내기 Unified diff
