개정판 8c128693
AliveItems MarkusLink And 원본파일 수정
Change-Id: I9a870479dc15f572e3576394ededee3a45a7c94a
ConvertService/ServiceBase/Markus.Service.DataBase/ConvertDatabase.cs | ||
---|---|---|
129 | 129 |
ServiceID = item.SERVICE_ID, |
130 | 130 |
ConvertState = (StatusCodeType)item.STATUS, |
131 | 131 |
CreateTime = item.CREATE_DATETIME, |
132 |
StartTime = (DateTime)item.START_DATETIME, |
|
133 |
EndTime = (DateTime)item.END_DATETIME, |
|
132 |
// StartTime = (DateTime)item.START_DATETIME,
|
|
133 |
//EndTime = (DateTime)item.END_DATETIME,
|
|
134 | 134 |
TotalPage = item.TOTAL_PAGE, |
135 | 135 |
CurrentPageNo = item.CURRENT_PAGE, |
136 | 136 |
Exception = item.EXCEPTION, |
... | ... | |
144 | 144 |
|
145 | 145 |
MarkusLink = "kcom://" + Markus.Service.DataBase.Extensions.MarkusAPI.CreateMarkusParam(item.PROJECT_NO, item.DOCUMENT_ID, "doftech") |
146 | 146 |
}; |
147 |
if(item.START_DATETIME == null) |
|
148 |
{ |
|
149 |
convertitem.StartTime = null; |
|
150 |
} |
|
151 |
else |
|
152 |
{ |
|
153 |
convertitem.StartTime = (DateTime)item.START_DATETIME; |
|
154 |
} |
|
155 |
if (item.END_DATETIME == null) |
|
156 |
{ |
|
157 |
convertitem.EndTime = null; |
|
158 |
} |
|
159 |
else |
|
160 |
{ |
|
161 |
convertitem.EndTime = (DateTime)item.END_DATETIME; |
|
162 |
} |
|
147 | 163 |
convertItems.Add(convertitem); |
148 | 164 |
} |
149 | 165 |
} |
ConvertService/ServiceBase/Markus.Service.StationController/Markus.Service.StationController.csproj | ||
---|---|---|
327 | 327 |
</EntityDeploy> |
328 | 328 |
<None Include="MarkusModel.edmx.diagram"> |
329 | 329 |
<DependentUpon>MarkusModel.edmx</DependentUpon> |
330 |
<SubType>Designer</SubType> |
|
330 | 331 |
</None> |
331 | 332 |
<None Include="packages.config" /> |
332 | 333 |
<None Include="Properties\Settings.settings"> |
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/ConvertAddDialogViewModel.cs | ||
---|---|---|
17 | 17 |
|
18 | 18 |
public ConvertAddDialogViewModel() |
19 | 19 |
{ |
20 |
ConverAdd_Select_FoldCommand = new DelegateCommand(ConverAdd_Select_Fold); |
|
21 | 20 |
ConverAdd_OKCommand = new DelegateCommand(ConverAdd_OK); |
22 | 21 |
} |
23 | 22 |
|
... | ... | |
62 | 61 |
|
63 | 62 |
#region Command |
64 | 63 |
|
65 |
public DelegateCommand ConverAdd_Select_FoldCommand { get; private set; } |
|
66 | 64 |
public DelegateCommand ConverAdd_OKCommand { get; private set; } |
67 | 65 |
|
68 | 66 |
#endregion |
69 | 67 |
|
70 | 68 |
#region Fuction |
71 | 69 |
|
72 |
#region ConverAdd_Select_Fold |
|
73 |
|
|
74 |
/// <summary> |
|
75 |
/// 그리드 상단 Conver 추가 버튼에서 Document URL Select Fold 버튼 |
|
76 |
/// </summary> |
|
77 |
|
|
78 |
public void ConverAdd_Select_Fold(object obj) |
|
79 |
{ |
|
80 |
//RadOpenFileDialog openFileDialog = new RadOpenFileDialog(); |
|
81 |
|
|
82 |
//openFileDialog.ShowDialog(); |
|
83 |
|
|
84 |
// |
|
85 |
SaveFileDialog saveFileDialog = new SaveFileDialog(); |
|
86 |
|
|
87 |
saveFileDialog.FileName = "Document"; // Default file name |
|
88 |
saveFileDialog.DefaultExt = ".txt"; // Default file extension |
|
89 |
saveFileDialog.Filter = "Word Documents (*.doc)|*.doc|Excel Worksheets (*.xls;*.xlsx)|*.xls;*.xlsx|PowerPoint Presentations (*.ppt)|*.ppt" + |
|
90 |
"|Office Files (*.doc;*.xls;*.ppt)|*.doc;*.xls;*.ppt" + |
|
91 |
"|All Files (*.*)|*.*"; |
|
92 |
|
|
93 |
|
|
94 |
if (saveFileDialog.ShowDialog() == true) |
|
95 |
{ |
|
96 |
|
|
97 |
|
|
98 |
if (!string.IsNullOrWhiteSpace(saveFileDialog.FileName)) |
|
99 |
{ |
|
100 |
ConverAdd_DOCUMENT_URL = saveFileDialog.FileName; |
|
101 |
} |
|
102 |
} |
|
103 |
// |
|
104 |
|
|
105 |
// if (openFileDialog.DialogResult == true) |
|
106 |
//{ |
|
107 |
// try |
|
108 |
// { |
|
109 |
|
|
110 |
// } |
|
111 |
// catch (Exception ex) |
|
112 |
// { |
|
113 |
// MessageBox.Show(ex.ToString()); |
|
114 |
// } |
|
115 |
//} |
|
116 |
|
|
117 |
} |
|
118 |
#endregion |
|
119 |
|
|
120 | 70 |
#region ConverAdd_OK |
121 | 71 |
/// <summary> |
122 | 72 |
/// 그리드 상단 Conver 추가 버튼 |
... | ... | |
141 | 91 |
{ |
142 | 92 |
MessageBox.Show(ex.ToString()); |
143 | 93 |
} |
94 |
|
|
95 |
ConverAdd_Project_NO = null; |
|
96 |
ConverAdd_DOCUMENT_ID = null; |
|
97 |
ConverAdd_DOCUMENT_URL = null; |
|
98 |
|
|
144 | 99 |
} |
145 | 100 |
|
146 | 101 |
#endregion |
147 | 102 |
|
148 |
|
|
149 | 103 |
#endregion |
150 | 104 |
} |
151 | 105 |
} |
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs | ||
---|---|---|
215 | 215 |
} |
216 | 216 |
|
217 | 217 |
|
218 |
private ConvertItem _SelectAliveConvert; |
|
219 |
public ConvertItem SelectAliveConvert |
|
220 |
{ |
|
221 |
get => _SelectAliveConvert; |
|
222 |
set |
|
223 |
{ |
|
224 |
_SelectAliveConvert = value; |
|
225 |
OnPropertyChanged(() => SelectAliveConvert); |
|
226 |
} |
|
227 |
} |
|
228 |
|
|
229 |
|
|
218 | 230 |
private StatusTypeList _StatusType; |
219 | 231 |
public StatusTypeList StatusType |
220 | 232 |
{ |
... | ... | |
254 | 266 |
} |
255 | 267 |
} |
256 | 268 |
|
257 |
public bool _ConvertShow; |
|
258 |
public bool ConvertShow |
|
259 |
{ |
|
260 |
get => _ConvertShow; |
|
261 |
set |
|
262 |
{ |
|
263 |
if (_ConvertShow = !value) |
|
264 |
{ |
|
265 |
_ConvertShow = false; |
|
266 |
} |
|
267 |
_ConvertShow = value; |
|
268 |
OnPropertyChanged(() => ConvertShow); |
|
269 |
} |
|
270 |
} |
|
271 |
|
|
272 | 269 |
public string _ProjectNumberFilter; |
273 | 270 |
public string ProjectNumberFilter |
274 | 271 |
{ |
... | ... | |
486 | 483 |
} |
487 | 484 |
} |
488 | 485 |
|
489 |
public int _DocpanelHeigh = 800; |
|
490 |
public int DocpanelHeight //나중에 다시 해야함 |
|
486 |
public int _DataBase_ItemsHeight = 800; |
|
487 |
public int DataBase_ItemsHeight |
|
488 |
{ |
|
489 |
get { return _DataBase_ItemsHeight; } |
|
490 |
set |
|
491 |
{ |
|
492 |
_DataBase_ItemsHeight = value; |
|
493 |
OnPropertyChanged(() => DataBase_ItemsHeight); |
|
494 |
|
|
495 |
} |
|
496 |
} |
|
497 |
|
|
498 |
|
|
499 |
public int _RealConvert_Height = 80; |
|
500 |
public int RealConvert_Height |
|
491 | 501 |
{ |
492 |
get { return _DocpanelHeigh; }
|
|
502 |
get { return _RealConvert_Height; }
|
|
493 | 503 |
set |
494 | 504 |
{ |
495 |
_DocpanelHeigh = value;
|
|
496 |
OnPropertyChanged(() => DocpanelHeight);
|
|
505 |
_RealConvert_Height = value;
|
|
506 |
OnPropertyChanged(() => RealConvert_Height);
|
|
497 | 507 |
} |
498 | 508 |
} |
499 | 509 |
|
500 |
private string _Click = "Click";
|
|
501 |
public string Click
|
|
510 |
public int _Alive_Height = 80;
|
|
511 |
public int Alive_Height
|
|
502 | 512 |
{ |
513 |
get { return _Alive_Height; } |
|
514 |
set |
|
515 |
{ |
|
516 |
_Alive_Height = value; |
|
517 |
OnPropertyChanged(() => Alive_Height); |
|
518 |
} |
|
519 |
} |
|
503 | 520 |
|
504 |
get { return _Click; } |
|
521 |
public bool _ConvertShow; |
|
522 |
public bool ConvertShow |
|
523 |
{ |
|
524 |
get => _ConvertShow; |
|
525 |
set |
|
526 |
{ |
|
527 |
if (_ConvertShow = !value) |
|
528 |
{ |
|
529 |
_ConvertShow = false; |
|
530 |
} |
|
531 |
_ConvertShow = value; |
|
532 |
OnPropertyChanged(() => ConvertShow); |
|
533 |
} |
|
505 | 534 |
} |
535 |
|
|
506 | 536 |
#endregion |
507 | 537 |
|
508 | 538 |
#region Command |
... | ... | |
527 | 557 |
/// </summary> |
528 | 558 |
|
529 | 559 |
private DispatcherTimer dispatcherTimer; |
530 |
//public override void Loaded()
|
|
531 |
//{
|
|
532 |
// base.Loaded();
|
|
533 |
|
|
534 |
// if (!App.IsDesignMode)
|
|
535 |
// {
|
|
536 |
// dispatcherTimer = new DispatcherTimer();
|
|
537 |
// dispatcherTimer.Tick += new EventHandler(Timer_Tick);
|
|
538 |
// dispatcherTimer.Interval = new TimeSpan(0, 0, 1);
|
|
539 |
// dispatcherTimer.Start();
|
|
540 |
// }
|
|
541 |
//}
|
|
560 |
public override void Loaded() |
|
561 |
{ |
|
562 |
base.Loaded(); |
|
563 |
|
|
564 |
if (!App.IsDesignMode) |
|
565 |
{ |
|
566 |
dispatcherTimer = new DispatcherTimer(); |
|
567 |
dispatcherTimer.Tick += new EventHandler(Timer_Tick); |
|
568 |
dispatcherTimer.Interval = new TimeSpan(0, 0, 1); |
|
569 |
dispatcherTimer.Start(); |
|
570 |
} |
|
571 |
} |
|
542 | 572 |
|
543 | 573 |
private async void Timer_Tick(object sender, EventArgs e) |
544 | 574 |
{ |
... | ... | |
619 | 649 |
collection.UpdateWhere(changeitem => |
620 | 650 |
ConvertItemEx.ChangeValues(changeitem, newitem), x => x.ConvertID == newitem.ConvertID && x.ProjectNumber == newitem.ProjectNumber); |
621 | 651 |
}); |
652 |
|
|
653 |
RealConvert_Height = 80 + ( 10 * collection.Count()); |
|
654 |
DataBase_ItemsHeight = 800 - (RealConvert_Height + Alive_Height); |
|
622 | 655 |
} |
623 | 656 |
} |
624 | 657 |
catch (Exception ex) |
... | ... | |
838 | 871 |
try |
839 | 872 |
{ |
840 | 873 |
List<ConvertItem> newitems = new List<ConvertItem>(); |
841 |
|
|
842 |
foreach (var client in App.StationClientList) |
|
874 |
using (Markus.Service.DataBase.ConvertDatabase database = new Markus.Service.DataBase.ConvertDatabase(App.MarkusDataBaseConnecitonString)) |
|
843 | 875 |
{ |
844 |
if (await SimplePingAsync(client.Endpoint.Address.ToString()))
|
|
876 |
foreach (var client in App.StationClientList)
|
|
845 | 877 |
{ |
846 |
try
|
|
878 |
if (await SimplePingAsync(client.Endpoint.Address.ToString()))
|
|
847 | 879 |
{ |
848 |
List<ConvertItem> itemsToList = new List<ConvertItem>(); |
|
849 |
var items = await client.AliveConvertListAsync(); |
|
850 |
foreach (var item in items) |
|
880 |
try |
|
851 | 881 |
{ |
852 |
ConvertItem itemsToEach = new ConvertItem(); |
|
853 |
itemsToEach.ServiceID = item.ServiceID; |
|
854 |
itemsToEach.ConvertID = item.ConvertID; |
|
855 |
itemsToEach.ProjectNumber = item.ProjectNumber; |
|
882 |
List<ConvertItem> itemsToList = new List<ConvertItem>(); |
|
883 |
var items = await client.AliveConvertListAsync(); |
|
884 |
string result = ""; |
|
856 | 885 |
|
857 |
if (item.ConvertState != null)
|
|
886 |
foreach (var item in items)
|
|
858 | 887 |
{ |
859 |
itemsToEach.ConvertState = (StatusCodeType)Enum.Parse(typeof(StatusCodeType), item.ConvertState); |
|
888 |
ConvertItem itemsToEach = new ConvertItem(); |
|
889 |
itemsToEach.ServiceID = item.ServiceID; |
|
890 |
itemsToEach.ConvertID = item.ConvertID; |
|
891 |
itemsToEach.ProjectNumber = item.ProjectNumber; |
|
892 |
|
|
893 |
var convertpath = database.GetSearchConvertPathAndMarkus(item.ProjectNumber, item.UniqueKey); |
|
894 |
|
|
895 |
if (item.ConvertState != null) |
|
896 |
{ |
|
897 |
itemsToEach.ConvertState = (StatusCodeType)Enum.Parse(typeof(StatusCodeType), item.ConvertState); |
|
898 |
} |
|
899 |
|
|
900 |
if (item.OriginfilePath.Contains("/")) |
|
901 |
{ |
|
902 |
result = item.OriginfilePath.Substring(item.OriginfilePath.LastIndexOf("/") + 1); |
|
903 |
} |
|
904 |
else |
|
905 |
{ |
|
906 |
result = item.OriginfilePath.Substring(item.OriginfilePath.LastIndexOf("%") + 1); |
|
907 |
} |
|
908 |
itemsToEach.FileName = result; |
|
909 |
|
|
910 |
itemsToEach.CurrentPageNo = item.CurrentPageNo; |
|
911 |
itemsToEach.TotalPage = item.TotalPage; |
|
912 |
itemsToEach.OriginfilePath = item.OriginfilePath; |
|
913 |
itemsToEach.ConvertPath = item.ConvertPath; |
|
914 |
itemsToEach.MarkusLink = convertpath[1]; |
|
915 |
itemsToEach.UniqueKey = item.UniqueKey; |
|
916 |
|
|
917 |
//itemsToEach.ConvertPath = item.ConvertPath; |
|
918 |
itemsToEach.ConvertPath = convertpath[0]; |
|
919 |
itemsToEach.CreateTime = item.CreateTime; |
|
920 |
itemsToEach.Exception = item.Exception; |
|
921 |
itemsToEach.ProcessorAffinity = item.ProcessorAffinity; |
|
922 |
itemsToEach.ReConverter = item.ReConverter; |
|
923 |
itemsToEach.DocumentID = item.DocumentID; |
|
924 |
itemsToEach.DocumnetName = item.DocumnetName; |
|
925 |
itemsToEach.GroupNo = item.GroupNo; |
|
926 |
itemsToEach.Revision = item.Revision; |
|
927 |
itemsToEach.StartTime = item.StartTime; |
|
928 |
itemsToEach.EndTime = item.EndTime; |
|
929 |
|
|
930 |
itemsToList.Add(itemsToEach); |
|
860 | 931 |
} |
932 |
newitems.AddRange(itemsToList); |
|
933 |
System.Diagnostics.Trace.WriteLine($"{client.Endpoint.Address} ping"); |
|
861 | 934 |
|
862 |
itemsToEach.CurrentPageNo = item.CurrentPageNo; |
|
863 |
itemsToEach.TotalPage = item.TotalPage; |
|
864 |
itemsToEach.OriginfilePath = item.OriginfilePath; |
|
865 |
itemsToEach.ConvertPath = item.ConvertPath; |
|
866 |
itemsToEach.MarkusLink = item.MarkusLink; |
|
867 |
itemsToEach.UniqueKey = item.UniqueKey; |
|
868 |
itemsToEach.FileName = item.FileName; |
|
869 |
itemsToEach.ConvertPath = item.ConvertPath; |
|
870 |
itemsToEach.CreateTime = item.CreateTime; |
|
871 |
itemsToEach.Exception = item.Exception; |
|
872 |
itemsToEach.ProcessorAffinity = item.ProcessorAffinity; |
|
873 |
itemsToEach.ReConverter = item.ReConverter; |
|
874 |
itemsToEach.DocumentID = item.DocumentID; |
|
875 |
itemsToEach.DocumnetName = item.DocumnetName; |
|
876 |
itemsToEach.GroupNo = item.GroupNo; |
|
877 |
itemsToEach.Revision = item.Revision; |
|
878 |
itemsToEach.StartTime = item.StartTime; |
|
879 |
itemsToEach.EndTime = item.EndTime; |
|
880 |
|
|
881 |
|
|
882 |
itemsToList.Add(itemsToEach); |
|
935 |
if (items.Count() == 0) |
|
936 |
{ |
|
937 |
System.Diagnostics.Trace.WriteLine($"{client.Endpoint.Address} Alive Items is zero."); |
|
938 |
} |
|
883 | 939 |
} |
884 |
newitems.AddRange(itemsToList); |
|
885 |
System.Diagnostics.Trace.WriteLine($"{client.Endpoint.Address} ping"); |
|
886 |
|
|
887 |
if (items.Count() == 0) |
|
940 |
catch (Exception ex) |
|
888 | 941 |
{ |
889 |
System.Diagnostics.Trace.WriteLine($"{client.Endpoint.Address} Alive Items is zero.");
|
|
942 |
System.Diagnostics.Trace.Fail($"{client.Endpoint.Address} {ex.Message}");
|
|
890 | 943 |
} |
891 | 944 |
} |
892 |
catch (Exception ex)
|
|
945 |
else
|
|
893 | 946 |
{ |
894 |
System.Diagnostics.Trace.Fail($"{client.Endpoint.Address} {ex.Message}");
|
|
947 |
System.Diagnostics.Trace.Fail($"{client.Endpoint.Address} ping Error");
|
|
895 | 948 |
} |
896 | 949 |
} |
897 |
else |
|
898 |
{ |
|
899 |
System.Diagnostics.Trace.Fail($"{client.Endpoint.Address} ping Error"); |
|
900 |
} |
|
901 | 950 |
} |
902 |
|
|
903 | 951 |
ItemsUpdate(newitems); |
904 | 952 |
await System.Windows.Application.Current.Dispatcher.InvokeAsync(() => ItemsUpdate(newitems)); |
905 | 953 |
} |
... | ... | |
966 | 1014 |
} |
967 | 1015 |
} |
968 | 1016 |
} |
1017 |
|
|
1018 |
Alive_Height = 80 + (newitems.Count() * 10 ); |
|
1019 |
DataBase_ItemsHeight = 800 - ( RealConvert_Height + Alive_Height); |
|
969 | 1020 |
} |
970 | 1021 |
|
971 | 1022 |
|
... | ... | |
1254 | 1305 |
#endregion |
1255 | 1306 |
|
1256 | 1307 |
|
1257 |
#region |
|
1308 |
#region ConvertAddDialog
|
|
1258 | 1309 |
|
1259 | 1310 |
/// <summary> |
1260 | 1311 |
/// 그리드 상단 Conver 추가 버튼 |
... | ... | |
1263 | 1314 |
|
1264 | 1315 |
public void ConverAdd(object obj) |
1265 | 1316 |
{ |
1266 |
//줄 530줄 load부분 주석 처리하면 잘됨 |
|
1267 |
//dispatcherTimer.Stop(); |
|
1317 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
|
1268 | 1318 |
|
1269 | 1319 |
Views.ConvertAddDialog convertAddDialog = new Views.ConvertAddDialog(); |
1320 |
|
|
1270 | 1321 |
convertAddDialog.ShowDialog(); |
1271 | 1322 |
|
1272 |
//dispatcherTimer.Start();
|
|
1323 |
dispatcherTimer.Tick += new EventHandler(Timer_Tick);
|
|
1273 | 1324 |
} |
1274 | 1325 |
|
1275 | 1326 |
#endregion |
1276 | 1327 |
|
1328 |
|
|
1277 | 1329 |
#endregion |
1278 | 1330 |
} |
1279 | 1331 |
} |
ConvertService/ServiceBase/Markus.Service.StationController/Views/ConvertAddDialog.xaml | ||
---|---|---|
7 | 7 |
<telerik:RadWindow.DataContext> |
8 | 8 |
<VM:ConvertAddDialogViewModel/> |
9 | 9 |
</telerik:RadWindow.DataContext> |
10 |
<Grid> |
|
10 |
<Grid Height="200" Width="400">
|
|
11 | 11 |
<Grid.Resources> |
12 | 12 |
<ResourceDictionary> |
13 | 13 |
|
... | ... | |
77 | 77 |
<TextBox Text="{Binding ConverAdd_Project_NO, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Grid.Row="0" Grid.Column="2" /> |
78 | 78 |
<TextBox Text="{Binding ConverAdd_DOCUMENT_ID, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" Grid.Column="2" /> |
79 | 79 |
<TextBox Text="{Binding ConverAdd_DOCUMENT_URL, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Grid.Row="2" Grid.Column="2" /> |
80 |
<StackPanel Orientation="Horizontal" Grid.Row="2" Grid.Column="2" Height="30"> |
|
81 |
<TextBox Text="{Binding ConverAdd_DOCUMENT_URL, Mode=TwoWay}" Width="270" /> |
|
82 |
<telerik:RadButton Command="{Binding ConverAdd_Select_FoldCommand , Mode=TwoWay}" Width="90" > |
|
83 |
<TextBox Text="Select Folder" Style="{StaticResource InfoStyle}"/> |
|
84 |
</telerik:RadButton> |
|
85 |
</StackPanel> |
|
86 |
<!--<telerik:RadButton Grid.Row="2" Grid.Column="2" Click="SelectFolderClick" Width="207" Height="20"/>--> |
|
87 |
<!--<telerik:RadFilePathPicker Text="{Binding ConverAdd_DOCUMENT_URL, Mode=OneWayToSource}" ShowDialogButtonContent="" Grid.Row="2" Grid.Column="2" ClearButtonContent="" />--> |
|
88 | 80 |
|
89 | 81 |
</Grid> |
90 | 82 |
<StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Right" Margin="0 0 0 10"> |
... | ... | |
92 | 84 |
<telerik:RadButton Content=" SEND" MinWidth="50" Margin="8 0" VerticalAlignment="Center" |
93 | 85 |
Command="{Binding ConverAdd_OKCommand , Mode=TwoWay}" /> |
94 | 86 |
|
95 |
<telerik:RadButton Content="CANCEL" MinWidth="80" Margin="0 0 10 0" VerticalAlignment="Center" |
|
96 |
IsCancel="True" /> |
|
87 |
<telerik:RadButton Content="CANCEL" MinWidth="80" Margin="0 0 10 0" VerticalAlignment="Center" IsCancel="True" Name="Close" /> |
|
97 | 88 |
</StackPanel> |
98 | 89 |
|
99 | 90 |
</Grid> |
ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseView.xaml | ||
---|---|---|
44 | 44 |
<i:InvokeCommandAction Command="{Binding ClosingCommand}"/> |
45 | 45 |
</i:EventTrigger> |
46 | 46 |
</i:Interaction.Triggers> |
47 |
<Grid HorizontalAlignment="Left" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
|
|
47 |
<Grid HorizontalAlignment="Stretch" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" VerticalAlignment="Stretch">
|
|
48 | 48 |
<Grid.RowDefinitions> |
49 | 49 |
<RowDefinition Height="Auto"/> |
50 | 50 |
<RowDefinition Height="*"/> |
... | ... | |
75 | 75 |
<ColumnDefinition Width="13*"/> |
76 | 76 |
</Grid.ColumnDefinitions> |
77 | 77 |
<Grid.RowDefinitions> |
78 |
<RowDefinition MaxHeight="1000"/>
|
|
78 |
<RowDefinition/> |
|
79 | 79 |
</Grid.RowDefinitions> |
80 | 80 |
|
81 |
<StackPanel> |
|
82 |
<DockPanel LastChildFill="True" MaxHeight="{Binding DocpanelHeight}"> |
|
83 | 81 |
|
84 |
<telerik:RadExpander ExpandDirection="Down" BorderThickness="0" Grid.Row="0" IsExpanded="False" telerik:AnimationManager.IsAnimationEnabled="False" DockPanel.Dock="Top"> |
|
85 |
<StackPanel Orientation="Vertical"> |
|
86 |
<controls:DatabaseFilter ProjectNo="{Binding ProjectNumberFilter,Mode=TwoWay}" UniqueKey="{Binding UniqueKeyFilter,Mode=TwoWay}" Service_ID="{Binding Service_IDFilter, Mode=TwoWay}" |
|
82 |
<StackPanel Orientation="Vertical" MaxHeight="850" Grid.Row="0"> |
|
83 |
|
|
84 |
<telerik:RadExpander ExpandDirection="Down" BorderThickness="0" Grid.Row="0" IsExpanded="False" telerik:AnimationManager.IsAnimationEnabled="False" DockPanel.Dock="Top"> |
|
85 |
<StackPanel Orientation="Vertical"> |
|
86 |
<controls:DatabaseFilter ProjectNo="{Binding ProjectNumberFilter,Mode=TwoWay}" UniqueKey="{Binding UniqueKeyFilter,Mode=TwoWay}" Service_ID="{Binding Service_IDFilter, Mode=TwoWay}" |
|
87 | 87 |
Docuemnt_Name="{Binding Docuemnt_NameFilter, Mode=TwoWay}" Docuemnt_NO="{Binding Docuemnt_NOFilter, Mode=TwoWay}" Reconverter="{Binding ReconverterFilter, Mode=TwoWay}" |
88 | 88 |
Revision="{Binding RevisionFilter, Mode=TwoWay}" GroupNO="{Binding GroupNOFilter, Mode=TwoWay}"/> |
89 |
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right"> |
|
90 |
<telerik:RadToggleButton Content=" Convert 추가" Command="{Binding ConverAddCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
|
91 |
<telerik:RadToggleButton Content=" 검색" Command="{Binding DataFilterCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
|
92 |
<telerik:RadToggleButton Content=" 원상복귀" Command="{Binding ResetCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
|
93 |
</StackPanel> |
|
89 |
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right"> |
|
90 |
<telerik:RadToggleButton Content=" Convert 추가" Command="{Binding ConverAddCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
|
91 |
<telerik:RadToggleButton Content=" 검색" Command="{Binding DataFilterCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
|
92 |
<telerik:RadToggleButton Content=" 원상복귀" Command="{Binding ResetCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
|
94 | 93 |
</StackPanel> |
95 |
</telerik:RadExpander> |
|
94 |
</StackPanel> |
|
95 |
</telerik:RadExpander> |
|
96 | 96 |
|
97 |
<telerik:RadExpander ExpandDirection="Down" BorderThickness="0" DockPanel.Dock="Top" Grid.Row="1" |
|
98 |
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" IsExpanded="True" |
|
97 |
<DockPanel LastChildFill="True"> |
|
98 |
<telerik:RadExpander ExpandDirection="Down" BorderThickness="0" Grid.Row="1" MaxHeight="{Binding DataBase_ItemsHeight, Mode=OneWay}" |
|
99 |
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" IsExpanded="True" |
|
99 | 100 |
telerik:AnimationManager.IsAnimationEnabled="False" > |
100 | 101 |
|
101 | 102 |
<telerik:RadExpander.Header> |
... | ... | |
168 | 169 |
</telerik:RadGridView.Columns> |
169 | 170 |
</telerik:RadGridView> |
170 | 171 |
</telerik:RadExpander> |
171 |
|
|
172 | 172 |
</DockPanel> |
173 |
|
|
174 |
<telerik:RadExpander Grid.Row="2" ExpandDirection="Down" BorderThickness="0" DockPanel.Dock="Top" |
|
173 |
<telerik:RadExpander Grid.Row="2" ExpandDirection="Down" BorderThickness="0" MaxHeight="{Binding RealConvert_Height,Mode=OneWay}" DockPanel.Dock="Bottom" |
|
175 | 174 |
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" |
176 | 175 |
telerik:AnimationManager.IsAnimationEnabled="False" IsExpanded ="{Binding ConvertShow, Mode=TwoWay}"> |
177 | 176 |
<telerik:RadExpander.Header> |
... | ... | |
246 | 245 |
</telerik:RadGridView> |
247 | 246 |
</telerik:RadExpander> |
248 | 247 |
|
249 |
<telerik:RadExpander Grid.Row="3" ExpandDirection="Down" BorderThickness="0" VerticalAlignment="Stretch" |
|
250 |
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" DockPanel.Dock="Top"
|
|
251 |
telerik:AnimationManager.IsAnimationEnabled="False" > |
|
248 |
<telerik:RadExpander Grid.Row="3" ExpandDirection="Down" BorderThickness="0" VerticalAlignment="Stretch" DockPanel.Dock="Bottom"
|
|
249 |
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" MaxHeight="{Binding Alive_Height,Mode=OneWay}"
|
|
250 |
telerik:AnimationManager.IsAnimationEnabled="False" IsExpanded ="False">
|
|
252 | 251 |
<telerik:RadExpander.Header> |
253 | 252 |
<Grid> |
254 | 253 |
<Grid.RowDefinitions> |
... | ... | |
265 | 264 |
</telerik:RadExpander.Header> |
266 | 265 |
<telerik:RadGridView GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" |
267 | 266 |
ItemsSource="{Binding AliveItems}" RowDetailsVisibilityMode="VisibleWhenSelected" |
267 |
SelectedItem="{Binding SelectAliveConvert, Mode=TwoWay}" |
|
268 | 268 |
AutoGenerateColumns="False" CanUserFreezeColumns="False" RowDetailsTemplate="{StaticResource RowDetailsTemplate}" |
269 | 269 |
ColumnWidth="*" ScrollViewer.CanContentScroll="False" IsFilteringAllowed="True" Grid.Row="1" > |
270 | 270 |
<telerik:RadGridView.Columns> |
내보내기 Unified diff