개정판 944a39ed
Document Items버튼 변경 & Selectedrow 되돌림
Change-Id: I7167834336341ade176c06638b1847cbfbec0ec5
ConvertService/ServiceBase/Markus.Service.StationController/Connected Services/DataService/DataService1.xsd | ||
---|---|---|
118 | 118 |
<xs:element minOccurs="0" name="DOCUMENT_ID" nillable="true" type="xs:string" /> |
119 | 119 |
<xs:element minOccurs="0" name="DOCUMENT_N0" nillable="true" type="xs:string" /> |
120 | 120 |
<xs:element minOccurs="0" name="GROUP_N0" nillable="true" type="xs:string" /> |
121 |
<xs:element minOccurs="0" name="ORIGINAL_FILE" nillable="true" type="xs:string" /> |
|
122 |
<xs:element minOccurs="0" name="REVISION" nillable="true" type="xs:string" /> |
|
121 | 123 |
</xs:sequence> |
122 | 124 |
</xs:complexType> |
123 | 125 |
<xs:element name="SELECT_DOCUMENT_ITEM_Result" nillable="true" type="tns:SELECT_DOCUMENT_ITEM_Result" /> |
ConvertService/ServiceBase/Markus.Service.StationController/Connected Services/DataService/Reference.cs | ||
---|---|---|
995 | 995 |
[System.Runtime.Serialization.OptionalFieldAttribute()] |
996 | 996 |
private string GROUP_N0Field; |
997 | 997 |
|
998 |
[System.Runtime.Serialization.OptionalFieldAttribute()] |
|
999 |
private string ORIGINAL_FILEField; |
|
1000 |
|
|
1001 |
[System.Runtime.Serialization.OptionalFieldAttribute()] |
|
1002 |
private string REVISIONField; |
|
1003 |
|
|
998 | 1004 |
[global::System.ComponentModel.BrowsableAttribute(false)] |
999 | 1005 |
public System.Runtime.Serialization.ExtensionDataObject ExtensionData { |
1000 | 1006 |
get { |
... | ... | |
1057 | 1063 |
} |
1058 | 1064 |
} |
1059 | 1065 |
|
1066 |
[System.Runtime.Serialization.DataMemberAttribute()] |
|
1067 |
public string ORIGINAL_FILE { |
|
1068 |
get { |
|
1069 |
return this.ORIGINAL_FILEField; |
|
1070 |
} |
|
1071 |
set { |
|
1072 |
if ((object.ReferenceEquals(this.ORIGINAL_FILEField, value) != true)) { |
|
1073 |
this.ORIGINAL_FILEField = value; |
|
1074 |
this.RaisePropertyChanged("ORIGINAL_FILE"); |
|
1075 |
} |
|
1076 |
} |
|
1077 |
} |
|
1078 |
|
|
1079 |
[System.Runtime.Serialization.DataMemberAttribute()] |
|
1080 |
public string REVISION { |
|
1081 |
get { |
|
1082 |
return this.REVISIONField; |
|
1083 |
} |
|
1084 |
set { |
|
1085 |
if ((object.ReferenceEquals(this.REVISIONField, value) != true)) { |
|
1086 |
this.REVISIONField = value; |
|
1087 |
this.RaisePropertyChanged("REVISION"); |
|
1088 |
} |
|
1089 |
} |
|
1090 |
} |
|
1091 |
|
|
1060 | 1092 |
public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; |
1061 | 1093 |
|
1062 | 1094 |
protected void RaisePropertyChanged(string propertyName) { |
ConvertService/ServiceBase/Markus.Service.StationController/Controls/GridViewSelectionUtilities.cs | ||
---|---|---|
28 | 28 |
public static readonly DependencyProperty SelectedItemsProperty = |
29 | 29 |
DependencyProperty.Register("SelectedItems", typeof(INotifyCollectionChanged), typeof(GridViewSelectionUtilities), new PropertyMetadata(OnSelectedItemsPropertyChanged)); |
30 | 30 |
|
31 |
|
|
32 | 31 |
private static void OnSelectedItemsPropertyChanged(DependencyObject target, DependencyPropertyChangedEventArgs args) |
33 | 32 |
{ |
34 | 33 |
var collection = args.NewValue as INotifyCollectionChanged; |
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs | ||
---|---|---|
268 | 268 |
if (_SelectFilterConvertList == null) |
269 | 269 |
{ |
270 | 270 |
_SelectFilterConvertList = new ObservableCollection<ConvertPDF>(); |
271 |
|
|
272 |
_SelectFilterConvertList.CollectionChanged += (snd, ect) => |
|
273 |
{ |
|
274 |
System.Diagnostics.Debug.WriteLine($"_SelectFilterConvertList : {_SelectFilterConvertList.Count()}"); |
|
275 |
}; |
|
271 | 276 |
} |
272 | 277 |
return _SelectFilterConvertList; |
273 | 278 |
} |
... | ... | |
1329 | 1334 |
} |
1330 | 1335 |
catch (WebException webException) |
1331 | 1336 |
{ |
1332 |
MessageBox.Show(SelectFilterConvert.FileName + " doesn't exist: " + webException.Message); |
|
1333 |
result = true;
|
|
1337 |
MessageBox.Show(SelectFilterConvertList[0].FileName + " doesn't exist: " + webException.Message);
|
|
1338 |
result = false;
|
|
1334 | 1339 |
} |
1335 | 1340 |
finally |
1336 | 1341 |
{ |
... | ... | |
1478 | 1483 |
SearchTimerOn = true; |
1479 | 1484 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
1480 | 1485 |
dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick); |
1486 |
|
|
1487 |
FilterConvertSource.Clear(); |
|
1488 |
|
|
1489 |
SearchTimer_Tick(null,new EventArgs()); |
|
1481 | 1490 |
} |
1482 | 1491 |
|
1483 | 1492 |
#endregion |
... | ... | |
1494 | 1503 |
SearchTimerOn = true; |
1495 | 1504 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
1496 | 1505 |
dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick); |
1506 |
|
|
1507 |
FilterConvertSource.Clear(); |
|
1508 |
|
|
1509 |
SearchTimer_Tick(null, new EventArgs()); |
|
1497 | 1510 |
} |
1498 | 1511 |
|
1499 | 1512 |
#endregion |
... | ... | |
1676 | 1689 |
|
1677 | 1690 |
convertDocumentDialog.Owner = Application.Current.MainWindow; |
1678 | 1691 |
convertDocumentDialog.WindowStartupLocation = WindowStartupLocation.CenterOwner; |
1692 |
convertDocumentDialog.Width = 1000; |
|
1693 |
convertDocumentDialog.Height = 600; |
|
1679 | 1694 |
|
1680 | 1695 |
convertDocumentDialog.ShowDialog(); |
1681 | 1696 |
|
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/FinalPDFViewModel.cs | ||
---|---|---|
1415 | 1415 |
} |
1416 | 1416 |
catch (WebException webException) |
1417 | 1417 |
{ |
1418 |
MessageBox.Show(SelectFilterConvert.FileName + " doesn't exist: " + webException.Message); |
|
1419 |
result = true;
|
|
1418 |
MessageBox.Show(SelectFilterConvertList[0].FileName + " doesn't exist: " + webException.Message);
|
|
1419 |
result = false;
|
|
1420 | 1420 |
} |
1421 | 1421 |
finally |
1422 | 1422 |
{ |
... | ... | |
1566 | 1566 |
SearchTimerOn = true; |
1567 | 1567 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
1568 | 1568 |
dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick); |
1569 |
|
|
1570 |
FilterConvertSource.Clear(); |
|
1571 |
|
|
1572 |
SearchTimer_Tick(null, new EventArgs()); |
|
1569 | 1573 |
} |
1570 | 1574 |
|
1571 | 1575 |
#endregion |
... | ... | |
1607 | 1611 |
SearchTimerOn = true; |
1608 | 1612 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
1609 | 1613 |
dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick); |
1614 |
|
|
1615 |
FilterConvertSource.Clear(); |
|
1616 |
|
|
1617 |
SearchTimer_Tick(null, new EventArgs()); |
|
1610 | 1618 |
} |
1611 | 1619 |
|
1612 | 1620 |
#endregion |
... | ... | |
1759 | 1767 |
|
1760 | 1768 |
convertDocumentDialog.Owner = Application.Current.MainWindow; |
1761 | 1769 |
convertDocumentDialog.WindowStartupLocation = WindowStartupLocation.CenterOwner; |
1770 |
convertDocumentDialog.Width = 1000; |
|
1771 |
convertDocumentDialog.Height = 600; |
|
1762 | 1772 |
|
1763 | 1773 |
convertDocumentDialog.ShowDialog(); |
1764 | 1774 |
|
ConvertService/ServiceBase/Markus.Service.StationController/Views/ConvertDocumentDialog.xaml | ||
---|---|---|
46 | 46 |
DataMemberBinding="{Binding Document_NO, Mode=TwoWay}" Width="*" /> |
47 | 47 |
<telerik:GridViewDataColumn Header="DocumentID" |
48 | 48 |
DataMemberBinding="{Binding Document_ID, Mode=TwoWay}" Width="*" /> |
49 |
<telerik:GridViewDataColumn Header="DocumentID" |
|
50 |
DataMemberBinding="{Binding DocumentID, Mode=TwoWay}" Width="*" /> |
|
49 |
<telerik:GridViewDataColumn Header="DocumnetURL" |
|
50 |
DataMemberBinding="{Binding DocumnetURL, Mode=TwoWay}" Width="*" /> |
|
51 |
<telerik:GridViewDataColumn Header="Revision" |
|
52 |
DataMemberBinding="{Binding Revision, Mode=TwoWay}" Width="*" /> |
|
51 | 53 |
</telerik:RadGridView.Columns> |
52 | 54 |
</telerik:RadGridView> |
53 | 55 |
</Grid> |
ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseView.xaml | ||
---|---|---|
9 | 9 |
xmlns:Data="clr-namespace:Markus.Service.StationController.Data" |
10 | 10 |
xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity" |
11 | 11 |
xmlns:local="clr-namespace:Markus.Service.StationController.Views" x:Name="userControl" x:Class="Markus.Service.StationController.Views.DataBaseView" |
12 |
mc:Ignorable="d" Background="White" d:DesignHeight="450" d:DesignWidth="1000"> |
|
12 |
mc:Ignorable="d" Background="White" d:DesignHeight="450" d:DesignWidth="1000" DataContext="{DynamicResource DataBaseItemsModel}">
|
|
13 | 13 |
<UserControl.Resources> |
14 | 14 |
<Style TargetType="telerik:GridViewCell" x:Key="StretchCellStyle"> |
15 | 15 |
<Setter Property="Margin" Value="0"/> |
... | ... | |
63 | 63 |
<local:DataBaseViewInfo /> |
64 | 64 |
</DataTemplate> |
65 | 65 |
</UserControl.Resources> |
66 |
<UserControl.DataContext> |
|
67 |
<VM:DataBaseItemsModel/> |
|
68 |
</UserControl.DataContext> |
|
69 | 66 |
<i:Interaction.Triggers> |
70 | 67 |
<i:EventTrigger EventName="Loaded"> |
71 | 68 |
<i:InvokeCommandAction Command="{Binding LoadedCommand}"/> |
... | ... | |
96 | 93 |
Docuemnt_Name="{Binding Document_NameFilter, Mode=TwoWay}" Docuemnt_NO="{Binding Docuemnt_NOFilter, Mode=TwoWay}" Reconverter="{Binding ReconverterFilter, Mode=TwoWay}" |
97 | 94 |
Revision="{Binding RevisionFilter, Mode=TwoWay}" GroupNO="{Binding GroupNOFilter, Mode=TwoWay}" Document_URL="{Binding DOCUMENT_URLFilter, Mode=TwoWay}"/> |
98 | 95 |
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right"> |
99 |
<telerik:RadToggleButton Content=" Document 필터" Command="{Binding DocumentFilterCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/>
|
|
96 |
<telerik:RadToggleButton Content=" Document Items" Command="{Binding DocumentFilterCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/>
|
|
100 | 97 |
<telerik:RadToggleButton Content=" Convert 추가" Command="{Binding ConvertAddCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
101 | 98 |
<telerik:RadToggleButton Content=" 검색" Command="{Binding DataFilterCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
102 | 99 |
<telerik:RadToggleButton Content=" 초기화" Command="{Binding ResetCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
... | ... | |
129 | 126 |
LeftFrozenColumnCount="6" |
130 | 127 |
RightFrozenColumnCount="0"> |
131 | 128 |
<i:Interaction.Behaviors> |
132 |
<controls:GridViewSelectionUtilities SelectedItems="{Binding SelectFilterConvertList, Source={StaticResource DataBaseItemsModel}}" />
|
|
129 |
<controls:GridViewSelectionUtilities SelectedItems="{Binding SelectFilterConvertList}" /> |
|
133 | 130 |
</i:Interaction.Behaviors> |
134 | 131 |
<telerik:RadContextMenu.ContextMenu> |
135 | 132 |
<telerik:RadContextMenu x:Name= "GridContextMenu"> |
ConvertService/ServiceBase/Markus.Service.StationController/Views/FinalPDFView.xaml | ||
---|---|---|
88 | 88 |
DisplayMemberPath="DisplayName" SelectedValuePath="Value" ItemsSource="{Binding StatusCodeList}" Height="20"/> |
89 | 89 |
<telerik:RadToggleButton Content=" 엑셀 저장 " Margin="10,0" Height="20" Command="{Binding DataSaveFileGemBoxCommand, Mode=OneWay}"/> |
90 | 90 |
</StackPanel> |
91 |
|
|
92 |
|
|
93 | 91 |
<Grid Grid.Row="1"> |
94 | 92 |
<Grid.Style> |
95 | 93 |
<Style> |
... | ... | |
237 | 235 |
</Grid> |
238 | 236 |
|
239 | 237 |
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="2"> |
240 |
<telerik:RadToggleButton Content=" Document 필터" Command="{Binding DocumentFilterCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/>
|
|
238 |
<telerik:RadToggleButton Content=" Document Items" Command="{Binding DocumentFilterCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/>
|
|
241 | 239 |
<telerik:RadToggleButton Content=" Convert 추가" Command="{Binding ConverAddCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
242 | 240 |
<telerik:RadToggleButton Content=" 검색" Command="{Binding DataFilterCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
243 | 241 |
<telerik:RadToggleButton Content=" 초기화" Command="{Binding ResetCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
... | ... | |
270 | 268 |
LeftFrozenColumnCount="6" |
271 | 269 |
RightFrozenColumnCount="0"> |
272 | 270 |
<i:Interaction.Behaviors> |
273 |
<controls:GridViewSelectionUtilities SelectedItems="{Binding SelectFilterConvertList, Source={StaticResource FinalPDFViewModel}}" />
|
|
271 |
<controls:GridViewSelectionUtilities SelectedItems="{Binding SelectFilterConvertList}" /> |
|
274 | 272 |
</i:Interaction.Behaviors> |
275 | 273 |
<telerik:RadContextMenu.ContextMenu> |
276 | 274 |
<telerik:RadContextMenu x:Name= "GridContextMenu"> |
ConvertService/ServiceBase/StationControllerService/MarkusModel.edmx | ||
---|---|---|
259 | 259 |
<Property Type="String" Name="GROUP_N0" Nullable="true" MaxLength="50" /> |
260 | 260 |
<Property Type="String" Name="DOCUMENT_N0" Nullable="true" MaxLength="50" /> |
261 | 261 |
<Property Type="String" Name="DOCUMENT_ID" Nullable="true" MaxLength="50" /> |
262 |
<Property Type="String" Name="ORIGINAL_FILE" Nullable="true" MaxLength="500" /> |
|
263 |
<Property Type="String" Name="REVISION" Nullable="true" MaxLength="50" /> |
|
262 | 264 |
<Property Type="String" Name="DOCUMENTID" Nullable="true" MaxLength="50" /> |
263 | 265 |
</ComplexType> |
264 | 266 |
</Schema> |
... | ... | |
359 | 361 |
<ScalarProperty Name="GROUP_N0" ColumnName="GROUP_N0" /> |
360 | 362 |
<ScalarProperty Name="DOCUMENT_N0" ColumnName="DOCUMENT_N0" /> |
361 | 363 |
<ScalarProperty Name="DOCUMENT_ID" ColumnName="DOCUMENT_ID" /> |
364 |
<ScalarProperty Name="ORIGINAL_FILE" ColumnName="ORIGINAL_FILE" /> |
|
365 |
<ScalarProperty Name="REVISION" ColumnName="REVISION" /> |
|
362 | 366 |
<ScalarProperty Name="DOCUMENTID" ColumnName="DOCUMENTID" /> |
363 | 367 |
</ComplexTypeMapping> |
364 | 368 |
</ResultMapping> |
ConvertService/ServiceBase/StationControllerService/StationControllerService.csproj.user | ||
---|---|---|
8 | 8 |
<IISExpressWindowsAuthentication /> |
9 | 9 |
<IISExpressUseClassicPipelineMode /> |
10 | 10 |
<UseGlobalApplicationHostFile /> |
11 |
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
|
11 |
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
|
12 | 12 |
<NameOfLastUsedPublishProfile>FolderProfile1</NameOfLastUsedPublishProfile> |
13 | 13 |
</PropertyGroup> |
14 | 14 |
<ProjectExtensions> |
내보내기 Unified diff