개정판 35a96e24
issue #000: BaseClient_GetMarkupInfoItemsCompleted에서 컨트롤을 생성하도록 수정
Change-Id: I378eb435ba6f0c5c45e3af40cb4ebfb6b79c2afa
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 515 | 515 |
gridViewMarkup.SelectedItem = PreviewUserMarkupInfoItem; |
| 516 | 516 |
} |
| 517 | 517 |
} |
| 518 |
|
|
| 519 | 518 |
} |
| 520 | 519 |
|
| 521 | 520 |
bool ComingNewBieEnd = false; |
| ... | ... | |
| 5228 | 5227 |
} |
| 5229 | 5228 |
public void ConsolidationMethod() |
| 5230 | 5229 |
{
|
| 5231 |
ChangeCommentReact(); |
|
| 5232 |
|
|
| 5233 | 5230 |
if (this.gridViewMarkup.SelectedItems.Count == 0) |
| 5234 | 5231 |
{
|
| 5235 | 5232 |
this.ParentOfType<MainWindow>().DialogMessage_Alert("Please select at least one user", "Alert");
|
| 5236 | 5233 |
} |
| 5237 | 5234 |
else |
| 5238 | 5235 |
{
|
| 5236 |
/* |
|
| 5239 | 5237 |
ViewerDataModel.Instance.IsConsolidate = true; |
| 5240 | 5238 |
this.ParentOfType<MainWindow>().dzTopMenu._SaveEvent(null, null); |
| 5241 |
List<KCOMDataModel.DataModel.MARKUP_DATA> instanceDataSet = new List<KCOMDataModel.DataModel.MARKUP_DATA>(); |
|
| 5242 | 5239 |
|
| 5243 | 5240 |
string project_no = App.ViewInfo.ProjectNO; |
| 5244 | 5241 |
string doc_id = _DocInfo.ID; |
| ... | ... | |
| 5250 | 5247 |
} |
| 5251 | 5248 |
Logger.sendReqLog("Consolidate", project_no + "," + user_id + "," + doc_id + "," + markupInfoItems, 1);
|
| 5252 | 5249 |
Logger.sendResLog("Consolidate", this.BaseClient.Consolidate(project_no, user_id, doc_id, markupInfoItems).ToString(), 1);
|
| 5253 |
//this.BaseClient.Consolidate(project_no, user_id, doc_id, markupInfoItems); |
|
| 5254 | 5250 |
|
| 5255 | 5251 |
Logger.sendReqLog("GetMarkupInfoItemsAsync", App.ViewInfo.ProjectNO + "," + _DocInfo.ID, 1);
|
| 5256 | 5252 |
this.BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, _DocInfo.ID); |
| 5253 |
*/ |
|
| 5254 |
|
|
| 5255 |
List<IKCOM.MarkupInfoItem> MySelectItem = new List<IKCOM.MarkupInfoItem>(); |
|
| 5256 |
foreach (var item in this.gridViewMarkup.SelectedItems) |
|
| 5257 |
{
|
|
| 5258 |
MySelectItem.Add(item as IKCOM.MarkupInfoItem); |
|
| 5259 |
} |
|
| 5260 |
int iPageNo = Convert.ToInt32(this.ParentOfType<MainWindow>().dzTopMenu.tlcurrentPage.Text); |
|
| 5257 | 5261 |
|
| 5262 |
ConsolidateCommand.Instance.Execute(MySelectItem, iPageNo); |
|
| 5258 | 5263 |
} |
| 5259 | 5264 |
} |
| 5260 | 5265 |
|
내보내기 Unified diff
