프로젝트

일반

사용자정보

개정판 f5ec88b8

IDf5ec88b82c58a578a820e4ca1cc81226a767e634
상위 5307e38b
하위 c68259ac

semi 이(가) 4년 이상 전에 추가함

ConvertPDF 와 FinalPDF GridView 복구, Chart Gridview 제거, 프로세스 TEST 종료

Change-Id: Ibab88acb876c1c45a2edc802b7e08fe2b81b5b05

차이점 보기:

ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseView.xaml
137 137
                <telerik:RadGridView.Columns>
138 138
                    <telerik:GridViewToggleRowDetailsColumn />
139 139
                    <controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
140
                    <telerik:GridViewDataColumn Header="Convert ID" 
141
											DataMemberBinding="{Binding ConvertID}" Width="*" />
140 142
                    <telerik:GridViewDataColumn x:Name="commend" Header="Markus " Width="0.5*"  >
141 143
                        <telerik:GridViewDataColumn.CellTemplate>
142 144
                            <DataTemplate>
......
167 169
                        <telerik:GridViewDataColumn.CellTemplate>
168 170
                            <DataTemplate>
169 171
                                <Grid>
170
                                    <!--<Grid.ColumnDefinitions>
172
                                    <Grid.ColumnDefinitions>
171 173
                                        <ColumnDefinition/>
172 174
                                        <ColumnDefinition Width="Auto"/>
173
                                    </Grid.ColumnDefinitions>-->
174
                                    <!--<TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>-->
175
                                    <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"
175
                                    </Grid.ColumnDefinitions>
176
                                    <TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>
177
                                    <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black" Grid.Column="1"
176 178
                                                   Command="{Binding ConvertPathFileSearchCommand, Source={StaticResource DataBaseItemsModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}">
177 179
                                        <Image Source="/Markus.Service.StationController;component/Resources/File_Search_Icon.png"  Stretch="None" />
178 180
                                    </telerik:RadButton>
......
183 185

  
184 186
                    <telerik:GridViewDataColumn Header="CreateTime" IsReadOnly="True"   Background="Transparent" 
185 187
											DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
188
                    <telerik:GridViewDataColumn Header="StartTime" IsReadOnly="True"   Background="Transparent" 
189
											DataMemberBinding="{Binding StartTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
190
                    <telerik:GridViewDataColumn Header="EndTime" IsReadOnly="True"   Background="Transparent" 
191
											DataMemberBinding="{Binding EndTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
186 192
                    <telerik:GridViewDataColumn Header="TotalTime" IsReadOnly="True"   Background="Transparent" 
187 193
											DataMemberBinding="{Binding TotalTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
188 194
                </telerik:RadGridView.Columns>
......
214 220
                        <telerik:RadMenuItem  Header="Convert"  Command="{Binding ConvertCommand}"/>
215 221
                        <telerik:RadMenuItem Header="Validation"  Command="{Binding ValidateCommand}"/>
216 222
                        <telerik:RadMenuItem Header="Delete"  Command="{Binding DeleteCommand}"/>
223
                        <telerik:RadMenuItem Header="Stop Process"  Command="{Binding Stop_ProcessCommand}"/>
217 224
                    </telerik:RadContextMenu>
218 225
                </telerik:RadContextMenu.ContextMenu>
219 226
                <telerik:RadGridView.Columns>
220 227
                    <telerik:GridViewToggleRowDetailsColumn />
221 228
                    <controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
222 229

  
230
                    <telerik:GridViewDataColumn Header="Convert ID" 
231
											DataMemberBinding="{Binding ConvertID}" Width="*" />
223 232
                    <telerik:GridViewDataColumn Header="Markus " Width="0.5*" CellStyle="{StaticResource StretchCellStyle}">
224 233
                        <telerik:GridViewDataColumn.CellTemplate>
225 234
                            <DataTemplate>
......
250 259
                        <telerik:GridViewDataColumn.CellTemplate>
251 260
                            <DataTemplate>
252 261
                                <Grid>
253
                                    <!--<Grid.ColumnDefinitions>
262
                                    <Grid.ColumnDefinitions>
254 263
                                        <ColumnDefinition/>
255 264
                                        <ColumnDefinition Width="Auto"/>
256
                                    </Grid.ColumnDefinitions>-->
257
                                    <!--<TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>-->
258
                                    <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"
265
                                    </Grid.ColumnDefinitions>
266
                                    <TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>
267
                                    <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black" Grid.Column="1"
259 268
                                                   Command="{Binding ConvertPathFileSearchCommand, Source={StaticResource DataBaseItemsModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}">
