프로젝트

일반

사용자정보

개정판 aaed7be2

IDaaed7be2a35a57346ae926655437a9fd8764ebba
상위 29cd086e
하위 2917ab4a

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

Filter Enter후 검색 TEST완료 & ADd ProjectNo 콤보박스 & Clear -> Selected All

Change-Id: Ifa232bf81e28f0a7dd325d094ae75640cda69bca

차이점 보기:

ConvertService/ServiceBase/Markus.Service.StationController/Controls/DatabaseFilter.xaml
7 7
      xmlns:local="clr-namespace:Markus.Service.StationController.Views"
8 8
      xmlns:VM="clr-namespace:Markus.Service.StationController.ViewModel"
9 9
      xmlns:maskedInput="clr-namespace:Telerik.Windows.Controls.MaskedInput;assembly=Telerik.Windows.Controls.Input"
10
      xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
10 11
      d:DesignHeight="300" d:DesignWidth="1000"
11 12
      mc:Ignorable="d"  >
12 13
    <Grid>
......
55 56
         EmptyContent="UniqueKey" Value="{Binding UniqueKeyFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
56 57
         TextMode="PlainText" Grid.Row="1" Grid.Column="4" Mask=""
57 58
         HorizontalAlignment="Stretch"
58
         VerticalAlignment="Center" Margin="2,0"/>
59
         VerticalAlignment="Center" Margin="2,0" AcceptsReturn="False">
60
                <telerik:RadMaskedTextInput.InputBindings>
61
                    <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
62
                </telerik:RadMaskedTextInput.InputBindings>
63
            </telerik:RadMaskedTextInput>
59 64

  
60 65
            <TextBlock Text="Service ID  " Grid.Row="1" Grid.Column="6"   VerticalAlignment="Center" HorizontalAlignment="Left"/>
61 66
            <telerik:RadMaskedTextInput IsClearButtonVisible="True" maskedInput:MaskedInputExtensions.MaxTextLength="1000"
62 67
         EmptyContent="Service ID" Value="{Binding Service_IDFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
63 68
         TextMode="PlainText" Grid.Row="1" Grid.Column="7" Mask=""
64 69
         HorizontalAlignment="Stretch"
65
         VerticalAlignment="Center" Margin="2,0"/>
70
         VerticalAlignment="Center" Margin="2,0" AcceptsReturn="False">
71
                <telerik:RadMaskedTextInput.InputBindings>
72
                    <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
73
                </telerik:RadMaskedTextInput.InputBindings>
74
            </telerik:RadMaskedTextInput>
66 75

  
67 76
            <TextBlock Text="Revision  " Grid.Row="1" Grid.Column="9" VerticalAlignment="Center"  HorizontalAlignment="Left"/>
68 77
            <telerik:RadMaskedTextInput IsClearButtonVisible="True" maskedInput:MaskedInputExtensions.MaxTextLength="1000"
69 78
         EmptyContent="Revision" Value="{Binding RevisionFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
70 79
         TextMode="PlainText" Grid.Row="1" Grid.Column="10" Mask=""
71 80
         HorizontalContentAlignment="Stretch"
72
         VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="2,0"/>
81
         VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="2,0" AcceptsReturn="False">
82
                <telerik:RadMaskedTextInput.InputBindings>
83
                    <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
84
                </telerik:RadMaskedTextInput.InputBindings>
85
            </telerik:RadMaskedTextInput>
73 86

  
74 87
            <TextBlock Text="Docuemnt Name  " Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
75 88
            <telerik:RadMaskedTextInput IsClearButtonVisible="True" maskedInput:MaskedInputExtensions.MaxTextLength="1000"
76 89
         EmptyContent="Docuemnt Name" Value="{Binding Document_NameFilter , UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
77 90
         TextMode="PlainText" Grid.Row="3" Grid.Column="1" Mask=""
78 91
         HorizontalContentAlignment="Stretch"
79
         VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="2,0"/>
92
         VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="2,0" AcceptsReturn="False">
93
                <telerik:RadMaskedTextInput.InputBindings>
94
                    <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
95
                </telerik:RadMaskedTextInput.InputBindings>
96
            </telerik:RadMaskedTextInput>
80 97

  
81 98
            <TextBlock Text="Docuemnt NO  " Grid.Row="3" Grid.Column="3"  VerticalAlignment="Center" HorizontalAlignment="Left"/>
82 99
            <telerik:RadMaskedTextInput IsClearButtonVisible="True" maskedInput:MaskedInputExtensions.MaxTextLength="1000"
83 100
         EmptyContent="Docuemnt NO" Value="{Binding Docuemnt_NOFilter , UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
84 101
         TextMode="PlainText" Grid.Row="3" Grid.Column="4" Mask=""
85 102
         HorizontalAlignment="Stretch"
86
         VerticalAlignment="Center" Margin="2,0"/>
103
         VerticalAlignment="Center" Margin="2,0" AcceptsReturn="False">
104
                <telerik:RadMaskedTextInput.InputBindings>
105
                    <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
106
                </telerik:RadMaskedTextInput.InputBindings>
