개정판 f5ec88b8
ConvertPDF 와 FinalPDF GridView 복구, Chart Gridview 제거, 프로세스 TEST 종료
Change-Id: Ibab88acb876c1c45a2edc802b7e08fe2b81b5b05
| ConvertService/ServiceBase/Markus.Service.StationController/Views/DashBoard.xaml | ||
|---|---|---|
| 31 | 31 |
<Style x:Key="TextBlockCountryStyle" TargetType="TextBlock"> |
| 32 | 32 |
<Setter Property="FontSize" Value="12" /> |
| 33 | 33 |
<Setter Property="Foreground" Value="Black" /> |
| 34 |
<Setter Property="Margin" Value="0 0 40 0" /> |
|
| 35 | 34 |
</Style> |
| 36 | 35 |
<Style TargetType="{x:Type controls:RowIndexColumn}">
|
| 37 | 36 |
<Setter Property="TextAlignment" Value="Center"/> |
| ... | ... | |
| 39 | 38 |
<Style x:Key="TextBlockCountryStyle_Exception" TargetType="TextBlock"> |
| 40 | 39 |
<Setter Property="FontSize" Value="12" /> |
| 41 | 40 |
<Setter Property="Foreground" Value="Blue" /> |
| 42 |
<Setter Property="Margin" Value="0 0 0 0" /> |
|
| 41 |
<Setter Property="Margin" Value="50 0 0 0" />
|
|
| 43 | 42 |
</Style> |
| 44 | 43 |
<telerik:ChartPalette x:Key="ActualTargetChartPalette"> |
| 45 | 44 |
<telerik:ChartPalette.GlobalEntries> |
| ... | ... | |
| 51 | 50 |
<RectangleGeometry x:Key="SolidRectLegendGeometry" Rect="0 0 12 12" /> |
| 52 | 51 |
<RectangleGeometry x:Key="LineSeriesLegendGeometry" Rect="0 5 12 2" /> |
| 53 | 52 |
<VM:DashBoardViewModel x:Key="DashBoardViewModel"/> |
| 54 |
<controls:RightAlignedLabelStrategy x:Key="RightAlignedLabelStrategy"/> |
|
| 55 | 53 |
<DataTemplate x:Key="RowDetailsTemplate"> |
| 56 | 54 |
<local:DataBaseViewInfo /> |
| 57 | 55 |
</DataTemplate> |
| ... | ... | |
| 121 | 119 |
LabelStyle="{StaticResource TextBlockCountryStyle}" />
|
| 122 | 120 |
</telerik:RadCartesianChart.VerticalAxis> |
| 123 | 121 |
<telerik:RadCartesianChart.HorizontalAxis> |
| 124 |
<telerik:LinearAxis Minimum="0" Maximum="15000" MajorStep="3000" LabelStyle="{StaticResource axisLabelStyle}"/>
|
|
| 122 |
<telerik:LinearAxis Minimum="0" Maximum="50000" MajorStep="10000" LabelStyle="{StaticResource axisLabelStyle}"/>
|
|
| 125 | 123 |
</telerik:RadCartesianChart.HorizontalAxis> |
| 126 | 124 |
<telerik:RadCartesianChart.Series> |
| 127 |
<telerik:BarSeries CategoryBinding="Project_NO" |
|
| 125 |
<telerik:BarSeries CategoryBinding="Project_NO" Name="CountBar"
|
|
| 128 | 126 |
ValueBinding="Count" |
| 129 | 127 |
ItemsSource="{Binding ConvertCOUNTDashBoard}"
|
| 130 | 128 |
CombineMode="None" |
| ... | ... | |
| 146 | 144 |
<telerik:SeriesLegendSettings Title="Count" MarkerGeometry="{StaticResource SolidRectLegendGeometry}" />
|
| 147 | 145 |
</telerik:BarSeries.LegendSettings> |
| 148 | 146 |
<telerik:BarSeries.LabelDefinitions> |
| 149 |
<telerik:ChartSeriesLabelDefinition Binding="StringCount" DefaultVisualStyle="{StaticResource TextBlockCountryStyle}" Strategy="{StaticResource RightAlignedLabelStrategy}" />
|
|
| 147 |
<telerik:ChartSeriesLabelDefinition Binding="StringCount" DefaultVisualStyle="{StaticResource TextBlockCountryStyle}" HorizontalAlignment="Right" VerticalAlignment="Center"/>
|
|
| 148 |
<telerik:ChartSeriesLabelDefinition Binding="ExceptionCount" DefaultVisualStyle="{StaticResource TextBlockCountryStyle_Exception}" HorizontalAlignment="Right" VerticalAlignment="Center"/>
|
|
| 150 | 149 |
</telerik:BarSeries.LabelDefinitions> |
| 151 | 150 |
</telerik:BarSeries> |
| 151 |
|
|
| 152 |
|
|
| 152 | 153 |
<telerik:BarSeries CategoryBinding="Project_NO" |
| 153 | 154 |
ValueBinding="ExceptionCount" |
| 154 | 155 |
ItemsSource="{Binding ConvertCOUNTDashBoard}"
|
| 155 | 156 |
CombineMode="None" |
| 156 |
ShowLabels="True"
|
|
| 157 |
ShowLabels="False"
|
|
| 157 | 158 |
ClipToPlotArea="True" > |
| 158 |
<telerik:BarSeries.LabelDefinitions> |
|
| 159 |
<telerik:ChartSeriesLabelDefinition Binding="ExceptionCount" Format="{}{0:F1}" DefaultVisualStyle="{StaticResource TextBlockCountryStyle_Exception}" Strategy="{StaticResource RightAlignedLabelStrategy}" />
|
|
| 160 |
</telerik:BarSeries.LabelDefinitions> |
|
| 161 | 159 |
<telerik:BarSeries.PointAnimation> |
| 162 | 160 |
<telerik:ChartMoveAnimation Delay="0:0:0.125" Duration="0:0:1.55" MoveAnimationType="Left" > |
| 163 | 161 |
<telerik:ChartMoveAnimation.Easing> |
| ... | ... | |
| 176 | 174 |
</telerik:BarSeries> |
| 177 | 175 |
</telerik:RadCartesianChart.Series> |
| 178 | 176 |
</telerik:RadCartesianChart> |
| 179 |
|
|
| 180 | 177 |
<telerik:RadLegend Grid.Column="1" Grid.Row="0" Margin="24,4,0,0" MinWidth="76" Items="{Binding LegendItems, ElementName=chart}" />
|
| 181 |
|
|
| 182 | 178 |
<telerik:RadGridView GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" |
| 183 | 179 |
ItemsSource="{Binding DashBoard_Convert}"
|
| 184 | 180 |
SelectionMode="Extended" |
| ... | ... | |
| 226 | 222 |
<telerik:GridViewDataColumn.CellTemplate> |
| 227 | 223 |
<DataTemplate> |
| 228 | 224 |
<Grid> |
| 229 |
<!--<Grid.ColumnDefinitions> |
|
| 230 |
<ColumnDefinition/> |
|
| 231 |
<ColumnDefinition Width="Auto"/> |
|
| 232 |
</Grid.ColumnDefinitions> |
|
| 233 |
<TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>-->
|
|
| 234 | 225 |
<telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black" |
| 235 | 226 |
Command="{Binding ConvertPathFileSearchCommand, Source={StaticResource DashBoardViewModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}">
|
| 236 | 227 |
<Image Source="/Markus.Service.StationController;component/Resources/File_Search_Icon.png" Stretch="None" /> |
| ... | ... | |
| 248 | 239 |
</telerik:RadGridView> |
| 249 | 240 |
</Grid> |
| 250 | 241 |
</Border> |
| 242 |
|
|
| 243 |
|
|
| 251 | 244 |
<TextBlock Text="FinalPDF Items" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Center" Margin="0,20,0,20"/> |
| 252 | 245 |
<Border BorderBrush="Black" BorderThickness="2" Grid.Row="3" Grid.Column="1" Margin="20,0,0,0"> |
| 253 | 246 |
<Grid> |
| ... | ... | |
| 267 | 260 |
LabelStyle="{StaticResource TextBlockCountryStyle}" />
|
| 268 | 261 |
</telerik:RadCartesianChart.VerticalAxis> |
| 269 | 262 |
<telerik:RadCartesianChart.HorizontalAxis> |
| 270 |
<telerik:LinearAxis Minimum="0" Maximum="50000" MajorStep="10000" LabelStyle="{StaticResource axisLabelStyle}"/>
|
|
| 263 |
<telerik:LinearAxis Minimum="0" Maximum="60000" MajorStep="15000" LabelStyle="{StaticResource axisLabelStyle}"/>
|
|
| 271 | 264 |
</telerik:RadCartesianChart.HorizontalAxis> |
| 272 | 265 |
<telerik:RadCartesianChart.Series> |
| 273 | 266 |
<telerik:BarSeries CategoryBinding="Project_NO" |
| ... | ... | |
| 292 | 285 |
<telerik:SeriesLegendSettings Title="Count" MarkerGeometry="{StaticResource SolidRectLegendGeometry}" />
|
| 293 | 286 |
</telerik:BarSeries.LegendSettings> |
| 294 | 287 |
<telerik:BarSeries.LabelDefinitions> |
| 295 |
<telerik:ChartSeriesLabelDefinition Binding="StringCount" DefaultVisualStyle="{StaticResource TextBlockCountryStyle}" Strategy="{StaticResource RightAlignedLabelStrategy}" />
|
|
| 288 |
<telerik:ChartSeriesLabelDefinition Binding="StringCount" DefaultVisualStyle="{StaticResource TextBlockCountryStyle}" HorizontalAlignment="Right" VerticalAlignment="Center" />
|
|
| 289 |
<telerik:ChartSeriesLabelDefinition Binding="ExceptionCount" DefaultVisualStyle="{StaticResource TextBlockCountryStyle_Exception}" HorizontalAlignment="Right" VerticalAlignment="Center"/>
|
|
| 296 | 290 |
</telerik:BarSeries.LabelDefinitions> |
| 297 | 291 |
</telerik:BarSeries> |
| 292 |
|
|
| 293 |
|
|
| 298 | 294 |
<telerik:BarSeries CategoryBinding="Project_NO" |
| 299 | 295 |
ValueBinding="ExceptionCount" |
| 300 | 296 |
ItemsSource="{Binding FinalPDFCOUNTDashBoard}"
|
| 301 | 297 |
CombineMode="None" |
| 302 |
ShowLabels="True"
|
|
| 298 |
ShowLabels="False"
|
|
| 303 | 299 |
ClipToPlotArea="True" > |
| 304 |
<telerik:BarSeries.LabelDefinitions> |
|
| 305 |
<telerik:ChartSeriesLabelDefinition Binding="ExceptionCount" Format="{}{0:F1}" DefaultVisualStyle="{StaticResource TextBlockCountryStyle_Exception}" Strategy="{StaticResource RightAlignedLabelStrategy}" />
|
|
| 306 |
</telerik:BarSeries.LabelDefinitions> |
|
| 307 | 300 |
<telerik:BarSeries.PointAnimation> |
| 308 | 301 |
<telerik:ChartMoveAnimation Delay="0:0:0.125" Duration="0:0:1.55" MoveAnimationType="Left" > |
| 309 | 302 |
<telerik:ChartMoveAnimation.Easing> |
| ... | ... | |
| 355 | 348 |
DataMemberBinding="{Binding ProjectNumber}" Width="*" />
|
| 356 | 349 |
<telerik:GridViewDataColumn Header="DocumentID" |
| 357 | 350 |
DataMemberBinding="{Binding DocumentID}" Width="*" />
|
| 358 |
<telerik:GridViewDataColumn Header="DocInfoID" |
|
| 359 |
DataMemberBinding="{Binding DocInfo_ID}" Width="*" />
|
|
| 360 |
<telerik:GridViewDataColumn Header="MarkusInfoID" |
|
| 361 |
DataMemberBinding="{Binding MarkupInfo_ID}" Width="*" />
|
|
| 362 | 351 |
<telerik:GridViewDataColumn Header="Create UserID" |
| 363 | 352 |
DataMemberBinding="{Binding Create_User_ID}" Width="*" />
|
| 364 | 353 |
<telerik:GridViewDataColumn Header="CurrentPageNo" |
| ... | ... | |
| 380 | 369 |
<telerik:GridViewDataColumn.CellTemplate> |
| 381 | 370 |
<DataTemplate> |
| 382 | 371 |
<Grid> |
| 383 |
<!--<Grid.ColumnDefinitions> |
|
| 384 |
<ColumnDefinition/> |
|
| 385 |
<ColumnDefinition Width="Auto"/> |
|
| 386 |
</Grid.ColumnDefinitions> |
|
| 387 |
<TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>-->
|
|
| 388 | 372 |
<telerik:RadButton Grid.Column="1" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black" |
| 389 | 373 |
Command="{Binding ConvertPathFileSearchCommand, Source={StaticResource DashBoardViewModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}">
|
| 390 | 374 |
<Image Source="/Markus.Service.StationController;component/Resources/File_Search_Icon.png" Stretch="None" /> |
내보내기 Unified diff
