프로젝트

일반

사용자정보

개정판 29010418

ID2901041836eed3cf191eeca4c32e2e52ff8deab8
상위 ced47e14
하위 6c8c6f91, f72fe197

이지연이(가) 5년 이상 전에 추가함

issue #000: daelim source compare 중

Change-Id: Icba4b84746c71502e895fde47f4c14f82b179230

차이점 보기:

KCOM/Services/BaseServices.cs
19 19
namespace KCOM.Views
20 20
{
21 21
    public partial class MainMenu : UserControl, INotifyPropertyChanged
22
    {        
22
    {
23 23
        const string DeepZoomUrl = @"http://{baseUrl}/TileSource/{TileSourcePath}/{ItemsPath}/{SharepointItemID}/{PageNo}.jpg";
24 24
        public ServiceDeepViewClient BaseClient;
25 25
        public ViewInfo _ViewInfo;
......
54 54
        }
55 55
        public void ServiceOn()
56 56
        {
57
            BaseClient = new ServiceDeepViewClient(App._binding, App._EndPoint);            
58
            
57
            BaseClient = new ServiceDeepViewClient(App._binding, App._EndPoint);
58

  
59 59
            BaseClient.GetDocInfoCompleted += BaseClient_GetDocInfoCompleted; //문서 섬네일, 페이지크기, 마크업 정보 [3]
60 60
            BaseClient.GetConversionStateCompleted += BaseClient_GetConversionStateCompleted;  //컨버팅의 여부 [2] 
61 61
            BaseClient.GetSystemDataCompleted += BaseClient_GetSystemDataCompleted; //시스템 정보 [1] 
62 62
            BaseClient.GetDocumentItemInfoCompleted += BaseClient_GetDocumentItemInfoCompleted; // 문서 자체의 정보 [4]
63
            BaseClient.GetMarkupInfoItemsCompleted += BaseClient_GetMarkupInfoItemsCompleted; 
64
            BaseClient.GetDeptDataCompleted += BaseClient_GetDeptDataCompleted; 
65
            BaseClient.DeleteMarkupCompleted += BaseClient_DeleteMarkupCompleted; 
63
            BaseClient.GetMarkupInfoItemsCompleted += BaseClient_GetMarkupInfoItemsCompleted;
64
            BaseClient.GetDeptDataCompleted += BaseClient_GetDeptDataCompleted;
65
            BaseClient.DeleteMarkupCompleted += BaseClient_DeleteMarkupCompleted;
66 66
            BaseClient.GetVPRevisionHistoryCompleted += BaseClient_GetVPRevisionHistoryCompleted;
67
            BaseClient.SetFinalPDFCompleted += BaseClient_SetFinalPDFCompleted; 
68
            BaseClient.GetCompareRectCompleted += BaseClient_GetCompareRectCompleted; 
69
            BaseClient.DeleteMarkupCompleted += BaseClient_DeleteMarkupCompleted; 
70
            BaseClient.DelFavoriteVPCompleted += BaseClient_DelFavoriteVPCompleted; 
71
            BaseClient.EditFavoriteVPCompleted += BaseClient_EditFavoriteVPCompleted; 
67
            BaseClient.SetFinalPDFCompleted += BaseClient_SetFinalPDFCompleted;
68
            BaseClient.GetCompareRectCompleted += BaseClient_GetCompareRectCompleted;
69
            BaseClient.DeleteMarkupCompleted += BaseClient_DeleteMarkupCompleted;
70
            BaseClient.DelFavoriteVPCompleted += BaseClient_DelFavoriteVPCompleted;
71
            BaseClient.EditFavoriteVPCompleted += BaseClient_EditFavoriteVPCompleted;
72 72
        }
73 73

  
74
        
74

  
75 75

  
76 76
        private void BaseClient_EditFavoriteVPCompleted(object sender, EditFavoriteVPCompletedEventArgs e)
77 77
        {
......
142 142
        {
143 143
            Logger.sendResLog("SetFinalPDFCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
144 144

  
145
            if (e.Error !=null || e.Result.Status == FinalStatus.Error)
145
            if (e.Error != null || e.Result.Status == FinalStatus.Error)
146 146
            {
147 147
                DialogMessage_Alert("최종 파일을 만드는데 문제가 발생하였습니다", "안내");
148 148
            }
......
180 180
                //cbSymbolPublic.ItemsSource = e.Result.ToList();
181 181
            }
182 182
        }
183
        public MarkupInfoItem PreviewUserMarkupInfoItem { get; set; }   
183
        public MarkupInfoItem PreviewUserMarkupInfoItem { get; set; }
184 184

  
185 185
        private void BaseClient_GetMarkupInfoItemsCompleted(object sender, GetMarkupInfoItemsCompletedEventArgs e)
186 186
        {
......
191 191
            if (e.Result != null)
192 192
            {
193 193
                var pureItem = e.Result;
194
                if(pureItem.Count > 0)
194
                if (pureItem.Count > 0)
195 195
                {
196 196
                    ViewerDataModel.Instance.MarkupList_USER.Clear();
197 197
                }
......
199 199
                pureItem.ToList().ForEach(d => d.MarkupList.ForEach(p =>
200 200
                {
201 201

  
202
                   if (d.UserID == App.ViewInfo.UserID)
202
                    if (d.UserID == App.ViewInfo.UserID)
203 203
                    {
204 204
                        d.userDelete = true;
205 205
                        d.DisplayColor = "#FFFF0000";
......
313 313
                    }
314 314
                });
315 315
                gridViewMarkup.ItemsSource = ViewerDataModel.Instance._markupInfoList;
316
				SetCommentPages();
316
                SetCommentPages();
317 317

  
318 318
                //this.gridViewMarkup.SelectedItem = this.gridViewMarkup.Items[0];
319 319
                var select_item = ViewerDataModel.Instance._markupInfoList.Where(info => info.UserID == App.ViewInfo.UserID).OrderByDescending(order => order.Consolidate == Convert.ToInt32(true)).FirstOrDefault();
......
562 562
                #endregion
563 563
            }
564 564
        }
565
        //MarkupUserListDisplay();
566
        //}
567
        //}
568 565

  
569 566
        private static ObservableCollection<MarkupInfoItem> SetDisplayColor(List<MarkupInfoItem> MarkupInfoList, string userID)
570 567
        {
......
626 623
                    //장원
627 624
                    _ViewInfo.UserID = _ViewInfo.UserID.Replace(@"DAELIM\", "");
628 625
                }
629
                Logger.sendReqLog("GetDocInfoAsync", _ViewInfo.ProjectNO + "," + _ViewInfo.DocumentItemID , 1);
626
                Logger.sendReqLog("GetDocInfoAsync", _ViewInfo.ProjectNO + "," + _ViewInfo.DocumentItemID, 1);
630 627
                BaseClient.GetDocInfoAsync(new KCOM_BasicParam { projectNo = _ViewInfo.ProjectNO, documentID = _ViewInfo.DocumentItemID });
631 628
            }
632 629
            else
......
706 703
                        userData.DEPARTMENT = "ALL";
707 704
                        Logger.sendReqLog("GetDeptDataAsync", userData.DEPARTMENT, 1);
708 705
                        BaseClient.GetDeptDataAsync(userData.DEPARTMENT);
709
                    }          
706
                    }
710 707
                }
711 708
            }