107
            </telerik:RadMaskedTextInput>
108

  
87 109

  
88 110
            <TextBlock Text="Reconverter " Grid.Row="3" Grid.Column="6"  VerticalAlignment="Center" HorizontalAlignment="Left"/>
89 111
            <telerik:RadMaskedTextInput IsClearButtonVisible="True" maskedInput:MaskedInputExtensions.MaxTextLength="1000"
90 112
         EmptyContent="Reconverter"  Value="{Binding ReconverterFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
91 113
         TextMode="PlainText" Grid.Row="3" Grid.Column="7" Mask=""
92 114
         HorizontalAlignment="Stretch"
93
         VerticalAlignment="Center" Margin="2,0"/>
115
         VerticalAlignment="Center" Margin="2,0" AcceptsReturn="False">
116
                <telerik:RadMaskedTextInput.InputBindings>
117
                    <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
118
                </telerik:RadMaskedTextInput.InputBindings>
119
            </telerik:RadMaskedTextInput>
94 120

  
95 121
            <TextBlock Text="Group NO " Grid.Row="3" Grid.Column="9"  VerticalAlignment="Center" HorizontalAlignment="Left"/>
96 122
            <telerik:RadMaskedTextInput IsClearButtonVisible="True" maskedInput:MaskedInputExtensions.MaxTextLength="1000"
97 123
         EmptyContent="Group NO"  Value="{Binding GroupNOFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
98 124
         TextMode="PlainText" Grid.Row="3" Grid.Column="10" Mask=""
99 125
         HorizontalAlignment="Stretch"
100
         VerticalAlignment="Center" Margin="2,0"/>
126
         VerticalAlignment="Center" Margin="2,0" AcceptsReturn="False">
127
                <telerik:RadMaskedTextInput.InputBindings>
128
                    <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
129
                </telerik:RadMaskedTextInput.InputBindings>
130
            </telerik:RadMaskedTextInput>
101 131

  
102 132
            <TextBlock Text="Document_URL " Grid.Row="5" Grid.Column="0"  VerticalAlignment="Center" HorizontalAlignment="Left"/>
103 133
            <telerik:RadMaskedTextInput IsClearButtonVisible="True"  maskedInput:MaskedInputExtensions.MaxTextLength="1000"
104 134
         EmptyContent="DOCUMENT_URL"  Value="{Binding DOCUMENT_URLFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
105 135
         TextMode="PlainText" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="11" Mask=""
106 136
         HorizontalAlignment="Stretch"
107
         VerticalAlignment="Center" Margin="2,0"/>
137
         VerticalAlignment="Center" Margin="2,0" AcceptsReturn="False">
138
                <telerik:RadMaskedTextInput.InputBindings>
139
                    <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
140
                </telerik:RadMaskedTextInput.InputBindings>
141
            </telerik:RadMaskedTextInput>
108 142
        </Grid>
109 143
        <Grid  Grid.Row="1"/>
