개정판 8129f2a5
issue #1035: Consolidate 시 데이터가 정상적으로 취합되지 않는 현상
Change-Id: I344ef162ace8d1b3c3818ad7ae1242695cd0ef33
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