개정판 8129f2a5
issue #1035: Consolidate 시 데이터가 정상적으로 취합되지 않는 현상
Change-Id: I344ef162ace8d1b3c3818ad7ae1242695cd0ef33
| KCOM/Events/ConsolidateCommand.cs | ||
|---|---|---|
| 43 | 43 |
{
|
| 44 | 44 |
try |
| 45 | 45 |
{
|
| 46 |
ViewerDataModel.Instance.IsConsolidate = true; |
|
| 46 | 47 |
string sDocID = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu._DocInfo.ID; |
| 47 | 48 |
/// 현재 작업 내용을 저장 |
| 48 |
Common.ViewerDataModel.Instance.SystemMain.dzTopMenu.SaveEvent(null, null); |
|
| 49 |
Common.ViewerDataModel.Instance.SystemMain.dzTopMenu._SaveEvent(null, null);
|
|
| 49 | 50 |
|
| 50 | 51 |
Logger.sendReqLog("Consolidate", App.ViewInfo.ProjectNO + "," + App.ViewInfo.UserID + "," + sDocID + "," + InfoList, 1);
|
| 51 | 52 |
Logger.sendResLog("Consolidate", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.Consolidate(App.ViewInfo.ProjectNO, App.ViewInfo.UserID, sDocID, InfoList).ToString(), 1);
|
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 329 | 329 |
var menu = this.ParentOfType<MainWindow>().dzMainMenu; |
| 330 | 330 |
try |
| 331 | 331 |
{
|
| 332 |
// update mylist and gridview |
|
| 333 |
menu.UpdateMyMarkupList(); |
|
| 334 |
|
|
| 332 | 335 |
SelectionSet.Instance.UnSelect(this.ParentOfType<MainWindow>().dzMainMenu); |
| 333 | 336 |
|
| 334 | 337 |
this.ParentOfType<MainWindow>().dzMainMenu.InkControl_Convert(); |
| ... | ... | |
| 343 | 346 |
return; |
| 344 | 347 |
} |
| 345 | 348 |
else |
| 346 |
{
|
|
| 349 |
{
|
|
| 347 | 350 |
foreach (var item in menu.gridViewMarkup.SelectedItems) |
| 348 | 351 |
{
|
| 349 | 352 |
if ((item as IKCOM.MarkupInfoItem).UserID == App.ViewInfo.UserID) |
| ... | ... | |
| 382 | 385 |
} |
| 383 | 386 |
finally |
| 384 | 387 |
{
|
| 388 |
/* |
|
| 385 | 389 |
/// delete markup information when 코멘트가 없을 경우 |
| 386 | 390 |
if (ViewerDataModel.Instance.MyMarkupList.Count == 0) |
| 387 | 391 |
{
|
| ... | ... | |
| 389 | 393 |
{
|
| 390 | 394 |
if ((item as IKCOM.MarkupInfoItem).UserID == App.ViewInfo.UserID) |
| 391 | 395 |
{
|
| 392 |
this.ParentOfType<MainWindow>().dzMainMenu.DeleteItem((item as IKCOM.MarkupInfoItem)); |
|
| 396 |
//this.ParentOfType<MainWindow>().dzMainMenu.DeleteItem((item as IKCOM.MarkupInfoItem));
|
|
| 393 | 397 |
} |
| 394 | 398 |
} |
| 395 | 399 |
} |
| 400 |
*/ |
|
| 396 | 401 |
} |
| 397 | 402 |
} |
| 398 | 403 |
|
| ... | ... | |
| 420 | 425 |
} |
| 421 | 426 |
} |
| 422 | 427 |
|
| 423 |
menu.UpdateMyMarkupList(); |
|
| 428 |
|
|
| 424 | 429 |
SaveCommand.Instance.Execute(SelectedMarkupInfos, SaveCommand.Instance.page_no); |
| 425 | 430 |
SaveCommand.Instance.PageAngleSave(App.ViewInfo.ProjectNO, ViewerDataModel.Instance.RotationDocs); |
| 426 | 431 |
} |
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 349 | 349 |
PartConsolidate = 0, |
| 350 | 350 |
userDelete = true, |
| 351 | 351 |
AvoidConsolidate = 0, |
| 352 |
IsPreviewUser = true
|
|
| 352 |
IsPreviewUser = false
|
|
| 353 | 353 |
}; |
| 354 | 354 |
|
| 355 | 355 |
App.Custom_ViewInfoId = infoId; |
| 356 |
|
|
| 357 |
ViewerDataModel.Instance._markupInfoList.Insert(0, PreviewUserMarkupInfoItem); |
|
| 356 | 358 |
} |
| 357 | 359 |
else |
| 358 | 360 |
{
|
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 5095 | 5095 |
} |
| 5096 | 5096 |
else |
| 5097 | 5097 |
{
|
| 5098 |
|
|
| 5099 |
ViewerDataModel.Instance.IsConsolidate = true; |
|
| 5100 |
this.ParentOfType<MainWindow>().dzTopMenu._SaveEvent(null, null); |
|
| 5101 |
|
|
| 5098 | 5102 |
foreach (MarkupInfoItem item in this.gridViewMarkup.SelectedItems) |
| 5099 | 5103 |
{
|
| 5100 | 5104 |
if (!this.userData.DEPARTMENT.Equals(item.Depatment)) |
| ... | ... | |
| 5103 | 5107 |
return; |
| 5104 | 5108 |
} |
| 5105 | 5109 |
} |
| 5106 |
ViewerDataModel.Instance.IsConsolidate = true; |
|
| 5107 |
this.ParentOfType<MainWindow>().dzTopMenu._SaveEvent(null, null); |
|
| 5110 |
|
|
| 5108 | 5111 |
List<KCOMDataModel.DataModel.MARKUP_DATA> instanceDataSet = new List<KCOMDataModel.DataModel.MARKUP_DATA>(); |
| 5109 | 5112 |
|
| 5110 | 5113 |
string project_no = App.ViewInfo.ProjectNO; |
| ... | ... | |
| 5117 | 5120 |
} |
| 5118 | 5121 |
Logger.sendReqLog("TeamConsolidate", project_no + "," + user_id + "," + doc_id + "," + markupInfoItems, 1);
|
| 5119 | 5122 |
Logger.sendResLog("TeamConsolidate", this.BaseClient.TeamConsolidate(project_no, user_id, doc_id, markupInfoItems).ToString(), 1);
|
| 5120 |
//this.BaseClient.TeamConsolidate(project_no, user_id, doc_id, markupInfoItems); |
|
| 5121 |
|
|
| 5122 | 5123 |
Logger.sendReqLog("GetMarkupInfoItemsAsync", App.ViewInfo.ProjectNO + "," + _DocInfo.ID, 1);
|
| 5123 | 5124 |
this.BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, _DocInfo.ID); |
| 5124 | 5125 |
} |
| ... | ... | |
| 5150 | 5151 |
this.BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, _DocInfo.ID); |
| 5151 | 5152 |
*/ |
| 5152 | 5153 |
|
| 5153 |
ViewerDataModel.Instance.IsConsolidate = true; |
|
| 5154 |
this.ParentOfType<MainWindow>().dzTopMenu._SaveEvent(null, null); |
|
| 5155 |
|
|
| 5156 | 5154 |
List<IKCOM.MarkupInfoItem> MySelectItem = new List<IKCOM.MarkupInfoItem>(); |
| 5157 | 5155 |
foreach (var item in this.gridViewMarkup.SelectedItems) |
| 5158 | 5156 |
{
|
| 5159 | 5157 |
MySelectItem.Add(item as IKCOM.MarkupInfoItem); |
| 5160 | 5158 |
} |
| 5161 | 5159 |
int iPageNo = Convert.ToInt32(this.ParentOfType<MainWindow>().dzTopMenu.tlcurrentPage.Text); |
| 5162 |
|
|
| 5160 |
|
|
| 5163 | 5161 |
ConsolidateCommand.Instance.Execute(MySelectItem, iPageNo); |
| 5164 | 5162 |
} |
| 5165 | 5163 |
} |
내보내기 Unified diff
