개정판 77cdac33
벽산 수정 후 백업
Change-Id: I8e3eb48f615478a49efa0ab4014a8ef17d273d0a
KCOM/Events/TeamConsolidateCommand.cs | ||
---|---|---|
8 | 8 |
using System.Collections.Generic; |
9 | 9 |
using System.Linq; |
10 | 10 |
using System.Text; |
11 |
using System.Threading.Tasks; |
|
11 | 12 |
using System.Windows.Controls; |
12 | 13 |
|
13 | 14 |
namespace KCOM.Events |
... | ... | |
42 | 43 |
{ |
43 | 44 |
try |
44 | 45 |
{ |
46 |
|
|
45 | 47 |
ViewerDataModel.Instance.IsConsolidate = true; |
46 | 48 |
/// save current working controls |
47 |
Common.ViewerDataModel.Instance.SystemMain.dzTopMenu._SaveEvent(null, null); |
|
48 |
|
|
49 |
//Common.ViewerDataModel.Instance.SystemMain.dzTopMenu._SaveEvent(null, null); |
|
50 |
//Common.ViewerDataModel.Instance.SystemMain.dzTopMenu.ExecuteSaveCommand(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu); |
|
51 |
|
|
49 | 52 |
ViewerDataModel.Instance.IsConsolidate = false; |
50 |
string project_no = App.ViewInfo.ProjectNO; |
|
53 |
|
|
51 | 54 |
string doc_id = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu._DocInfo.ID; |
52 | 55 |
string user_id = App.ViewInfo.UserID; |
53 | 56 |
//Logger.sendReqLog("TeamConsolidate", project_no + "," + user_id + "," + doc_id + "," + MarkupInfoList, 1); |
54 | 57 |
//Logger.sendResLog("TeamConsolidate", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.TeamConsolidate(project_no, user_id, doc_id, MarkupInfoList).ToString(), 1); |
55 |
|
|
58 |
var result = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.TeamConsolidate(App.ViewInfo.ProjectNO, user_id, doc_id, MarkupInfoList); |
|
56 | 59 |
//Logger.sendReqLog("GetMarkupInfoItemsAsync", App.ViewInfo.ProjectNO + "," + doc_id, 1); |
57 |
|
|
58 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, doc_id); |
|
60 |
|
|
61 |
if (result) |
|
62 |
{ |
|
63 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, doc_id); |
|
64 |
} |
|
65 |
else |
|
66 |
{ |
|
67 |
Common.ViewerDataModel.Instance.SystemMain.DialogMessage_Alert("System Error", "Alert"); |
|
68 |
} |
|
59 | 69 |
} |
60 | 70 |
catch(Exception ex) |
61 | 71 |
{ |
내보내기 Unified diff