개정판 6466bd2d
Dashboard chart Markus링크 수정, Cell stlye수정, Chart와 GridView넓이 늘림
Change-Id: If2c9c0367ca3f52f1cb4b41b48c2ae82f5e29f3a
| ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DashBoardViewModel.cs | ||
|---|---|---|
| 223 | 223 |
} |
| 224 | 224 |
} |
| 225 | 225 |
|
| 226 |
private ObservableCollection<FinalPDF> _SelectedFinalPDFList;
|
|
| 227 |
public ObservableCollection<FinalPDF> SelectedFinalPDFList
|
|
| 226 |
private FinalPDF _SelectedFinalPDF;
|
|
| 227 |
public FinalPDF SelectedFinalPDF
|
|
| 228 | 228 |
{
|
| 229 | 229 |
get |
| 230 |
{
|
|
| 231 |
if (_SelectedFinalPDFList == null) |
|
| 232 |
{
|
|
| 233 |
_SelectedFinalPDFList = new ObservableCollection<FinalPDF>(); |
|
| 234 |
} |
|
| 235 |
return _SelectedFinalPDFList; |
|
| 230 |
{
|
|
| 231 |
return _SelectedFinalPDF; |
|
| 236 | 232 |
} |
| 237 | 233 |
set |
| 238 | 234 |
{
|
| 239 |
_SelectedFinalPDFList = value;
|
|
| 240 |
OnPropertyChanged(() => SelectedFinalPDFList);
|
|
| 235 |
_SelectedFinalPDF = value; |
|
| 236 |
OnPropertyChanged(() => SelectedFinalPDF); |
|
| 241 | 237 |
} |
| 242 | 238 |
} |
| 243 | 239 |
|
| 244 |
private ObservableCollection<ConvertPDF> _SelectedConvertList;
|
|
| 245 |
public ObservableCollection<ConvertPDF> SelectedConvertList
|
|
| 240 |
private ConvertPDF _SelectedConvert;
|
|
| 241 |
public ConvertPDF SelectedConvert
|
|
| 246 | 242 |
{
|
| 247 |
get |
|
| 248 |
{
|
|
| 249 |
if (_SelectedConvertList == null) |
|
| 250 |
{
|
|
| 251 |
_SelectedConvertList = new ObservableCollection<ConvertPDF>(); |
|
| 252 |
} |
|
| 253 |
return _SelectedConvertList; |
|
| 254 |
} |
|
| 243 |
get => _SelectedConvert; |
|
| 255 | 244 |
set |
| 256 | 245 |
{
|
| 257 |
_SelectedConvertList = value;
|
|
| 258 |
OnPropertyChanged(() => SelectedConvertList);
|
|
| 246 |
_SelectedConvert = value; |
|
| 247 |
OnPropertyChanged(() => SelectedConvert); |
|
| 259 | 248 |
} |
| 260 | 249 |
} |
| 261 | 250 |
#endregion |
| ... | ... | |
| 386 | 375 |
{
|
| 387 | 376 |
var convertitem = obj as ConvertPDF; |
| 388 | 377 |
|
| 389 |
SelectedConvertList.Add(convertitem);
|
|
| 378 |
SelectedConvert = convertitem;
|
|
| 390 | 379 |
|
| 391 | 380 |
ProcessStartInfo startInfo = null; |
| 392 | 381 |
|
| ... | ... | |
| 407 | 396 |
{
|
| 408 | 397 |
var convertitem = obj as FinalPDF; |
| 409 | 398 |
|
| 410 |
SelectedFinalPDFList.Add(convertitem);
|
|
| 399 |
SelectedFinalPDF = convertitem;
|
|
| 411 | 400 |
|
| 412 | 401 |
ProcessStartInfo startInfo = null; |
| 413 | 402 |
|
| ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs | ||
|---|---|---|
| 1385 | 1385 |
|
| 1386 | 1386 |
SelectRealConvert = convertitem; |
| 1387 | 1387 |
|
| 1388 |
SelectAliveConvert = convertitem; |
|
| 1389 |
|
|
| 1388 | 1390 |
ProcessStartInfo startInfo = null; |
| 1389 | 1391 |
|
| 1390 | 1392 |
startInfo = new ProcessStartInfo("iexplore.exe", convertitem.MarkusLink);
|
| ConvertService/ServiceBase/Markus.Service.StationController/Views/DashBoard.xaml | ||
|---|---|---|
| 20 | 20 |
<Setter Property="VerticalContentAlignment" Value="Stretch"/> |
| 21 | 21 |
<Setter Property="HorizontalContentAlignment" Value="Stretch"/> |
| 22 | 22 |
</Style> |
| 23 |
<Style TargetType="{x:Type telerik:GridViewHeaderCell}">
|
|
| 24 |
<Setter Property="HorizontalContentAlignment" Value="Center"/> |
|
| 25 |
<Setter Property="Background" Value="Gray"/> |
|
| 26 |
</Style> |
|
| 27 |
<Style TargetType="{x:Type telerik:GridViewCell}">
|
|
| 28 |
<Setter Property="HorizontalContentAlignment" Value="Center"/> |
|
| 29 |
</Style> |
|
| 23 | 30 |
<Style TargetType="{x:Type telerik:GridViewCell}" x:Key="OriginalFileGridViewCell">
|
| 24 | 31 |
<Setter Property="HorizontalContentAlignment" Value="Left"/> |
| 25 | 32 |
</Style> |
| ... | ... | |
| 111 | 118 |
<RowDefinition Height="*"/> |
| 112 | 119 |
<RowDefinition Height="Auto"/> |
| 113 | 120 |
</Grid.RowDefinitions> |
| 114 |
<telerik:RadCartesianChart x:Name="chart" Palette="{StaticResource ActualTargetChartPalette}" ClipToBounds="False" Margin="0,50,0,50" Grid.Row="0">
|
|
| 121 |
<telerik:RadCartesianChart x:Name="chart" Palette="{StaticResource ActualTargetChartPalette}" ClipToBounds="False" Margin="0,50,0,50" Grid.Row="0" Grid.ColumnSpan="2">
|
|
| 115 | 122 |
<telerik:RadCartesianChart.VerticalAxis> |
| 116 | 123 |
<telerik:CategoricalAxis IsInverse="True" |
| 117 | 124 |
MajorTickStyle="{StaticResource TransparentTickStyle}"
|
| ... | ... | |
| 175 | 182 |
</telerik:RadCartesianChart.Series> |
| 176 | 183 |
</telerik:RadCartesianChart> |
| 177 | 184 |
<telerik:RadLegend Grid.Column="1" Grid.Row="0" Margin="24,4,0,0" MinWidth="76" Items="{Binding LegendItems, ElementName=chart}" />
|
| 178 |
<telerik:RadGridView GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" |
|
| 179 |
ItemsSource="{Binding DashBoard_Convert}"
|
|
| 180 |
SelectionMode="Extended" |
|
| 181 |
SelectionUnit="FullRow" |
|
| 182 |
CanUserSelect ="True" |
|
| 183 |
RowDetailsTemplate="{StaticResource RowDetailsTemplate}"
|
|
| 184 |
AutoGenerateColumns="False" |
|
| 185 |
ColumnWidth="*" CanUserFreezeColumns="False" |
|
| 186 |
Grid.Row="1" Grid.ColumnSpan="2" ScrollViewer.CanContentScroll="True" IsFilteringAllowed="True" |
|
| 187 |
LeftFrozenColumnCount="6" |
|
| 188 |
RightFrozenColumnCount="0"> |
|
| 189 |
<i:Interaction.Behaviors> |
|
| 190 |
<controls:GridViewSelectionUtilities SelectedItems="{Binding SelectedConvertList, Source={StaticResource DashBoardViewModel}}" />
|
|
| 191 |
</i:Interaction.Behaviors> |
|
| 192 |
<telerik:RadGridView.Columns> |
|
| 185 |
<telerik:RadGridView GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.ColumnSpan="2" |
|
| 186 |
ItemsSource="{Binding DashBoard_Convert}"
|
|
| 187 |
SelectedItem="{Binding SelectRealConvert, Mode=TwoWay}"
|
|
| 188 |
RowDetailsTemplate="{StaticResource RowDetailsTemplate}"
|
|
| 189 |
AutoGenerateColumns="False" CanUserFreezeColumns="False" |
|
| 190 |
ColumnWidth="*" |
|
| 191 |
Grid.Row="1" ScrollViewer.CanContentScroll="False" IsFilteringAllowed="True"> |
|
| 192 |
<telerik:RadGridView.Columns> |
|
| 193 | 193 |
<telerik:GridViewToggleRowDetailsColumn /> |
| 194 | 194 |
<controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
|
| 195 |
<telerik:GridViewDataColumn x:Name="commend" Header="Markus " Width="0.5*" >
|
|
| 195 |
<telerik:GridViewDataColumn x:Name="commend" Header="Markus " Width="*" > |
|
| 196 | 196 |
<telerik:GridViewDataColumn.CellTemplate> |
| 197 | 197 |
<DataTemplate> |
| 198 | 198 |
<telerik:RadButton Content="Click" BorderThickness="0" |
| 199 | 199 |
Background="Transparent" |
| 200 |
Command="{Binding MarkusLinkCommand, Source={StaticResource DashBoardViewModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}"/>
|
|
| 200 |
Command="{Binding ConvertPDFMarkusLinkCommand, Source={StaticResource DashBoardViewModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}"/>
|
|
| 201 | 201 |
</DataTemplate> |
| 202 | 202 |
</telerik:GridViewDataColumn.CellTemplate> |
| 203 | 203 |
</telerik:GridViewDataColumn> |
| ... | ... | |
| 252 | 252 |
<RowDefinition Height="*"/> |
| 253 | 253 |
<RowDefinition Height="Auto"/> |
| 254 | 254 |
</Grid.RowDefinitions> |
| 255 |
<telerik:RadCartesianChart x:Name="char1" Palette="{StaticResource ActualTargetChartPalette}" ClipToBounds="False" Margin="0,50,0,50" Grid.Row="0">
|
|
| 255 |
<telerik:RadCartesianChart x:Name="char1" Palette="{StaticResource ActualTargetChartPalette}" ClipToBounds="False" Margin="0,50,0,50" Grid.Row="0" Grid.ColumnSpan="2">
|
|
| 256 | 256 |
<telerik:RadCartesianChart.VerticalAxis> |
| 257 | 257 |
<telerik:CategoricalAxis IsInverse="True" |
| 258 | 258 |
MajorTickStyle="{StaticResource TransparentTickStyle}"
|
| ... | ... | |
| 317 | 317 |
</telerik:RadCartesianChart> |
| 318 | 318 |
|
| 319 | 319 |
<telerik:RadLegend Grid.Column="1" Grid.Row="0" MinWidth="76" Items="{Binding LegendItems, ElementName=char1}" />
|
| 320 |
|
|
| 321 |
<telerik:RadGridView GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" |
|
| 322 |
ItemsSource="{Binding DashBoard_FinalPDF}"
|
|
| 323 |
SelectionMode="Extended" |
|
| 324 |
SelectionUnit="FullRow" |
|
| 325 |
CanUserSelect ="True" |
|
| 326 |
RowDetailsTemplate="{StaticResource RowDetailsTemplate}"
|
|
| 327 |
AutoGenerateColumns="False" |
|
| 328 |
ColumnWidth="*" CanUserFreezeColumns="False" |
|
| 329 |
Grid.Row="1" Grid.ColumnSpan="2" ScrollViewer.CanContentScroll="True" IsFilteringAllowed="True" |
|
| 330 |
LeftFrozenColumnCount="6" |
|
| 331 |
RightFrozenColumnCount="0"> |
|
| 332 |
<i:Interaction.Behaviors> |
|
| 333 |
<controls:GridViewSelectionUtilities SelectedItems="{Binding SelectedFinalPDFList, Source={StaticResource DashBoardViewModel}}" />
|
|
| 334 |
</i:Interaction.Behaviors> |
|
| 335 |
<telerik:RadGridView.Columns> |
|
| 320 |
|
|
| 321 |
<telerik:RadGridView GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.ColumnSpan="2" |
|
| 322 |
ItemsSource="{Binding DashBoard_FinalPDF}"
|
|
| 323 |
SelectedItem="{Binding SelectRealConvert, Mode=TwoWay}"
|
|
| 324 |
RowDetailsTemplate="{StaticResource RowDetailsTemplate}"
|
|
| 325 |
AutoGenerateColumns="False" CanUserFreezeColumns="False" |
|
| 326 |
ColumnWidth="*" |
|
| 327 |
Grid.Row="1" ScrollViewer.CanContentScroll="False" IsFilteringAllowed="True"> |
|
| 328 |
<telerik:RadGridView.Columns> |
|
| 336 | 329 |
<telerik:GridViewToggleRowDetailsColumn /> |
| 337 | 330 |
<controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
|
| 338 |
<telerik:GridViewDataColumn Header="Markus " Width="0.5*" CellStyle="{StaticResource StretchCellStyle}">
|
|
| 331 |
<telerik:GridViewDataColumn Header="Markus " Width="*" CellStyle="{StaticResource StretchCellStyle}">
|
|
| 339 | 332 |
<telerik:GridViewDataColumn.CellTemplate> |
| 340 | 333 |
<DataTemplate> |
| 341 | 334 |
<telerik:RadButton Content="Click" BorderThickness="0" |
| 342 | 335 |
Background="Transparent" |
| 343 |
Command="{Binding MarkusLinkCommand, Source={StaticResource DashBoardViewModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}"/>
|
|
| 336 |
Command="{Binding FinalPDFMarkusLinkCommand, Source={StaticResource DashBoardViewModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}"/>
|
|
| 344 | 337 |
</DataTemplate> |
| 345 | 338 |
</telerik:GridViewDataColumn.CellTemplate> |
| 346 | 339 |
</telerik:GridViewDataColumn> |
내보내기 Unified diff
