프로젝트

일반

사용자정보

개정판 919dee1b

ID919dee1be3f2021ea0e7c41c2257d1fc2ef33331
상위 c4ce78d9
하위 32e65f42, 4395d001

semi 이(가) 4년 이상 전에 추가함

Merged 완료

차이점 보기:

ConvertService/ServiceController/Markus.Service.StationController/ViewModel/FinalPDFViewModel.cs
47 47
            ConverAddCommand = new DelegateCommand(ConverAdd);
48 48
            FinalPDFPathFileSearchCommand = new DelegateCommand(FinalPDFPathFileSearch);
49 49
            Stop_ProcessCommand = new DelegateCommand(Stop_Process);
50
            EnterCommand = new DelegateCommand(Enter);
51 50
            DocumentFilterCommand = new DelegateCommand(DocumentFilter);
51
            Markup_CheckCommand = new DelegateCommand(Markup_Check);
52 52
        }
53 53

  
54 54
        #endregion
......
690 690
        public DelegateCommand Stop_ProcessCommand { get; private set; }
691 691
        public DelegateCommand EnterCommand { get; private set; }
692 692
        public DelegateCommand DocumentFilterCommand { get; private set; }
693
        public DelegateCommand Markup_CheckCommand { get; private set; }
693 694

  
694 695
        #endregion
695 696

  
......
1079 1080

  
1080 1081
                                var MarkusLink = "kcom://" + CreateMarkusParam(item.ProjectNumber, item.DocumentID, "doftech");
1081 1082

  
1082
                                itemsToEach.ConvertState = (StatusCodeType)Enum.Parse(typeof(StatusCodeType), item.ConvertState.ToString());
1083
                                if (item.ConvertState != null)
1084
                                {
1085
                                    itemsToEach.ConvertState = (StatusCodeType)Enum.Parse(typeof(StatusCodeType), item.ConvertState);
1086
                                }
1083 1087

  
1084 1088
                                if (item.OriginfilePath.Contains("/"))
1085 1089
                                {
......
1098 1102
                                itemsToEach.MarkusLink = MarkusLink;
1099 1103
                                itemsToEach.DocumentID = item.DocumentID;
1100 1104
                                itemsToEach.GroupNo = item.GroupNo;
1101
                                itemsToEach.DocumentName = item.DocumentName;
1105
                                itemsToEach.DocumentName = item.DocumnetName;
1102 1106
                                itemsToEach.Revision = item.Revision;
1103 1107
                                itemsToEach.Exception = item.Exception;
1104 1108
                                itemsToEach.ConvertPath = item.ConvertPath;
......
1596 1600

  
1597 1601
        #endregion
1598 1602

  
1599
        #region Filter Enter
1600

  
1601

  
1602
        /// <summary>
1603
        /// 필터된 상단 그리드 엑셀로 출력
1604
        /// </summary>
1605

  
1606
        public void Enter(object sender)
1607
        {
1608
            SearchTimerOn = true;
1609
            dispatcherTimer.Tick -= new EventHandler(Timer_Tick);
1610
            dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick);
1611

  
1612
            FilterConvertSource.Clear();
1613

  
1614
            SearchTimer_Tick(null, new EventArgs());
1615
        }
1616

  
1617
        #endregion
1618

  
1619 1603
        #region Data Export
1620 1604

  
1621 1605

  
......
1820 1804

  
1821 1805
        #endregion
1822 1806

  
1807
        #region Markup_Check
1808

  
1809
        public void Markup_Check(object obj)
1810
        {
1811
            if (SearchTimerOn == true)
1812
            {
1813
                dispatcherTimer.Tick -= new EventHandler(SearchTimer_Tick);
1814
            }
1815
            else
1816
            {
1817
                dispatcherTimer.Tick -= new EventHandler(Timer_Tick);
1818
            }
1819

  
1820
            if (SelectFilterConvertList != null)
1821
            {
1822
                Views.MarkupCheckView markupCheckView = new Views.MarkupCheckView(SelectFilterConvertList[0].ProjectNumber, SelectFilterConvertList[0].DocumentID);
1823

  
1824
                markupCheckView.Owner = Application.Current.MainWindow;
1825
                markupCheckView.WindowStartupLocation = WindowStartupLocation.CenterOwner;
1826
                markupCheckView.Width = 1000;
1827
                markupCheckView.Height = 600;
1828

  
1829
                markupCheckView.ShowDialog();
1830
            }
1831

  
1832
            if (SearchTimerOn == true)
1833
            {
1834
                dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick);
1835
            }
1836
            else
1837
            {
1838
                dispatcherTimer.Tick += new EventHandler(Timer_Tick);
1839
            }
1840
        }
1841

  
1842
        #endregion
1843

  
1823 1844
        #endregion
1824 1845
    }
1825 1846
}

내보내기 Unified diff

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