개정판 1126281e
issue #753 consolidate & merged pdf method modify
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 4993 | 4993 |
} |
| 4994 | 4994 |
Logger.sendReqLog("Consolidate", project_no + "," + user_id + "," + doc_id + "," + markupInfoItems, 1);
|
| 4995 | 4995 |
Logger.sendResLog("Consolidate", this.BaseClient.Consolidate(project_no, user_id, doc_id, markupInfoItems).ToString(), 1);
|
| 4996 |
//this.BaseClient.Consolidate(project_no, user_id, doc_id, markupInfoItems); |
|
| 4997 |
|
|
| 4998 | 4996 |
Logger.sendReqLog("GetMarkupInfoItemsAsync", App.ViewInfo.ProjectNO + "," + _DocInfo.ID, 1);
|
| 4999 |
this.BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, _DocInfo.ID);
|
|
| 4997 |
var items = this.BaseClient.GetMarkupInfoItems(App.ViewInfo.ProjectNO, _DocInfo.ID);
|
|
| 5000 | 4998 |
|
| 5001 |
var item2 = gridViewMarkup.Items.Cast<MarkupInfoItem>().Where(d => d.Consolidate == 1 && d.AvoidConsolidate == 0).FirstOrDefault();
|
|
| 4999 |
var item2 = items.Where(d => d.Consolidate == 1 && d.AvoidConsolidate == 0).FirstOrDefault();
|
|
| 5002 | 5000 |
if (item2 != null) |
| 5003 | 5001 |
{
|
| 5004 | 5002 |
Logger.sendReqLog("SetFinalPDFAsync", _ViewInfo.ProjectNO + "," + _DocInfo.ID + "," + item2.MarkupInfoID + "," + _ViewInfo.UserID, 1);
|
| 5005 | 5003 |
|
| 5006 | 5004 |
BaseClient.SetFinalPDFAsync(_ViewInfo.ProjectNO, _DocInfo.ID, item2.MarkupInfoID, _ViewInfo.UserID); |
| 5005 |
BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, _DocInfo.ID); |
|
| 5007 | 5006 |
} |
| 5008 | 5007 |
else |
| 5009 | 5008 |
{
|
내보내기 Unified diff