712 709
            else
......
720 717
                //System.Windows.Browser.HtmlPage.Window.Invoke("close");
721 718
            }
722 719
        }
723
        
720

  
724 721

  
725 722
        private void BaseClient_GetDocInfoCompleted(object sender, GetDocInfoCompletedEventArgs e)
726 723
        {
......
731 728
                DialogMessage_Alert("페이지정보를 가져올 수 없습니다.", "Alert");
732 729
                return;
733 730
            }
734
            
731

  
735 732
            var MainUrl = DeepZoomUrl.Replace("{baseUrl}", App.SystemInfo.HostName);
736 733
            MainUrl = MainUrl.Replace("{TileSourcePath}", _ViewInfo.ProjectNO + "_Tile");
737 734
            MainUrl = MainUrl.Replace("{ItemsPath}", (Convert.ToInt64(_ViewInfo.DocumentItemID) / 100).ToString());
......
769 766
            //ViewerDataModel.Instance.SystemMain.dzMainMenu.TempLoad();
770 767

  
771 768
            Logger.sendReqLog("GetVPRevisionHistoryAsync", CurrentDoc.ProjectNo + "," + CurrentDoc.Document_NO + "," + CurrentDoc.Document_Id, 1);
772
            BaseClient.GetVPRevisionHistoryAsync(CurrentDoc.ProjectNo, CurrentDoc.Document_NO, CurrentDoc.Document_Id);            
