프로젝트

일반

사용자정보

개정판 ed3740c4

IDed3740c4813aa7e50f84e7ce76a79b604c47e2f7
상위 e05fe8ab
하위 55d4f382, 5b2924ff

김동진이(가) 5년 이상 전에 추가함

issue #1138: save 후 view 의 정보를 업데이트 하도록 로직 추가.

Change-Id: Ia75e729b593e5fc5e4fc4e29227d1bcc87af56fd

차이점 보기:

KCOM/Events/SaveCommand.cs
90 90
                            DATA_TYPE = value.Data_Type
91 91
                        });
92 92
                    });
93
                    Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveMarkupData(UserState, Project_No, document_id, user_id, markupdata); 
93
                    Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveMarkupData(UserState, Project_No, document_id, user_id, markupdata);
94
                    Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.MarkupitemViewUpdate(UserState.MarkupInfoID);
94 95
                }
95 96
                //User Information List Rebind
96
                Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.gridViewMarkup.Rebind();                
97
                Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.gridViewMarkup.Rebind();
97 98
                TempFile.Remove(); //임시파일삭제                
98 99
            }
99 100
            catch (Exception)
KCOM/Views/MainMenu.xaml.cs
761 761
            Logger.sendCheckLog("pageNavigator_PageChanging_SetCommentPages Setting", 1);
762 762
            List<UsersCommentPagesMember> _pages = new List<UsersCommentPagesMember>();
763 763
            foreach (var item in ViewerDataModel.Instance._markupInfoList)
764
            {                
765
                UsersCommentPagesMember instance = new UsersCommentPagesMember();
766
                instance.UserName = item.UserName;
767
                instance.Depart = item.Depatment;
768
                instance.MarkupInfoID = item.MarkupInfoID;
769
                instance.IsSelected = true;
770
                instance.isConSolidation = item.Consolidate;
771
                instance.SetColor = item.DisplayColor;
772
                if (item.UserID == App.ViewInfo.UserID && item.MarkupInfoID == item.MarkupInfoID)
764
            {
765
                //Comment 가 존재할 경우에만 Thumbnail 에 추가
766
                if(item.MarkupList != null)
773 767
                {
774
                    instance.PageNumber = ViewerDataModel.Instance.MyMarkupList.Select(d => d.PageNumber).ToList();
768
                    UsersCommentPagesMember instance = new UsersCommentPagesMember();
769
                    instance.UserName = item.UserName;
770
                    instance.Depart = item.Depatment;
771
                    instance.MarkupInfoID = item.MarkupInfoID;
772
                    instance.IsSelected = true;
773
                    instance.isConSolidation = item.Consolidate;
774
                    instance.SetColor = item.DisplayColor;
775
                    if (item.UserID == App.ViewInfo.UserID && item.MarkupInfoID == item.MarkupInfoID)
776
                    {
777
                        instance.PageNumber = ViewerDataModel.Instance.MyMarkupList.Select(d => d.PageNumber).ToList();
778
                    }
779
                    else
780
                    {
781
                        instance.PageNumber = ViewerDataModel.Instance.MarkupList_Pre.Where(data => data.MarkupInfoID == item.MarkupInfoID).Select(d => d.PageNumber).ToList();
782
                    }
783
                    _pages.Add(instance);
784
                }                   
785
            }
786
            
787
            this.pageNavigator.SetCommentList(_pages.ToList());
788
        }
789

  
790
        public void MarkupitemViewUpdate(string markupinfo_id)
791
        {
792
            //db에 업데이트 한 list 를 view 에 업데이트
793
            string sDocID = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu._DocInfo.ID;
794
            List<MarkupInfoItem> results = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMarkupInfoItems(App.ViewInfo.ProjectNO, sDocID);
795
            MarkupInfoItem dbinfo = results.Where(x => x.MarkupInfoID == markupinfo_id).FirstOrDefault();
796
            MarkupInfoItem viewinfo = Common.ViewerDataModel.Instance._markupInfoList.Where(x => x.MarkupInfoID == markupinfo_id).FirstOrDefault();
797
            if (dbinfo.MarkupList.Count > 0)
798
            {
799
                if (viewinfo.MarkupList != null)
800
                {
801
                    viewinfo.MarkupList.Clear();
802
                    viewinfo.MarkupList = null;
775 803
                }
776
                else
804
                viewinfo.MarkupList = new List<MarkupItem>();
805
                foreach (var item in dbinfo.MarkupList)
777 806
                {
778
                    instance.PageNumber = ViewerDataModel.Instance.MarkupList_Pre.Where(data => data.MarkupInfoID == item.MarkupInfoID).Select(d => d.PageNumber).ToList();
807
                    viewinfo.MarkupList.Add(item);
779 808
                }
780
                _pages.Add(instance);
781 809
            }
782
            
783
            this.pageNavigator.SetCommentList(_pages.ToList());
784 810
        }
785 811

  
786 812
        private void zoomAndPanControl_MouseWheel(object sender, MouseWheelEventArgs e)

내보내기 Unified diff

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