개정판 b92f142f
convert service 수정
Controller 수정
Change-Id: I38994fcc4d4452d638ea74b27cc8638f4157e17a
| ConvertService/ServiceBase/Markus.Service.StationController/Views/MergeDataView.xaml | ||
|---|---|---|
| 4 | 4 |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
| 5 | 5 |
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" |
| 6 | 6 |
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" |
| 7 |
xmlns:markus="clr-namespace:Markus.Message;assembly=Markus.Message" |
|
| 7 | 8 |
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation" |
| 8 | 9 |
xmlns:local="clr-namespace:Markus.Service.StationController.ViewModel" |
| 9 | 10 |
mc:Ignorable="d" |
| ... | ... | |
| 17 | 18 |
<RowDefinition Height="3.5*"/> |
| 18 | 19 |
</Grid.RowDefinitions> |
| 19 | 20 |
<GroupBox Header="Service Alive Items" Margin="3" BorderThickness="0"> |
| 20 |
<!--<Views:AliveView />-->
|
|
| 21 |
<Views:AliveView />
|
|
| 21 | 22 |
</GroupBox> |
| 22 | 23 |
<GroupBox Header="Error Items" Grid.Row="1" Margin="3" BorderThickness="0"> |
| 23 |
<!--<Views:DataBaseByStatusView/>-->
|
|
| 24 |
<Views:DataBaseByStatusView/>
|
|
| 24 | 25 |
</GroupBox> |
| 25 | 26 |
<GroupBox Header="Completed Items" Grid.Row="2" Margin="3" BorderThickness="0"> |
| 26 |
<!--<Views:DataBaseByStatusView/>-->
|
|
| 27 |
<Views:DataBaseByStatusView/>
|
|
| 27 | 28 |
</GroupBox> |
| 28 | 29 |
|
| 29 | 30 |
</Grid> |
내보내기 Unified diff