110 144
        <StackPanel Grid.Row="3" Grid.ColumnSpan="11">
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/ConvertAddDialogViewModel.cs
10 10
using System.Windows;
11 11
using System.Windows.Controls;
12 12
using System.ComponentModel;
13
using Markus.Service.StationController.Data;
14
using System.Collections.ObjectModel;
13 15

  
14 16
namespace Markus.Service.StationController.ViewModel
15 17
{
......
19 21

  
20 22
        public ConvertAddDialogViewModel()
21 23
        {
24
            ProjectName();
22 25
            ConverAdd_OKCommand = new DelegateCommand(ConverAdd_OK);
23 26
        }
24 27

  
25
        #endregion
26

  
27
        #region Propertise
28

  
29
        DataService.DataServiceClient WcfClient = new DataService.DataServiceClient();
30

  
31
        private string _ConverAdd_Project_NO;
32
        public string ConverAdd_Project_NO
28
        private async void ProjectName()
33 29
        {
34
            get { return _ConverAdd_Project_NO; }
35
            set
30
            if (ProjectNames.Count() == 0)
36 31
            {
37
                if (_ConverAdd_Project_NO != value)
32
                foreach (var x in await WcfClient.GET_SELECT_RUN_PROJECTSAsync(0))
38 33
                {
39
                    _ConverAdd_Project_NO = value;
40
                    OnPropertyChanged(() => ConverAdd_Project_NO);
34
                    ProjectName projectName = new ProjectName(x.PROJECT_NO, x.PROJECT_NAME);
35
                    ProjectNames.Add(projectName);
41 36
                }
42 37
            }
43 38
        }
39
        #endregion
40

  
41
        #region Propertise
42

  
43
        DataService.DataServiceClient WcfClient = new DataService.DataServiceClient();
44 44

  
45 45
        private string _ConverAdd_DOCUMENT_ID;
46 46
        public string ConverAdd_DOCUMENT_ID
......
76 76
            get { return _Project_NO_Border; }
77 77
            set
78 78
            {
79
                if (ConverAdd_Project_NO != null)
79
                if (ProjectNames.Contains(ProjectNumberFilter))
80 80
                {
81 81
                    _Project_NO_Border = "#FF000000";
82 82
                    OnPropertyChanged(() => Project_NO_Border);
......
133 133
            get { return _Project_NO_Color; }
134 134
            set
135 135
            {
136
                if (ConverAdd_Project_NO != null)
136
                if (ProjectNames.Contains(ProjectNumberFilter))
137 137
                {
138 138
                    _Project_NO_Color = "#FFFFFFFF";
139 139
                    OnPropertyChanged(() => Project_NO_Color);
......
183 183
                }
184 184
            }
185 185
        }
186

  
187
        public ObservableCollection<ProjectName> _ProjectNames;
188
        public ObservableCollection<ProjectName> ProjectNames
189
        {
190
            get
191
            {
192
                if (_ProjectNames == null)
193
                {
194
                    _ProjectNames = new System.Collections.ObjectModel.ObservableCollection<ProjectName>();
195
                }
196

  
197
                return _ProjectNames;
198
            }
199
            set
200
            {
201
                _ProjectNames = value;
202
                OnPropertyChanged(() => ProjectNames);
203
            }
204
        }
205

  
206
        public ProjectName _ProjectNumberFilter;
207
        public ProjectName ProjectNumberFilter
208
        {
209
            get
210
            {
211
                if (_ProjectNumberFilter == null)
212
                {
213
                    _ProjectNumberFilter = new ProjectName();
214
                }
215
                return _ProjectNumberFilter;
216
            }
217
            set
218
            {
219
                _ProjectNumberFilter = value;
220
                OnPropertyChanged(() => ProjectNumberFilter);
221
            }
222
        }
186 223
        #endregion
187 224

  
188 225
        #region Command
......
200 237
        /// </summary>
201 238
        public async void ConverAdd_OK(object obj)
202 239
        {
203
            if (String.IsNullOrEmpty(ConverAdd_Project_NO) || String.IsNullOrEmpty(ConverAdd_DOCUMENT_URL)|| String.IsNullOrEmpty(ConverAdd_DOCUMENT_ID) )
240
            if (String.IsNullOrEmpty(ProjectNumberFilter.Project_NO) || String.IsNullOrEmpty(ConverAdd_DOCUMENT_URL) || String.IsNullOrEmpty(ConverAdd_DOCUMENT_ID))
204 241
            {
205
                Project_NO_Border ="";
242
                Project_NO_Border = "";
206 243
                DOCUMENT_ID_Border = "";
207 244
                DOCUMENT_URL_Border = "";
208 245
                Project_NO_Color = "";
......
214 251
                try
215 252
                {
216 253
                    string ConverAdd_ID = GuidExtension.shortGuid();
217
                    var items = await WcfClient.GET_SELECT_CONVERT_INSERTAsync(ConverAdd_ID, ConverAdd_Project_NO, ConverAdd_DOCUMENT_URL, ConverAdd_DOCUMENT_ID);
254
                    var items = await WcfClient.GET_SELECT_CONVERT_INSERTAsync(ConverAdd_ID, ProjectNumberFilter.Project_NO, ConverAdd_DOCUMENT_URL, ConverAdd_DOCUMENT_ID);
218 255
                    System.Diagnostics.Debug.WriteLine(items);
219 256

  
220 257
                    MessageBox.Show("데이터베이스에 추가 완료! ");
......
223 260
                {
224 261
                    MessageBox.Show(ex.ToString());
225 262
                }
263
                Project_NO_Border = "";
264
                DOCUMENT_ID_Border = "";
265
                DOCUMENT_URL_Border = "";
266
                Project_NO_Color = "";
267
                DOCUMENT_ID_Color = "";
268
                DOCUMENT_URL_Color = "";
226 269

  
227
                ConverAdd_Project_NO = null;
228 270
                ConverAdd_DOCUMENT_ID = null;
229 271
                ConverAdd_DOCUMENT_URL = null;
230 272
            }
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs
49 49
            ConvertAddCommand = new DelegateCommand(ConvertAdd);
50 50
            ConvertPathFileSearchCommand = new DelegateCommand(ConvertPathFileSearch);
51 51
            Stop_ProcessCommand = new DelegateCommand(Stop_Process);
52
            EnterCommand = new DelegateCommand(Enter);
52 53
        }
53 54

  
54 55
        #endregion
......
610 611
        public DelegateCommand ConvertAddCommand { get; private set; }
611 612
        public DelegateCommand ConvertPathFileSearchCommand { get; private set; }
612 613
        public DelegateCommand Stop_ProcessCommand { get; private set; }
613

  
614
        public DelegateCommand EnterCommand { get; private set; }
614 615

  
615 616
        #endregion
616 617

  
......
780 781

  
781 782
                if (ProjectNames.Count() == 0)
782 783
                {
783
                    ProjectName Clear = new ProjectName("Clear", "Clear");
784
                    ProjectName Clear = new ProjectName("Selected All", "Selected All");
784 785
                    ProjectNames.Add(Clear);
785 786

  
786 787
                    foreach (var x in await WcfClient.GET_SELECT_RUN_PROJECTSAsync(0))
......
882 883

  
883 884
                if (ProjectNames.Count() == 0)
884 885
                {
886
                    ProjectName Clear = new ProjectName("Selected All", "Selected All");
887
                    ProjectNames.Add(Clear);
888

  
885 889
                    foreach (var x in await WcfClient.GET_SELECT_RUN_PROJECTSAsync(0))
886 890
                    {
887 891
                        ProjectName projectName = new ProjectName(x.PROJECT_NO, x.PROJECT_NAME);
......
1359 1363
                }
1360 1364
            };
1361 1365

  
1362
            RadWindow.Confirm("Do you want to delete it??",  handler);
1366
            RadWindow.Confirm("Do you want to delete it??", handler);
1363 1367
        }
1364 1368

  
1365 1369
        private async void OnClosed(object obj)
......
1465 1469
                }
1466 1470
            }
1467 1471
        }
