개정판 50b63148
search할때 업데이트 오류 수정
Change-Id: Iba06efc28768c7795c821911964fea487dba75c2
ConvertService/ServiceBase/Markus.Service.StationController/App.config | ||
---|---|---|
5 | 5 |
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> |
6 | 6 |
</configSections> |
7 | 7 |
<connectionStrings> |
8 |
<add name="markusEntities" connectionString="metadata=res://*/MarkusModel.csdl|res://*/MarkusModel.ssdl|res://*/MarkusModel.msl;provider=System.Data.SqlClient;provider connection string="data source=192.168.0.67;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;MultipleActiveResultSets=True;App=EntityFramework"" providerName="System.Data.EntityClient" /> |
|
8 |
<add name="markusEntities" connectionString="metadata=res://*/MarkusModel.csdl|res://*/MarkusModel.ssdl|res://*/MarkusModel.msl;provider=System.Data.SqlClient;provider connection string="data source= |
|
9 |
0.67;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;MultipleActiveResultSets=True;App=EntityFramework"" providerName="System.Data.EntityClient" /> |
|
9 | 10 |
</connectionStrings> |
10 | 11 |
<startup> |
11 | 12 |
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> |
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/ConvertExcelDialogViewModel.cs | ||
---|---|---|
123 | 123 |
{ |
124 | 124 |
SaveFileDialog saveFileDialog = new SaveFileDialog(); |
125 | 125 |
|
126 |
saveFileDialog.FileName = "Document"; // Default file name
|
|
127 |
saveFileDialog.DefaultExt = ".txt"; // Default file extension
|
|
128 |
saveFileDialog.Filter = "Csv documents (.Csv)|*.csv|Excel(2017~2019)Worksheets|*.xlsx"; // Filter files by extension
|
|
126 |
saveFileDialog.FileName = "Document"; |
|
127 |
saveFileDialog.DefaultExt = ".txt"; |
|
128 |
saveFileDialog.Filter = "Csv documents (.Csv)|*.csv|Excel(2017~2019)Worksheets|*.xlsx"; |
|
129 | 129 |
|
130 | 130 |
if (saveFileDialog.ShowDialog() == true) |
131 | 131 |
{ |
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs | ||
---|---|---|
579 | 579 |
} |
580 | 580 |
} |
581 | 581 |
|
582 |
public bool _SearchTimerOn = false; |
|
583 |
public bool SearchTimerOn |
|
584 |
{ |
|
585 |
get => _SearchTimerOn; |
|
586 |
set |
|
587 |
{ |
|
588 |
if (_SearchTimerOn = !value) |
|
589 |
{ |
|
590 |
_SearchTimerOn = false; |
|
591 |
} |
|
592 |
_SearchTimerOn = value; |
|
593 |
OnPropertyChanged(() => SearchTimerOn); |
|
594 |
} |
|
595 |
} |
|
596 |
|
|
597 |
|
|
598 |
|
|
582 | 599 |
#endregion |
583 | 600 |
|
584 | 601 |
#region Command |
... | ... | |
1263 | 1280 |
|
1264 | 1281 |
public void DataFilter(object obj) |
1265 | 1282 |
{ |
1283 |
SearchTimerOn = true; |
|
1266 | 1284 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
1267 | 1285 |
dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick); |
1268 | 1286 |
} |
... | ... | |
1338 | 1356 |
|
1339 | 1357 |
public void DataExportData(object obj) |
1340 | 1358 |
{ |
1341 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
|
1359 |
if(SearchTimerOn == true) |
|
1360 |
{ |
|
1361 |
dispatcherTimer.Tick -= new EventHandler(SearchTimer_Tick); |
|
1362 |
} |
|
1363 |
else |
|
1364 |
{ |
|
1365 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
|
1366 |
} |
|
1342 | 1367 |
|
1343 | 1368 |
Return_FilterConvertSource(FilterConvertSource); |
1344 | 1369 |
|
... | ... | |
1349 | 1374 |
|
1350 | 1375 |
convertExcelDialog.ShowDialog(); |
1351 | 1376 |
|
1352 |
|
|
1353 |
dispatcherTimer.Tick += new EventHandler(Timer_Tick); |
|
1377 |
if (SearchTimerOn == true) |
|
1378 |
{ |
|
1379 |
dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick); |
|
1380 |
} |
|
1381 |
else |
|
1382 |
{ |
|
1383 |
dispatcherTimer.Tick += new EventHandler(Timer_Tick); |
|
1384 |
} |
|
1354 | 1385 |
} |
1355 | 1386 |
|
1356 | 1387 |
#endregion |
... | ... | |
1375 | 1406 |
|
1376 | 1407 |
public void Reset(object obj) |
1377 | 1408 |
{ |
1409 |
SearchTimerOn = false; |
|
1378 | 1410 |
ExcptionCheck = false; |
1379 | 1411 |
SelectedInt = 10; |
1380 | 1412 |
ProjectNumberFilter = ProjectNames[0]; |
... | ... | |
1404 | 1436 |
|
1405 | 1437 |
public void ConvertAdd(object obj) |
1406 | 1438 |
{ |
1407 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
|
1439 |
if (SearchTimerOn == true) |
|
1440 |
{ |
|
1441 |
dispatcherTimer.Tick -= new EventHandler(SearchTimer_Tick); |
|
1442 |
} |
|
1443 |
else |
|
1444 |
{ |
|
1445 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
|
1446 |
} |
|
1408 | 1447 |
|
1409 | 1448 |
Views.ConvertAddDialog convertAddDialog = new Views.ConvertAddDialog(); |
1410 | 1449 |
|
1450 |
convertAddDialog.Owner = Application.Current.MainWindow; |
|
1411 | 1451 |
convertAddDialog.WindowStartupLocation = WindowStartupLocation.CenterOwner; |
1412 | 1452 |
|
1413 | 1453 |
convertAddDialog.ShowDialog(); |
1414 | 1454 |
|
1415 |
dispatcherTimer.Tick += new EventHandler(Timer_Tick); |
|
1455 |
if (SearchTimerOn == true) |
|
1456 |
{ |
|
1457 |
dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick); |
|
1458 |
} |
|
1459 |
else |
|
1460 |
{ |
|
1461 |
dispatcherTimer.Tick += new EventHandler(Timer_Tick); |
|
1462 |
} |
|
1416 | 1463 |
} |
1417 | 1464 |
|
1418 | 1465 |
#endregion |
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/FinalPDFViewModel.cs | ||
---|---|---|
658 | 658 |
} |
659 | 659 |
} |
660 | 660 |
|
661 |
public bool _SearchTimerOn = false; |
|
662 |
public bool SearchTimerOn |
|
663 |
{ |
|
664 |
get => _SearchTimerOn; |
|
665 |
set |
|
666 |
{ |
|
667 |
if (_SearchTimerOn = !value) |
|
668 |
{ |
|
669 |
_SearchTimerOn = false; |
|
670 |
} |
|
671 |
_SearchTimerOn = value; |
|
672 |
OnPropertyChanged(() => SearchTimerOn); |
|
673 |
} |
|
674 |
} |
|
675 |
|
|
661 | 676 |
#endregion |
662 | 677 |
|
663 | 678 |
#region Command |
... | ... | |
1344 | 1359 |
|
1345 | 1360 |
public void DataFilter(object obj) |
1346 | 1361 |
{ |
1362 |
SearchTimerOn = true; |
|
1347 | 1363 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
1348 | 1364 |
dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick); |
1349 | 1365 |
} |
... | ... | |
1417 | 1433 |
|
1418 | 1434 |
public void DataExportData(object obj) |
1419 | 1435 |
{ |
1420 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
|
1436 |
if (SearchTimerOn == true) |
|
1437 |
{ |
|
1438 |
dispatcherTimer.Tick -= new EventHandler(SearchTimer_Tick); |
|
1439 |
} |
|
1440 |
else |
|
1441 |
{ |
|
1442 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
|
1443 |
} |
|
1421 | 1444 |
|
1422 | 1445 |
Return_FilterConvertSource(FilterConvertSource); |
1423 | 1446 |
|
... | ... | |
1429 | 1452 |
finalPDFExcelDialog.ShowDialog(); |
1430 | 1453 |
|
1431 | 1454 |
|
1432 |
dispatcherTimer.Tick += new EventHandler(Timer_Tick); |
|
1455 |
if (SearchTimerOn == true) |
|
1456 |
{ |
|
1457 |
dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick); |
|
1458 |
} |
|
1459 |
else |
|
1460 |
{ |
|
1461 |
dispatcherTimer.Tick += new EventHandler(Timer_Tick); |
|
1462 |
} |
|
1433 | 1463 |
} |
1434 | 1464 |
|
1435 | 1465 |
#endregion |
... | ... | |
1455 | 1485 |
|
1456 | 1486 |
public void Reset(object obj) |
1457 | 1487 |
{ |
1488 |
SearchTimerOn = false; |
|
1458 | 1489 |
ExcptionCheck = false; |
1459 | 1490 |
SelectedInt = 10; |
1460 | 1491 |
ProjectNumberFilter = ProjectNames[0]; |
... | ... | |
1488 | 1519 |
|
1489 | 1520 |
public void ConverAdd(object obj) |
1490 | 1521 |
{ |
1491 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
|
1522 |
if (SearchTimerOn == true) |
|
1523 |
{ |
|
1524 |
dispatcherTimer.Tick -= new EventHandler(SearchTimer_Tick); |
|
1525 |
} |
|
1526 |
else |
|
1527 |
{ |
|
1528 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
|
1529 |
} |
|
1492 | 1530 |
|
1493 | 1531 |
Views.FinalPDFAddDialog convertAddDialog = new Views.FinalPDFAddDialog(); |
1494 | 1532 |
|
1533 |
convertAddDialog.Owner = Application.Current.MainWindow; |
|
1495 | 1534 |
convertAddDialog.WindowStartupLocation = WindowStartupLocation.CenterOwner; |
1496 | 1535 |
|
1497 | 1536 |
convertAddDialog.ShowDialog(); |
1498 | 1537 |
|
1499 |
dispatcherTimer.Tick += new EventHandler(Timer_Tick); |
|
1538 |
if (SearchTimerOn == true) |
|
1539 |
{ |
|
1540 |
dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick); |
|
1541 |
} |
|
1542 |
else |
|
1543 |
{ |
|
1544 |
dispatcherTimer.Tick += new EventHandler(Timer_Tick); |
|
1545 |
} |
|
1500 | 1546 |
} |
1501 | 1547 |
|
1502 | 1548 |
#endregion |
ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseView.xaml | ||
---|---|---|
55 | 55 |
</Setter.Value> |
56 | 56 |
</Setter> |
57 | 57 |
</Style> |
58 |
<!--<Style x:Key="MyFocusVisual"> |
|
59 |
<Setter Property="Control.Template" Value="{x:Null}"/> |
|
60 |
</Style>--> |
|
61 |
<!--<DataTemplate x:Key="borderedTemplate"> |
|
62 |
<Border BorderBrush="Transparent" BorderThickness="0" Background="White" SnapsToDevicePixels="true"> |
|
63 |
<TextBox VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="Black" IsReadOnly="True" ScrollViewer.PanningMode="VerticalFirst" Stylus.IsFlicksEnabled="False" |
|
64 |
SnapsToDevicePixels="True" HorizontalContentAlignment="Left" VerticalContentAlignment="Center" FocusVisualStyle="{DynamicResource MyFocusVisual}" |
|
65 |
Background="White" BorderBrush="Transparent" BorderThickness="0"> |
|
66 |
</TextBox> |
|
67 |
</Border> |
|
68 |
</DataTemplate>--> |
|
69 |
|
|
70 | 58 |
<VM:DataBaseItemsModel x:Key="DataBaseItemsModel"/> |
71 | 59 |
<DataTemplate x:Key="RowDetailsTemplate"> |
72 | 60 |
<local:DataBaseViewInfo /> |
73 | 61 |
</DataTemplate> |
74 | 62 |
</UserControl.Resources> |
75 |
<!--<UserControl.DataContext> |
|
76 |
<VM:DataBaseItemsModel/> |
|
77 |
</UserControl.DataContext>--> |
|
78 | 63 |
<i:Interaction.Triggers> |
79 | 64 |
<i:EventTrigger EventName="Loaded"> |
80 | 65 |
<i:InvokeCommandAction Command="{Binding LoadedCommand}"/> |
... | ... | |
125 | 110 |
</Grid> |
126 | 111 |
</telerik:RadExpander.Header> |
127 | 112 |
|
128 |
<!--SelectedItem="{Binding SelectFilterConvertList, Mode=OneWayToSource}" --> |
|
129 |
<!-- controls:GridViewSelectionUtilities.SelectedItems="{Binding SelectFilterConvertList, Source=StaticResource context, Mode=TwoWay}"--> |
|
130 |
<!-- SelectedItem="{Binding SelectFilterConvert, Source=StaticResource context, Mode=TwoWay}"--> |
|
131 | 113 |
<telerik:RadGridView x:Name="dataGrid1" GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" |
132 | 114 |
ItemsSource="{Binding FilterConvertSourceView}" |
133 | 115 |
SelectionMode="Extended" |
... | ... | |
183 | 165 |
</DataTemplate> |
184 | 166 |
</telerik:GridViewDynamicHyperlinkColumn.CellTemplate> |
185 | 167 |
</telerik:GridViewDynamicHyperlinkColumn> |
186 |
<!--<telerik:GridViewDataColumn Header=" ConvertPath" |
|
187 |
DataMemberBinding="{Binding ConvertPath}" Width="2.5*" > |
|
188 |
</telerik:GridViewDataColumn>--> |
|
168 |
|
|
189 | 169 |
<telerik:GridViewDataColumn Header=" ConvertPath" IsReadOnly="True" Width="2.5*"> |
190 |
<!--Style="{Binding Mode=OneWay, Source={StaticResource borderedTemplate}}"--> |
|
191 | 170 |
<telerik:GridViewDataColumn.CellTemplate> |
192 | 171 |
<DataTemplate> |
193 | 172 |
<StackPanel Orientation="Horizontal" > |
... | ... | |
275 | 254 |
</DataTemplate> |
276 | 255 |
</telerik:GridViewDynamicHyperlinkColumn.CellTemplate> |
277 | 256 |
</telerik:GridViewDynamicHyperlinkColumn> |
278 |
<!--<telerik:GridViewDataColumn Header=" ConvertPath" |
|
279 |
DataMemberBinding="{Binding ConvertPath}" Width="2.5*" />--> |
|
257 |
|
|
280 | 258 |
<telerik:GridViewDataColumn Header=" ConvertPath" Width="2.5*"> |
281 | 259 |
<telerik:GridViewDataColumn.CellTemplate> |
282 | 260 |
<DataTemplate > |
... | ... | |
355 | 333 |
</DataTemplate> |
356 | 334 |
</telerik:GridViewDynamicHyperlinkColumn.CellTemplate> |
357 | 335 |
</telerik:GridViewDynamicHyperlinkColumn> |
358 |
<!--<telerik:GridViewDataColumn Header=" ConvertPath" |
|
359 |
DataMemberBinding="{Binding ConvertPath}" Width="2.5*" />--> |
|
336 |
|
|
360 | 337 |
<telerik:GridViewDataColumn Header=" ConvertPath" Width="2.5*"> |
361 | 338 |
<telerik:GridViewDataColumn.CellTemplate> |
362 | 339 |
<DataTemplate > |
ConvertService/ServiceBase/Markus.Service.StationController/Views/FinalPDFView.xaml | ||
---|---|---|
59 | 59 |
<local:FinalPDFInfo /> |
60 | 60 |
</DataTemplate> |
61 | 61 |
</UserControl.Resources> |
62 |
<!--<UserControl.DataContext> |
|
63 |
<VM:DataBaseItemsModel/> |
|
64 |
</UserControl.DataContext>--> |
|
65 | 62 |
<i:Interaction.Triggers> |
66 | 63 |
<i:EventTrigger EventName="Loaded"> |
67 | 64 |
<i:InvokeCommandAction Command="{Binding LoadedCommand}"/> |
... | ... | |
87 | 84 |
<telerik:RadComboBox Width="100" SelectedItem="{Binding SelectedStatus, Mode=TwoWay}" SelectedIndex="4" |
88 | 85 |
DisplayMemberPath="DisplayName" SelectedValuePath="Value" ItemsSource="{Binding StatusCodeList}" Height="20"/> |
89 | 86 |
<telerik:RadToggleButton Content=" 엑셀 저장 " Margin="10,0" Height="20" Command="{Binding DataSaveFileGemBoxCommand, Mode=OneWay}"/> |
90 |
<!--<telerik:RadToggleButton Content=" Filter" Command="{Binding DataFilterCommand, Mode=OneWay}"/>--> |
|
91 | 87 |
</StackPanel> |
92 | 88 |
|
93 | 89 |
|
... | ... | |
127 | 123 |
SelectedItem="{Binding ProjectNumberFilter}" |
128 | 124 |
AllowMultipleSelection="False" |
129 | 125 |
EmptyText="Project_NO : Project_Name"/> |
130 |
<!--<telerik:RadMaskedTextInput IsClearButtonVisible="True" Grid.Row="0" Grid.Column="1" EmptyContent="ProjectNumber" InputBehavior="Replace" HorizontalContentAlignment="Stretch" |
|
131 |
TextMode="PlainText" Value="{Binding ProjectNumberFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="2,0" |
|
132 |
maskedInput:MaskedInputExtensions.MaxTextLength="1000" Mask=""/>--> |
|
133 | 126 |
|
134 | 127 |
<TextBlock Text="Document ID " Grid.Row="0" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Left"/> |
135 | 128 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" EmptyContent="DocumentID" Value="{Binding DocumentIDFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" |
... | ... | |
182 | 175 |
HorizontalAlignment="Stretch" |
183 | 176 |
SelectedValue="{Binding SelectedCreateTimeBegin ,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged }" > |
184 | 177 |
</telerik:RadDateTimePicker> |
185 |
<!--<DatePicker Text="{Binding OpenStartTime, StringFormat='yy.mm.dd HH:mm:ss' ,RelativeSource={RelativeSource AncestorType={x:Type DatePicker}}}" SelectedDate="{Binding SelectedOpenTime}" Width="124" SelectedDateFormat="Long" Margin="0,-1,0,1"/>--> |
|
186 | 178 |
<TextBlock Text=" ~ " VerticalAlignment="Center"/> |
187 | 179 |
<telerik:RadDateTimePicker x:Name="datePicker2" Width="200" |
188 | 180 |
InputMode="DateTimePicker" HorizontalAlignment="Stretch" |
... | ... | |
387 | 379 |
</DataTemplate> |
388 | 380 |
</telerik:GridViewDynamicHyperlinkColumn.CellTemplate> |
389 | 381 |
</telerik:GridViewDynamicHyperlinkColumn> |
390 |
<!--<telerik:GridViewDataColumn Header=" ConvertPath" |
|
391 |
DataMemberBinding="{Binding ConvertPath}" Width="2.5*" />--> |
|
382 |
|
|
392 | 383 |
<telerik:GridViewDataColumn Header=" ConvertPath" Width="2.5*"> |
393 | 384 |
<telerik:GridViewDataColumn.CellTemplate> |
394 | 385 |
<DataTemplate> |
... | ... | |
504 | 495 |
</DataTemplate> |
505 | 496 |
</telerik:GridViewDataColumn.CellTemplate> |
506 | 497 |
</telerik:GridViewDataColumn> |
507 |
<!--<telerik:GridViewDataColumn Header=" ConvertPath" |
|
508 |
DataMemberBinding="{Binding ConvertPath}" Width="2.5*" />--> |
|
498 |
|
|
509 | 499 |
<telerik:GridViewDataColumn Header="CreateTime" |
510 | 500 |
DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" /> |
511 | 501 |
<telerik:GridViewDataColumn Header="StartTime" |
ConvertService/ServiceBase/Markus.Service.StationController/Views/FinalPDFViewInfo.xaml | ||
---|---|---|
51 | 51 |
<Grid.RowDefinitions> |
52 | 52 |
<RowDefinition Height="20" /> |
53 | 53 |
<RowDefinition Height="20" /> |
54 |
<!--<RowDefinition Height="20" /> |
|
55 |
<RowDefinition Height="20" />--> |
|
56 | 54 |
</Grid.RowDefinitions> |
57 | 55 |
<Grid.ColumnDefinitions> |
58 | 56 |
<ColumnDefinition Width="110" /> |
... | ... | |
74 | 72 |
<TextBox Text="{Binding DocumentName }" MaxWidth="300" |
75 | 73 |
Grid.Row="0" |
76 | 74 |
Grid.Column="5" /> |
77 |
<!--<TextBlock Text="Document No: " |
|
78 |
Grid.Row="1" |
|
79 |
Grid.Column="0" HorizontalAlignment="Stretch" /> |
|
80 |
<TextBox Text="{Binding DocumnetNo}" |
|
81 |
Grid.Row="1" |
|
82 |
Grid.Column="2" />--> |
|
83 |
<!--<TextBlock Text="ReConverter: " |
|
84 |
Grid.Row="1" |
|
85 |
Grid.Column="3"/> |
|
86 |
<TextBox Text="{Binding ReConverter}" MaxWidth="300" |
|
87 |
Grid.Row="1" |
|
88 |
Grid.Column="5"/>--> |
|
89 |
<!--<TextBlock Text="Document Name: " |
|
90 |
Grid.Row="2" |
|
91 |
Grid.Column="0" /> |
|
92 |
<TextBox Text="{Binding DocumnetName}" |
|
93 |
Grid.Row="2" |
|
94 |
Grid.Column="2"/>--> |
|
95 |
<!--<TextBlock Text="Service ID: " |
|
96 |
Grid.Row="2" |
|
97 |
Grid.Column="3"/> |
|
98 |
<TextBox Text="{Binding ServiceID}" MaxWidth="300" |
|
99 |
Grid.Row="2" |
|
100 |
Grid.Column="5" />--> |
|
101 | 75 |
<TextBlock Text="Revision: " |
102 | 76 |
Grid.Row="1" |
103 | 77 |
Grid.Column="0"/> |
내보내기 Unified diff