개정판 5a954acc
FilterConvertSourceView 수정
Change-Id: I722ba6f320480c737ef6f0fc97612116ead4ae82
ConvertService/ServiceBase/IServiceBase/ConvertItem.cs | ||
---|---|---|
563 | 563 |
} |
564 | 564 |
} |
565 | 565 |
} |
566 |
|
|
566 | 567 |
} |
567 | 568 |
} |
ConvertService/ServiceBase/Markus.Service.DataBase/ConvertDatabase.cs | ||
---|---|---|
84 | 84 |
join documents in entities.DOCUMENT_ITEM on items.DOCUMENT_ID equals documents.DOCUMENT_ID into GroupItems |
85 | 85 |
from subpet in GroupItems.DefaultIfEmpty() |
86 | 86 |
where items.STATUS == status |
87 |
select items; |
|
88 |
|
|
89 |
|
|
90 |
//orderby items.CREATE_DATETIME descending |
|
91 |
//select new |
|
92 |
//{ |
|
93 |
// ID = items.ID, |
|
94 |
// DOCUMENT_URL = items.DOCUMENT_URL, |
|
95 |
// RECONVERTER = items.RECONVERTER, |
|
96 |
// SERVICE_ID = items.SERVICE_ID, |
|
97 |
// STATUS = items.STATUS, |
|
98 |
// CREATE_DATETIME = items.CREATE_DATETIME, |
|
99 |
// START_DATETIME = items.START_DATETIME, |
|
100 |
// END_DATETIME = items.END_DATETIME, |
|
101 |
// TOTAL_PAGE = items.TOTAL_PAGE, |
|
102 |
// CURRENT_PAGE = items.CURRENT_PAGE, |
|
103 |
// EXCEPTION = items.EXCEPTION, |
|
104 |
// PROJECT_NO = items.PROJECT_NO, |
|
105 |
// DOCUMENT_ID = items.DOCUMENT_ID, |
|
106 |
// REVISION = subpet.REVISION, |
|
107 |
// DOCUMENT_NO = subpet.DOCUMENT_NO, |
|
108 |
// DOCUMENT_NAME = subpet.DOCUMENT_NAME, |
|
109 |
// GROUP_NO = subpet.GROUP_NO, |
|
110 |
// //REVISION = documents.REVISION, |
|
111 |
// //DOCUMENT_NO = documents.DOCUMENT_NO, |
|
112 |
// //DOCUMENT_NAME = documents.DOCUMENT_NAME, |
|
113 |
// //GROUP_NO = documents.GROUP_NO |
|
114 |
//}; |
|
87 |
orderby items.CREATE_DATETIME descending |
|
88 |
select new |
|
89 |
{ |
|
90 |
ID = items.ID, |
|
91 |
DOCUMENT_URL = items.DOCUMENT_URL, |
|
92 |
RECONVERTER = items.RECONVERTER, |
|
93 |
SERVICE_ID = items.SERVICE_ID, |
|
94 |
STATUS = items.STATUS, |
|
95 |
CREATE_DATETIME = items.CREATE_DATETIME, |
|
96 |
START_DATETIME = items.START_DATETIME, |
|
97 |
END_DATETIME = items.END_DATETIME, |
|
98 |
TOTAL_PAGE = items.TOTAL_PAGE, |
|
99 |
CURRENT_PAGE = items.CURRENT_PAGE, |
|
100 |
EXCEPTION = items.EXCEPTION, |
|
101 |
PROJECT_NO = items.PROJECT_NO, |
|
102 |
DOCUMENT_ID = items.DOCUMENT_ID, |
|
103 |
REVISION = subpet.REVISION, |
|
104 |
DOCUMENT_NO = subpet.DOCUMENT_NO, |
|
105 |
DOCUMENT_NAME = subpet.DOCUMENT_NAME, |
|
106 |
GROUP_NO = subpet.GROUP_NO, |
|
107 |
}; |
|
115 | 108 |
|
116 | 109 |
if (query.Count() > 0)//세미 |
117 | 110 |
{ |
ConvertService/ServiceBase/Markus.Service.StationController/StationController.ini | ||
---|---|---|
15 | 15 |
|
16 | 16 |
|
17 | 17 |
#효성 복사본 |
18 |
MarkusDataBaseConnectionString = w0RfRwPwWVzkhKYSFkzqaccCbanjnTfSeig1IFc1IQ2MDThANWCNLmZqA6e2emQZqdM0l2Hsk1Ns/1Bfk6Vy+23gcbZlEDSBfSz7+eQaliiW9b2Wes1FDJ/C1Ho+35kTHGBbQk0tlIA0SWQHbR0KFo8TH5AbCyrLkjI87W6iXJVBpfI1QmTK0guIlTPnEEtCzXnXtgY9e8IHVnRIqT1PDq7ennJLPbB3f5FQ0Q1ry+Q= |
|
18 |
#MarkusDataBaseConnectionString = w0RfRwPwWVzkhKYSFkzqaccCbanjnTfSeig1IFc1IQ2MDThANWCNLmZqA6e2emQZqdM0l2Hsk1Ns/1Bfk6Vy+23gcbZlEDSBfSz7+eQaliiW9b2Wes1FDJ/C1Ho+35kTHGBbQk0tlIA0SWQHbR0KFo8TH5AbCyrLkjI87W6iXJVBpfI1QmTK0guIlTPnEEtCzXnXtgY9e8IHVnRIqT1PDq7ennJLPbB3f5FQ0Q1ry+Q=
|
|
19 | 19 |
|
20 | 20 |
#Doftech 개발 |
21 |
#MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w==
|
|
21 |
MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w== |
|
22 | 22 |
|
23 | 23 |
# remote test MARKUS_V3 |
24 | 24 |
#MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w== |
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs | ||
---|---|---|
39 | 39 |
DeleteCommand = new DelegateCommand(DataDelete); |
40 | 40 |
ValidateCommand = new DelegateCommand(DataValidate); |
41 | 41 |
MarkusLinkCommand = new DelegateCommand(MarkusLink); |
42 |
RemoveCreateTimeFilterCommand = new DelegateCommand(RemoveCreateTimeFilter); |
|
43 |
FilterConvertSourceView.Filter = new Predicate<object>(o => DetailFilter(o as ConvertItem)); |
|
42 | 44 |
} |
43 | 45 |
|
44 | 46 |
#endregion |
... | ... | |
56 | 58 |
} |
57 | 59 |
} |
58 | 60 |
|
61 |
public ICollectionView FilterConvertSourceView |
|
62 |
{ |
|
63 |
get { return CollectionViewSource.GetDefaultView(FilterConvertSource); } |
|
64 |
} |
|
65 |
|
|
59 | 66 |
private System.Collections.ObjectModel.ObservableCollection<ConvertItem> _FilterConvertSource; |
60 | 67 |
public System.Collections.ObjectModel.ObservableCollection<ConvertItem> FilterConvertSource |
61 | 68 |
{ |
62 | 69 |
//get => _FilterConvertSource; |
63 | 70 |
get |
64 | 71 |
{ |
65 |
//if (_FilterConvertSource == null) |
|
66 |
//{ |
|
67 |
// _FilterConvertSource = new System.Collections.ObjectModel.ObservableCollection<ConvertItem>(); |
|
68 |
//} |
|
69 |
//var view = CollectionViewSource.GetDefaultView(FilterConvertSource); |
|
70 |
//if (view.CanFilter) |
|
72 |
if (_FilterConvertSource == null) |
|
73 |
{ |
|
74 |
_FilterConvertSource = new System.Collections.ObjectModel.ObservableCollection<ConvertItem>(); |
|
75 |
} |
|
76 |
//if (_FilterConvertSource != null) |
|
71 | 77 |
//{ |
72 |
// view.Filter = TestFilter; |
|
78 |
// var view = CollectionViewSource.GetDefaultView(FilterConvertSource); |
|
79 |
// if (view.CanFilter) |
|
80 |
// { |
|
81 |
// view.Filter = DetailFilter; |
|
82 |
// } |
|
73 | 83 |
//} |
74 | 84 |
return _FilterConvertSource; |
75 | 85 |
} |
... | ... | |
237 | 247 |
if (_ProjectNumberFilter != value) |
238 | 248 |
{ |
239 | 249 |
_ProjectNumberFilter = value; |
240 |
OnPropertyChanged(() => ProjectNumberFilter); |
|
241 |
CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
250 |
OnPropertyChanged(() => ProjectNumberFilter); |
|
251 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
252 |
FilterConvertSourceView.Refresh(); |
|
242 | 253 |
} |
243 | 254 |
} |
244 | 255 |
} |
... | ... | |
253 | 264 |
{ |
254 | 265 |
_UniqueKeyFilter = value; |
255 | 266 |
OnPropertyChanged(() => UniqueKeyFilter); |
256 |
CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
267 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
268 |
FilterConvertSourceView.Refresh(); |
|
257 | 269 |
} |
258 | 270 |
} |
259 | 271 |
} |
260 | 272 |
|
261 |
public string _ConvertStateFilter;
|
|
262 |
public string ConvertStateFilter
|
|
273 |
public StatusCodeType _ConvertStateFilter;
|
|
274 |
public StatusCodeType ConvertStateFilter
|
|
263 | 275 |
{ |
264 | 276 |
get { return _ConvertStateFilter; } |
265 | 277 |
set |
... | ... | |
268 | 280 |
{ |
269 | 281 |
_ConvertStateFilter = value; |
270 | 282 |
OnPropertyChanged(() => ConvertStateFilter); |
271 |
CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
283 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
284 |
FilterConvertSourceView.Refresh(); |
|
272 | 285 |
} |
273 | 286 |
} |
274 | 287 |
} |
... | ... | |
283 | 296 |
{ |
284 | 297 |
_Docuemnt_NOFilter = value; |
285 | 298 |
OnPropertyChanged(() => Docuemnt_NOFilter); |
286 |
CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
299 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
300 |
FilterConvertSourceView.Refresh(); |
|
287 | 301 |
} |
288 | 302 |
} |
289 | 303 |
} |
... | ... | |
298 | 312 |
{ |
299 | 313 |
_Docuemnt_NameFilter = value; |
300 | 314 |
OnPropertyChanged(() => Docuemnt_NameFilter); |
301 |
CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
315 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
316 |
FilterConvertSourceView.Refresh(); |
|
302 | 317 |
} |
303 | 318 |
} |
304 | 319 |
} |
305 | 320 |
|
306 |
public string _ReconverterFilter;
|
|
307 |
public string ReconverterFilter
|
|
321 |
public int? _ReconverterFilter;
|
|
322 |
public int? ReconverterFilter
|
|
308 | 323 |
{ |
309 | 324 |
get { return _ReconverterFilter; } |
310 | 325 |
set |
... | ... | |
313 | 328 |
{ |
314 | 329 |
_ReconverterFilter = value; |
315 | 330 |
OnPropertyChanged(() => ReconverterFilter); |
316 |
CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
331 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
332 |
FilterConvertSourceView.Refresh(); |
|
333 |
|
|
317 | 334 |
} |
318 | 335 |
} |
319 | 336 |
} |
... | ... | |
328 | 345 |
{ |
329 | 346 |
_Service_IDFilter = value; |
330 | 347 |
OnPropertyChanged(() => Service_IDFilter); |
331 |
CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
348 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
349 |
FilterConvertSourceView.Refresh(); |
|
332 | 350 |
} |
333 | 351 |
} |
334 | 352 |
} |
... | ... | |
343 | 361 |
{ |
344 | 362 |
_RevisionFilter = value; |
345 | 363 |
OnPropertyChanged(() => RevisionFilter); |
346 |
CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
364 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
365 |
FilterConvertSourceView.Refresh(); |
|
347 | 366 |
} |
348 | 367 |
} |
349 | 368 |
} |
369 |
|
|
370 |
private DateTime _SelectedCreateTimeBegin = DateTime.Now; |
|
371 |
public DateTime SelectedCreateTimeBegin |
|
372 |
{ |
|
373 |
|
|
374 |
get { return _SelectedCreateTimeBegin; } |
|
375 |
set |
|
376 |
{ |
|
377 |
if (_SelectedCreateTimeBegin == value) |
|
378 |
return; |
|
379 |
_SelectedCreateTimeBegin = value; |
|
380 |
OnPropertyChanged(() => SelectedCreateTimeBegin); |
|
381 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
382 |
FilterConvertSourceView.Refresh(); |
|
383 |
//AddGeneratorBeginFilter(); |
|
384 |
|
|
385 |
} |
|
386 |
} |
|
387 |
|
|
388 |
private DateTime _SelectedCreateTimeEnd = DateTime.Now; |
|
389 |
public DateTime SelectedCreateTimeEnd |
|
390 |
{ |
|
391 |
|
|
392 |
get { return _SelectedCreateTimeEnd; } |
|
393 |
set |
|
394 |
{ |
|
395 |
if (_SelectedCreateTimeEnd == value) |
|
396 |
return; |
|
397 |
_SelectedCreateTimeEnd = value; |
|
398 |
OnPropertyChanged(() => SelectedCreateTimeEnd); |
|
399 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
400 |
FilterConvertSourceView.Refresh(); |
|
401 |
//AddGeneratorBeginFilter(); |
|
402 |
|
|
403 |
} |
|
404 |
} |
|
405 |
|
|
350 | 406 |
#endregion |
351 | 407 |
|
352 | 408 |
#region Command |
... | ... | |
356 | 412 |
public DelegateCommand ValidateCommand { get; private set; } |
357 | 413 |
public DelegateCommand DataSaveFileGemBoxCommand { get; private set; } |
358 | 414 |
public DelegateCommand MarkusLinkCommand { get; private set; } |
415 |
public DelegateCommand RemoveCreateTimeFilterCommand { get; private set;} |
|
416 |
|
|
359 | 417 |
#endregion |
360 | 418 |
|
361 | 419 |
#region Main Logic |
... | ... | |
478 | 536 |
_status = (int)SelectedStatus.Value; |
479 | 537 |
} |
480 | 538 |
|
481 |
//if (ProjectNumberFilter != null) |
|
482 |
//{ |
|
483 |
// from item in FilterConvertSource |
|
484 |
// where like % item.ProjectNumber |
|
485 |
//} |
|
486 |
|
|
487 |
var items = database.GetConvertProjects(_status)//x:database객체 y:statusCodeTypeList의값 Count()안에 predicator 조건 만족하면 count개수안에 넣음 |
|
488 |
.Take(SelectedCount.ValueMember).ToList(); |
|
539 |
//var items = database.GetConvertProjects(_status)//x:database객체 y:statusCodeTypeList의값 Count()안에 predicator 조건 만족하면 count개수안에 넣음 |
|
540 |
// .Take(SelectedCount.ValueMember).ToList(); |
|
541 |
var items = database.GetConvertProjects(_status).ToList(); |
|
542 |
if (ProjectNumberFilter != null) |
|
543 |
{ |
|
544 |
items.Where(x => x.ProjectNumber.Contains("/" + ProjectNumberFilter + "/")); |
|
545 |
} |
|
546 |
if (Docuemnt_NameFilter != null) |
|
547 |
{ |
|
548 |
items.Where(x => x.DocumnetName.Contains("/" + Docuemnt_NameFilter + "/")); |
|
549 |
} |
|
550 |
if (Service_IDFilter != null) |
|
551 |
{ |
|
552 |
items.Where(x => x.ServiceID.Contains("/" + Service_IDFilter + "/")); |
|
553 |
} |
|
554 |
if (UniqueKeyFilter != null) |
|
555 |
{ |
|
556 |
items.Where(x => x.UniqueKey.Contains("/" + UniqueKeyFilter + "/")); |
|
557 |
} |
|
558 |
if (Docuemnt_NOFilter != null) |
|
559 |
{ |
|
560 |
items.Where(x => x.DocumnetNo.Contains("/" + Docuemnt_NOFilter + "/")); |
|
561 |
} |
|
562 |
if (ReconverterFilter.HasValue) |
|
563 |
{ |
|
564 |
items.Where(x => x.ReConverter == ReconverterFilter.Value); |
|
565 |
} |
|
566 |
if (RevisionFilter != null) |
|
567 |
{ |
|
568 |
items.Where(x => x.Revision.Contains("/" + RevisionFilter + "/")); |
|
569 |
} |
|
570 |
items = items.Take(SelectedCount.ValueMember).ToList(); |
|
489 | 571 |
|
490 | 572 |
if (collection.Count() == 0) |
491 | 573 |
{ |
... | ... | |
917 | 999 |
|
918 | 1000 |
#endregion |
919 | 1001 |
|
920 |
#region TestFilter
|
|
1002 |
#region DetailFilter
|
|
921 | 1003 |
|
922 | 1004 |
|
923 | 1005 |
/// <summary> |
924 | 1006 |
/// Grid Filter |
925 | 1007 |
/// </summary> |
926 | 1008 |
|
927 |
private bool TestFilter(object item)
|
|
1009 |
private bool DetailFilter(object item)
|
|
928 | 1010 |
{ |
929 | 1011 |
var Item = item as ConvertItem; |
930 | 1012 |
if (ProjectNumberFilter == null) return true; |
931 | 1013 |
if (ProjectNumberFilter == Item.ProjectNumber) return true; |
1014 |
//if (ConvertStateFilter == null) return true; |
|
1015 |
//if (ConvertStateFilter == (StatusCodeType)Item.ConvertState) return true; |
|
1016 |
if (Docuemnt_NameFilter == null) return true; |
|
1017 |
if (Docuemnt_NameFilter == Item.DocumnetName) return true; |
|
1018 |
if (Service_IDFilter == null) return true; |
|
1019 |
if (Service_IDFilter == Item.ServiceID) return true; |
|
1020 |
if (UniqueKeyFilter == null) return true; |
|
1021 |
if (UniqueKeyFilter == Item.UniqueKey) return true; |
|
1022 |
if (Docuemnt_NOFilter == null) return true; |
|
1023 |
if (Docuemnt_NOFilter == Item.DocumnetNo) return true; |
|
1024 |
if (ReconverterFilter == null) return true; |
|
1025 |
if (ReconverterFilter == Item.ReConverter) return true; |
|
1026 |
if (RevisionFilter == null) return true; |
|
1027 |
if (RevisionFilter == Item.Revision) return true; |
|
1028 |
|
|
932 | 1029 |
return false; |
933 | 1030 |
} |
934 | 1031 |
|
1032 |
public void RemoveCreateTimeFilter(object obj)//미완성 |
|
1033 |
{ |
|
1034 |
SelectedCreateTimeBegin = DateTime.Now; |
|
1035 |
SelectedCreateTimeEnd = DateTime.Now; |
|
1036 |
} |
|
1037 |
|
|
935 | 1038 |
#endregion |
936 | 1039 |
|
937 | 1040 |
#endregion |
ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseView.xaml | ||
---|---|---|
69 | 69 |
<RowDefinition Height="Auto"/> |
70 | 70 |
</Grid.RowDefinitions> |
71 | 71 |
<telerik:RadExpander ExpandDirection="Down" BorderThickness="0" MaxHeight="700" Grid.Row="0" |
72 |
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" IsExpanded="True"
|
|
72 |
IsExpanded="True" |
|
73 | 73 |
telerik:AnimationManager.IsAnimationEnabled="False"> |
74 | 74 |
<telerik:RadGridView GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" |
75 |
RowDetailsTemplate="{StaticResource RowDetailsTemplate}"
|
|
75 |
RowDetailsTemplate="{StaticResource DatabaseFilter}"
|
|
76 | 76 |
AutoGenerateColumns="False" CanUserFreezeColumns="True" |
77 | 77 |
ColumnWidth="*" RowDetailsVisibilityMode="VisibleWhenSelected" |
78 |
Grid.Row="1" ScrollViewer.CanContentScroll="True" IsFilteringAllowed="True" |
|
79 |
LeftFrozenColumnCount="6" |
|
80 |
RightFrozenColumnCount="0"> |
|
78 |
Grid.Row="1" > |
|
81 | 79 |
<telerik:RadGridView.Columns> |
82 |
<telerik:GridViewDataColumn Header="필터 검색원하시면 클릭하세요! "/> |
|
80 |
<telerik:GridViewDataColumn Header="필터 검색원하시면 아래를 클릭하세요!"> |
|
81 |
<telerik:GridViewColumn.CellTemplate> |
|
82 |
<DataTemplate> |
|
83 |
<TextBlock Text="Click" VerticalAlignment="Center" /> |
|
84 |
</DataTemplate> |
|
85 |
</telerik:GridViewColumn.CellTemplate> |
|
86 |
</telerik:GridViewDataColumn> |
|
83 | 87 |
</telerik:RadGridView.Columns> |
84 | 88 |
</telerik:RadGridView> |
85 | 89 |
</telerik:RadExpander> |
... | ... | |
97 | 101 |
<TextBlock Text="{Binding SelectedCount.ValueMember, StringFormat=\{0:d\}}" Grid.Column="1"/> |
98 | 102 |
</Grid> |
99 | 103 |
</telerik:RadExpander.Header> |
104 |
<!--ItemsSource="{Binding FilterConvertSource}" --> |
|
100 | 105 |
<telerik:RadGridView x:Name="dataGrid1" GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" |
101 |
ItemsSource="{Binding FilterConvertSource}" |
|
106 |
ItemsSource="{Binding FilterConvertSourceView}"
|
|
102 | 107 |
SelectedItem="{Binding SelectFilterConvert, Mode=TwoWay}" |
103 | 108 |
RowDetailsTemplate="{StaticResource RowDetailsTemplate}" |
104 | 109 |
AutoGenerateColumns="False" CanUserFreezeColumns="True" |
ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseView.xaml.cs | ||
---|---|---|
18 | 18 |
/// <summary> |
19 | 19 |
/// ExportDataView.xaml에 대한 상호 작용 논리 |
20 | 20 |
/// </summary> |
21 |
public partial class DataBaseView: UserControl |
|
21 |
public partial class DataBaseView : UserControl
|
|
22 | 22 |
{ |
23 | 23 |
//partial이란 파일을 두개로 나눴다 |
24 | 24 |
|
25 | 25 |
public DataBaseView() |
26 | 26 |
{ |
27 | 27 |
InitializeComponent(); |
28 |
}
|
|
28 |
} |
|
29 | 29 |
} |
30 | 30 |
} |
ConvertService/ServiceBase/Markus.Service.StationController/Views/DatabaseFilter.xaml | ||
---|---|---|
84 | 84 |
InputMode="DateTimePicker" Width="200" |
85 | 85 |
VerticalAlignment="Center" |
86 | 86 |
HorizontalAlignment="Center" |
87 |
SelectedValue="{Binding SelectedGeneratorBegin ,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged }"
|
|
87 |
SelectedValue="{Binding SelectedCreateTimeBegin ,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged }"
|
|
88 | 88 |
Margin="0,1"> |
89 | 89 |
</telerik:RadDateTimePicker> |
90 |
<DatePicker Text="{Binding OpenStartTime, StringFormat='yy.mm.dd HH:mm:ss' ,RelativeSource={RelativeSource AncestorType={x:Type DatePicker}}}" SelectedDate="{Binding SelectedOpenTime}" Width="124" SelectedDateFormat="Long" Margin="0,-1,0,1"/>
|
|
90 |
<!--<DatePicker Text="{Binding OpenStartTime, StringFormat='yy.mm.dd HH:mm:ss' ,RelativeSource={RelativeSource AncestorType={x:Type DatePicker}}}" SelectedDate="{Binding SelectedOpenTime}" Width="124" SelectedDateFormat="Long" Margin="0,-1,0,1"/>-->
|
|
91 | 91 |
<TextBlock Text=" ~ "/> |
92 | 92 |
<telerik:RadDateTimePicker x:Name="datePicker2" |
93 | 93 |
InputMode="DateTimePicker" Width="200" |
94 | 94 |
VerticalAlignment="Center" |
95 | 95 |
HorizontalAlignment="Center" |
96 |
SelectedValue="{Binding SelectedGeneratorEnd ,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
96 |
SelectedValue="{Binding SelectedCreateTimeEnd ,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
97 | 97 |
Margin="0,1"> |
98 | 98 |
</telerik:RadDateTimePicker> |
99 |
<DatePicker Text="{Binding OpenStartTime, StringFormat='yy.mm.dd HH:mm:ss' ,RelativeSource={RelativeSource AncestorType={x:Type DatePicker}}}" SelectedDate="{Binding SelectedOpenTime}" Width="124" SelectedDateFormat="Long" Margin="0,-1,0,1"/> |
|
99 |
<Button Content="Clear" Margin="5" Width="50" Height="20" HorizontalAlignment="Left" Command="{Binding RemoveCreateTimeFilterCommand, Mode=OneWay}"/> |
|
100 |
<!--<DatePicker Text="{Binding OpenStartTime, StringFormat='yy.mm.dd HH:mm:ss' ,RelativeSource={RelativeSource AncestorType={x:Type DatePicker}}}" SelectedDate="{Binding SelectedOpenTime}" Width="124" SelectedDateFormat="Long" Margin="0,-1,0,1"/>--> |
|
100 | 101 |
|
101 | 102 |
|
102 | 103 |
<!--<telerik:RadMaskedTextInput IsClearButtonVisible="True" |
내보내기 Unified diff