개정판 50b63148
search할때 업데이트 오류 수정
Change-Id: Iba06efc28768c7795c821911964fea487dba75c2
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 |
내보내기 Unified diff