개정판 85f68fef
GridViewToggleRowDetailsColumn 변경
Change-Id: I10b9c3cc95e812ad3a93e4ff84123aebe005209d
| ConvertService/ServiceBase/IServiceBase/ConvertItem.cs | ||
|---|---|---|
| 595 | 595 |
} |
| 596 | 596 |
} |
| 597 | 597 |
|
| 598 |
|
|
| 599 |
|
|
| 598 | 600 |
} |
| 599 | 601 |
} |
| ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs | ||
|---|---|---|
| 22 | 22 |
using System.Windows.Input; |
| 23 | 23 |
using Markus.Mvvm.ToolKit; |
| 24 | 24 |
using System.Windows.Data; |
| 25 |
using System.Windows.Controls; |
|
| 25 | 26 |
|
| 26 | 27 |
namespace Markus.Service.StationController.ViewModel |
| 27 | 28 |
{
|
| ... | ... | |
| 42 | 43 |
ValidateCommand = new DelegateCommand(DataValidate); |
| 43 | 44 |
MarkusLinkCommand = new DelegateCommand(MarkusLink); |
| 44 | 45 |
RemoveCreateTimeFilterCommand = new DelegateCommand(RemoveCreateTimeFilter); |
| 45 |
FilterConvertSourceView.Filter = new Predicate<object>(o => DetailFilter(o as ConvertItem)); |
|
| 46 | 46 |
ResetCommand = new DelegateCommand(Reset); |
| 47 | 47 |
ConverAddCommand = new DelegateCommand(ConverAdd); |
| 48 | 48 |
} |
| ... | ... | |
| 84 | 84 |
get |
| 85 | 85 |
{
|
| 86 | 86 |
var view = CollectionViewSource.GetDefaultView(FilterConvertSource); |
| 87 |
//if (view.CanFilter) |
|
| 88 |
//{
|
|
| 89 |
// view.Filter = DetailFilter; |
|
| 90 |
// view.Filter = o => String.IsNullOrEmpty(ProjectNumberFilter) ? true : ((string)o).Contains(ProjectNumberFilter); |
|
| 91 |
// view.Filter = o => String.IsNullOrEmpty(UniqueKeyFilter) ? true : ((string)o).Contains(UniqueKeyFilter); |
|
| 92 |
//} |
|
| 93 | 87 |
return view; |
| 94 | 88 |
} |
| 95 | 89 |
} |
| ... | ... | |
| 97 | 91 |
private System.Collections.ObjectModel.ObservableCollection<ConvertItem> _FilterConvertSource; |
| 98 | 92 |
public System.Collections.ObjectModel.ObservableCollection<ConvertItem> FilterConvertSource |
| 99 | 93 |
{
|
| 100 |
//get => _FilterConvertSource; |
|
| 101 | 94 |
get |
| 102 | 95 |
{
|
| 103 | 96 |
if (_FilterConvertSource == null) |
| 104 | 97 |
{
|
| 105 | 98 |
_FilterConvertSource = new System.Collections.ObjectModel.ObservableCollection<ConvertItem>(); |
| 106 | 99 |
} |
| 107 |
//if (_FilterConvertSource != null) |
|
| 108 |
//{
|
|
| 109 |
// var view = CollectionViewSource.GetDefaultView(FilterConvertSource); |
|
| 110 |
// if (view.CanFilter) |
|
| 111 |
// {
|
|
| 112 |
// view.Filter = DetailFilter; |
|
| 113 |
// } |
|
| 114 |
//} |
|
| 115 | 100 |
return _FilterConvertSource; |
| 116 | 101 |
} |
| 117 | 102 |
set |
| ... | ... | |
| 272 | 257 |
get { return _ProjectNumberFilter; }
|
| 273 | 258 |
set |
| 274 | 259 |
{
|
| 275 |
if(_ProjectNumberFilter == "") |
|
| 260 |
if (_ProjectNumberFilter == "")
|
|
| 276 | 261 |
{
|
| 277 | 262 |
_ProjectNumberFilter = null; |
| 278 | 263 |
} |
| ... | ... | |
| 280 | 265 |
{
|
| 281 | 266 |
_ProjectNumberFilter = value; |
| 282 | 267 |
OnPropertyChanged(() => ProjectNumberFilter); |
| 283 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
| 284 |
//FilterConvertSourceView.Refresh(); |
|
| 285 | 268 |
} |
| 286 | 269 |
} |
| 287 | 270 |
} |
| ... | ... | |
| 303 | 286 |
{
|
| 304 | 287 |
_UniqueKeyFilter = value; |
| 305 | 288 |
OnPropertyChanged(() => UniqueKeyFilter); |
| 306 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
| 307 |
//FilterConvertSourceView.Refresh(); |
|
| 308 | 289 |
} |
| 309 | 290 |
} |
| 310 | 291 |
} |
| ... | ... | |
| 319 | 300 |
{
|
| 320 | 301 |
_ConvertStateFilter = value; |
| 321 | 302 |
OnPropertyChanged(() => ConvertStateFilter); |
| 322 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
| 323 |
//FilterConvertSourceView.Refresh(); |
|
| 324 | 303 |
} |
| 325 | 304 |
} |
| 326 | 305 |
} |
| ... | ... | |
| 339 | 318 |
{
|
| 340 | 319 |
_Docuemnt_NOFilter = value; |
| 341 | 320 |
OnPropertyChanged(() => Docuemnt_NOFilter); |
| 342 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
| 343 |
//FilterConvertSourceView.Refresh(); |
|
| 344 | 321 |
} |
| 345 | 322 |
} |
| 346 | 323 |
} |
| ... | ... | |
| 359 | 336 |
{
|
| 360 | 337 |
_Docuemnt_NameFilter = value; |
| 361 | 338 |
OnPropertyChanged(() => Docuemnt_NameFilter); |
| 362 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
| 363 |
//FilterConvertSourceView.Refresh(); |
|
| 364 | 339 |
} |
| 365 | 340 |
} |
| 366 | 341 |
} |
| ... | ... | |
| 371 | 346 |
get { return _ReconverterFilter; }
|
| 372 | 347 |
set |
| 373 | 348 |
{
|
| 374 |
if (_ReconverterFilter == null)
|
|
| 349 |
if (_ReconverterFilter == null) |
|
| 375 | 350 |
{
|
| 376 | 351 |
_ReconverterFilter = 0; |
| 377 | 352 |
} |
| ... | ... | |
| 379 | 354 |
{
|
| 380 | 355 |
_ReconverterFilter = value; |
| 381 | 356 |
OnPropertyChanged(() => ReconverterFilter); |
| 382 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
| 383 |
//FilterConvertSourceView.Refresh(); |
|
| 384 | 357 |
|
| 385 | 358 |
} |
| 386 | 359 |
} |
| ... | ... | |
| 396 | 369 |
{
|
| 397 | 370 |
_Service_IDFilter = null; |
| 398 | 371 |
} |
| 399 |
else if (_Service_IDFilter != value)
|
|
| 372 |
else if (_Service_IDFilter != value) |
|
| 400 | 373 |
{
|
| 401 | 374 |
_Service_IDFilter = value; |
| 402 | 375 |
OnPropertyChanged(() => Service_IDFilter); |
| 403 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
| 404 |
//FilterConvertSourceView.Refresh(); |
|
| 405 | 376 |
} |
| 406 | 377 |
} |
| 407 | 378 |
} |
| ... | ... | |
| 414 | 385 |
{
|
| 415 | 386 |
if (_RevisionFilter == "") |
| 416 | 387 |
{
|
| 417 |
_RevisionFilter = null ;
|
|
| 388 |
_RevisionFilter = null; |
|
| 418 | 389 |
} |
| 419 | 390 |
else if (_RevisionFilter != value) |
| 420 | 391 |
{
|
| 421 | 392 |
_RevisionFilter = value; |
| 422 | 393 |
OnPropertyChanged(() => RevisionFilter); |
| 423 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
| 424 |
//FilterConvertSourceView.Refresh(); |
|
| 425 | 394 |
} |
| 426 | 395 |
} |
| 427 | 396 |
} |
| ... | ... | |
| 440 | 409 |
{
|
| 441 | 410 |
_GroupNOFilter = value; |
| 442 | 411 |
OnPropertyChanged(() => GroupNOFilter); |
| 443 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
| 444 |
//FilterConvertSourceView.Refresh(); |
|
| 445 | 412 |
} |
| 446 | 413 |
} |
| 447 | 414 |
} |
| ... | ... | |
| 458 | 425 |
return; |
| 459 | 426 |
_SelectedCreateTimeBegin = value; |
| 460 | 427 |
OnPropertyChanged(() => SelectedCreateTimeBegin); |
| 461 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
| 462 |
//FilterConvertSourceView.Refresh(); |
|
| 463 |
//AddGeneratorBeginFilter(); |
|
| 464 | 428 |
|
| 465 | 429 |
} |
| 466 | 430 |
} |
| ... | ... | |
| 476 | 440 |
return; |
| 477 | 441 |
_SelectedCreateTimeEnd = value; |
| 478 | 442 |
OnPropertyChanged(() => SelectedCreateTimeEnd); |
| 479 |
//CollectionViewSource.GetDefaultView(FilterConvertSource).Refresh(); |
|
| 480 |
//FilterConvertSourceView.Refresh(); |
|
| 481 |
//AddGeneratorBeginFilter(); |
|
| 482 |
|
|
| 483 | 443 |
} |
| 484 | 444 |
} |
| 485 | 445 |
|
| 486 | 446 |
public int _DataBase_ItemsHeight = 800; |
| 487 |
public int DataBase_ItemsHeight
|
|
| 447 |
public int DataBase_ItemsHeight |
|
| 488 | 448 |
{
|
| 489 | 449 |
get { return _DataBase_ItemsHeight; }
|
| 490 | 450 |
set |
| 491 | 451 |
{
|
| 492 | 452 |
_DataBase_ItemsHeight = value; |
| 493 | 453 |
OnPropertyChanged(() => DataBase_ItemsHeight); |
| 494 |
|
|
| 495 | 454 |
} |
| 496 | 455 |
} |
| 497 | 456 |
|
| ... | ... | |
| 650 | 609 |
ConvertItemEx.ChangeValues(changeitem, newitem), x => x.ConvertID == newitem.ConvertID && x.ProjectNumber == newitem.ProjectNumber); |
| 651 | 610 |
}); |
| 652 | 611 |
|
| 653 |
RealConvert_Height = 80 + ( 10 * collection.Count());
|
|
| 612 |
RealConvert_Height = 80 + (10 * collection.Count()); |
|
| 654 | 613 |
DataBase_ItemsHeight = 800 - (RealConvert_Height + Alive_Height); |
| 655 | 614 |
} |
| 656 | 615 |
} |
| ... | ... | |
| 768 | 727 |
|
| 769 | 728 |
//DocumentID = unikey |
| 770 | 729 |
|
| 771 |
//null 왼쪽에서 부터 p_BEGIN_START_DATETIE, p_Finish_START_DATETIE, BEGIN_END_DATETIME, Finish_END_DATETIME (전에 없애라고 하셔서..) |
|
| 772 |
//오류떠서 [Model].Context.tt File에서 288줄 Function.Name to edmFunction.FullName바꿨더니 오류 안남 |
|
| 773 | 730 |
var items = entities.SELECT_CONVERT_ITEM(ProjectNumberFilter, UniqueKeyFilter, _status, SelectedCount.ValueMember, SelectedCreateTimeBegin, SelectedCreateTimeEnd, null, null, null, null, GroupNOFilter, |
| 774 |
Docuemnt_NameFilter, Docuemnt_NOFilter, RevisionFilter).ToList();//이대로 그냥 쓰면 쿼리 -> 쿼리 결과는 두 번 이상 열거할 수 없습니다 뜸
|
|
| 731 |
Docuemnt_NameFilter, Docuemnt_NOFilter, RevisionFilter).ToList(); |
|
| 775 | 732 |
|
| 776 | 733 |
//SEARCH 할때 최소한 프로젝트 넘버랑 유니크키(다큐먼트 넘버) 크레이트타임 시작 줘야함 |
| 777 | 734 |
|
| ... | ... | |
| 913 | 870 |
itemsToEach.ConvertPath = item.ConvertPath; |
| 914 | 871 |
itemsToEach.MarkusLink = convertpath[1]; |
| 915 | 872 |
itemsToEach.UniqueKey = item.UniqueKey; |
| 916 |
|
|
| 917 |
//itemsToEach.ConvertPath = item.ConvertPath; |
|
| 873 |
itemsToEach.GroupNo = item.GroupNo; |
|
| 874 |
itemsToEach.ProcessorAffinity = item.ProcessorAffinity; |
|
| 875 |
itemsToEach.DocumnetName = item.DocumnetName; |
|
| 876 |
itemsToEach.Revision = item.Revision; |
|
| 877 |
itemsToEach.Exception = item.Exception; |
|
| 918 | 878 |
itemsToEach.ConvertPath = convertpath[0]; |
| 919 | 879 |
itemsToEach.CreateTime = item.CreateTime; |
| 920 |
itemsToEach.Exception = item.Exception; |
|
| 921 |
itemsToEach.ProcessorAffinity = item.ProcessorAffinity; |
|
| 922 | 880 |
itemsToEach.ReConverter = item.ReConverter; |
| 923 | 881 |
itemsToEach.DocumentID = item.DocumentID; |
| 924 |
itemsToEach.DocumnetName = item.DocumnetName; |
|
| 925 |
itemsToEach.GroupNo = item.GroupNo; |
|
| 926 |
itemsToEach.Revision = item.Revision; |
|
| 927 | 882 |
itemsToEach.StartTime = item.StartTime; |
| 928 | 883 |
itemsToEach.EndTime = item.EndTime; |
| 929 | 884 |
|
| ... | ... | |
| 1015 | 970 |
} |
| 1016 | 971 |
} |
| 1017 | 972 |
|
| 1018 |
Alive_Height = 80 + (newitems.Count() * 10 );
|
|
| 1019 |
DataBase_ItemsHeight = 800 - ( RealConvert_Height + Alive_Height);
|
|
| 973 |
Alive_Height = 80 + (newitems.Count() * 10); |
|
| 974 |
DataBase_ItemsHeight = 800 - (RealConvert_Height + Alive_Height); |
|
| 1020 | 975 |
} |
| 1021 | 976 |
|
| 1022 | 977 |
|
| ... | ... | |
| 1252 | 1207 |
|
| 1253 | 1208 |
#region Data Search |
| 1254 | 1209 |
|
| 1255 |
|
|
| 1256 |
/// <summary> |
|
| 1257 |
/// Grid Filter |
|
| 1258 |
/// </summary> |
|
| 1259 |
|
|
| 1260 |
private bool DetailFilter(object item) |
|
| 1261 |
{
|
|
| 1262 |
var Item = item as ConvertItem; |
|
| 1263 |
if (ProjectNumberFilter == null) return true; |
|
| 1264 |
if (ProjectNumberFilter == Item.ProjectNumber) return true; |
|
| 1265 |
//if (ConvertStateFilter == null) return true; |
|
| 1266 |
//if (ConvertStateFilter == (StatusCodeType)Item.ConvertState) return true; |
|
| 1267 |
if (Docuemnt_NameFilter == null) return true; |
|
| 1268 |
if (Docuemnt_NameFilter == Item.DocumnetName) return true; |
|
| 1269 |
if (Service_IDFilter == null) return true; |
|
| 1270 |
if (Service_IDFilter == Item.ServiceID) return true; |
|
| 1271 |
if (UniqueKeyFilter == null) return true; |
|
| 1272 |
if (UniqueKeyFilter == Item.UniqueKey) return true; |
|
| 1273 |
if (Docuemnt_NOFilter == null) return true; |
|
| 1274 |
if (Docuemnt_NOFilter == Item.DocumnetNo) return true; |
|
| 1275 |
if (ReconverterFilter == null) return true; |
|
| 1276 |
if (ReconverterFilter == Item.ReConverter) return true; |
|
| 1277 |
if (RevisionFilter == null) return true; |
|
| 1278 |
if (RevisionFilter == Item.Revision) return true; |
|
| 1279 |
|
|
| 1280 |
return false; |
|
| 1281 |
} |
|
| 1282 |
|
|
| 1283 | 1210 |
public void RemoveCreateTimeFilter(object obj) |
| 1284 | 1211 |
{
|
| 1285 | 1212 |
DefaultCreateTime = DateTime.Now; |
| ... | ... | |
| 1325 | 1252 |
|
| 1326 | 1253 |
#endregion |
| 1327 | 1254 |
|
| 1328 |
|
|
| 1329 | 1255 |
#endregion |
| 1330 | 1256 |
} |
| 1331 | 1257 |
} |
| ConvertService/ServiceBase/Markus.Service.StationController/Views/ConvertAddDialog.xaml | ||
|---|---|---|
| 7 | 7 |
<telerik:RadWindow.DataContext> |
| 8 | 8 |
<VM:ConvertAddDialogViewModel/> |
| 9 | 9 |
</telerik:RadWindow.DataContext> |
| 10 |
<Grid Height="200" Width="400">
|
|
| 10 |
<Grid Height="130" Width="480">
|
|
| 11 | 11 |
<Grid.Resources> |
| 12 | 12 |
<ResourceDictionary> |
| 13 | 13 |
|
| ... | ... | |
| 62 | 62 |
<Grid.ColumnDefinitions> |
| 63 | 63 |
<ColumnDefinition Width="90" /> |
| 64 | 64 |
<ColumnDefinition Width="10" /> |
| 65 |
<ColumnDefinition /> |
|
| 65 |
<ColumnDefinition Width="*"/> |
|
| 66 |
<ColumnDefinition Width="10" /> |
|
| 67 |
<ColumnDefinition Width="90" /> |
|
| 68 |
<ColumnDefinition Width="10" /> |
|
| 69 |
<ColumnDefinition Width="1.5*"/> |
|
| 66 | 70 |
</Grid.ColumnDefinitions> |
| 67 | 71 |
<Grid.RowDefinitions> |
| 68 |
<RowDefinition /> |
|
| 69 |
<RowDefinition /> |
|
| 70 |
<RowDefinition /> |
|
| 72 |
<RowDefinition Height="25"/> |
|
| 73 |
<RowDefinition Height="25"/> |
|
| 71 | 74 |
</Grid.RowDefinitions> |
| 72 |
|
|
| 73 |
<TextBlock Grid.Row="0" Text="Project NO" /> |
|
| 74 |
<TextBlock Grid.Row="1" Text="DOCUMENT ID" /> |
|
| 75 |
<TextBlock Grid.Row="2" Text="Document URL" /> |
|
| 75 |
<TextBlock Grid.Row="0" Text="Project NO" /> |
|
| 76 |
<TextBlock Grid.Row="0" Grid.Column="4" Text="DOCUMENT ID" /> |
|
| 77 |
<TextBlock Grid.Row="1" Grid.Column="0" Text="Document URL" /> |
|
| 76 | 78 |
|
| 77 | 79 |
<TextBox Text="{Binding ConverAdd_Project_NO, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Grid.Row="0" Grid.Column="2" />
|
| 78 |
<TextBox Text="{Binding ConverAdd_DOCUMENT_ID, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" Grid.Column="2" />
|
|
| 79 |
<TextBox Text="{Binding ConverAdd_DOCUMENT_URL, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Grid.Row="2" Grid.Column="2" />
|
|
| 80 |
|
|
| 80 |
<TextBox Text="{Binding ConverAdd_DOCUMENT_ID, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Grid.Row="0" Grid.Column="6" />
|
|
| 81 |
<TextBox Text="{Binding ConverAdd_DOCUMENT_URL, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="5"/>
|
|
| 81 | 82 |
</Grid> |
| 82 | 83 |
<StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Right" Margin="0 0 0 10"> |
| 83 | 84 |
|
| ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseView.xaml | ||
|---|---|---|
| 60 | 60 |
<!--<telerik:RadToggleButton Content=" Filter" Command="{Binding DataFilterCommand, Mode=OneWay}"/>-->
|
| 61 | 61 |
</StackPanel> |
| 62 | 62 |
<Grid HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Row="1" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" > |
| 63 |
<!--<Grid.ColumnDefinitions> |
|
| 64 |
<ColumnDefinition Width="387*"/> |
|
| 65 |
<ColumnDefinition Width="13*"/> |
|
| 66 |
</Grid.ColumnDefinitions> |
|
| 67 |
<Grid.RowDefinitions> |
|
| 68 |
<RowDefinition Height="*"/> |
|
| 69 |
<RowDefinition Height="*" /> |
|
| 70 |
<RowDefinition Height="*"/> |
|
| 71 |
<RowDefinition Height="*"/> |
|
| 72 |
</Grid.RowDefinitions>--> |
|
| 73 | 63 |
<Grid.ColumnDefinitions> |
| 74 | 64 |
<ColumnDefinition Width="387*"/> |
| 75 | 65 |
<ColumnDefinition Width="13*"/> |
| ... | ... | |
| 77 | 67 |
<Grid.RowDefinitions> |
| 78 | 68 |
<RowDefinition/> |
| 79 | 69 |
</Grid.RowDefinitions> |
| 80 |
|
|
| 81 |
|
|
| 82 | 70 |
<StackPanel Orientation="Vertical" MaxHeight="850" Grid.Row="0"> |
| 83 |
|
|
| 84 | 71 |
<telerik:RadExpander ExpandDirection="Down" BorderThickness="0" Grid.Row="0" IsExpanded="False" telerik:AnimationManager.IsAnimationEnabled="False" DockPanel.Dock="Top"> |
| 85 | 72 |
<StackPanel Orientation="Vertical"> |
| 86 | 73 |
<controls:DatabaseFilter ProjectNo="{Binding ProjectNumberFilter,Mode=TwoWay}" UniqueKey="{Binding UniqueKeyFilter,Mode=TwoWay}" Service_ID="{Binding Service_IDFilter, Mode=TwoWay}"
|
| ... | ... | |
| 98 | 85 |
<telerik:RadExpander ExpandDirection="Down" BorderThickness="0" Grid.Row="1" MaxHeight="{Binding DataBase_ItemsHeight, Mode=OneWay}"
|
| 99 | 86 |
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" IsExpanded="True" |
| 100 | 87 |
telerik:AnimationManager.IsAnimationEnabled="False" > |
| 101 |
|
|
| 102 | 88 |
<telerik:RadExpander.Header> |
| 103 | 89 |
<Grid> |
| 104 | 90 |
<Grid.ColumnDefinitions> |
| ... | ... | |
| 109 | 95 |
<TextBlock Text="{Binding SelectedCount.DisplayMember, StringFormat=\{0:d\}}" Grid.Column="1"/>
|
| 110 | 96 |
</Grid> |
| 111 | 97 |
</telerik:RadExpander.Header> |
| 112 |
<telerik:RadGridView x:Name="dataGrid1" GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" |
|
| 98 |
|
|
| 99 |
<telerik:RadGridView x:Name="dataGrid1" GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" |
|
| 113 | 100 |
ItemsSource="{Binding FilterConvertSourceView}"
|
| 114 | 101 |
SelectedItem="{Binding SelectFilterConvert, Mode=TwoWay}"
|
| 115 |
RowDetailsTemplate="{StaticResource RowDetailsTemplate}"
|
|
| 116 |
AutoGenerateColumns="False" CanUserFreezeColumns="True"
|
|
| 117 |
ColumnWidth="*" RowDetailsVisibilityMode="VisibleWhenSelected"
|
|
| 102 |
RowDetailsTemplate="{StaticResource RowDetailsTemplate}"
|
|
| 103 |
AutoGenerateColumns="False" |
|
| 104 |
ColumnWidth="*" CanUserFreezeColumns="False"
|
|
| 118 | 105 |
Grid.Row="1" ScrollViewer.CanContentScroll="True" IsFilteringAllowed="True" |
| 119 | 106 |
LeftFrozenColumnCount="6" |
| 120 | 107 |
RightFrozenColumnCount="0"> |
| ... | ... | |
| 126 | 113 |
</telerik:RadContextMenu> |
| 127 | 114 |
</telerik:RadContextMenu.ContextMenu> |
| 128 | 115 |
<telerik:RadGridView.Columns> |
| 116 |
<telerik:GridViewToggleRowDetailsColumn /> |
|
| 129 | 117 |
<controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
|
| 130 | 118 |
<telerik:GridViewDataColumn Header="Convert ID " |
| 131 | 119 |
DataMemberBinding="{Binding ConvertID}" Width="1.5*" />
|
| ... | ... | |
| 170 | 158 |
</telerik:RadGridView> |
| 171 | 159 |
</telerik:RadExpander> |
| 172 | 160 |
</DockPanel> |
| 173 |
<telerik:RadExpander Grid.Row="2" ExpandDirection="Down" BorderThickness="0" MaxHeight="{Binding RealConvert_Height,Mode=OneWay}" DockPanel.Dock="Bottom"
|
|
| 161 |
|
|
| 162 |
<telerik:RadExpander Grid.Row="2" ExpandDirection="Down" BorderThickness="0" MaxHeight="{Binding RealConvert_Height,Mode=OneWay}"
|
|
| 174 | 163 |
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" |
| 175 | 164 |
telerik:AnimationManager.IsAnimationEnabled="False" IsExpanded ="{Binding ConvertShow, Mode=TwoWay}">
|
| 176 | 165 |
<telerik:RadExpander.Header> |
| ... | ... | |
| 188 | 177 |
SelectedItem="{Binding SelectRealConvert, Mode=TwoWay}"
|
| 189 | 178 |
RowDetailsTemplate="{StaticResource RowDetailsTemplate}"
|
| 190 | 179 |
AutoGenerateColumns="False" CanUserFreezeColumns="False" |
| 191 |
ColumnWidth="*" RowDetailsVisibilityMode="VisibleWhenSelected"
|
|
| 180 |
ColumnWidth="*" |
|
| 192 | 181 |
Grid.Row="1" ScrollViewer.CanContentScroll="False" IsFilteringAllowed="True"> |
| 193 | 182 |
<telerik:RadContextMenu.ContextMenu> |
| 194 | 183 |
<telerik:RadContextMenu> |
| ... | ... | |
| 198 | 187 |
</telerik:RadContextMenu> |
| 199 | 188 |
</telerik:RadContextMenu.ContextMenu> |
| 200 | 189 |
<telerik:RadGridView.Columns> |
| 190 |
<telerik:GridViewToggleRowDetailsColumn /> |
|
| 201 | 191 |
<controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
|
| 202 | 192 |
|
| 203 | 193 |
<telerik:GridViewDataColumn Header="Convert ID " |
| ... | ... | |
| 245 | 235 |
</telerik:RadGridView> |
| 246 | 236 |
</telerik:RadExpander> |
| 247 | 237 |
|
| 248 |
<telerik:RadExpander Grid.Row="3" ExpandDirection="Down" BorderThickness="0" VerticalAlignment="Stretch" DockPanel.Dock="Bottom"
|
|
| 238 |
<telerik:RadExpander Grid.Row="3" ExpandDirection="Down" BorderThickness="0" VerticalAlignment="Stretch" |
|
| 249 | 239 |
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" MaxHeight="{Binding Alive_Height,Mode=OneWay}"
|
| 250 | 240 |
telerik:AnimationManager.IsAnimationEnabled="False" IsExpanded ="False"> |
| 251 | 241 |
<telerik:RadExpander.Header> |
| ... | ... | |
| 263 | 253 |
</Grid> |
| 264 | 254 |
</telerik:RadExpander.Header> |
| 265 | 255 |
<telerik:RadGridView GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" |
| 266 |
ItemsSource="{Binding AliveItems}" RowDetailsVisibilityMode="VisibleWhenSelected"
|
|
| 256 |
ItemsSource="{Binding AliveItems}"
|
|
| 267 | 257 |
SelectedItem="{Binding SelectAliveConvert, Mode=TwoWay}"
|
| 268 | 258 |
AutoGenerateColumns="False" CanUserFreezeColumns="False" RowDetailsTemplate="{StaticResource RowDetailsTemplate}"
|
| 269 | 259 |
ColumnWidth="*" ScrollViewer.CanContentScroll="False" IsFilteringAllowed="True" Grid.Row="1" > |
| 270 | 260 |
<telerik:RadGridView.Columns> |
| 261 |
<telerik:GridViewToggleRowDetailsColumn /> |
|
| 271 | 262 |
<controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
|
| 272 | 263 |
|
| 273 | 264 |
<telerik:GridViewDataColumn Header="Convert ID " |
| ... | ... | |
| 296 | 287 |
<telerik:GridViewDynamicHyperlinkColumn Header="원본파일" |
| 297 | 288 |
NavigateUrlFormatString="{}{0}"
|
| 298 | 289 |
NavigateUrlMemberPaths="OriginfilePath" |
| 299 |
Width="*"> |
|
| 290 |
Width="2*">
|
|
| 300 | 291 |
<telerik:GridViewDynamicHyperlinkColumn.CellTemplate> |
| 301 | 292 |
<DataTemplate> |
| 302 | 293 |
<TextBlock Text="{Binding FileName}"/>
|
| ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseView.xaml.cs | ||
|---|---|---|
| 12 | 12 |
using System.Windows.Media.Imaging; |
| 13 | 13 |
using System.Windows.Shapes; |
| 14 | 14 |
using System.Windows.Navigation; |
| 15 |
using Markus.Service.Interface; |
|
| 15 | 16 |
|
| 16 | 17 |
namespace Markus.Service.StationController.Views |
| 17 | 18 |
{
|
| ... | ... | |
| 25 | 26 |
public DataBaseView() |
| 26 | 27 |
{
|
| 27 | 28 |
InitializeComponent(); |
| 28 |
} |
|
| 29 | 29 |
|
| 30 |
} |
|
| 31 |
//private void OnMouseDown(object sender, MouseButtonEventArgs e) |
|
| 32 |
//{
|
|
| 33 |
// DataGridRow row = sender as DataGridRow; |
|
| 34 |
// if (row != null) |
|
| 35 |
// {
|
|
| 36 |
// row.DetailsVisibility = row.IsSelected ? System.Windows.Visibility.Collapsed : System.Windows.Visibility.Visible; |
|
| 37 |
// } |
|
| 38 |
//} |
|
| 39 |
//private void DGrid_OnLoadingRowDetails(object sender, DataGridRowDetailsEventArgs e) |
|
| 40 |
//{
|
|
| 41 |
// ConvertItem model = e.Row.Item as ConvertItem; |
|
| 42 |
// e.Row.DetailsVisibility = (e.Row.DetailsVisibility == Visibility.Collapsed ? Visibility.Visible : Visibility.Collapsed); |
|
| 43 |
// //e.Row.DetailsVisibility = Visibility.Collapsed; |
|
| 44 |
//} |
|
| 30 | 45 |
} |
| 31 | 46 |
} |
| ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseViewInfo.xaml | ||
|---|---|---|
| 6 | 6 |
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" |
| 7 | 7 |
xmlns:local="clr-namespace:Markus.Service.StationController.Views" |
| 8 | 8 |
mc:Ignorable="d" Background="White" d:DesignHeight="450" d:DesignWidth="800"> |
| 9 |
<Grid HorizontalAlignment="Stretch" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" |
|
| 10 |
VerticalAlignment="Stretch"> |
|
| 9 |
<Grid HorizontalAlignment="Stretch" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" VerticalAlignment="Stretch"> |
|
| 10 |
<Grid.RowDefinitions> |
|
| 11 |
<RowDefinition/> |
|
| 12 |
<RowDefinition/> |
|
| 13 |
</Grid.RowDefinitions> |
|
| 11 | 14 |
<Grid.Resources> |
| 12 |
<Style x:Key="InfoStyle" TargetType="{x:Type TextBox}">
|
|
| 15 |
<Style TargetType="{x:Type TextBox}">
|
|
| 13 | 16 |
<Setter Property="Margin" Value="5,5,0,0"/> |
| 14 | 17 |
<Setter Property="VerticalAlignment" Value="Center"/> |
| 18 |
<Setter Property="HorizontalContentAlignment" Value="Left"/> |
|
| 15 | 19 |
<Setter Property="Foreground" Value="Black"/> |
| 16 | 20 |
<Setter Property="Background" Value="Transparent"/> |
| 17 | 21 |
<Setter Property="BorderBrush" Value="Transparent"/> |
| ... | ... | |
| 33 | 37 |
</Setter.Value> |
| 34 | 38 |
</Setter> |
| 35 | 39 |
</Style> |
| 36 |
<!--<Style TargetType="DataGridCell">
|
|
| 40 |
<Style TargetType="DataGridCell"> |
|
| 37 | 41 |
<Setter Property="Margin" Value="10"/> |
| 38 |
</Style>-->
|
|
| 42 |
</Style> |
|
| 39 | 43 |
<Style TargetType="TextBlock"> |
| 40 | 44 |
<Setter Property="FontWeight" Value="Bold"/> |
| 41 | 45 |
<Setter Property="Margin" Value="5,5,0,0"/> |
| ... | ... | |
| 43 | 47 |
<Setter Property="VerticalAlignment" Value="Center"/> |
| 44 | 48 |
</Style> |
| 45 | 49 |
</Grid.Resources> |
| 46 |
<Grid.RowDefinitions> |
|
| 47 |
<RowDefinition Height="AUTO" /> |
|
| 48 |
<RowDefinition Height="AUTO" /> |
|
| 49 |
<RowDefinition Height="AUTO" /> |
|
| 50 |
<RowDefinition Height="AUTO" /> |
|
| 51 |
<RowDefinition Height="Auto" /> |
|
| 52 |
</Grid.RowDefinitions> |
|
| 53 |
<Grid.ColumnDefinitions> |
|
| 54 |
<ColumnDefinition Width="Auto" /> |
|
| 55 |
<ColumnDefinition Width="Auto" /> |
|
| 56 |
<ColumnDefinition Width="Auto"/> |
|
| 57 |
<ColumnDefinition Width="Auto" /> |
|
| 58 |
</Grid.ColumnDefinitions> |
|
| 59 |
<TextBlock Text="GROUP_NO: " |
|
| 50 |
<StackPanel> |
|
| 51 |
<Grid Grid.Row="0"> |
|
| 52 |
<Grid.RowDefinitions> |
|
| 53 |
<RowDefinition Height="20" /> |
|
| 54 |
<RowDefinition Height="20" /> |
|
| 55 |
<RowDefinition Height="20" /> |
|
| 56 |
<RowDefinition Height="20" /> |
|
| 57 |
</Grid.RowDefinitions> |
|
| 58 |
<Grid.ColumnDefinitions> |
|
| 59 |
<ColumnDefinition Width="110" /> |
|
| 60 |
<ColumnDefinition Width="10" /> |
|
| 61 |
<ColumnDefinition Width="300"/> |
|
| 62 |
<ColumnDefinition Width="115" /> |
|
| 63 |
<ColumnDefinition Width="10"/> |
|
| 64 |
<ColumnDefinition Width="300"/> |
|
| 65 |
</Grid.ColumnDefinitions> |
|
| 66 |
<TextBlock Text="Group No: " |
|
| 60 | 67 |
Grid.Row="0" |
| 61 | 68 |
Grid.Column="0"/> |
| 62 |
<TextBox Text="{Binding GroupNo}"
|
|
| 63 |
Grid.Row="0" Style="{StaticResource InfoStyle}"
|
|
| 64 |
Grid.Column="1"/> |
|
| 65 |
<TextBlock Text="ProcessorAffinity: " |
|
| 66 |
Grid.Row="0" Margin="10,0,0,0" |
|
| 69 |
<TextBox Text="{Binding GroupNo}"
|
|
| 70 |
Grid.Row="0" |
|
| 67 | 71 |
Grid.Column="2"/> |
| 68 |
<TextBox Text="{Binding ProcessorAffinity}" Margin="10,0,0,0"
|
|
| 69 |
Grid.Row="0" Style="{StaticResource InfoStyle}"
|
|
| 70 |
Grid.Column="3" /> |
|
| 71 |
<TextBlock Text="DOCUMENT_NO: " |
|
| 72 |
<TextBlock Text="Processor Affinity: " |
|
| 73 |
Grid.Row="0" |
|
| 74 |
Grid.Column="3"/> |
|
| 75 |
<TextBox Text="{Binding ProcessorAffinity}" MaxWidth="300"
|
|
| 76 |
Grid.Row="0" |
|
| 77 |
Grid.Column="5" /> |
|
| 78 |
<TextBlock Text="Document No: " |
|
| 72 | 79 |
Grid.Row="1" |
| 73 |
Grid.Column="0" /> |
|
| 74 |
<TextBox Text="{Binding DocumnetNo}"
|
|
| 75 |
Grid.Row="1" Style="{StaticResource InfoStyle}"
|
|
| 76 |
Grid.Column="1" /> |
|
| 77 |
<TextBlock Text="ReConverter: " |
|
| 78 |
Grid.Row="1" Margin="10,0,0,0" |
|
| 79 |
Grid.Column="2"/> |
|
| 80 |
<TextBox Text="{Binding ReConverter}" Margin="10,0,0,0"
|
|
| 81 |
Grid.Row="1" Style="{StaticResource InfoStyle}"
|
|
| 80 |
Grid.Column="0" HorizontalAlignment="Stretch" /> |
|
| 81 |
<TextBox Text="{Binding DocumnetNo}"
|
|
| 82 |
Grid.Row="1" |
|
| 83 |
Grid.Column="2" /> |
|
| 84 |
<TextBlock Text="ReConverter: " |
|
| 85 |
Grid.Row="1" |
|
| 82 | 86 |
Grid.Column="3"/> |
| 83 |
<TextBlock Text="DOCUMENT_NAME: " |
|
| 87 |
<TextBox Text="{Binding ReConverter}" MaxWidth="300"
|
|
| 88 |
Grid.Row="1" |
|
| 89 |
Grid.Column="5"/> |
|
| 90 |
<TextBlock Text="Document Name: " |
|
| 84 | 91 |
Grid.Row="2" |
| 85 | 92 |
Grid.Column="0" /> |
| 86 |
<TextBox Text="{Binding DocumnetName}"
|
|
| 87 |
Grid.Row="2" Style="{StaticResource InfoStyle}"
|
|
| 88 |
Grid.Column="1"/> |
|
| 89 |
<TextBlock Text="Service ID: " |
|
| 90 |
Grid.Row="2" Margin="10,0,0,0" |
|
| 93 |
<TextBox Text="{Binding DocumnetName}"
|
|
| 94 |
Grid.Row="2" |
|
| 91 | 95 |
Grid.Column="2"/> |
| 92 |
<TextBox Text="{Binding ServiceID}" HorizontalAlignment="Left" Margin="10,0,0,0"
|
|
| 93 |
Grid.Row="2" Style="{StaticResource InfoStyle}"
|
|
| 94 |
Grid.Column="3" Width="489"/> |
|
| 95 |
<TextBlock Text="REVISION: " |
|
| 96 |
<TextBlock Text="Service ID: " |
|
| 97 |
Grid.Row="2" |
|
| 98 |
Grid.Column="3"/> |
|
| 99 |
<TextBox Text="{Binding ServiceID}" MaxWidth="300"
|
|
| 100 |
Grid.Row="2" |
|
| 101 |
Grid.Column="5" /> |
|
| 102 |
<TextBlock Text="Revision: " |
|
| 96 | 103 |
Grid.Row="3" |
| 97 | 104 |
Grid.Column="0"/> |
| 98 |
<TextBox Text="{Binding Revision}"
|
|
| 99 |
Grid.Row="3" Style="{StaticResource InfoStyle}"
|
|
| 100 |
Grid.Column="1"/> |
|
| 101 |
<TextBlock Text="Exception: " |
|
| 105 |
<TextBox Text="{Binding Revision}"
|
|
| 106 |
Grid.Row="3" |
|
| 107 |
Grid.Column="2"/> |
|
| 108 |
</Grid> |
|
| 109 |
|
|
| 110 |
<Grid Grid.Row="1"> |
|
| 111 |
<Grid.RowDefinitions> |
|
| 112 |
<RowDefinition Height="AUTO" /> |
|
| 113 |
</Grid.RowDefinitions> |
|
| 114 |
<Grid.ColumnDefinitions> |
|
| 115 |
<ColumnDefinition Width="110" /> |
|
| 116 |
<ColumnDefinition Width="10" /> |
|
| 117 |
<ColumnDefinition Width="Auto"/> |
|
| 118 |
</Grid.ColumnDefinitions> |
|
| 119 |
<TextBlock Text="Exception: " |
|
| 102 | 120 |
Grid.Row="4" Margin="5,5,0,15" |
| 103 | 121 |
Grid.Column="0"/> |
| 104 |
<TextBox Text="{Binding Exception}" TextWrapping="Wrap"
|
|
| 105 |
Grid.Row="4" Style="{StaticResource InfoStyle}" AcceptsReturn="True" Margin="0,5,0,15"
|
|
| 106 |
Grid.Column="1" Grid.ColumnSpan="3"/> |
|
| 122 |
<TextBox Text="{Binding Exception}" TextWrapping="Wrap"
|
|
| 123 |
Grid.Row="4" AcceptsReturn="True" Margin="0,5,0,15" |
|
| 124 |
Grid.Column="2" Grid.ColumnSpan="4"/> |
|
| 125 |
</Grid> |
|
| 126 |
</StackPanel> |
|
| 107 | 127 |
</Grid> |
| 108 |
</UserControl> |
|
| 128 |
</UserControl> |
|
내보내기 Unified diff