1468
#endregion
1472
        #endregion
1469 1473

  
1470
#region DataFilter
1474
        #region DataFilter
1471 1475

  
1472 1476
        public void DataFilter(object obj)
1473 1477
        {
1474
            SearchTimerOn = true; 
1478
            SearchTimerOn = true;
1475 1479
            dispatcherTimer.Tick -= new EventHandler(Timer_Tick);
1476 1480
            dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick);
1477 1481
        }
1478 1482

  
1479
#endregion
1483
        #endregion
1484

  
1485
        #region Filter Enter
1486

  
1480 1487

  
1481
#region MarkusLink
1488
        /// <summary>
1489
        /// 필터된 상단 그리드 엑셀로 출력
1490
        /// </summary>
1491

  
1492
        public void Enter(object sender)
1493
        {
1494
            SearchTimerOn = true;
1495
            dispatcherTimer.Tick -= new EventHandler(Timer_Tick);
1496
            dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick);
1497
        }
1498

  
1499
        #endregion
1500

  
1501
        #region MarkusLink
1482 1502

  
1483 1503
        private void MarkusLink(object obj)
1484 1504
        {
......
1505 1525
            }
1506 1526
        }
1507 1527

  
1508
#endregion
1528
        #endregion
1509 1529

  
1510
#region Data Export
1530
        #region Data Export
1511 1531

  
1512 1532

  
1513 1533
        /// <summary>
......
1516 1536

  
1517 1537
        public void DataExportData(object obj)
1518 1538
        {
1519
            if(SearchTimerOn == true)
1539
            if (SearchTimerOn == true)
1520 1540
            {
1521 1541
                dispatcherTimer.Tick -= new EventHandler(SearchTimer_Tick);
1522 1542
            }
......
1544 1564
            }
1545 1565
        }
1546 1566

  
1547
#endregion
1567
        #endregion
1548 1568

  
1549
#region Data Search
1569
        #region Data Search
1550 1570

  
1551 1571
        public void RemoveCreateTimeFilter(object obj)
1552 1572
        {
......
1555 1575
            SelectedCreateTimeEnd = DefaultCreateTime;
1556 1576
        }
1557 1577

  
1558
#endregion
1578
        #endregion
1559 1579

  
1560
#region Reset
1580
        #region Reset
1561 1581

  
1562 1582
        /// <summary>
1563 1583
        /// 그리드 상단 원상복귀 버튼
......
1585 1605
            dispatcherTimer.Tick += new EventHandler(Timer_Tick);
1586 1606
        }
1587 1607

  
1588
#endregion
1608
        #endregion
1589 1609

  
1590
#region ConvertAddDialog
1610
        #region ConvertAddDialog
1591 1611

  
1592 1612
        /// <summary>
1593 1613
        /// 그리드 상단 Conver 추가 버튼
......
1623 1643
                    dispatcherTimer.Tick += new EventHandler(Timer_Tick);
1624 1644
                }
1625 1645
            }
1626
            catch(Exception ex)
1646
            catch (Exception ex)
1627 1647
            {
1628 1648
                MessageBox.Show(ex.ToString());
1629 1649
            }
1630 1650
        }
1631 1651

  
1632
#endregion
1652
        #endregion
1633 1653

  
1634
#region ConvertPathFileSearch
1654
        #region ConvertPathFileSearch
1635 1655

  
1636 1656
        /// <summary>
1637 1657
        ///  ConvertPath 파일 탐색기로 열리는 아이콘
......
1653 1673
            }
1654 1674
        }
1655 1675

  
1656
#endregion
1676
        #endregion
1657 1677

  
1658
#endregion
1678
        #endregion
1659 1679
    }