260 269
                                        <Image Source="/Markus.Service.StationController;component/Resources/File_Search_Icon.png"  Stretch="None" />
261 270
                                    </telerik:RadButton>
......
266 275

  
267 276
                    <telerik:GridViewDataColumn Header="CreateTime"  IsReadOnly="True"
268 277
											DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
278
                    <telerik:GridViewDataColumn Header="StartTime" IsReadOnly="True"   Background="Transparent" 
279
											DataMemberBinding="{Binding StartTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
280
                    <telerik:GridViewDataColumn Header="EndTime" IsReadOnly="True"   Background="Transparent" 
281
											DataMemberBinding="{Binding EndTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
269 282
                    <telerik:GridViewDataColumn Header="TotalTime" IsReadOnly="True"   Background="Transparent" 
270 283
											DataMemberBinding="{Binding TotalTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
271 284
                </telerik:RadGridView.Columns>
272 285
            </telerik:RadGridView>
273 286
        </telerik:RadExpander>
287
        
274 288
        <telerik:RadExpander Grid.Row="4" ExpandDirection="Down" BorderThickness="0"  VerticalAlignment="Stretch" Margin="0,0,0,10"
275 289
                  ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
276 290
                             telerik:AnimationManager.IsAnimationEnabled="False"  IsExpanded ="{Binding  AliveShow, Mode=TwoWay}">
......
291 305
                             SelectedItem="{Binding SelectAliveConvert, Mode=TwoWay}"
292 306
							 AutoGenerateColumns="False" CanUserFreezeColumns="False" RowDetailsTemplate="{StaticResource RowDetailsTemplate}"
293 307
                             ColumnWidth="*"  ScrollViewer.CanContentScroll="False" IsFilteringAllowed="True" Grid.Row="1" >
308
                <telerik:RadContextMenu.ContextMenu>
309
                    <telerik:RadContextMenu>
310
                        <telerik:RadMenuItem  Header="Convert"  Command="{Binding ConvertCommand}"/>
311
                        <telerik:RadMenuItem Header="Validation"  Command="{Binding ValidateCommand}"/>
312
                        <telerik:RadMenuItem Header="Delete"  Command="{Binding DeleteCommand}"/>
313
                        <telerik:RadMenuItem Header="Stop Process"  Command="{Binding Stop_ProcessCommand}"/>
314
                    </telerik:RadContextMenu>
315
                </telerik:RadContextMenu.ContextMenu>
294 316
                <telerik:RadGridView.Columns>
295 317
                    <telerik:GridViewToggleRowDetailsColumn />
296 318
                    <controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
297

  
319
                    <telerik:GridViewDataColumn Header="Convert ID" 
320
											DataMemberBinding="{Binding ConvertID}" Width="*" />
298 321
                    <telerik:GridViewDataColumn Header="Markus " Width="0.5*" CellStyle="{StaticResource StretchCellStyle}">
299 322
                        <telerik:GridViewDataColumn.CellTemplate>
300 323
                            <DataTemplate>
......
325 348
                        <telerik:GridViewDataColumn.CellTemplate>
326 349
                            <DataTemplate>
327 350
                                <Grid>
328
                                    <!--<Grid.ColumnDefinitions>
351
                                    <Grid.ColumnDefinitions>
329 352
                                        <ColumnDefinition/>
330 353
                                        <ColumnDefinition Width="Auto"/>
331
                                    </Grid.ColumnDefinitions-->
332
                                    <!--<TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>-->
333
                                    <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"
354
                                    </Grid.ColumnDefinitions>
355
                                    <TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>
356
                                    <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black" Grid.Column="1"
334 357
                                                   Command="{Binding ConvertPathFileSearchCommand, Source={StaticResource DataBaseItemsModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}">
335 358
                                        <Image Source="/Markus.Service.StationController;component/Resources/File_Search_Icon.png"  Stretch="None" />
336 359
                                    </telerik:RadButton>
......
340 363
                    </telerik:GridViewDataColumn>
341 364
                    <telerik:GridViewDataColumn Header="CreateTime"  IsReadOnly="True"
342 365
											DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
366
                    <telerik:GridViewDataColumn Header="StartTime" IsReadOnly="True"   Background="Transparent" 
367
											DataMemberBinding="{Binding StartTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
368
                    <telerik:GridViewDataColumn Header="EndTime" IsReadOnly="True"   Background="Transparent" 
369
											DataMemberBinding="{Binding EndTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
343 370
                    <telerik:GridViewDataColumn Header="TotalTime" IsReadOnly="True"   Background="Transparent" 
344 371
											DataMemberBinding="{Binding TotalTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
345 372
                </telerik:RadGridView.Columns>

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)