개정판 102476f6
issue #923: add TeamConsolidateCommand
Change-Id: I2426013772bd3f7f129287c33024fc3fa7ef36d9
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 5085 | 5085 |
ConsolidationMethod(); |
| 5086 | 5086 |
} |
| 5087 | 5087 |
|
| 5088 |
/// <summary> |
|
| 5089 |
/// execute TeamConsolidationCommand |
|
| 5090 |
/// </summary> |
|
| 5088 | 5091 |
public void TeamConsolidationMethod() |
| 5089 | 5092 |
{
|
| 5090 |
UpdateMyMarkupList(); |
|
| 5093 |
this.UpdateMyMarkupList();
|
|
| 5091 | 5094 |
if (this.gridViewMarkup.SelectedItems.Count == 0) |
| 5092 | 5095 |
{
|
| 5093 | 5096 |
this.ParentOfType<MainWindow>().DialogMessage_Alert("Please select at least one user", "Alert");
|
| ... | ... | |
| 5102 | 5105 |
return; |
| 5103 | 5106 |
} |
| 5104 | 5107 |
} |
| 5105 |
ViewerDataModel.Instance.IsConsolidate = true; |
|
| 5106 |
this.ParentOfType<MainWindow>().dzTopMenu._SaveEvent(null, null); |
|
| 5107 |
List<KCOMDataModel.DataModel.MARKUP_DATA> instanceDataSet = new List<KCOMDataModel.DataModel.MARKUP_DATA>(); |
|
| 5108 |
|
|
| 5109 |
string project_no = App.ViewInfo.ProjectNO; |
|
| 5110 |
string doc_id = _DocInfo.ID; |
|
| 5111 |
string user_id = App.ViewInfo.UserID; |
|
| 5112 |
List<MarkupInfoItem> markupInfoItems = new List<MarkupInfoItem>(); |
|
| 5108 |
List<MarkupInfoItem> MarkupInfoList = new List<MarkupInfoItem>(); |
|
| 5113 | 5109 |
foreach (MarkupInfoItem item in this.gridViewMarkup.SelectedItems) |
| 5114 | 5110 |
{
|
| 5115 |
markupInfoItems.Add(item);
|
|
| 5111 |
MarkupInfoList.Add(item);
|
|
| 5116 | 5112 |
} |
| 5117 |
Logger.sendReqLog("TeamConsolidate", project_no + "," + user_id + "," + doc_id + "," + markupInfoItems, 1);
|
|
| 5118 |
Logger.sendResLog("TeamConsolidate", this.BaseClient.TeamConsolidate(project_no, user_id, doc_id, markupInfoItems).ToString(), 1);
|
|
| 5119 |
//this.BaseClient.TeamConsolidate(project_no, user_id, doc_id, markupInfoItems); |
|
| 5120 |
|
|
| 5121 |
Logger.sendReqLog("GetMarkupInfoItemsAsync", App.ViewInfo.ProjectNO + "," + _DocInfo.ID, 1);
|
|
| 5122 |
this.BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, _DocInfo.ID); |
|
| 5113 |
TeamConsolidateCommand.Instance.Execute(MarkupInfoList); |
|
| 5123 | 5114 |
} |
| 5124 | 5115 |
} |
| 5116 |
|
|
| 5125 | 5117 |
public void ConsolidationMethod() |
| 5126 | 5118 |
{
|
| 5127 | 5119 |
if (this.gridViewMarkup.SelectedItems.Count == 0) |
| ... | ... | |
| 5130 | 5122 |
} |
| 5131 | 5123 |
else |
| 5132 | 5124 |
{
|
| 5133 |
/* |
|
| 5134 |
ViewerDataModel.Instance.IsConsolidate = true; |
|
| 5135 |
this.ParentOfType<MainWindow>().dzTopMenu._SaveEvent(null, null); |
|
| 5136 |
|
|
| 5137 |
string project_no = App.ViewInfo.ProjectNO; |
|
| 5138 |
string doc_id = _DocInfo.ID; |
|
| 5139 |
string user_id = App.ViewInfo.UserID; |
|
| 5140 |
List<MarkupInfoItem> markupInfoItems = new List<MarkupInfoItem>(); |
|
| 5141 |
foreach (MarkupInfoItem item in this.gridViewMarkup.SelectedItems) |
|
| 5142 |
{
|
|
| 5143 |
markupInfoItems.Add(item); |
|
| 5144 |
} |
|
| 5145 |
Logger.sendReqLog("Consolidate", project_no + "," + user_id + "," + doc_id + "," + markupInfoItems, 1);
|
|
| 5146 |
Logger.sendResLog("Consolidate", this.BaseClient.Consolidate(project_no, user_id, doc_id, markupInfoItems).ToString(), 1);
|
|
| 5147 |
|
|
| 5148 |
Logger.sendReqLog("GetMarkupInfoItemsAsync", App.ViewInfo.ProjectNO + "," + _DocInfo.ID, 1);
|
|
| 5149 |
this.BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, _DocInfo.ID); |
|
| 5150 |
*/ |
|
| 5151 |
|
|
| 5152 | 5125 |
List<IKCOM.MarkupInfoItem> MySelectItem = new List<IKCOM.MarkupInfoItem>(); |
| 5153 | 5126 |
foreach (var item in this.gridViewMarkup.SelectedItems) |
| 5154 | 5127 |
{
|
내보내기 Unified diff