1660 1680
}
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/FinalPDFAddDialogViewModel.cs
6 6
using System.Threading.Tasks;
7 7
using System.Windows;
8 8
using Telerik.Windows.Controls;
9
using Markus.Service.StationController.Data;
10
using System.Collections.ObjectModel;
9 11

  
10 12
namespace Markus.Service.StationController.ViewModel
11 13
{
......
15 17

  
16 18
        public FinalPDFAddDialogViewModel()
17 19
        {
20
            ProjectName();
18 21
            FinalPDFAdd_OKCommand = new DelegateCommand(FinalPDFAdd_OK);
19 22
        }
20 23

  
24
        private async void ProjectName()
25
        {
26
            if (ProjectNames.Count() == 0)
27
            {
28
                foreach (var x in await WcfClient.GET_SELECT_RUN_PROJECTSAsync(0))
29
                {
30
                    ProjectName projectName = new ProjectName(x.PROJECT_NO, x.PROJECT_NAME);
31
                    ProjectNames.Add(projectName);
32
                }
33
            }
34
        }
21 35
        #endregion
22 36

  
23 37
        #region Propertise
24 38

  
25 39
        DataService.DataServiceClient WcfClient = new DataService.DataServiceClient();
26 40

  
27
        private string _FinalPDFAdd_Project_NO;
28
        public string FinalPDFAdd_Project_NO
29
        {
30
            get { return _FinalPDFAdd_Project_NO; }
31
            set
32
            {
33
                _FinalPDFAdd_Project_NO = value;
34
                OnPropertyChanged(() => FinalPDFAdd_Project_NO);
35
            }
36
        }
37

  
38 41
        private string _FinalPDFAdd_Document_ID;
39 42
        public string FinalPDFAdd_Document_ID
40 43
        {
......
63 66
            get { return _Project_NO_Border; }
64 67
            set
65 68
            {
66
                if (FinalPDFAdd_Project_NO != null)
69
                if (ProjectNames.Contains(ProjectNumberFilter))
67 70
                {
68 71
                    _Project_NO_Border = "#FF000000";
69 72
                    OnPropertyChanged(() => Project_NO_Border);
......
120 123
            get { return _Project_NO_Color; }
121 124
            set
122 125
            {
123
                if (FinalPDFAdd_Project_NO != null)
126
                if (ProjectNames.Contains(ProjectNumberFilter))
124 127
                {
125 128
                    _Project_NO_Color = "#FFFFFFFF";
126 129
                    OnPropertyChanged(() => Project_NO_Color);
......
170 173
                }
171 174
            }
172 175
        }
176

  
177
        public ObservableCollection<ProjectName> _ProjectNames;
178
        public ObservableCollection<ProjectName> ProjectNames
179
        {
180
            get
181
            {
182
                if (_ProjectNames == null)
183
                {
184
                    _ProjectNames = new System.Collections.ObjectModel.ObservableCollection<ProjectName>();
185
                }
186

  
187
                return _ProjectNames;
188
            }
189
            set
190
            {
191
                _ProjectNames = value;
192
                OnPropertyChanged(() => ProjectNames);
193
            }
194
        }
195

  
196
        public ProjectName _ProjectNumberFilter;
197
        public ProjectName ProjectNumberFilter
198
        {
199
            get
200
            {
201
                if (_ProjectNumberFilter == null)
202
                {
203
                    _ProjectNumberFilter = new ProjectName();
204
                }
205
                return _ProjectNumberFilter;
206
            }
207
            set
208
            {
209
                _ProjectNumberFilter = value;
210
                OnPropertyChanged(() => ProjectNumberFilter);
211
            }
212
        }
173 213
        #endregion
174 214

  
175 215
        #region Command
......
187 227
        /// </summary>
188 228
        public async void FinalPDFAdd_OK(object obj)
189 229
        {
190
            if (String.IsNullOrEmpty(FinalPDFAdd_Project_NO) || String.IsNullOrEmpty(FinalPDFAdd_DocInfo_ID) || String.IsNullOrEmpty(FinalPDFAdd_Document_ID))
230
            if (String.IsNullOrEmpty(ProjectNumberFilter.Project_NO) || String.IsNullOrEmpty(FinalPDFAdd_Document_ID) || String.IsNullOrEmpty(FinalPDFAdd_DocInfo_ID))
191 231
            {
192 232
                Project_NO_Border = "";
193 233
                DOCUMENT_ID_Border = "";
......
201 241
                try
202 242
                {
203 243
                    string ConverAdd_ID = GuidExtension.shortGuid();
204
                    var items = await WcfClient.GET_SELECT_CONVERT_INSERTAsync(ConverAdd_ID, FinalPDFAdd_Project_NO, FinalPDFAdd_DocInfo_ID, FinalPDFAdd_Document_ID);
244
                    var items = await WcfClient.GET_SELECT_CONVERT_INSERTAsync(ConverAdd_ID, ProjectNumberFilter.Project_NO, FinalPDFAdd_DocInfo_ID, FinalPDFAdd_Document_ID);
205 245
                    System.Diagnostics.Debug.WriteLine(items);
206 246

  
207 247
                    MessageBox.Show("데이터베이스에 추가 완료! ");
......
211 251
                    MessageBox.Show(ex.ToString());
212 252
                }
213 253

  
214
                FinalPDFAdd_Project_NO = null;
254
                Project_NO_Border = "";
255
                DOCUMENT_ID_Border = "";
256
                DocInfo_ID_Border = "";
257
                Project_NO_Color = "";
258
                DOCUMENT_ID_Color = "";
259
                DocInfo_ID_Color = "";
260

  
215 261
                FinalPDFAdd_DocInfo_ID = null;
216 262
                FinalPDFAdd_Document_ID = null;
217 263
            }
ConvertService/ServiceBase/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);
50 51
        }
51 52

  
52 53
        #endregion
......
629 630
            }
630 631
        }
