프로젝트

일반

사용자정보

개정판 50b63148

ID50b6314854bdaf8faa7f891f1b1814c4c60f0494
상위 cb806a91
하위 cdb2c0a2

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

search할때 업데이트 오류 수정

Change-Id: Iba06efc28768c7795c821911964fea487dba75c2

차이점 보기:

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

내보내기 Unified diff

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