프로젝트

일반

사용자정보

개정판 b42dd24d

IDb42dd24ddb89ae3b28024ec36780f58abfd055db
상위 a1e2ba68
하위 bae83c92

김태성이(가) 3년 이상 전에 추가함

finalPDF 수정

Change-Id: Ic1c091379dcc59c6c7a0f42f275a4d57a9239229

차이점 보기:

KCOM/Events/ConsolidateCommand.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
......
39 40
        /// </summary>
40 41
        /// <param name="UserState"></param>
41 42
        /// <param name="iPageNo"></param>
42
        public void Execute(List<MarkupInfoItem> InfoList, int iPageNo)
43
        public async Task<bool> Execute(List<MarkupInfoItem> InfoList, int iPageNo)
43 44
        {
45
            bool result = false; 
46

  
44 47
            try
45 48
            {
49
                SelectionSet.Instance.UnSelect(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu);
50
                // update mylist and gridview
51
                Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.UpdateMyMarkupList();
52

  
53
                await Common.ViewerDataModel.Instance.SystemMain.dzTopMenu.ExecuteSaveCommand(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu);
54

  
46 55
                ViewerDataModel.Instance.IsConsolidate = true;
47 56
                string sDocID = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu._DocInfo.ID;
48 57
                /// 현재 작업 내용을 저장
49
                Common.ViewerDataModel.Instance.SystemMain.dzTopMenu._SaveEvent(null, null);
58
                //Common.ViewerDataModel.Instance.SystemMain.dzTopMenu._SaveEvent(null, null);
59

  
60
          
50 61
                ViewerDataModel.Instance.IsConsolidate = false;
51 62

  
52 63
                //Logger.sendReqLog("Consolidate", App.ViewInfo.ProjectNO + "," + App.ViewInfo.UserID + "," + sDocID + "," + InfoList, 1);
53 64
                //Logger.sendResLog("Consolidate", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.Consolidate(App.ViewInfo.ProjectNO, App.ViewInfo.UserID, sDocID, InfoList).ToString(), 1);
54 65

  
55
                var result = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.Consolidate(App.ViewInfo.ProjectNO, App.ViewInfo.UserID, sDocID, InfoList);
66
                result = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.Consolidate(App.ViewInfo.ProjectNO, App.ViewInfo.UserID, sDocID, InfoList);
56 67

  
57 68
                //Logger.sendReqLog("GetMarkupInfoItemsAsync", App.ViewInfo.ProjectNO + "," + sDocID, 1);
58 69
                Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, sDocID);
......
64 75
                Common.ViewerDataModel.Instance.SystemMain.DialogMessage_Alert(string.Format("{0}", ex.StackTrace), "Alert");
65 76
                throw ex;
66 77
            }
78

  
79
            return result;
67 80
        }
68 81
    }
69 82
}

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)