769
            BaseClient.GetVPRevisionHistoryAsync(CurrentDoc.ProjectNo, CurrentDoc.Document_NO, CurrentDoc.Document_Id);
773 770
        }
774 771

  
775 772

  
......
781 778
                ViewerDataModel.Instance.SystemMain.dzTopMenu.btnTopStamp.Visibility = Visibility.Collapsed;
782 779
            }
783 780
            Logger.sendReqLog("GetSystemDataAsync", "", 1);
784
            BaseClient.GetSystemDataAsync();            
781
            BaseClient.GetSystemDataAsync();
785 782
        }
786 783

  
787 784
        public void HubSet()
......
830 827
                }
831 828
                else
832 829
                {
833
                    switch(task.Result)
830
                    switch (task.Result)
834 831
                    {
835 832
                        case "2":
836 833
                            {
......
883 880
            List<MarkupInfoItem> gridItem = gridViewMarkup.Items.Cast<MarkupInfoItem>().ToList(); //전체 마크업
884 881
            List<MarkupInfoItem> gridSelectionItem = gridViewMarkup.SelectedItems.Cast<MarkupInfoItem>().ToList(); //선택 된 마크업
885 882
            List<MarkupInfoItem> gridNonSelectionItem = gridItem.Except(gridSelectionItem).ToList(); //선택 되지 않은 마크업
886
                                                                                                    //MarkupToPDF.Controls.Parsing.LayerControl layerControl = new MarkupToPDF.Controls.Parsing.LayerControl();
883
                                                                                                     //MarkupToPDF.Controls.Parsing.LayerControl layerControl = new MarkupToPDF.Controls.Parsing.LayerControl();
887 884
            layerControl.ProjectNo = App.ViewInfo.ProjectNO;
888 885
            Common.ViewerDataModel.Instance.MarkupControls_USER.Clear();  //전체 제거
889
            Common.ViewerDataModel.Instance.MarkupControls.Clear();  //전체 제거            
886
            Common.ViewerDataModel.Instance.MarkupControls.Clear();  //전체 제거
890 887
            foreach (var item in gridSelectionItem)
891 888
            {
892 889
                if (item.UserID == App.ViewInfo.UserID)
......
904 901
                    });
905 902
                }
906 903
            }
907
            (from A in gridSelectionItem
908
             from B in Common.ViewerDataModel.Instance.MarkupControls_USER
909
             where A.MarkupInfoID == B.MarkupInfoID
910
             select B).ToList().ForEach(data =>
911
             {
912
                 Common.ViewerDataModel.Instance.MarkupControls_USER.Remove(data);
913
             });
904
                (from A in gridSelectionItem
905
                 from B in Common.ViewerDataModel.Instance.MarkupControls_USER
906
                 where A.MarkupInfoID == B.MarkupInfoID
907
                 select B).ToList().ForEach(data =>
908
                 {
909
                     Common.ViewerDataModel.Instance.MarkupControls_USER.Remove(data);
910
                 });
914 911
            (from A in gridSelectionItem
915 912
             from B in Common.ViewerDataModel.Instance.MarkupControls
916 913
             where A.MarkupInfoID == B.MarkupInfoID
......
919 916
                 Common.ViewerDataModel.Instance.MarkupControls.Remove(data);
920 917
             });
921 918

  
922
            
923 919
            foreach (var item in gridSelectionItem)
924 920
            {
925 921
                if (item.UserID == App.ViewInfo.UserID)

내보내기 Unified diff

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