631 632

  
632
        public bool _AliveShow;
633
        public bool _AliveShow = false;
633 634
        public bool AliveShow
634 635
        {
635 636
            get => _AliveShow;
636 637
            set
637 638
            {
638
                if (_AliveShow = !value)
639
                {
640
                    _AliveShow = false;
641
                }
642 639
                _AliveShow = value;
643 640
                OnPropertyChanged(() => AliveShow);
644 641
            }
......
690 687
        public DelegateCommand ConverAddCommand { get; private set; }
691 688
        public DelegateCommand FinalPDFPathFileSearchCommand { get; private set; }
692 689
        public DelegateCommand Stop_ProcessCommand { get; private set; }
690
        public DelegateCommand EnterCommand { get; private set; }
693 691

  
694 692
        #endregion
695 693

  
......
858 856

  
859 857
                if (ProjectNames.Count() == 0)
860 858
                {
861
                    ProjectName Clear = new ProjectName("Clear", "Clear");
859
                    ProjectName Clear = new ProjectName("Selected All", "Selected All");
862 860
                    ProjectNames.Add(Clear);
863 861
                    foreach (var x in await WcfClient.GET_SELECT_RUN_PROJECTSAsync(0))
864 862
                    {
......
963 961

  
964 962
                if (ProjectNames.Count() == 0)
965 963
                {
964
                    ProjectName Clear = new ProjectName("Selected All", "Selected All");
965
                    ProjectNames.Add(Clear);
966 966
                    foreach (var x in await WcfClient.GET_SELECT_RUN_PROJECTSAsync(0))
967 967
                    {
968 968
                        ProjectName projectName = new ProjectName(x.PROJECT_NO, x.PROJECT_NAME);
......
1063 1063
                            var items = await client.AliveConvertListAsync();
1064 1064
                            string result = "";
1065 1065

  
1066
                            if (items.Count() > 0)
1067
                            {
1068
                                AliveShow = true;
1069
                            }
1070

  
1071

  
1066 1072
                            foreach (var item in items)
1067 1073
                            {
1068 1074
                                FinalPDF itemsToEach = new FinalPDF();
......
1185 1191
                }
1186 1192
            }
1187 1193

  
1188
            if (AliveItems.Count() > 1)
1189
            {
1190
                AliveShow = true;
1191
            }
1192 1194

  
1193 1195
            Alive_Height = 80 + (newitems.Count() * 10);
1194 1196
            DataBase_ItemsHeight = 800 - (RealConvert_Height + Alive_Height);
......
1591 1593

  
1592 1594
        #endregion
1593 1595

  
1596
        #region Filter Enter
1597

  
1598

  
1599
        /// <summary>
1600
        /// 필터된 상단 그리드 엑셀로 출력
1601
        /// </summary>
1602

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

  
1610
        #endregion
1611

  
1594 1612
        #region Data Export
1595 1613

  
1596 1614

  
......
1664 1682
            CreateUser_IDFilter = null;
1665 1683
            GROUP_NOFilter = null;
1666 1684
            REVISIONFilter = null;
1685
            Document_URLFilter = null;
1667 1686

  
1668 1687
            DefaultCreateTime = DateTime.Now.AddHours(-1);
1669 1688
            SelectedCreateTimeBegin = DefaultCreateTime;
ConvertService/ServiceBase/Markus.Service.StationController/Views/ConvertAddDialog.xaml
80 80
                <TextBlock Grid.Row="1" Grid.Column="4" Text="DOCUMENT ID" />
81 81
                <TextBlock Grid.Row="3" Grid.Column="0" Text="Document URL" />
82 82

  
83
                <TextBox Text="{Binding ConverAdd_Project_NO, Mode=TwoWay,  UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" Grid.Column="2" BorderBrush="{Binding Project_NO_Border}" />
83
                <telerik:RadComboBox Grid.Row="1" Grid.Column="2" HorizontalAlignment="Stretch"
84
                                         DisplayMemberPath="Project_NOAndProject_Name"
85
                                         ItemsSource="{Binding ProjectNames}" 
86
                                         SelectedItem="{Binding ProjectNumberFilter}"
87
                                         AllowMultipleSelection="False"
88
                                         BorderBrush="{Binding Project_NO_Border}"
89
                                         EmptyText="Project_NO : Project_Name" />
84 90
                <TextBox Text="{Binding ConverAdd_DOCUMENT_ID, Mode=TwoWay,  UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" Grid.Column="6" BorderBrush="{Binding DOCUMENT_ID_Border}"/>
85 91
                <TextBox Text="{Binding ConverAdd_DOCUMENT_URL,  Mode=TwoWay,  UpdateSourceTrigger=PropertyChanged }" Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="5" BorderBrush="{Binding DOCUMENT_URL_Border}" />
86 92

  
......
105 111
                        <TextBlock  HorizontalAlignment="Left" VerticalAlignment="Top" Text="DOCUMENT ID empty" FontSize="9" Foreground="{Binding DOCUMENT_ID_Color}" />
106 112
                    </StackPanel>
107 113
                </DockPanel>
108
                
114

  
109 115
                <DockPanel Grid.Column="2" Grid.Row="2" Grid.ColumnSpan="5" >
110 116
                    <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
111 117
                        <Grid Width="12" Height="12">
ConvertService/ServiceBase/Markus.Service.StationController/Views/FinalPDFAddDialog.xaml
78 78
                <TextBlock Grid.Row="1" Grid.Column="4" Text="Document ID" />
79 79
                <TextBlock Grid.Row="3" Grid.Column="0" Text="DocInfo_ID" />
80 80

  
81
                <TextBox Text="{Binding FinalPDFAdd_Project_NO, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" Grid.Column="2" BorderBrush="{Binding Project_NO_Border}" />
81
                <telerik:RadComboBox Grid.Row="1" Grid.Column="2" HorizontalAlignment="Stretch"
82
                                         DisplayMemberPath="Project_NOAndProject_Name"
83
                                         ItemsSource="{Binding ProjectNames}" 
84
                                         SelectedItem="{Binding ProjectNumberFilter}"
85
                                         AllowMultipleSelection="False"
86
                                         BorderBrush="{Binding Project_NO_Border}"
87
                                         EmptyText="Project_NO : Project_Name" />
82 88
                <TextBox Text="{Binding FinalPDFAdd_Document_ID, Mode=TwoWay,  UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" Grid.Column="6" BorderBrush="{Binding DOCUMENT_ID_Border}" />
83 89
                <TextBox Text="{Binding FinalPDFAdd_DocInfo_ID,  Mode=TwoWay,  UpdateSourceTrigger=PropertyChanged}" Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="5" BorderBrush="{Binding DocInfo_ID_Border}"/>
84 90

  
ConvertService/ServiceBase/Markus.Service.StationController/Views/FinalPDFView.xaml
129 129
                                         ItemsSource="{Binding ProjectNames}" 
130 130
                                         SelectedItem="{Binding ProjectNumberFilter}"
131 131
                                         AllowMultipleSelection="False"
132
                                         EmptyText="Project_NO : Project_Name"/>
132
                                         EmptyText="Project_NO : Project_Name" Height="22" VerticalAlignment="Top"/>
133 133

  
134 134
                <TextBlock Text="Document ID  " Grid.Row="1" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Left"/>
135 135
                <telerik:RadMaskedTextInput IsClearButtonVisible="True"  EmptyContent="DocumentID" Value="{Binding DocumentIDFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
136 136
                                                        TextMode="PlainText" Grid.Row="1" Grid.Column="4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="2,0"
137
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""/>
137
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask="" AcceptsReturn="False">
138
                    <telerik:RadMaskedTextInput.InputBindings>
139
                        <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
140
                    </telerik:RadMaskedTextInput.InputBindings>
141
                </telerik:RadMaskedTextInput>
138 142

  
139 143
                <TextBlock Text="MarkupInfo ID  " Grid.Row="1" Grid.Column="6"   VerticalAlignment="Center" HorizontalAlignment="Left"/>
140 144
                <telerik:RadMaskedTextInput IsClearButtonVisible="True" EmptyContent="MarkupInfo ID " Value="{Binding MarkupInfo_IDFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
141 145
                                                        TextMode="PlainText" Grid.Row="1" Grid.Column="7" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="2,0"
142
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""/>
146
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""  AcceptsReturn="False">
147
                    <telerik:RadMaskedTextInput.InputBindings>
148
                        <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
149
                    </telerik:RadMaskedTextInput.InputBindings>
150
                </telerik:RadMaskedTextInput>
143 151

  
144 152
                <TextBlock Text="Docuemnt Name  " Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
145 153
                <telerik:RadMaskedTextInput IsClearButtonVisible="True"  EmptyContent="Docuemnt Name" Value="{Binding Document_NameFilter , UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
146 154
                               TextMode="PlainText" Grid.Row="3" Grid.Column="1" HorizontalContentAlignment="Stretch"  VerticalAlignment="Bottom" HorizontalAlignment="Stretch" Margin="2,0"
147
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""/>
155
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""  AcceptsReturn="False">
156
                    <telerik:RadMaskedTextInput.InputBindings>
157
                        <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
158
                    </telerik:RadMaskedTextInput.InputBindings>
159
                </telerik:RadMaskedTextInput>
148 160

  
149 161
                <TextBlock Text="Docuemnt NO  " Grid.Row="3" Grid.Column="3"  VerticalAlignment="Center" HorizontalAlignment="Left"/>
150 162
                <telerik:RadMaskedTextInput IsClearButtonVisible="True" EmptyContent="Docuemnt NO" Value="{Binding Document_NOFilter , UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
151 163
                           TextMode="PlainText" Grid.Row="3" Grid.Column="4"   HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="2,0"
152
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""/>
164
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""  AcceptsReturn="False">
165
                    <telerik:RadMaskedTextInput.InputBindings>
166
                        <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
167
                    </telerik:RadMaskedTextInput.InputBindings>
168
                </telerik:RadMaskedTextInput>
169
                
153 170
                <TextBlock Text="CreateUser ID " Grid.Row="3" Grid.Column="6"  VerticalAlignment="Center" HorizontalAlignment="Left"/>
154 171
                <telerik:RadMaskedTextInput IsClearButtonVisible="True"   EmptyContent="CreateUser ID "  Value="{Binding CreateUser_IDFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
155 172
                            TextMode="PlainText" Grid.Row="3" Grid.Column="7"  HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="2,0"
156
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""/>
173
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""  AcceptsReturn="False">
174
                    <telerik:RadMaskedTextInput.InputBindings>
175
                        <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
176
                    </telerik:RadMaskedTextInput.InputBindings>
177
                </telerik:RadMaskedTextInput>
178
                
157 179
                <TextBlock Text="DocInfo ID " Grid.Row="1" Grid.Column="9"  VerticalAlignment="Center" HorizontalAlignment="Left"/>
158 180
                <telerik:RadMaskedTextInput IsClearButtonVisible="True"  EmptyContent="DocInfo ID"  Value="{Binding DOCINFO_IDFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
159 181
                         TextMode="PlainText" Grid.Row="1" Grid.Column="10"   HorizontalAlignment="Stretch"   VerticalAlignment="Center" Margin="2,0"
160
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""/>
182
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""  AcceptsReturn="False">
183
                    <telerik:RadMaskedTextInput.InputBindings>
184
                        <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
185
                    </telerik:RadMaskedTextInput.InputBindings>
186
                </telerik:RadMaskedTextInput>
187
                
161 188
                <TextBlock Text="GROUP NO " Grid.Row="3" Grid.Column="9"  VerticalAlignment="Center" HorizontalAlignment="Left"/>
162 189
                <telerik:RadMaskedTextInput IsClearButtonVisible="True"  EmptyContent="GROUP NO"  Value="{Binding GROUP_NOFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
163 190
                         TextMode="PlainText" Grid.Row="3" Grid.Column="10"   HorizontalAlignment="Stretch"   VerticalAlignment="Center" Margin="2,0"
164
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""/>
191
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""  AcceptsReturn="False">
192
                    <telerik:RadMaskedTextInput.InputBindings>
193
                        <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
194
                    </telerik:RadMaskedTextInput.InputBindings>
195
                </telerik:RadMaskedTextInput>
196
                
165 197
                <TextBlock Text="REVISION " Grid.Row="5" Grid.Column="0"  VerticalAlignment="Center" HorizontalAlignment="Left"/>
166 198
                <telerik:RadMaskedTextInput IsClearButtonVisible="True"  EmptyContent="REVISION"  Value="{Binding REVISIONFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
167 199
                         TextMode="PlainText" Grid.Row="5" Grid.Column="1"   HorizontalAlignment="Stretch"   VerticalAlignment="Center" Margin="2,0"
168
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""/>
200
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""  AcceptsReturn="False">
201
                    <telerik:RadMaskedTextInput.InputBindings>
202
                        <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
203
                    </telerik:RadMaskedTextInput.InputBindings>
204
                </telerik:RadMaskedTextInput>
169 205

  
170 206
                <TextBlock Text="DOCUMENT_URL " Grid.Row="5" Grid.Column="3"  VerticalAlignment="Center" HorizontalAlignment="Left"/>
171 207
                <telerik:RadMaskedTextInput IsClearButtonVisible="True"  EmptyContent="DOCUMENT_URL"  Value="{Binding Document_URLFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
172 208
                         TextMode="PlainText" Grid.Row="5" Grid.Column="4"   HorizontalAlignment="Stretch"   VerticalAlignment="Center" Margin="2,0" Grid.ColumnSpan="7"
173
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""/>
209
                                                maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask="" AcceptsReturn="False">
210
                    <telerik:RadMaskedTextInput.InputBindings>
211
                        <KeyBinding Key="Enter" Command="{Binding EnterCommand, UpdateSourceTrigger=PropertyChanged}" />
212
                    </telerik:RadMaskedTextInput.InputBindings>
213
                </telerik:RadMaskedTextInput>
174 214
            </Grid>
175 215

  
176 216
            <StackPanel Grid.Row="4" Grid.ColumnSpan="11">
ConvertService/ServiceBase/StationControllerService/StationControllerService.csproj.user
8 8
    <IISExpressWindowsAuthentication />
9 9
    <IISExpressUseClassicPipelineMode />
10 10
    <UseGlobalApplicationHostFile />
11
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
11
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
12 12
    <NameOfLastUsedPublishProfile>FolderProfile1</NameOfLastUsedPublishProfile>
13 13
  </PropertyGroup>
14 14
  <ProjectExtensions>

내보내기 Unified diff

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