개정판 5feff9f0
마지막 정리
Change-Id: I7427bed974c03eaad1c7910df561e77c49b37529
ConvertService/ServiceBase/IServiceBase/ConvertItem.cs | ||
---|---|---|
112 | 112 |
ProjectNumber = projectNo; |
113 | 113 |
ConvertState = (StatusCodeType)Status; |
114 | 114 |
UniqueKey = documentID; |
115 |
DocumnetName = documentName;
|
|
116 |
DocumnetNo = documentNo;
|
|
115 |
DocumentName = documentName;
|
|
116 |
DocumentNo = documentNo;
|
|
117 | 117 |
DocumnetURL = document_URL; |
118 | 118 |
Revision = revision; |
119 | 119 |
CurrentPageNo = currentPageNo; |
... | ... | |
153 | 153 |
Create_User_ID = createUserID; |
154 | 154 |
ConvertState = (StatusCodeType)Status; |
155 | 155 |
DocInfo_ID = docInfoID; |
156 |
DocumnetName = documentName;
|
|
157 |
DocumnetNo = documentNo;
|
|
156 |
DocumentName = documentName;
|
|
157 |
DocumentNo = documentNo;
|
|
158 | 158 |
Revision = revision; |
159 | 159 |
CurrentPageNo = currentPageNo; |
160 | 160 |
TotalPage = totalPage; |
... | ... | |
200 | 200 |
string _exception; |
201 | 201 |
string _revision;//↓ DOCUMENT_ITEM |
202 | 202 |
string _documentNo; |
203 |
string _docuemnt_Name;
|
|
203 |
string _document_Name;
|
|
204 | 204 |
string _GroupName; |
205 | 205 |
string _documentID; |
206 | 206 |
string _documentURL; |
... | ... | |
506 | 506 |
if (_revision != value) |
507 | 507 |
{ |
508 | 508 |
_revision = value; |
509 |
OnPropertyChanged("REVISION");
|
|
509 |
OnPropertyChanged("Revision");
|
|
510 | 510 | |
511 | 511 |
} |
512 | 512 |
} |
513 | 513 |
} |
514 | 514 | |
515 | 515 |
[DataMember] |
516 |
public string DocumnetNo
|
|
516 |
public string DocumentNo
|
|
517 | 517 |
{ |
518 | 518 |
get |
519 | 519 |
{ |
... | ... | |
524 | 524 |
if (_documentNo != value) |
525 | 525 |
{ |
526 | 526 |
_documentNo = value; |
527 |
OnPropertyChanged("DOCUMENT_NO");
|
|
527 |
OnPropertyChanged("DocumentNo");
|
|
528 | 528 | |
529 | 529 |
} |
530 | 530 |
} |
531 | 531 |
} |
532 | 532 | |
533 | 533 |
[DataMember] |
534 |
public string DocumnetName
|
|
534 |
public string DocumentName
|
|
535 | 535 |
{ |
536 | 536 |
get |
537 | 537 |
{ |
538 |
return _docuemnt_Name;
|
|
538 |
return _document_Name;
|
|
539 | 539 |
} |
540 | 540 |
set |
541 | 541 |
{ |
542 |
if (_docuemnt_Name != value)
|
|
542 |
if (_document_Name != value)
|
|
543 | 543 |
{ |
544 |
_docuemnt_Name = value;
|
|
545 |
OnPropertyChanged("DOCUMENT_NAME");
|
|
544 |
_document_Name = value;
|
|
545 |
OnPropertyChanged("DocumentName");
|
|
546 | 546 | |
547 | 547 |
} |
548 | 548 |
} |
... | ... | |
560 | 560 |
if (_documentURL != value) |
561 | 561 |
{ |
562 | 562 |
_documentURL = value; |
563 |
OnPropertyChanged("_documentURL");
|
|
563 |
OnPropertyChanged("DocumnetURL");
|
|
564 | 564 | |
565 | 565 |
} |
566 | 566 |
} |
... | ... | |
580 | 580 |
if (_GroupName != value) |
581 | 581 |
{ |
582 | 582 |
_GroupName = value; |
583 |
OnPropertyChanged("GROUP_NO");
|
|
583 |
OnPropertyChanged("GroupNo");
|
|
584 | 584 | |
585 | 585 |
} |
586 | 586 |
} |
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs | ||
---|---|---|
916 | 916 |
itemsToEach.UniqueKey = item.UniqueKey;//DocumentNO 없음 |
917 | 917 |
itemsToEach.GroupNo = item.GroupNo;//없음 |
918 | 918 |
itemsToEach.ProcessorAffinity = item.ProcessorAffinity; |
919 |
itemsToEach.DocumnetName = item.DocumnetName;
|
|
919 |
itemsToEach.DocumentName = item.DocumnetName;
|
|
920 | 920 |
itemsToEach.Revision = item.Revision;//없음 |
921 | 921 |
itemsToEach.Exception = item.Exception;//없음 |
922 | 922 |
itemsToEach.ConvertPath = convertpath[0]; |
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/FinalPDFViewModel.cs | ||
---|---|---|
954 | 954 |
itemsToEach.MarkusLink = convertpath[1]; |
955 | 955 |
itemsToEach.DocumentID = item.DocumentID; |
956 | 956 |
itemsToEach.GroupNo = item.GroupNo; |
957 |
itemsToEach.DocumnetName = item.DocumnetName;
|
|
957 |
itemsToEach.DocumentName = item.DocumnetName;
|
|
958 | 958 |
itemsToEach.Revision = item.Revision; |
959 | 959 |
itemsToEach.Exception = item.Exception; |
960 | 960 |
itemsToEach.ConvertPath = convertpath[0]; |
ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseView.xaml | ||
---|---|---|
84 | 84 |
<telerik:RadToggleButton Content=" 엑셀 저장 " Margin="10,0" Height="20" Command="{Binding DataSaveFileGemBoxCommand, Mode=OneWay}"/> |
85 | 85 |
<!--<telerik:RadToggleButton Content=" Filter" Command="{Binding DataFilterCommand, Mode=OneWay}"/>--> |
86 | 86 |
</StackPanel> |
87 |
<Grid HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Row="1" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" > |
|
88 |
<Grid.ColumnDefinitions> |
|
89 |
<ColumnDefinition Width="387*"/> |
|
90 |
<ColumnDefinition Width="13*"/> |
|
91 |
</Grid.ColumnDefinitions> |
|
87 |
<Grid HorizontalAlignment="Left" Grid.Row="1" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" > |
|
92 | 88 |
<Grid.RowDefinitions> |
93 |
<RowDefinition/> |
|
89 |
<RowDefinition Height="Auto"/> |
|
90 |
<RowDefinition Height="Auto"/> |
|
94 | 91 |
</Grid.RowDefinitions> |
95 |
<StackPanel Orientation="Vertical" MaxHeight="850" Grid.Row="0"> |
|
96 |
<StackPanel Orientation="Vertical"> |
|
97 |
<controls:DatabaseFilter ProjectNo="{Binding ProjectNumberFilter,Mode=TwoWay}" UniqueKey="{Binding UniqueKeyFilter,Mode=TwoWay}" Service_ID="{Binding Service_IDFilter, Mode=TwoWay}" |
|
92 |
<StackPanel Orientation="Vertical"> |
|
93 |
<controls:DatabaseFilter ProjectNo="{Binding ProjectNumberFilter,Mode=TwoWay}" UniqueKey="{Binding UniqueKeyFilter,Mode=TwoWay}" Service_ID="{Binding Service_IDFilter, Mode=TwoWay}" |
|
98 | 94 |
Docuemnt_Name="{Binding Document_NameFilter, Mode=TwoWay}" Docuemnt_NO="{Binding Docuemnt_NOFilter, Mode=TwoWay}" Reconverter="{Binding ReconverterFilter, Mode=TwoWay}" |
99 | 95 |
Revision="{Binding RevisionFilter, Mode=TwoWay}" GroupNO="{Binding GroupNOFilter, Mode=TwoWay}"/> |
100 |
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right"> |
|
101 |
<telerik:RadToggleButton Content=" Convert 추가" Command="{Binding ConverAddCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
|
102 |
<telerik:RadToggleButton Content=" 검색" Command="{Binding DataFilterCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
|
103 |
<telerik:RadToggleButton Content=" 초기화" Command="{Binding ResetCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
|
104 |
</StackPanel> |
|
96 |
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right"> |
|
97 |
<telerik:RadToggleButton Content=" Convert 추가" Command="{Binding ConverAddCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
|
98 |
<telerik:RadToggleButton Content=" 검색" Command="{Binding DataFilterCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
|
99 |
<telerik:RadToggleButton Content=" 초기화" Command="{Binding ResetCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
|
105 | 100 |
</StackPanel> |
106 | ||
107 |
<DockPanel LastChildFill="True"> |
|
108 |
<telerik:RadExpander ExpandDirection="Down" BorderThickness="0" Grid.Row="1" MaxHeight="{Binding DataBase_ItemsHeight, Mode=OneWay}" |
|
109 |
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" IsExpanded="True" HorizontalAlignment="Stretch" |
|
110 |
VerticalAlignment="Stretch" |
|
101 |
</StackPanel> |
|
102 |
<Grid Grid.Row="1"> |
|
103 |
<Grid.RowDefinitions> |
|
104 |
<RowDefinition Height="Auto"/> |
|
105 |
<RowDefinition Height="Auto"/> |
|
106 |
<RowDefinition Height="Auto"/> |
|
107 |
</Grid.RowDefinitions> |
|
108 |
<telerik:RadExpander ExpandDirection="Down" BorderThickness="0" MaxHeight="{Binding DataBase_ItemsHeight, Mode=OneWay}" |
|
109 |
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" IsExpanded="True" |
|
111 | 110 |
telerik:AnimationManager.IsAnimationEnabled="False" > |
112 |
<telerik:RadExpander.Header>
|
|
113 |
<Grid>
|
|
114 |
<Grid.ColumnDefinitions>
|
|
115 |
<ColumnDefinition Width="Auto"/>
|
|
116 |
<ColumnDefinition Width="Auto"/>
|
|
117 |
</Grid.ColumnDefinitions>
|
|
118 |
<TextBlock Text="DataBase Items : "/>
|
|
119 |
<TextBlock Text="{Binding SelectedCount.DisplayMember, StringFormat=\{0:d\}}" Grid.Column="1"/>
|
|
120 |
</Grid>
|
|
121 |
</telerik:RadExpander.Header>
|
|
122 |
|
|
123 |
<telerik:RadGridView x:Name="dataGrid1" GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
|
|
111 |
<telerik:RadExpander.Header> |
|
112 |
<Grid> |
|
113 |
<Grid.ColumnDefinitions> |
|
114 |
<ColumnDefinition Width="Auto"/> |
|
115 |
<ColumnDefinition Width="Auto"/> |
|
116 |
</Grid.ColumnDefinitions> |
|
117 |
<TextBlock Text="DataBase Items : "/> |
|
118 |
<TextBlock Text="{Binding SelectedCount.DisplayMember, StringFormat=\{0:d\}}" Grid.Column="1"/> |
|
119 |
</Grid> |
|
120 |
</telerik:RadExpander.Header> |
|
121 | ||
122 |
<telerik:RadGridView x:Name="dataGrid1" GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" |
|
124 | 123 |
ItemsSource="{Binding FilterConvertSourceView}" |
125 | 124 |
SelectedItem="{Binding SelectFilterConvert, Mode=TwoWay}" |
126 | 125 |
RowDetailsTemplate="{StaticResource RowDetailsTemplate}" |
... | ... | |
129 | 128 |
Grid.Row="1" ScrollViewer.CanContentScroll="True" IsFilteringAllowed="True" |
130 | 129 |
LeftFrozenColumnCount="6" |
131 | 130 |
RightFrozenColumnCount="0"> |
132 |
<telerik:RadContextMenu.ContextMenu>
|
|
133 |
<telerik:RadContextMenu x:Name= "GridContextMenu">
|
|
134 |
<telerik:RadMenuItem Header="Convert" Command="{Binding ConvertCommand}"/>
|
|
135 |
<telerik:RadMenuItem Header="Validation" Command="{Binding ValidateCommand}"/>
|
|
136 |
<telerik:RadMenuItem Header="Delete" Command="{Binding DeleteCommand}"/>
|
|
137 |
</telerik:RadContextMenu>
|
|
138 |
</telerik:RadContextMenu.ContextMenu>
|
|
139 |
<telerik:RadGridView.Columns>
|
|
140 |
<telerik:GridViewToggleRowDetailsColumn />
|
|
141 |
<controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
|
|
142 |
<telerik:GridViewDataColumn Header="Convert ID "
|
|
131 |
<telerik:RadContextMenu.ContextMenu> |
|
132 |
<telerik:RadContextMenu x:Name= "GridContextMenu"> |
|
133 |
<telerik:RadMenuItem Header="Convert" Command="{Binding ConvertCommand}"/> |
|
134 |
<telerik:RadMenuItem Header="Validation" Command="{Binding ValidateCommand}"/> |
|
135 |
<telerik:RadMenuItem Header="Delete" Command="{Binding DeleteCommand}"/> |
|
136 |
</telerik:RadContextMenu> |
|
137 |
</telerik:RadContextMenu.ContextMenu> |
|
138 |
<telerik:RadGridView.Columns> |
|
139 |
<telerik:GridViewToggleRowDetailsColumn /> |
|
140 |
<controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" /> |
|
141 |
<telerik:GridViewDataColumn Header="Convert ID " |
|
143 | 142 |
DataMemberBinding="{Binding ConvertID}" Width="1.5*" /> |
144 |
<telerik:GridViewDataColumn x:Name="commend" Header="Markus " Width="0.5*" CellStyle="{StaticResource StretchCellStyle}">
|
|
145 |
<telerik:GridViewDataColumn.CellTemplate>
|
|
146 |
<DataTemplate>
|
|
147 |
<telerik:RadButton Content="Click" BorderThickness="0"
|
|
143 |
<telerik:GridViewDataColumn x:Name="commend" Header="Markus " Width="0.5*" CellStyle="{StaticResource StretchCellStyle}"> |
|
144 |
<telerik:GridViewDataColumn.CellTemplate> |
|
145 |
<DataTemplate> |
|
146 |
<telerik:RadButton Content="Click" BorderThickness="0" |
|
148 | 147 |
Background="Transparent" |
149 | 148 |
Command="{Binding MarkusLinkCommand, Source={StaticResource DataBaseItemsModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}"/> |
150 |
</DataTemplate>
|
|
151 |
</telerik:GridViewDataColumn.CellTemplate>
|
|
152 |
</telerik:GridViewDataColumn>
|
|
153 |
<telerik:GridViewDataColumn Header="ProjectNO"
|
|
149 |
</DataTemplate> |
|
150 |
</telerik:GridViewDataColumn.CellTemplate> |
|
151 |
</telerik:GridViewDataColumn> |
|
152 |
<telerik:GridViewDataColumn Header="ProjectNO" |
|
154 | 153 |
DataMemberBinding="{Binding ProjectNumber}" Width="*" /> |
155 |
<telerik:GridViewDataColumn Header="UniqueKey"
|
|
154 |
<telerik:GridViewDataColumn Header="UniqueKey" |
|
156 | 155 |
DataMemberBinding="{Binding UniqueKey}" Width="*" /> |
157 |
<telerik:GridViewDataColumn Header="ConvertState"
|
|
156 |
<telerik:GridViewDataColumn Header="ConvertState" |
|
158 | 157 |
DataMemberBinding="{Binding ConvertState, Mode=TwoWay}" Width="*" /> |
159 |
<telerik:GridViewDataColumn Header="CurrentPageNo"
|
|
158 |
<telerik:GridViewDataColumn Header="CurrentPageNo" |
|
160 | 159 |
DataMemberBinding="{Binding CurrentPageNo, Mode=TwoWay}" Width="*" /> |
161 |
<telerik:GridViewDataColumn Header="TotalPageNo"
|
|
160 |
<telerik:GridViewDataColumn Header="TotalPageNo" |
|
162 | 161 |
DataMemberBinding="{Binding TotalPage, Mode=TwoWay}" Width="*" /> |
163 |
<telerik:GridViewDynamicHyperlinkColumn Header="원본파일"
|
|
162 |
<telerik:GridViewDynamicHyperlinkColumn Header="원본파일" |
|
164 | 163 |
NavigateUrlFormatString=" {0}" |
165 | 164 |
NavigateUrlMemberPaths="OriginfilePath" |
166 | 165 |
Width="2*"> |
167 |
<telerik:GridViewDynamicHyperlinkColumn.CellTemplate>
|
|
168 |
<DataTemplate>
|
|
169 |
<TextBlock Text="{Binding FileName}"/>
|
|
170 |
</DataTemplate>
|
|
171 |
</telerik:GridViewDynamicHyperlinkColumn.CellTemplate>
|
|
172 |
</telerik:GridViewDynamicHyperlinkColumn>
|
|
173 |
<telerik:GridViewDataColumn Header=" ConvertPath"
|
|
166 |
<telerik:GridViewDynamicHyperlinkColumn.CellTemplate> |
|
167 |
<DataTemplate> |
|
168 |
<TextBlock Text="{Binding FileName}"/> |
|
169 |
</DataTemplate> |
|
170 |
</telerik:GridViewDynamicHyperlinkColumn.CellTemplate> |
|
171 |
</telerik:GridViewDynamicHyperlinkColumn> |
|
172 |
<telerik:GridViewDataColumn Header=" ConvertPath" |
|
174 | 173 |
DataMemberBinding="{Binding ConvertPath}" Width="2.5*" /> |
175 |
<telerik:GridViewDataColumn Header="CreateTime"
|
|
174 |
<telerik:GridViewDataColumn Header="CreateTime" |
|
176 | 175 |
DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" /> |
177 |
<telerik:GridViewDataColumn Header="StartTime"
|
|
176 |
<telerik:GridViewDataColumn Header="StartTime" |
|
178 | 177 |
DataMemberBinding="{Binding StartTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" /> |
179 |
<telerik:GridViewDataColumn Header="EndTime"
|
|
178 |
<telerik:GridViewDataColumn Header="EndTime" |
|
180 | 179 |
DataMemberBinding="{Binding EndTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" /> |
181 |
</telerik:RadGridView.Columns> |
|
182 |
</telerik:RadGridView> |
|
183 |
</telerik:RadExpander> |
|
184 |
</DockPanel> |
|
185 |
|
|
186 |
<telerik:RadExpander Grid.Row="2" ExpandDirection="Down" BorderThickness="0" MaxHeight="{Binding RealConvert_Height,Mode=OneWay}" |
|
180 |
</telerik:RadGridView.Columns> |
|
181 |
</telerik:RadGridView> |
|
182 |
</telerik:RadExpander> |
|
183 |
<telerik:RadExpander Grid.Row="1" ExpandDirection="Down" BorderThickness="0" MaxHeight="{Binding RealConvert_Height,Mode=OneWay}" |
|
187 | 184 |
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" HorizontalAlignment="Stretch" |
188 | 185 |
VerticalAlignment="Stretch" |
189 | 186 |
telerik:AnimationManager.IsAnimationEnabled="False" IsExpanded ="{Binding ConvertShow, Mode=TwoWay}"> |
... | ... | |
259 | 256 |
</telerik:RadGridView.Columns> |
260 | 257 |
</telerik:RadGridView> |
261 | 258 |
</telerik:RadExpander> |
262 | ||
263 |
<telerik:RadExpander Grid.Row="3" ExpandDirection="Down" BorderThickness="0" VerticalAlignment="Stretch" |
|
259 |
<telerik:RadExpander Grid.Row="2" ExpandDirection="Down" BorderThickness="0" VerticalAlignment="Stretch" |
|
264 | 260 |
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" MaxHeight="{Binding Alive_Height,Mode=OneWay}" |
265 | 261 |
telerik:AnimationManager.IsAnimationEnabled="False" IsExpanded ="False"> |
266 | 262 |
<telerik:RadExpander.Header> |
... | ... | |
331 | 327 |
</telerik:RadGridView> |
332 | 328 |
</telerik:RadExpander> |
333 | 329 | |
334 |
</StackPanel>
|
|
330 |
</Grid>
|
|
335 | 331 |
</Grid> |
336 | 332 |
</Grid> |
337 | 333 |
</UserControl> |
ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseViewInfo.xaml | ||
---|---|---|
58 | 58 |
<ColumnDefinition Width="110" /> |
59 | 59 |
<ColumnDefinition Width="10" /> |
60 | 60 |
<ColumnDefinition Width="300"/> |
61 |
<ColumnDefinition Width="115" /> |
|
61 |
<ColumnDefinition Width="58" /> |
|
62 |
<ColumnDefinition Width="57"/> |
|
62 | 63 |
<ColumnDefinition Width="10"/> |
63 | 64 |
<ColumnDefinition Width="300"/> |
64 | 65 |
</Grid.ColumnDefinitions> |
65 | 66 |
<TextBlock Text="Group No: " |
66 | 67 |
Grid.Row="0" |
67 |
Grid.Column="0"/> |
|
68 |
Grid.Column="0" Margin="5,5,0,19" Grid.RowSpan="2"/>
|
|
68 | 69 |
<TextBox Text="{Binding GroupNo}" |
69 | 70 |
Grid.Row="0" |
70 | 71 |
Grid.Column="2"/> |
... | ... | |
76 | 77 |
Grid.Column="5" />--> |
77 | 78 |
<TextBlock Text="Document No: " |
78 | 79 |
Grid.Row="1" |
79 |
Grid.Column="0" HorizontalAlignment="Stretch" /> |
|
80 |
<TextBox Text="{Binding DocumnetNo}"
|
|
80 |
Grid.Column="0" HorizontalAlignment="Stretch" Margin="5,5,0,19" Grid.RowSpan="2" />
|
|
81 |
<TextBox Text="{Binding DocumentNo}"
|
|
81 | 82 |
Grid.Row="1" |
82 | 83 |
Grid.Column="2" /> |
83 | 84 |
<TextBlock Text="ReConverter: " |
84 | 85 |
Grid.Row="1" |
85 |
Grid.Column="3"/> |
|
86 |
Grid.Column="3" Grid.ColumnSpan="2" Margin="5,5,0,19" Grid.RowSpan="2"/>
|
|
86 | 87 |
<TextBox Text="{Binding ReConverter}" MaxWidth="300" |
87 | 88 |
Grid.Row="1" |
88 |
Grid.Column="5"/>
|
|
89 |
Grid.Column="6"/>
|
|
89 | 90 |
<TextBlock Text="Document Name: " |
90 | 91 |
Grid.Row="2" |
91 |
Grid.Column="0" /> |
|
92 |
<TextBox Text="{Binding DocumnetName}"
|
|
92 |
Grid.Column="0" Margin="5,5,0,-1" />
|
|
93 |
<TextBox Text="{Binding DocumentName}"
|
|
93 | 94 |
Grid.Row="2" |
94 | 95 |
Grid.Column="2"/> |
95 | 96 |
<TextBlock Text="Service ID: " |
96 | 97 |
Grid.Row="2" |
97 |
Grid.Column="3"/> |
|
98 |
Grid.Column="3" Grid.ColumnSpan="2" Margin="5,5,0,-1"/>
|
|
98 | 99 |
<TextBox Text="{Binding ServiceID}" MaxWidth="300" |
99 | 100 |
Grid.Row="2" |
100 |
Grid.Column="5" />
|
|
101 |
Grid.Column="6" />
|
|
101 | 102 |
<TextBlock Text="Revision: " |
102 | 103 |
Grid.Row="0" |
103 |
Grid.Column="3"/> |
|
104 |
Grid.Column="3" Grid.ColumnSpan="2" Margin="5,5,0,19" Grid.RowSpan="2"/>
|
|
104 | 105 |
<TextBox Text="{Binding Revision}" |
105 | 106 |
Grid.Row="0" |
106 |
Grid.Column="5"/>
|
|
107 |
Grid.Column="6"/>
|
|
107 | 108 |
</Grid> |
108 | 109 | |
109 | 110 |
<Grid Grid.Row="1"> |
ConvertService/ServiceBase/Markus.Service.StationController/Views/FinalPDFView.xaml | ||
---|---|---|
52 | 52 |
</Setter.Value> |
53 | 53 |
</Setter> |
54 | 54 |
</Style> |
55 |
|
|
55 | ||
56 | 56 |
<VM:FinalPDFViewModel x:Key="FinalPDFViewModel"/> |
57 | 57 |
<DataTemplate x:Key="RowDetailsTemplate"> |
58 | 58 |
<local:FinalPDFInfo /> |
... | ... | |
84 | 84 |
<telerik:RadToggleButton Content=" 엑셀 저장 " Margin="10,0" Height="20" Command="{Binding DataSaveFileGemBoxCommand, Mode=OneWay}"/> |
85 | 85 |
<!--<telerik:RadToggleButton Content=" Filter" Command="{Binding DataFilterCommand, Mode=OneWay}"/>--> |
86 | 86 |
</StackPanel> |
87 |
<Grid HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Row="1" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" > |
|
88 |
<Grid.ColumnDefinitions> |
|
89 |
<ColumnDefinition Width="387*"/> |
|
90 |
<ColumnDefinition Width="13*"/> |
|
91 |
</Grid.ColumnDefinitions> |
|
87 |
<Grid HorizontalAlignment="Left" Grid.Row="1" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" > |
|
92 | 88 |
<Grid.RowDefinitions> |
93 |
<RowDefinition/> |
|
94 |
<RowDefinition/> |
|
95 |
<RowDefinition/> |
|
89 |
<RowDefinition Height="Auto"/>
|
|
90 |
<RowDefinition Height="Auto"/>
|
|
91 |
<RowDefinition Height="Auto"/>
|
|
96 | 92 |
</Grid.RowDefinitions> |
97 | ||
98 | 93 |
<Grid Grid.Row="0"> |
99 | 94 |
<Grid.Style> |
100 | 95 |
<Style> |
... | ... | |
185 | 180 |
<telerik:RadToggleButton Content=" 초기화" Command="{Binding ResetCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
186 | 181 |
</StackPanel> |
187 | 182 | |
188 |
<StackPanel Orientation="Vertical" MaxHeight="800" Grid.Row="2"> |
|
189 |
<!--<StackPanel Orientation="Vertical">--> |
|
190 | ||
191 |
<!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Right"> |
|
192 |
<telerik:RadToggleButton Content=" Convert 추가" Command="{Binding ConverAddCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
|
193 |
<telerik:RadToggleButton Content=" 검색" Command="{Binding DataFilterCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
|
194 |
<telerik:RadToggleButton Content=" 초기화" Command="{Binding ResetCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
|
195 |
</StackPanel>--> |
|
196 |
<!--</StackPanel>--> |
|
197 | ||
198 |
<DockPanel LastChildFill="True"> |
|
199 |
<telerik:RadExpander ExpandDirection="Down" BorderThickness="0" Grid.Row="1" MaxHeight="{Binding DataBase_ItemsHeight, Mode=OneWay}" |
|
183 |
<Grid Grid.Row="2"> |
|
184 |
<Grid.RowDefinitions> |
|
185 |
<RowDefinition Height="Auto"/> |
|
186 |
<RowDefinition Height="Auto"/> |
|
187 |
<RowDefinition Height="Auto"/> |
|
188 |
</Grid.RowDefinitions> |
|
189 |
<telerik:RadExpander ExpandDirection="Down" BorderThickness="0" MaxHeight="{Binding DataBase_ItemsHeight, Mode=OneWay}" |
|
200 | 190 |
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" IsExpanded="True" |
201 | 191 |
telerik:AnimationManager.IsAnimationEnabled="False" > |
202 |
<telerik:RadExpander.Header>
|
|
203 |
<Grid>
|
|
204 |
<Grid.ColumnDefinitions>
|
|
205 |
<ColumnDefinition Width="Auto"/>
|
|
206 |
<ColumnDefinition Width="Auto"/>
|
|
207 |
</Grid.ColumnDefinitions>
|
|
208 |
<TextBlock Text="Final PDF Items : "/>
|
|
209 |
<TextBlock Text="{Binding SelectedCount.DisplayMember, StringFormat=\{0:d\}}" Grid.Column="1"/>
|
|
210 |
</Grid>
|
|
211 |
</telerik:RadExpander.Header>
|
|
192 |
<telerik:RadExpander.Header> |
|
193 |
<Grid> |
|
194 |
<Grid.ColumnDefinitions> |
|
195 |
<ColumnDefinition Width="Auto"/> |
|
196 |
<ColumnDefinition Width="Auto"/> |
|
197 |
</Grid.ColumnDefinitions> |
|
198 |
<TextBlock Text="Final PDF Items : "/> |
|
199 |
<TextBlock Text="{Binding SelectedCount.DisplayMember, StringFormat=\{0:d\}}" Grid.Column="1"/> |
|
200 |
</Grid> |
|
201 |
</telerik:RadExpander.Header> |
|
212 | 202 | |
213 |
<telerik:RadGridView x:Name="dataGrid1" GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
|
|
203 |
<telerik:RadGridView x:Name="dataGrid1" GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" |
|
214 | 204 |
ItemsSource="{Binding FilterConvertSourceView}" |
215 | 205 |
SelectedItem="{Binding SelectFilterConvert, Mode=TwoWay}" |
216 | 206 |
RowDetailsTemplate="{StaticResource RowDetailsTemplate}" |
... | ... | |
219 | 209 |
Grid.Row="1" ScrollViewer.CanContentScroll="True" IsFilteringAllowed="True" |
220 | 210 |
LeftFrozenColumnCount="6" |
221 | 211 |
RightFrozenColumnCount="0"> |
222 |
<telerik:RadContextMenu.ContextMenu>
|
|
223 |
<telerik:RadContextMenu x:Name= "GridContextMenu">
|
|
224 |
<telerik:RadMenuItem Header="Convert" Command="{Binding ConvertCommand}"/>
|
|
225 |
<telerik:RadMenuItem Header="Validation" Command="{Binding ValidateCommand}"/>
|
|
226 |
<telerik:RadMenuItem Header="Delete" Command="{Binding DeleteCommand}"/>
|
|
227 |
</telerik:RadContextMenu>
|
|
228 |
</telerik:RadContextMenu.ContextMenu>
|
|
229 |
<telerik:RadGridView.Columns>
|
|
230 |
<telerik:GridViewToggleRowDetailsColumn />
|
|
231 |
<controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
|
|
232 |
<telerik:GridViewDataColumn Header=" ID "
|
|
212 |
<telerik:RadContextMenu.ContextMenu> |
|
213 |
<telerik:RadContextMenu x:Name= "GridContextMenu"> |
|
214 |
<telerik:RadMenuItem Header="Convert" Command="{Binding ConvertCommand}"/> |
|
215 |
<telerik:RadMenuItem Header="Validation" Command="{Binding ValidateCommand}"/> |
|
216 |
<telerik:RadMenuItem Header="Delete" Command="{Binding DeleteCommand}"/> |
|
217 |
</telerik:RadContextMenu> |
|
218 |
</telerik:RadContextMenu.ContextMenu> |
|
219 |
<telerik:RadGridView.Columns> |
|
220 |
<telerik:GridViewToggleRowDetailsColumn /> |
|
221 |
<controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" /> |
|
222 |
<telerik:GridViewDataColumn Header=" ID " |
|
233 | 223 |
DataMemberBinding="{Binding ConvertID}" Width="1.5*" /> |
234 |
<telerik:GridViewDataColumn x:Name="commend" Header="Markus " Width="0.5*" CellStyle="{StaticResource StretchCellStyle}">
|
|
235 |
<telerik:GridViewDataColumn.CellTemplate>
|
|
236 |
<DataTemplate>
|
|
237 |
<telerik:RadButton Content="Click" BorderThickness="0"
|
|
224 |
<telerik:GridViewDataColumn x:Name="commend" Header="Markus " Width="0.5*" CellStyle="{StaticResource StretchCellStyle}"> |
|
225 |
<telerik:GridViewDataColumn.CellTemplate> |
|
226 |
<DataTemplate> |
|
227 |
<telerik:RadButton Content="Click" BorderThickness="0" |
|
238 | 228 |
Background="Transparent" |
239 | 229 |
Command="{Binding MarkusLinkCommand, Source={StaticResource FinalPDFViewModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}"/> |
240 |
</DataTemplate>
|
|
241 |
</telerik:GridViewDataColumn.CellTemplate>
|
|
242 |
</telerik:GridViewDataColumn>
|
|
243 |
<telerik:GridViewDataColumn Header="ProjectNO"
|
|
230 |
</DataTemplate> |
|
231 |
</telerik:GridViewDataColumn.CellTemplate> |
|
232 |
</telerik:GridViewDataColumn> |
|
233 |
<telerik:GridViewDataColumn Header="ProjectNO" |
|
244 | 234 |
DataMemberBinding="{Binding ProjectNumber}" Width="*" /> |
245 |
<telerik:GridViewDataColumn Header="DocumentID"
|
|
235 |
<telerik:GridViewDataColumn Header="DocumentID" |
|
246 | 236 |
DataMemberBinding="{Binding DocumentID}" Width="*" /> |
247 |
<telerik:GridViewDataColumn Header="DocInfoID"
|
|
237 |
<telerik:GridViewDataColumn Header="DocInfoID" |
|
248 | 238 |
DataMemberBinding="{Binding DocInfo_ID}" Width="*" /> |
249 |
<telerik:GridViewDataColumn Header="MarkusInfoID"
|
|
239 |
<telerik:GridViewDataColumn Header="MarkusInfoID" |
|
250 | 240 |
DataMemberBinding="{Binding MarkusInfo_ID}" Width="*" /> |
251 |
<telerik:GridViewDataColumn Header="Create UserID"
|
|
241 |
<telerik:GridViewDataColumn Header="Create UserID" |
|
252 | 242 |
DataMemberBinding="{Binding Create_UserID}" Width="*" /> |
253 |
<telerik:GridViewDataColumn Header="ConvertState"
|
|
243 |
<telerik:GridViewDataColumn Header="ConvertState" |
|
254 | 244 |
DataMemberBinding="{Binding ConvertState, Mode=TwoWay}" Width="*" /> |
255 |
<telerik:GridViewDataColumn Header="CurrentPageNo"
|
|
245 |
<telerik:GridViewDataColumn Header="CurrentPageNo" |
|
256 | 246 |
DataMemberBinding="{Binding CurrentPageNo, Mode=TwoWay}" Width="*" /> |
257 |
<telerik:GridViewDataColumn Header="TotalPageNo"
|
|
247 |
<telerik:GridViewDataColumn Header="TotalPageNo" |
|
258 | 248 |
DataMemberBinding="{Binding TotalPage, Mode=TwoWay}" Width="*" /> |
259 |
<telerik:GridViewDynamicHyperlinkColumn Header="원본파일"
|
|
249 |
<telerik:GridViewDynamicHyperlinkColumn Header="원본파일" |
|
260 | 250 |
NavigateUrlFormatString=" {0}" |
261 | 251 |
NavigateUrlMemberPaths="OriginfilePath" |
262 | 252 |
Width="2*"> |
263 |
<telerik:GridViewDynamicHyperlinkColumn.CellTemplate>
|
|
264 |
<DataTemplate>
|
|
265 |
<TextBlock Text="{Binding FileName}"/>
|
|
266 |
</DataTemplate>
|
|
267 |
</telerik:GridViewDynamicHyperlinkColumn.CellTemplate>
|
|
268 |
</telerik:GridViewDynamicHyperlinkColumn>
|
|
269 |
<telerik:GridViewDataColumn Header=" ConvertPath"
|
|
253 |
<telerik:GridViewDynamicHyperlinkColumn.CellTemplate> |
|
254 |
<DataTemplate> |
|
255 |
<TextBlock Text="{Binding FileName}"/> |
|
256 |
</DataTemplate> |
|
257 |
</telerik:GridViewDynamicHyperlinkColumn.CellTemplate> |
|
258 |
</telerik:GridViewDynamicHyperlinkColumn> |
|
259 |
<telerik:GridViewDataColumn Header=" ConvertPath" |
|
270 | 260 |
DataMemberBinding="{Binding ConvertPath}" Width="2.5*" /> |
271 |
<telerik:GridViewDataColumn Header="CreateTime"
|
|
261 |
<telerik:GridViewDataColumn Header="CreateTime" |
|
272 | 262 |
DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" /> |
273 |
<telerik:GridViewDataColumn Header="StartTime"
|
|
263 |
<telerik:GridViewDataColumn Header="StartTime" |
|
274 | 264 |
DataMemberBinding="{Binding StartTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" /> |
275 |
<telerik:GridViewDataColumn Header="EndTime"
|
|
265 |
<telerik:GridViewDataColumn Header="EndTime" |
|
276 | 266 |
DataMemberBinding="{Binding EndTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" /> |
277 |
</telerik:RadGridView.Columns> |
|
278 |
</telerik:RadGridView> |
|
279 |
</telerik:RadExpander> |
|
280 |
</DockPanel> |
|
267 |
</telerik:RadGridView.Columns> |
|
268 |
</telerik:RadGridView> |
|
269 |
</telerik:RadExpander> |
|
281 | 270 | |
282 |
<telerik:RadExpander Grid.Row="2" ExpandDirection="Down" BorderThickness="0" MaxHeight="{Binding RealConvert_Height,Mode=OneWay}"
|
|
271 |
<telerik:RadExpander Grid.Row="1" ExpandDirection="Down" BorderThickness="0" MaxHeight="{Binding RealConvert_Height,Mode=OneWay}"
|
|
283 | 272 |
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" |
284 | 273 |
telerik:AnimationManager.IsAnimationEnabled="False" IsExpanded ="{Binding ConvertShow, Mode=TwoWay}"> |
285 | 274 |
<telerik:RadExpander.Header> |
... | ... | |
373 | 362 |
</telerik:RadGridView> |
374 | 363 |
</telerik:RadExpander> |
375 | 364 | |
376 |
<telerik:RadExpander Grid.Row="3" ExpandDirection="Down" BorderThickness="0" VerticalAlignment="Stretch"
|
|
365 |
<telerik:RadExpander Grid.Row="2" ExpandDirection="Down" BorderThickness="0" VerticalAlignment="Stretch"
|
|
377 | 366 |
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" MaxHeight="{Binding Alive_Height,Mode=OneWay}" |
378 | 367 |
telerik:AnimationManager.IsAnimationEnabled="False" IsExpanded ="False"> |
379 | 368 |
<telerik:RadExpander.Header> |
... | ... | |
461 | 450 |
</telerik:RadGridView.Columns> |
462 | 451 |
</telerik:RadGridView> |
463 | 452 |
</telerik:RadExpander> |
464 | ||
465 |
</StackPanel> |
|
453 |
</Grid> |
|
466 | 454 |
</Grid> |
467 | 455 |
</Grid> |
468 | 456 |
</UserControl> |
ConvertService/ServiceBase/Markus.Service.StationController/Views/FinalPDFViewInfo.xaml | ||
---|---|---|
65 | 65 |
<TextBlock Text="Group No: " |
66 | 66 |
Grid.Row="0" |
67 | 67 |
Grid.Column="0"/> |
68 |
<TextBox Text="{Binding GROUP_NOFilter }"
|
|
68 |
<TextBox Text="{Binding GroupNo }"
|
|
69 | 69 |
Grid.Row="0" |
70 | 70 |
Grid.Column="2"/> |
71 | 71 |
<TextBlock Text="Document Name: " |
72 | 72 |
Grid.Row="0" |
73 | 73 |
Grid.Column="3"/> |
74 |
<TextBox Text="{Binding Document_NameFilter }" MaxWidth="300"
|
|
74 |
<TextBox Text="{Binding DocumentName }" MaxWidth="300"
|
|
75 | 75 |
Grid.Row="0" |
76 | 76 |
Grid.Column="5" /> |
77 | 77 |
<!--<TextBlock Text="Document No: " |
... | ... | |
101 | 101 |
<TextBlock Text="Revision: " |
102 | 102 |
Grid.Row="1" |
103 | 103 |
Grid.Column="0"/> |
104 |
<TextBox Text="{Binding REVISIONFilter }"
|
|
104 |
<TextBox Text="{Binding Revision }"
|
|
105 | 105 |
Grid.Row="1" |
106 | 106 |
Grid.Column="2"/> |
107 | 107 | |
108 | 108 |
<TextBlock Text="Document NO: " |
109 | 109 |
Grid.Row="1" |
110 | 110 |
Grid.Column="3"/> |
111 |
<TextBox Text="{Binding Document_NOFilter }"
|
|
111 |
<TextBox Text="{Binding DocumentNo }"
|
|
112 | 112 |
Grid.Row="1" |
113 | 113 |
Grid.Column="5"/> |
114 | 114 |
</Grid> |
내보내기 Unified diff