프로젝트

일반

사용자정보

개정판 19d6b221

ID19d6b22109371bf47f839172429713ac7c3854a7
상위 037ab674
하위 59a29a3b

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

Exception is not null 콤보박스 & Excel Export수정

Change-Id: I72953fb153aca7869b88110667986238f5c8b431

차이점 보기:

ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/FinalPDFExcelDialogViewModel.cs
35 35
                {
36 36
                    ItemsSource = new ObservableCollection<CheckBoxItem>
37 37
                    {
38
                        //new CheckBoxItem { IsChecked=true, Name="ServiceID"},
39
                        //new CheckBoxItem { IsChecked=true, Name="ConvertID"},
40
                        //new CheckBoxItem { IsChecked=true, Name="ProjectNumber"},
41
                        //new CheckBoxItem { IsChecked=true, Name="ConvertState"},
42
                        //new CheckBoxItem { IsChecked=true, Name="CurrentPageNo"},
43
                        //new CheckBoxItem { IsChecked=true, Name="TotalPage"},
44
                        //new CheckBoxItem { IsChecked=true, Name="OriginfilePath"},
45
                        //new CheckBoxItem { IsChecked=true, Name="ConvertPath"},
46
                        //new CheckBoxItem { IsChecked=true, Name="CreateTime"},
47
                        //new CheckBoxItem { IsChecked=true, Name="StartTime"},
48
                        //new CheckBoxItem { IsChecked=true, Name="EndTime"},
49
                        //new CheckBoxItem { IsChecked=true, Name="Exception"},
50
                        //new CheckBoxItem { IsChecked=true, Name="ReConverter"},
51
                        //new CheckBoxItem { IsChecked=true, Name="Revision"},
52
                        //new CheckBoxItem { IsChecked=true, Name="UniqueKey"},
53
                        //new CheckBoxItem { IsChecked=true, Name="Group_NO"},
54
                        //new CheckBoxItem { IsChecked=true, Name="Document_NO"},
55
                        //new CheckBoxItem { IsChecked=true, Name="Document_Name"}
38
                        new CheckBoxItem { IsChecked=true, Name="ConvertID"},
39
                        new CheckBoxItem { IsChecked=true, Name="ProjectNumber"},
40
                        new CheckBoxItem { IsChecked=true, Name="ConvertState"},
41
                        new CheckBoxItem { IsChecked=true, Name="CurrentPageNo"},
42
                        new CheckBoxItem { IsChecked=true, Name="TotalPage"},
43
                        new CheckBoxItem { IsChecked=true, Name="OriginfilePath"},
44
                        new CheckBoxItem { IsChecked=true, Name="ConvertPath"},
45
                        new CheckBoxItem { IsChecked=true, Name="CreateTime"},
46
                        new CheckBoxItem { IsChecked=true, Name="StartTime"},
47
                        new CheckBoxItem { IsChecked=true, Name="EndTime"},
48
                        new CheckBoxItem { IsChecked=true, Name="Exception"},
49
                        new CheckBoxItem { IsChecked=true, Name="Revision"},
50
                        new CheckBoxItem { IsChecked=true, Name="GroupNo"},
51
                        new CheckBoxItem { IsChecked=true, Name="DocumentNo"},
52
                        new CheckBoxItem { IsChecked=true, Name="DocumentID"},
53
                        new CheckBoxItem { IsChecked=true, Name="DocumentName"},
54
                        new CheckBoxItem { IsChecked=true, Name="MarkupInfo_ID"},
55
                        new CheckBoxItem { IsChecked=true, Name="DocInfo_ID"},
56
                        new CheckBoxItem { IsChecked=true, Name="Create_User_ID"},
57
                        new CheckBoxItem { IsChecked=true, Name="MarkusLink"}
56 58
                    };
57 59
                }
58 60

  
......
64 66
                OnPropertyChanged(() => ExcelSource);
65 67
            }
66 68
        }
67
        private System.Collections.ObjectModel.ObservableCollection<ConvertPDF> _ExcelSource;
68
        public System.Collections.ObjectModel.ObservableCollection<ConvertPDF> ExcelSource
69
        private System.Collections.ObjectModel.ObservableCollection<FinalPDF> _ExcelSource;
70
        public System.Collections.ObjectModel.ObservableCollection<FinalPDF> ExcelSource
69 71
        {
70 72
            get
71 73
            {
72 74
                if (_ExcelSource == null)
73 75
                {
74
                    _ExcelSource = new System.Collections.ObjectModel.ObservableCollection<ConvertPDF>();
75
                    _ExcelSource = DataBaseItemsModel.Return_FilterConvertSource();
76
                    _ExcelSource = new System.Collections.ObjectModel.ObservableCollection<FinalPDF>();
77
                    _ExcelSource = FinalPDFViewModel.Return_FilterConvertSource();
76 78
                }
77 79
                return _ExcelSource;
78 80
            }
......
147 149
                        }
148 150

  
149 151
                        DataExport dataExport = new DataExport();
150
                        dataExport.DataExportExcel(saveFileDialog.FileName, "Convert PDF", ExcelSource, headers);
152
                        dataExport.DataExportExcel(saveFileDialog.FileName, "Final PDF", ExcelSource, headers);
151 153
                    }
152 154
                }
153 155
            }

내보내기 Unified diff

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